dzduole 1 month ago
parent
commit
dda669fce8
31 changed files with 59 additions and 65 deletions
  1. 1 7
      art/fgui/.objs/metas/isxx5ak7/wehi3uf.info
  2. 1 1
      art/fgui/assets/game/UIBox/component/box_com1.xml
  3. 1 1
      art/fgui/assets/game/UIGame/component/Component45.xml
  4. 2 2
      art/fgui/assets/game/UIGame/component/topNode.xml
  5. 1 1
      art/fgui/assets/game/UIGame/component/wordsDisplay.xml
  6. 2 2
      art/fgui/assets/game/UIGameEnd/UIGameEnd.xml
  7. 1 1
      art/fgui/assets/game/UIGameEnd/component/Component39.xml
  8. 2 2
      art/fgui/assets/game/UIGameEnd/component/Component55.xml
  9. 1 1
      art/fgui/assets/game/UIGameEnd/component/Component56.xml
  10. 2 2
      art/fgui/assets/game/UILevelProp/component/Component83.xml
  11. 1 1
      art/fgui/assets/game/UILevelProp/component/Component84.xml
  12. 1 1
      art/fgui/assets/game/UILevelProp/component/Component84_1.xml
  13. 3 3
      art/fgui/assets/game/UILevelProp/component/Component85.xml
  14. 1 1
      art/fgui/assets/game/UILevelSelect/UIMain/component/Component3.xml
  15. 1 1
      art/fgui/assets/game/UIMatching/UIMatching.xml
  16. 2 2
      art/fgui/assets/game/UIMatching/component/Component18.xml
  17. 1 1
      art/fgui/assets/game/UIMatching/component/dh_zy_jiazai.xml
  18. 3 3
      art/fgui/assets/game/UIMoney/UIMoney.xml
  19. 2 2
      art/fgui/assets/game/UIRepentProp/component/longBtn.xml
  20. 1 1
      art/fgui/assets/game/UIRodMethod/component/Component61.xml
  21. 1 1
      art/fgui/assets/game/UIRodMethod/component/sureBtn.xml
  22. 3 3
      art/fgui/assets/game/UISecretary/Component118.xml
  23. 1 1
      art/fgui/assets/game/UIWordsList/UIWordsList.xml
  24. 7 7
      art/fgui/assets/game/_sharecomponent/shareBtn.xml
  25. 8 8
      art/fgui/assets/game/_sharecomponent/shareBtn2.xml
  26. BIN
      client/laya/bin/asset/fgui/game.obj
  27. 1 1
      client/laya/bin/index.html
  28. 0 0
      client/laya/bin/js/bundle.js.map
  29. 1 1
      client/laya/release/newTable/index.html
  30. 1 1
      client/laya/release/web/index.html
  31. 6 6
      client/laya/src/core/mgrs/SpineMgr.ts

+ 1 - 7
art/fgui/.objs/metas/isxx5ak7/wehi3uf.info

@@ -1,7 +1 @@
-{
-  "objectStatus": {
-    "n22_cy72": {
-      "collapsed": true
-    }
-  }
-}
+{}

+ 1 - 1
art/fgui/assets/game/UIBox/component/box_com1.xml

@@ -2,7 +2,7 @@
 <component size="698,76">
   <displayList>
     <image id="n14_ihpy" name="n14" src="n43d3vi" fileName="UIGame/asset/bq5_1(1).png" xy="125,0"/>
-    <text id="n6_hkrz" name="n6" xy="0,16" size="698,54" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Open treasure chests to win fantastic prizes!"/>
+    <text id="n6_hkrz" name="n6" xy="0,16" size="698,54" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Open treasure chests to win fantastic prizes!"/>
   </displayList>
   <transition name="t0" autoPlay="true">
     <item time="0" type="Alpha" target="n14_ihpy" tween="true" startValue="0" endValue="1" duration="12"/>

+ 1 - 1
art/fgui/assets/game/UIGame/component/Component45.xml

@@ -12,7 +12,7 @@
     <image id="n42_iveg" name="n42" src="hkrz3rj" fileName="UIGame/asset/yy_szk2.png" xy="5,53" size="73,23">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <text id="n43_iveg" name="awardTxt" xy="5,55" size="72,26" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="1000">
+    <text id="n43_iveg" name="awardTxt" xy="5,55" size="72,26" font="Arial" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="1000">
       <gearDisplay controller="c1" pages="0"/>
     </text>
     <image id="n44_i4k2" name="n44" src="i4k2437" fileName="UIGame/asset/yy_zs13_1.png" xy="1,82">

+ 2 - 2
art/fgui/assets/game/UIGame/component/topNode.xml

@@ -13,8 +13,8 @@
     <loader id="n8_hkrz" name="aiHeadLoader" xy="748,6" size="80,80" fill="scaleMatchHeight"/>
     <image id="n33_hkrz" name="n33" src="hkrz3rk" fileName="UIGame/asset/yy_txk.png" xy="501,0" size="90,90"/>
     <image id="n34_hkrz" name="n34" src="hkrz3rk" fileName="UIGame/asset/yy_txk.png" xy="744,0" size="90,90"/>
-    <text id="n25_hkrz" name="selfNameTxt" xy="326,7" pivot="1,0.5" size="167,31" fontSize="22" color="#ffffff" align="right" vAlign="middle" text="我的名字123123"/>
-    <text id="n26_hkrz" name="aiNameTxt" xy="842,8" pivot="0,0.5" size="167,31" fontSize="22" color="#ffffff" align="right" vAlign="middle" text="我的名字123123"/>
+    <text id="n25_hkrz" name="selfNameTxt" xy="329,6" pivot="1,0.5" size="164,32" font="Arial" fontSize="22" color="#ffffff" align="right" vAlign="middle" text="我的名字123123"/>
+    <text id="n26_hkrz" name="aiNameTxt" xy="842,7" pivot="0,0.5" size="164,32" font="Arial" fontSize="22" color="#ffffff" align="right" vAlign="middle" text="我的名字123123"/>
     <list id="n31_hkrz" name="selfBallList" xy="211,38" pivot="1,0.5" size="282,46" layout="row" overflow="scroll" scrollBarFlags="416" colGap="6" defaultItem="ui://isxx5ak7hkrz3sk" autoItemSize="false" align="right" vAlign="middle" autoClearItems="true" scrollItemToViewOnClick="false">
       <item/>
       <item/>

+ 1 - 1
art/fgui/assets/game/UIGame/component/wordsDisplay.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="242,48">
   <displayList>
-    <text id="n61_iveg" name="txt" xy="-14,0" size="270,47" fontSize="20" color="#617398" align="center" vAlign="middle" autoSize="none" text="好棒棒呀,哈哈哈哈哈哈哈"/>
+    <text id="n61_iveg" name="txt" xy="-14,0" size="270,47" font="Arial" fontSize="20" color="#617398" align="center" vAlign="middle" autoSize="none" text="好棒棒呀,哈哈哈哈哈哈哈"/>
     <graph id="n63_iveg" name="n63" xy="0,46" size="242,1" type="rect" lineSize="0" fillColor="#ffa8b1ce"/>
   </displayList>
 </component>

+ 2 - 2
art/fgui/assets/game/UIGameEnd/UIGameEnd.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1334,750" designImageAlpha="0" designImageLayer="1">
-  <controller name="c1" alias="结算" exported="true" pages="0,chenggong,1,shibai,2,完美过关,3,过关,4,闯关失败" selected="1"/>
+  <controller name="c1" alias="结算" exported="true" pages="0,chenggong,1,shibai,2,完美过关,3,过关,4,闯关失败" selected="0"/>
   <displayList>
     <graph id="n22_wehi" name="n22" xy="0,0" size="1334,750" type="rect" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
@@ -66,7 +66,7 @@
       <gearDisplay controller="c1" pages="2,3,4"/>
       <relation target="n14_wehi" sidePair="center-center"/>
     </component>
-    <text id="n47_g1gi" name="n47" xy="828,419" size="154,34" fontSize="24" color="#ffffff" align="center" vAlign="middle" autoSize="none" italic="true" text="3-Star Reward">
+    <text id="n47_g1gi" name="n47" xy="828,419" size="154,34" font="Arial" fontSize="24" color="#ffffff" align="center" vAlign="middle" autoSize="none" italic="true" text="3-Star Reward">
       <gearDisplay controller="c1" pages="2"/>
       <relation target="n14_wehi" sidePair="center-center"/>
     </text>

+ 1 - 1
art/fgui/assets/game/UIGameEnd/component/Component39.xml

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n5_wehi" name="n5" src="wehi3ub" fileName="UIGameEnd/asset/js_bz1.png" xy="265,0" size="648,80"/>
     <image id="n6_wehi" name="n6" src="wehi3u5" fileName="UIGameEnd/asset/js_zs2.png" xy="500,21" size="77,42" aspect="true"/>
-    <text id="n7_wehi" name="n7" xy="575,21" size="189,59" fontSize="36" color="#ffffff" vAlign="middle" vars="true" autoSize="none" text="+{jinbi=1000}"/>
+    <text id="n7_wehi" name="n7" xy="575,21" size="189,59" font="Arial" fontSize="36" color="#ffffff" vAlign="middle" vars="true" autoSize="none" bold="true" strokeColor="#000000" strokeSize="2" text="+{jinbi=1000}"/>
   </displayList>
   <transition name="t0" autoPlay="true">
     <item time="0" type="Alpha" target="n5_wehi" tween="true" startValue="1" endValue="1" duration="12"/>

+ 2 - 2
art/fgui/assets/game/UIGameEnd/component/Component55.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="270,58">
-  <controller name="c1" alias="结算" exported="true" pages="0,chenggong,1,shibai" selected="1"/>
+  <controller name="c1" alias="结算" exported="true" pages="0,chenggong,1,shibai" selected="0"/>
   <displayList>
     <image id="n30_g4yb" name="n30" src="brgy3uu" fileName="UIGameEnd/asset/zs4.png" xy="0,0" size="270,58" group="n33_anpx" alpha="0.4"/>
-    <text id="n31_g4yb" name="n31" xy="24,-4" size="230,65" group="n33_anpx" fontSize="22" color="#52719d" align="center" vAlign="middle" autoSize="none" text="Great, keep up the&#xA; good work!">
+    <text id="n31_g4yb" name="n31" xy="24,-4" size="230,65" group="n33_anpx" font="Arial" fontSize="22" color="#52719d" align="center" vAlign="middle" autoSize="none" bold="true" text="Great, keep up the&#xA; good work!">
       <gearDisplay controller="c1" pages="0,1"/>
       <gearDisplay2 controller="c1" pages="0" condition="0"/>
     </text>

+ 1 - 1
art/fgui/assets/game/UIGameEnd/component/Component56.xml

@@ -3,7 +3,7 @@
   <controller name="c1" alias="结算" exported="true" pages="0,完美过关,1,过关,4,失败" selected="0"/>
   <displayList>
     <image id="n30_g4yb" name="n30" src="brgy3uu" fileName="UIGameEnd/asset/zs4.png" xy="0,0" size="270,58" alpha="0.4"/>
-    <text id="n31_g4yb" name="n31" xy="12,14" size="257,32" fontSize="22" color="#52719d" vAlign="middle" leading="1" autoSize="none" text="keep up the good work!">
+    <text id="n31_g4yb" name="n31" xy="14,14" size="257,32" font="Arial" fontSize="22" color="#52719d" vAlign="middle" leading="1" autoSize="none" text="keep up the good work!">
       <gearDisplay controller="c1" pages="0,1"/>
       <gearDisplay2 controller="c1" pages="0" condition="0"/>
     </text>

+ 2 - 2
art/fgui/assets/game/UILevelProp/component/Component83.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="300,37">
-  <controller name="c1" alias="规则" exported="true" pages="0,清台模式,1,挑战模式" selected="1"/>
+  <controller name="c1" alias="规则" exported="true" pages="0,清台模式,1,挑战模式" selected="0"/>
   <displayList>
-    <text id="n17_xs1r" name="n17" xy="47,5" size="186,36" fontSize="26" color="#ffffff" align="center" vars="true" bold="true" text="Reward Mode">
+    <text id="n17_xs1r" name="n17" xy="47,0" size="219,36" font="Arial" fontSize="26" color="#ffffff" align="center" vars="true" bold="true" text="Clear-Table Mode">
       <gearText controller="c1" pages="0,1" values="Clear-Table Mode|Reward Mode"/>
     </text>
     <image id="n19_xs1r" name="n19" src="xs1r47y" fileName="UILevelProp/asset/tc_gk_tb1.png" xy="0,0" size="38,37" aspect="true">

+ 1 - 1
art/fgui/assets/game/UILevelProp/component/Component84.xml

@@ -8,7 +8,7 @@
       <relation target="" sidePair="center-center"/>
     </movieclip>
     <image id="n23_xs1r" name="n23" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="15,16"/>
-    <text id="n24_xs1r" name="numTxt" xy="0,72" size="82,29" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="99"/>
+    <text id="n24_xs1r" name="numTxt" xy="0,72" size="82,29" font="Arial" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="99"/>
     <image id="n25_gpvx" name="n25" src="p4tr41x" fileName="UIGameEnd/asset/db2.png" xy="11,9" size="62,62" aspect="true">
       <gearDisplay controller="c1" pages="1"/>
     </image>

+ 1 - 1
art/fgui/assets/game/UILevelProp/component/Component84_1.xml

@@ -8,7 +8,7 @@
       <relation target="" sidePair="center-center"/>
     </movieclip>
     <image id="n23_xs1r" name="n23" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="17,16"/>
-    <text id="n24_xs1r" name="numTxt" xy="11,71" size="61,29" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="99"/>
+    <text id="n24_xs1r" name="numTxt" xy="11,71" size="61,29" font="Arial" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="99"/>
     <image id="n25_gpvx" name="n25" src="p4tr41x" fileName="UIGameEnd/asset/db2.png" xy="10,10" size="62,62" aspect="true">
       <gearDisplay controller="c1" pages="1"/>
     </image>

+ 3 - 3
art/fgui/assets/game/UILevelProp/component/Component85.xml

@@ -8,15 +8,15 @@
       <relation target="" sidePair="left-left"/>
     </image>
     <text id="n7_xs1r" name="levelTxt" xy="231,20" pivot="0.5,0.5" size="436,54" font="Arial" fontSize="40" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Level  1"/>
-    <text id="n10_xs1r" name="n10" xy="390,96" size="298,32" fontSize="22" color="#6d85b3" vAlign="middle" leading="0" autoSize="none" text="Level Rules">
+    <text id="n10_xs1r" name="n10" xy="390,96" size="298,32" font="Arial" fontSize="22" color="#6d85b3" vAlign="middle" leading="0" autoSize="none" text="Level Rules">
       <relation target="n3_xs1r" sidePair="left-left"/>
     </text>
     <image id="n11_xs1r" name="n11" src="xs1r47t" fileName="UILevelProp/asset/gq5.png" xy="383,198"/>
-    <text id="n12_xs1r" name="n12" xy="390,198" size="297,32" fontSize="22" color="#6d85b3" vAlign="middle" leading="0" autoSize="none" text="Clearance Conditions">
+    <text id="n12_xs1r" name="n12" xy="390,198" size="297,32" font="Arial" fontSize="22" color="#6d85b3" vAlign="middle" leading="0" autoSize="none" text="Clearance Conditions">
       <relation target="n11_xs1r" sidePair="left-left"/>
     </text>
     <image id="n13_xs1r" name="n13" src="xs1r47t" fileName="UILevelProp/asset/gq5.png" xy="384,300"/>
-    <text id="n14_xs1r" name="n14" xy="390,300" size="490,32" fontSize="22" color="#6d85b3" vAlign="middle" leading="0" autoSize="none" text="Level Rewards (for Three-Star Clearance)">
+    <text id="n14_xs1r" name="n14" xy="390,300" size="490,32" font="Arial" fontSize="22" color="#6d85b3" vAlign="middle" leading="0" autoSize="none" text="Level Rewards (for Three-Star Clearance)">
       <relation target="n13_xs1r" sidePair="left-left"/>
     </text>
     <component id="n17_xs1r" name="modeNode" src="xs1r47z" fileName="UILevelProp/component/Component83.xml" xy="393,140" controller="c1,1">

+ 1 - 1
art/fgui/assets/game/UILevelSelect/UIMain/component/Component3.xml

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n26_ixm4" name="n26" src="n43d3vv" fileName="UIMain/asset/zjm_tx2.png" xy="62,18" size="187,41"/>
     <image id="n24_ixm4" name="n24" src="n43d3vt" fileName="UIMain/asset/zjm_tx.png" xy="0,0" size="68,69"/>
-    <text id="n45_ixm4" name="nameTxt" xy="80,30" size="139,29" fontSize="20" color="#ffffff" vAlign="middle" leading="5" autoSize="height" singleLine="true" text="Player"/>
+    <text id="n45_ixm4" name="nameTxt" xy="80,30" size="139,29" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" leading="5" autoSize="height" singleLine="true" text="Player"/>
     <component id="n46_ixm4" name="headRoot" src="ixm43xi" fileName="UIMain/component/Component4.xml" xy="2,1" size="64,66" aspect="true"/>
   </displayList>
 </component>

+ 1 - 1
art/fgui/assets/game/UIMatching/UIMatching.xml

@@ -25,7 +25,7 @@
       <relation target="" sidePair="center-center,top-top%"/>
     </image>
     <image id="n56_hxtr" name="n56" src="n0xy3yc" fileName="UIMatching/asset/pp_dk3.png" xy="352,619" size="630,58" group="n59_hxtr"/>
-    <text id="n58_hxtr" name="n58" xy="425,626" size="483,42" group="n59_hxtr" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="game will start soon"/>
+    <text id="n58_hxtr" name="n58" xy="425,626" size="483,42" group="n59_hxtr" font="Arial" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="game will start soon"/>
     <group id="n59_hxtr" name="n59" xy="352,619" size="630,58" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom%"/>
     </group>

+ 2 - 2
art/fgui/assets/game/UIMatching/component/Component18.xml

@@ -2,13 +2,13 @@
 <component size="347,116">
   <controller name="c1" exported="true" pages="0,不显示,1,显示" selected="1"/>
   <displayList>
-    <text id="n9_n0xy" name="nameTxt" xy="116,4" size="227,34" fontSize="22" color="#ffffff" vAlign="middle" autoSize="ellipsis" text="playerxxxxx"/>
+    <text id="n9_n0xy" name="nameTxt" xy="116,4" size="227,34" font="Arial" fontSize="22" color="#ffffff" vAlign="middle" autoSize="ellipsis" text="playerxxxxx"/>
     <loader id="n26_hxtr" name="headImg" xy="0,7" size="107,107" url="ui://isxx5ak7ixm43xl" align="center" vAlign="middle" fill="scaleMatchHeight" clearOnPublish="true"/>
     <image id="n24_hxtr" name="n24" src="hxtr3yr" fileName="UIMatching/asset/txk.png" xy="0,7" size="107,107"/>
     <loader id="n27_hxtr" name="skillImg" xy="118,49" size="170,170" scale="0.4,0.4" url="ui://isxx5ak7qlo0417" align="center" vAlign="middle" fill="scale" clearOnPublish="true">
       <gearDisplay controller="c1" pages="1"/>
     </loader>
-    <text id="n29_hxtr" name="skillTxt" xy="192,90" size="156,29" fontSize="20" color="#ffffff" vAlign="middle" vars="true" autoSize="none" text="{jnmz1=Jump}Lv.{jndj1=1}">
+    <text id="n29_hxtr" name="skillTxt" xy="192,90" size="156,29" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" vars="true" autoSize="none" text="{jnmz1=Jump}Lv.{jndj1=1}">
       <gearDisplay controller="c1" pages="1"/>
     </text>
   </displayList>

+ 1 - 1
art/fgui/assets/game/UIMatching/component/dh_zy_jiazai.xml

@@ -11,7 +11,7 @@
     <image id="n5_nsoo" name="n5" src="j69a40c" fileName="UIGameEnd/asset/wz2(1).png" xy="451,217"/>
     <image id="n6_nsoo" name="n6" src="j69a40c" fileName="UIGameEnd/asset/wz2(1).png" xy="463,217"/>
     <image id="n8_j69a" name="n8" src="n0xy3ya" fileName="UIMatching/asset/pp_dk1.png" xy="225,191"/>
-    <text id="n7_j69a" name="n7" xy="272,196" size="256,32" fontSize="20" color="#ffffff" vAlign="middle" autoSize="none" text="Searching for opponents"/>
+    <text id="n7_j69a" name="n7" xy="272,196" size="256,32" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" autoSize="none" text="Searching for opponents"/>
   </displayList>
   <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
     <item time="0" type="Alpha" target="n4_nsoo" tween="true" startValue="0" endValue="1" duration="12"/>

+ 3 - 3
art/fgui/assets/game/UIMoney/UIMoney.xml

@@ -11,7 +11,7 @@
     <component id="n5_wehi" name="addCoinBtn" src="wehi3un" fileName="_sharecomponent/MoneyBtn.xml" xy="519,4" size="42,42">
       <gearDisplay controller="c1" pages="0,1,13,14"/>
     </component>
-    <text id="n6_wehi" name="coinTxt" xy="393,10" size="90,29" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" leading="0" autoSize="none" text="99999">
+    <text id="n6_wehi" name="coinTxt" xy="393,10" size="90,29" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="99999">
       <gearDisplay controller="c1" pages="0,1,13,14"/>
     </text>
     <image id="n7_wehi" name="n7" src="wehi3um" fileName="UIMoney/asset/ty_dk.png" xy="577,0" size="219,50">
@@ -20,7 +20,7 @@
     <component id="n9_wehi" name="addDiamondBtn" src="wehi3un" fileName="_sharecomponent/MoneyBtn.xml" xy="746,4" size="42,42">
       <gearDisplay controller="c1" pages="1,13,15,17"/>
     </component>
-    <text id="n10_wehi" name="diamondTxt" xy="621,8" size="86,33" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" leading="0" autoSize="none" text="99999">
+    <text id="n10_wehi" name="diamondTxt" xy="621,8" size="86,33" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="99999">
       <gearDisplay controller="c1" pages="1,13,15,17"/>
     </text>
     <image id="n11_wehi" name="diamondImg" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="579,8" pivot="0.5,0.5" size="39,33" aspect="true">
@@ -35,7 +35,7 @@
     <component id="n14_jpsz" name="addPowerBtn" src="wehi3un" fileName="_sharecomponent/MoneyBtn.xml" xy="292,2" size="42,42">
       <gearDisplay controller="c1" pages="13,14,15,16"/>
     </component>
-    <text id="n15_jpsz" name="powerTxt" xy="164,10" size="92,29" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" leading="0" autoSize="none" text="99999">
+    <text id="n15_jpsz" name="powerTxt" xy="164,10" size="92,29" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="99999">
       <gearDisplay controller="c1" pages="13,14,15,16"/>
     </text>
     <text id="n16_jpsz" name="powerTimeTxt" xy="126,45" size="133,24" fontSize="16" color="#ffffff" align="center" vAlign="middle" vars="true" text="回满倒计时: {time=00:56}">

+ 2 - 2
art/fgui/assets/game/UIRepentProp/component/longBtn.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="165,51" pivot="0.5,0.5" extention="Button">
-  <controller name="c1" pages="0,,1," selected="0">
+  <controller name="c1" pages="0,,1," selected="1">
     <remark page="0" value="看视频"/>
     <remark page="1" value="不看视频"/>
   </controller>
   <displayList>
     <image id="n2_hkrz" name="n2" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,0" size="165,51" aspect="true"/>
-    <text id="n1_hkrz" name="n1" xy="50,1" size="68,48" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="OK"/>
+    <text id="n1_hkrz" name="n1" xy="50,1" size="68,48" font="Arial" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="OK"/>
     <image id="n4_p4tr" name="n4" src="hkrz3te" fileName="_shareasset/1.png" xy="14,14" pivot="0.5,0.5" size="31,22" aspect="true">
       <gearDisplay controller="c1" pages="0"/>
     </image>

+ 1 - 1
art/fgui/assets/game/UIRodMethod/component/Component61.xml

@@ -2,7 +2,7 @@
 <component size="698,76">
   <displayList>
     <image id="n14_ihpy" name="n14" src="n43d3vi" fileName="UIGame/asset/bq5_1(1).png" xy="125,0"/>
-    <text id="n6_hkrz" name="n6" xy="-1,17" size="698,54" fontSize="40" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="High and Low Cue Ball Control"/>
+    <text id="n6_hkrz" name="n6" xy="-1,17" size="698,54" font="Arial" fontSize="40" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="High and Low Cue Ball Control"/>
   </displayList>
   <transition name="t0" autoPlay="true">
     <item time="0" type="Alpha" target="n14_ihpy" tween="true" startValue="0" endValue="1" duration="12"/>

+ 1 - 1
art/fgui/assets/game/UIRodMethod/component/sureBtn.xml

@@ -2,7 +2,7 @@
 <component size="165,51" pivot="0.5,0.5" extention="Button">
   <displayList>
     <image id="n2_hkrz" name="n2" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,0" size="165,51" aspect="true"/>
-    <text id="n1_hkrz" name="n1" xy="0,3" size="164,48" fontSize="26" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" autoSize="none" text="OK"/>
+    <text id="n1_hkrz" name="n1" xy="0,3" size="164,48" font="Arial" fontSize="26" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" autoSize="none" bold="true" text="OK"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.1"/>
 </component>

+ 3 - 3
art/fgui/assets/game/UISecretary/Component118.xml

@@ -2,11 +2,11 @@
 <component size="291,65" pivot="0.5,0.5" extention="Button" designImageLayer="1">
   <displayList>
     <image id="n9_u8ei" name="n9" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,82" size="291,91" scale="1,-0.9"/>
-    <image id="n10_u8ei" name="n10" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="82,26" pivot="0.5,0.5" size="42,34" group="n13_u8ei" aspect="true"/>
-    <text id="n11_u8ei" name="n11" xy="132,23" size="76,42" group="n13_u8ei" fontSize="30" color="#ffffff" align="center" vAlign="middle" text="3000">
+    <image id="n10_u8ei" name="n10" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="84,26" pivot="0.5,0.5" size="42,34" group="n13_u8ei" aspect="true"/>
+    <text id="n11_u8ei" name="n11" xy="134,23" size="72,42" group="n13_u8ei" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" text="3000">
       <relation target="n10_u8ei" sidePair="left-left"/>
     </text>
-    <group id="n13_u8ei" name="n13" xy="82,23" size="126,42" advanced="true">
+    <group id="n13_u8ei" name="n13" xy="84,23" size="122,42" advanced="true">
       <relation target="n9_u8ei" sidePair="center-center"/>
     </group>
   </displayList>

+ 1 - 1
art/fgui/assets/game/UIWordsList/UIWordsList.xml

@@ -19,7 +19,7 @@
       <gearDisplay controller="c1" pages="0"/>
     </component>
     <loader id="n58_iveg" name="mybggg" xy="896,122" size="281,340" group="n75_j7kx" url="ui://isxx5ak7hkrz3ro" fill="scaleFree"/>
-    <list id="n62_i4k2" name="wordsList" xy="913,133" size="246,310" group="n75_j7kx" overflow="scroll" defaultItem="ui://isxx5ak7iveg436" autoItemSize="false" autoClearItems="true">
+    <list id="n62_i4k2" name="wordsList" xy="913,132" size="246,310" group="n75_j7kx" overflow="scroll" defaultItem="ui://isxx5ak7iveg436" autoItemSize="false" autoClearItems="true">
       <gearDisplay controller="c1" pages="0"/>
       <item/>
       <item/>

+ 7 - 7
art/fgui/assets/game/_sharecomponent/shareBtn.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="165,51" pivot="0.5,0.5" extention="Button">
-  <controller name="c1" alias="小按钮" exported="true" pages="0,分享,1,拿来吧你,2,退出,3,悔球,4,使用,5,继续,12,充满体力,13,立即体验,14,确定" selected="5"/>
+  <controller name="c1" alias="小按钮" exported="true" pages="0,分享,1,拿来吧你,2,退出,3,悔球,4,使用,5,继续,12,充满体力,13,立即体验,14,确定" selected="6"/>
   <displayList>
     <image id="n2_hkrz" name="n2" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,0" size="165,51" aspect="true"/>
     <text id="n1_hkrz" name="n1" xy="0,3" size="164,48" font="Arial" fontSize="22" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="悔球">
@@ -8,19 +8,19 @@
       <gearXY controller="c1" pages="3,4" values="14,-1|23,3" default="0,3"/>
       <gearText controller="c1" pages="0,3,4,14" values="share|undo a shot|USE|确定&#xA;" default="悔球"/>
     </text>
-    <text id="n3_p4tr" name="n3" xy="30,11" size="135,29" font="Arial" fontSize="20" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="充满体力">
+    <text id="n3_p4tr" name="n3" xy="11,11" size="142,29" font="Arial" fontSize="20" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Full of energy">
       <gearDisplay controller="c1" pages="1,12,13"/>
       <gearText controller="c1" pages="1,12,13" values="Get|Full of energy|Now" default="充满体力"/>
     </text>
-    <image id="n4_p4tr" name="n4" src="hkrz3te" fileName="_shareasset/1.png" xy="19,14" pivot="0.5,0.5" size="28,20" aspect="true">
+    <image id="n4_p4tr" name="n4" src="hkrz3te" fileName="_shareasset/1.png" xy="2,0" pivot="0.5,0.5" size="28,20" aspect="true">
       <gearDisplay controller="c1" pages="1,3,4,12,13"/>
-      <gearXY controller="c1" pages="3,4,12" values="1,15|37,14|2,17" default="19,14"/>
+      <gearXY controller="c1" pages="3,4,12" values="1,15|37,14|2,0" default="19,14"/>
     </image>
-    <text id="n5_mnrs" name="n5" xy="1,1" size="164,48" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="退出&#xA;">
+    <text id="n5_mnrs" name="n5" xy="1,1" size="164,48" font="Arial" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="退出&#xA;">
       <gearDisplay controller="c1" pages="2,14"/>
-      <gearText controller="c1" pages="2,14" values="EXIT|OK" default="退出&#xA;"/>
+      <gearText controller="c1" pages="2,14" values="Exit|OK" default="退出&#xA;"/>
     </text>
-    <text id="n6_s93b" name="n6" xy="0,4" size="164,48" font="Arial" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="continue">
+    <text id="n6_s93b" name="n6" xy="0,1" size="164,48" font="Arial" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="continue">
       <gearDisplay controller="c1" pages="5"/>
     </text>
   </displayList>

+ 8 - 8
art/fgui/assets/game/_sharecomponent/shareBtn2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="239,73" pivot="0.5,0.5" extention="Button" designImageLayer="1">
-  <controller name="c1" alias="按钮" exported="true" pages="0,换人再战,1,下一关要看视频,2,下一关不用看视频,3,开心收下,4,下一关要花费金币,5,立即挑战,6,知道了,7,领取,8,已领取,9,免费抽奖,10,普通领取,11,体力+开始游戏,21,连点开箱,22,连点开箱+视频,23,体力挑战下一关,24,三倍领取" selected="0"/>
+  <controller name="c1" alias="按钮" exported="true" pages="0,换人再战,1,下一关要看视频,2,下一关不用看视频,3,开心收下,4,下一关要花费金币,5,立即挑战,6,知道了,7,领取,8,已领取,9,免费抽奖,10,普通领取,11,体力+开始游戏,21,连点开箱,22,连点开箱+视频,23,体力挑战下一关,24,三倍领取" selected="13"/>
   <displayList>
     <image id="n2_hkrz" name="n2" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,0" size="239,73" aspect="true">
       <gearDisplay controller="c1" pages="0,1,2,3,4,5,6,7,9,10,11,21,22,23,24"/>
@@ -8,33 +8,33 @@
     <image id="n24_wcn5" name="n24" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,0" size="239,73" aspect="true" grayed="true">
       <gearDisplay controller="c1" pages="8"/>
     </image>
-    <text id="n1_hkrz" name="n1" xy="7,16" size="224,43" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="Change player">
+    <text id="n1_hkrz" name="n1" xy="0,12" size="224,43" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="开始游戏">
       <gearDisplay controller="c1" pages="0,4,21"/>
       <gearXY controller="c1" pages="0,4,21" values="7,16|7,27|7,11" default="0,12"/>
       <gearText controller="c1" pages="0,3,4,5,6,21" values="Change player|start|next level|Start|Start|Unpacking" default="开始游戏"/>
     </text>
-    <text id="n3_p4tr" name="n3" xy="44,11" size="189,44" fontSize="32" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="next level">
+    <text id="n3_p4tr" name="n3" xy="44,11" size="189,44" font="Arial" fontSize="32" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="下一关">
       <gearDisplay controller="c1" pages="2,5,6"/>
       <gearText controller="c1" pages="0,2,5,6" values="next level|next level|Start|" default="下一关"/>
     </text>
-    <text id="n23_lp3l" name="n23" xy="1,6" size="232,65" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" text="OK">
+    <text id="n23_lp3l" name="n23" xy="1,6" size="232,65" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" text="知道了">
       <gearDisplay controller="c1" pages="6,7,8"/>
       <gearText controller="c1" pages="0,5,6,7,8" values="OK|OK|OK|receive|Receive" default="知道了"/>
     </text>
-    <text id="n4_p4tr" name="n4" xy="50,14" size="185,44" font="Arial" fontSize="30" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="next level">
+    <text id="n4_p4tr" name="n4" xy="50,14" size="185,44" font="Arial" fontSize="30" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="Unpacking">
       <gearDisplay controller="c1" pages="1,9,11,22,23,24"/>
       <gearText controller="c1" pages="0,1,5,6,9,11,22,23,24" values="next level|next level|Next Level|Next Level|Prize draw|Start|Unpacking|Next level|Triple claim" default="下一关"/>
     </text>
-    <image id="n5_p4tr" name="n5" src="hkrz3te" fileName="_shareasset/1.png" xy="46,22" size="42,30" aspect="true">
+    <image id="n5_p4tr" name="n5" src="hkrz3te" fileName="_shareasset/1.png" xy="7,21" size="42,30" aspect="true">
       <gearDisplay controller="c1" pages="1,9,22,24"/>
       <gearXY controller="c1" pages="1,9,22,24" values="3,22|4,21|7,21|6,21" default="46,22"/>
     </image>
-    <text id="n6_p4tr" name="n6" xy="0,4" size="228,60" fontSize="31" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="开心收下">
+    <text id="n6_p4tr" name="n6" xy="0,4" size="228,60" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="开心收下">
       <gearDisplay controller="c1" pages="3,10"/>
       <gearXY controller="c1" pages="10" values="5,6" default="0,4"/>
       <gearText controller="c1" pages="3,6,10" values="Next Level|Cheerfully Receive|Receive" default="开心收下"/>
     </text>
-    <text id="n20_cy72" name="n20" xy="110,3" size="52,39" group="n22_cy72" fontSize="28" color="#ffffff" vAlign="middle" leading="0" text="500">
+    <text id="n20_cy72" name="n20" xy="110,3" size="52,39" group="n22_cy72" font="Arial" fontSize="28" color="#ffffff" vAlign="middle" leading="0" text="500">
       <gearDisplay controller="c1" pages="4,5"/>
       <relation target="n21_cy72" sidePair="left-right"/>
     </text>

BIN
client/laya/bin/asset/fgui/game.obj


+ 1 - 1
client/laya/bin/index.html

@@ -1,7 +1,7 @@
 <html>
 
 <head>
-    <title>www.layabox.com</title>
+    <title>8 Ball Fury</title>
     <meta charset='utf-8' />
     <meta name='renderer' content='webkit' />
     <meta name='viewport' content='width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no'

File diff suppressed because it is too large
+ 0 - 0
client/laya/bin/js/bundle.js.map


+ 1 - 1
client/laya/release/newTable/index.html

@@ -1,7 +1,7 @@
 <html>
 
 <head>
-    <title>www.layabox.com</title>
+    <title>8 Ball Fury</title>
     <meta charset='utf-8' />
     <meta name='renderer' content='webkit' />
     <meta name='viewport' content='width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no'

+ 1 - 1
client/laya/release/web/index.html

@@ -1,7 +1,7 @@
 <html>
 
 <head>
-    <title>www.layabox.com</title>
+    <title>8 Ball Fury</title>
     <meta charset='utf-8' />
     <meta name='renderer' content='webkit' />
     <meta name='viewport' content='width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no'

+ 6 - 6
client/laya/src/core/mgrs/SpineMgr.ts

@@ -10,12 +10,12 @@ export default class SpineMgr {
         this.templet = new Laya.Templet();
         this.templet.on(Laya.Event.COMPLETE, this, this.parseComplete);
         this.templet.on(Laya.Event.ERROR, this, this.onError);
-        if(name==='mishu'){
-            this.templet.loadAni('spine/nvmishu.skel');
-        }else{
-            this.templet.loadAni(`spine/${name}.sk`);
-        }
-    
+        // if(name==='mishu'){
+        //     this.templet.loadAni('spine/nvmishu.skel');
+        // }else{
+        //     this.templet.loadAni(`spine/${name}.sk`);
+        // }
+        this.templet.loadAni(`spine/${name}.sk`);
         this.templet.lock = true;
         this.spineName = name;
     }

Some files were not shown because too many files changed in this diff