dzduole 1 month ago
parent
commit
a0f34b2ea2
39 changed files with 132 additions and 102 deletions
  1. 1 7
      art/fgui/.objs/metas/isxx5ak7/ehtov4gk.info
  2. 6 0
      art/fgui/.objs/metas/isxx5ak7/kt443qc.info
  3. 30 24
      art/fgui/.objs/workspace.json
  4. 4 4
      art/fgui/assets/game/UIAddProp/component/hb_zs1.xml
  5. 1 1
      art/fgui/assets/game/UIAddProp/component/hb_zs2.xml
  6. 2 2
      art/fgui/assets/game/UIAddProp/component/hb_zs3.xml
  7. 2 2
      art/fgui/assets/game/UIGameEnd/UIGameEnd.xml
  8. 2 2
      art/fgui/assets/game/UIGameEnd/component/Component30(1).xml
  9. 1 1
      art/fgui/assets/game/UIGameEnd/component/Component30.xml
  10. 1 1
      art/fgui/assets/game/UIGameEnd/component/Component30_1.xml
  11. 2 2
      art/fgui/assets/game/UILevelDisplay/component/PutBallLevelDisplay.xml
  12. 1 1
      art/fgui/assets/game/UILevelSelect/UIMain/component/Component3.xml
  13. 1 1
      art/fgui/assets/game/UIMatching/component/Component18.xml
  14. 2 2
      art/fgui/assets/game/UIModeSelection/UIModeSelection.xml
  15. 2 2
      art/fgui/assets/game/UIModeSelection/component/ModeSelection_com1.xml
  16. 2 2
      art/fgui/assets/game/UIModeSelection/component/ModeSelection_com2.xml
  17. 2 2
      art/fgui/assets/game/UIModeSelection/component/ModeSelection_com3.xml
  18. 1 1
      art/fgui/assets/game/UIRodMethod/component/Component61.xml
  19. 1 1
      art/fgui/assets/game/UISkill/component/skillDisplay.xml
  20. 3 3
      art/fgui/assets/game/UISkill/component/skillItem.xml
  21. 3 3
      art/fgui/assets/game/UISkill/component/skillItem_1.xml
  22. 1 1
      art/fgui/assets/game/_sharecomponent/Airframe.xml
  23. 3 3
      art/fgui/assets/game/package.xml
  24. 1 1
      art/fgui/assets/loading/UILoading.xml
  25. BIN
      client/laya/bin/asset/fgui/game.obj
  26. 34 22
      client/laya/bin/js/bundle.js
  27. 0 0
      client/laya/bin/js/bundle.js.map
  28. 0 0
      client/laya/bin/libs/moyu.js
  29. 0 0
      client/laya/release/bytedancegame/libs/moyu.js
  30. 0 0
      client/laya/release/newTable/libs/moyu.js
  31. 0 0
      client/laya/release/web/libs/moyu.js
  32. 0 0
      client/laya/release/web/res/json/npc.json
  33. 1 1
      client/laya/src/ui/UIAddProp.ts
  34. 2 2
      client/laya/src/ui/UIGetAward.ts
  35. 2 1
      client/laya/src/ui/UILevelProp.ts
  36. 1 1
      client/laya/src/ui/UIModeSelection.ts
  37. 3 4
      client/laya/src/ui/UISkill.ts
  38. 12 0
      client/laya/src/ui/item/SkillDisplay.ts
  39. 2 2
      client/laya/src/utils/Common.ts

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

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

+ 6 - 0
art/fgui/.objs/metas/isxx5ak7/kt443qc.info

@@ -5,6 +5,9 @@
       "locked": true,
       "hidden": true
     },
+    "n85_jnvl": {
+      "hidden": true
+    },
     "n44_ixm4": {
       "collapsed": true
     },
@@ -22,6 +25,9 @@
     },
     "n45_ixm4": {
       "collapsed": true
+    },
+    "n28_ixm4": {
+      "hidden": true
     }
   },
   "adaptiveTest": true,

+ 30 - 24
art/fgui/.objs/workspace.json

@@ -8,14 +8,12 @@
   ],
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://isxx5ak7kt443qc",
-    "ui://isxx5ak7n0xy3y2",
-    "ui://isxx5ak7uepz49c"
+    "ui://isxx5ak7wehi3ug"
   ],
   "test.device": "iPad",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://isxx5ak7kt443qc",
+  "doc.activeDoc": "ui://isxx5ak7wehi3ug",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
@@ -25,24 +23,6 @@
     "isxx5ak7",
     "/UIAddProp/component/",
     "isxx5ak7",
-    "/UIBox/",
-    "isxx5ak7",
-    "/UIBox/component/",
-    "isxx5ak7",
-    "/UIDraw/",
-    "isxx5ak7",
-    "/UIDraw/component/",
-    "isxx5ak7",
-    "/UIFirerworks/",
-    "isxx5ak7",
-    "/UIGame/",
-    "isxx5ak7",
-    "/UIGame/component/",
-    "isxx5ak7",
-    "/UIGameEnd/",
-    "isxx5ak7",
-    "/UIGameEnd/component/",
-    "isxx5ak7",
     "/UIGetAward/",
     "isxx5ak7",
     "/UIGetAward/component/",
@@ -61,6 +41,10 @@
     "isxx5ak7",
     "/UILevelSelect/",
     "isxx5ak7",
+    "/UILevelSelect/UIMain/",
+    "isxx5ak7",
+    "/UILevelSelect/UIMain/component/",
+    "isxx5ak7",
     "/UILevelSelect/component/",
     "isxx5ak7",
     "/UIMain/",
@@ -69,11 +53,33 @@
     "isxx5ak7",
     "/UIMatching/",
     "isxx5ak7",
+    "/UIMatching/component/",
+    "isxx5ak7",
     "/UIModeSelection/",
     "isxx5ak7",
-    "/UIRodMethod/",
+    "/UIModeSelection/component/",
+    "isxx5ak7",
+    "/UIMoney/",
+    "isxx5ak7",
+    "/UITry/",
+    "isxx5ak7",
+    "/UITry/Component/",
+    "isxx5ak7",
+    "/UITry/asset/",
+    "isxx5ak7",
+    "/UITry/component/",
+    "isxx5ak7",
+    "/UIWordsList/",
+    "isxx5ak7",
+    "/UIWordsList/UIVideoShare/",
+    "isxx5ak7",
+    "/UIWordsList/UIVideoShare/component/",
+    "isxx5ak7",
+    "/_exportasset/",
+    "isxx5ak7",
+    "/_shareasset/",
     "isxx5ak7",
-    "/UIRodMethod/component/",
+    "/_sharecomponent/",
     "isxx5ak7",
     "/windows/"
   ],

+ 4 - 4
art/fgui/assets/game/UIAddProp/component/hb_zs1.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="226,448" pivot="0.5,0.5" extention="Button">
-  <controller name="c1" exported="true" pages="0,分享得钻石,1,看视频获得随机钻石" selected="0"/>
+  <controller name="c1" exported="true" pages="0,分享得钻石,1,看视频获得随机钻石" selected="1"/>
   <displayList>
     <image id="n20_ehto" name="n20" src="ehtov4fi" fileName="UIAddProp/asset/hb_db1.png" xy="0,0"/>
     <image id="n21_ehto" name="n21" src="ehtov4fe" fileName="UIAddProp/asset/hb_bq_hs.png" xy="0,0"/>
-    <text id="n26_ehto" name="n26" xy="41,83" pivot="0.5,0.5" size="144,39" fontSize="28" color="#6379ac" align="center" vAlign="middle" bold="true" text="分享得钻石">
+    <text id="n26_ehto" name="n26" xy="2,50" pivot="0.5,0.5" size="221,104" fontSize="20" color="#6379ac" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" text="Watch a Video to Get&#xA; Random Diamonds">
       <gearDisplay controller="c1" pages="0,1"/>
-      <gearText controller="c1" pages="1" values="看视频得随机钻石" default="分享得钻石"/>
+      <gearText controller="c1" pages="0,1" values="Share to &#xA;Earn Diamonds|Watch a Video to Get&#xA; Random Diamonds"/>
     </text>
     <text id="n27_ehto" name="n27" xy="2,15" pivot="0.5,0.5" size="56,23" rotation="-47" fontSize="15" color="#ffffff" align="center" vAlign="middle" text="activity"/>
-    <text id="n46_lgji" name="shareTxt" xy="76,174" pivot="0.5,0.5" size="73,39" fontSize="28" color="#6379ac" align="center" vAlign="middle" bold="true" text="(0/3)"/>
+    <text id="n46_lgji" name="shareTxt" xy="2,174" pivot="0.5,0.5" size="221,39" fontSize="26" color="#6379ac" align="center" vAlign="middle" autoSize="none" bold="true" text="(0/3)"/>
     <component id="n32_ehto" name="n32" src="ehtov4gm" fileName="UIAddProp/component/dh_zs1.xml" xy="35,274"/>
     <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,392"/>
     <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="64,407" group="n41_ehto" scale="0.8,0.8"/>

+ 1 - 1
art/fgui/assets/game/UIAddProp/component/hb_zs2.xml

@@ -4,7 +4,7 @@
     <image id="n20_ehto" name="n20" src="ehtov4fi" fileName="UIAddProp/asset/hb_db1.png" xy="0,0"/>
     <image id="n21_ehto" name="n21" src="ehtov4ff" fileName="UIAddProp/asset/hb_bq_ls.png" xy="0,0"/>
     <text id="n26_ehto" name="n26" xy="10,44" pivot="0.5,0.5" size="206,116" fontSize="28" color="#6379ac" align="center" vAlign="middle" autoSize="none" bold="true" text="Get diamonds by &#xA;watching videos."/>
-    <text id="n27_ehto" name="n27" xy="13,15" pivot="0.5,0.5" size="34,23" rotation="-47" fontSize="15" color="#ffffff" align="center" vAlign="middle" text="限时"/>
+    <text id="n27_ehto" name="n27" xy="5,15" pivot="0.5,0.5" size="50,23" rotation="-47" fontSize="15" color="#ffffff" align="center" vAlign="middle" text="Timed"/>
     <component id="n32_ehto" name="n32" src="ehtov4gw" fileName="UIAddProp/component/dh_zs2.xml" xy="29,191"/>
     <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,392"/>
     <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="83,406" group="n41_ehto" scale="0.8,0.8"/>

+ 2 - 2
art/fgui/assets/game/UIAddProp/component/hb_zs3.xml

@@ -4,10 +4,10 @@
     <image id="n20_ehto" name="n20" src="ehtov4fi" fileName="UIAddProp/asset/hb_db1.png" xy="0,0"/>
     <image id="n21_ehto" name="n21" src="ehtov4fg" fileName="UIAddProp/asset/hb_bq_zs.png" xy="0,0"/>
     <text id="n26_ehto" name="n26" xy="15,46" pivot="0.5,0.5" size="195,113" fontSize="28" color="#6379ac" align="center" vAlign="middle" autoSize="none" bold="true" text="Challenge the Cue Ball &#xA;Arrangement Master!"/>
-    <text id="n27_ehto" name="n27" xy="13,15" pivot="0.5,0.5" size="34,23" rotation="-47" fontSize="15" color="#ffffff" align="center" vAlign="middle" text="热点"/>
+    <text id="n27_ehto" name="n27" xy="14,15" pivot="0.5,0.5" size="32,23" rotation="-47" fontSize="15" color="#ffffff" align="center" vAlign="middle" text="Hot"/>
     <component id="n32_ehto" name="n32" src="ehtov4gy" fileName="UIAddProp/component/dh_zs3.xml" xy="29,195"/>
     <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,392"/>
-    <text id="n47_ehto" name="n47" xy="51,409" size="124,42" fontSize="30" color="#c3945c" text="立即挑战"/>
+    <text id="n47_ehto" name="n47" xy="0,401" size="222,42" fontSize="30" color="#c3945c" text="Challenge Now"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
   <transition name="t0" autoPlay="true">

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

@@ -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="三星奖励">
+    <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">
       <gearDisplay controller="c1" pages="2"/>
       <relation target="n14_wehi" sidePair="center-center"/>
     </text>
@@ -74,7 +74,7 @@
       <gearDisplay controller="c1" pages="4"/>
       <relation target="n14_wehi" sidePair="center-center"/>
     </component>
-    <text id="n55_g1gi" name="isGetAward" xy="812,533" size="192,29" visible="false" fontSize="20" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="本关奖励已获得">
+    <text id="n55_g1gi" name="isGetAward" xy="812,533" size="352,29" visible="false" fontSize="20" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="Rewards Already Claimed">
       <gearDisplay controller="c1" pages="2"/>
       <relation target="n14_wehi" sidePair="center-center"/>
     </text>

+ 2 - 2
art/fgui/assets/game/UIGameEnd/component/Component30(1).xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="66,104">
-  <controller name="c1" alias="结算奖励" exported="true" pages="0,奖励,1,未获得,2,已获得" selected="2"/>
+  <controller name="c1" alias="结算奖励" exported="true" pages="0,奖励,1,未获得,2,已获得" selected="0"/>
   <displayList>
     <image id="n46_p4tr" name="n46" src="p4tr41x" fileName="UIGameEnd/asset/db2.png" xy="0,0" size="66,66" aspect="true"/>
     <loader id="n47_p4tr" name="n47" xy="0,0" size="66,66" url="ui://isxx5ak7wehi3ui" align="center" vAlign="middle"/>
     <text id="n49_p4tr" name="n49" xy="31,47" size="40,22" fontSize="14" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="600">
       <gearDisplay controller="c1" pages="0,1"/>
     </text>
-    <text id="n50_p4tr" name="n50" xy="5,74" size="58,26" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="未获得">
+    <text id="n50_p4tr" name="n50" xy="-1,74" size="67,26" fontSize="18" color="#0000cc" align="center" vAlign="middle" autoSize="none" text="Unobtained">
       <gearDisplay controller="c1" pages="1"/>
     </text>
     <image id="n51_p4tr" name="n51" src="p4tr41x" fileName="UIGameEnd/asset/db2.png" xy="0,0" size="66,66" group="n53_p4tr" aspect="true"/>

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

@@ -7,7 +7,7 @@
     <text id="n49_p4tr" name="numTxt" xy="31,47" size="40,22" fontSize="14" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="600">
       <gearDisplay controller="c1" pages="0,1"/>
     </text>
-    <text id="n50_p4tr" name="n50" xy="5,75" size="58,26" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="未获得">
+    <text id="n50_p4tr" name="n50" xy="5,75" size="58,26" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="Unobtained">
       <gearDisplay controller="c1" pages="1"/>
     </text>
     <image id="n53_p4tr" name="n53" src="p4tr41x" fileName="UIGameEnd/asset/db2.png" xy="0,0" size="66,66" group="n55_p4tr" aspect="true"/>

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

@@ -7,7 +7,7 @@
     <text id="n49_p4tr" name="numTxt" xy="31,47" size="40,22" fontSize="14" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="600">
       <gearDisplay controller="c1" pages="0,1"/>
     </text>
-    <text id="n50_p4tr" name="n50" xy="5,74" size="58,26" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="未获得">
+    <text id="n50_p4tr" name="n50" xy="5,74" size="58,26" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="Unobtained">
       <gearDisplay controller="c1" pages="1"/>
     </text>
     <image id="n51_p4tr" name="n51" src="p4tr41x" fileName="UIGameEnd/asset/db2.png" xy="0,0" size="66,66" group="n53_p4tr" aspect="true"/>

+ 2 - 2
art/fgui/assets/game/UILevelDisplay/component/PutBallLevelDisplay.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="175,211">
-  <controller name="c1" alias="关卡状态" exported="true" pages="0,3星关卡,1,2星或1星,2,当前关卡,3,未解锁关卡,4,未解锁挑战模式,6,当前关卡为挑战模式" selected="5"/>
+  <controller name="c1" alias="关卡状态" exported="true" pages="0,3星关卡,1,2星或1星,2,当前关卡,3,未解锁关卡,4,未解锁挑战模式,6,当前关卡为挑战模式" selected="0"/>
   <displayList>
     <image id="n2_avag" name="n2" src="avag478" fileName="UILevelDisplay/asset/bq_db2.png" xy="0,0" size="175,211"/>
     <image id="n22_gpvx" name="n22" src="gpvxv4h8" fileName="UILevelDisplay/asset/bq_xq2_1.png" xy="118,82">
@@ -35,7 +35,7 @@
     <image id="n20_gpvx" name="n20" src="avag472" fileName="UILevelDisplay/asset/bq_zt5_1.png" xy="44,119" pivot="0.5,0.5" size="87,28">
       <gearDisplay controller="c1" pages="4"/>
     </image>
-    <text id="n21_gpvx" name="n21" xy="59,122" size="58,26" fontSize="18" color="#ffffff" align="center" vAlign="middle" text="奖励关">
+    <text id="n21_gpvx" name="n21" xy="59,122" size="69,26" fontSize="18" color="#ffffff" align="center" vAlign="middle" text="Reward">
       <gearDisplay controller="c1" pages="4"/>
     </text>
     <component id="n24_j979" name="special" src="j979v4i6" fileName="UILevelDisplay/component/special.xml" xy="19,31">

+ 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="游客"/>
+    <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"/>
     <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/component/Component18.xml

@@ -8,7 +8,7 @@
     <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="#58769e" vAlign="middle" vars="true" autoSize="none" text="{jnmz1=跳杆}Lv.{jndj1=1}">
+    <text id="n29_hxtr" name="skillTxt" xy="192,90" size="156,29" fontSize="20" color="#58769e" vAlign="middle" vars="true" autoSize="none" text="{jnmz1=Jump}Lv.{jndj1=1}">
       <gearDisplay controller="c1" pages="1"/>
     </text>
   </displayList>

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

@@ -4,10 +4,10 @@
     <graph id="n19_lrxg" name="n19" xy="0,0" size="1334,750" alpha="0.8" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <loader id="n23_jaak" name="closeBtn" xy="0,0" size="1334,750">
+    <loader id="n23_jaak" name="closeBtn" xy="1,0" size="1334,750">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <component id="n22_lrxg" name="myNode" src="jaakv561" fileName="UIModeSelection/component/ModeSelection_com123.xml" xy="160,177">
+    <component id="n22_lrxg" name="myNode" src="jaakv561" fileName="UIModeSelection/component/ModeSelection_com123.xml" xy="159,177">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
   </displayList>

+ 2 - 2
art/fgui/assets/game/UIModeSelection/component/ModeSelection_com1.xml

@@ -20,10 +20,10 @@
     <group id="n35_lrxg" name="n35" xy="112,290" size="93,36" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <image id="n29_lrxg" name="n29" src="avag460" fileName="UIModeSelection/asset2/msxz1_16.png" xy="119,366">
+    <image id="n29_lrxg" name="n29" src="avag460" fileName="UIModeSelection/asset2/msxz1_16.png" xy="191,366">
       <relation target="n32_lrxg" sidePair="right-left"/>
     </image>
-    <text id="n32_lrxg" name="tipsTxt" xy="141,361" size="167,32" fontSize="22" color="#707c9f" align="right" vAlign="middle" text="Minimum 2000">
+    <text id="n32_lrxg" name="tipsTxt" xy="213,361" size="95,29" fontSize="20" color="#707c9f" vAlign="middle" text="Min 2000">
       <relation target="" sidePair="right-right"/>
     </text>
     <image id="n30_lrxg" name="n30" src="avag461" fileName="UIModeSelection/asset2/msxz1_17.png" xy="9,367"/>

+ 2 - 2
art/fgui/assets/game/UIModeSelection/component/ModeSelection_com2.xml

@@ -20,10 +20,10 @@
     <group id="n35_lrxg" name="n35" xy="114,291" size="93,36" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <image id="n29_lrxg" name="n29" src="avag460" fileName="UIModeSelection/asset2/msxz1_16.png" xy="118,366">
+    <image id="n29_lrxg" name="n29" src="avag460" fileName="UIModeSelection/asset2/msxz1_16.png" xy="190,366">
       <relation target="n32_lrxg" sidePair="right-left"/>
     </image>
-    <text id="n32_lrxg" name="tipsTxt" xy="140,362" size="167,32" fontSize="22" color="#707c9f" align="right" vAlign="middle" text="Minimum 2000">
+    <text id="n32_lrxg" name="tipsTxt" xy="212,362" size="95,29" fontSize="20" color="#707c9f" align="right" vAlign="middle" text="Min 2000">
       <relation target="" sidePair="right-right"/>
     </text>
     <image id="n30_lrxg" name="n30" src="avag461" fileName="UIModeSelection/asset2/msxz1_17.png" xy="9,367"/>

+ 2 - 2
art/fgui/assets/game/UIModeSelection/component/ModeSelection_com3.xml

@@ -20,10 +20,10 @@
     <group id="n35_lrxg" name="n35" xy="112,293" size="93,36" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <image id="n29_lrxg" name="n29" src="avag460" fileName="UIModeSelection/asset2/msxz1_16.png" xy="119,366">
+    <image id="n29_lrxg" name="n29" src="avag460" fileName="UIModeSelection/asset2/msxz1_16.png" xy="191,366">
       <relation target="n32_lrxg" sidePair="right-left"/>
     </image>
-    <text id="n32_lrxg" name="tipsTxt" xy="141,361" size="167,32" fontSize="22" color="#707c9f" align="right" vAlign="middle" text="Minimum 2000">
+    <text id="n32_lrxg" name="tipsTxt" xy="213,361" size="95,29" fontSize="20" color="#707c9f" align="right" vAlign="middle" text="Min 2000">
       <relation target="" sidePair="right-right"/>
     </text>
     <image id="n30_lrxg" name="n30" src="avag461" fileName="UIModeSelection/asset2/msxz1_17.png" xy="9,367"/>

+ 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="高低杆准心"/>
+    <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"/>
   </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/UISkill/component/skillDisplay.xml

@@ -14,7 +14,7 @@
     <text id="n24_qlo0" name="nameTxt" xy="3,2" size="280,32" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" text="come down from heaven"/>
     <text id="n25_qlo0" name="levelTxt" xy="289,2" size="95,32" fontSize="22" color="#696b80" vAlign="middle" vars="true" autoSize="none" text="Lv.{ganfa=1}"/>
     <image id="n28_qlo0" name="n28" src="qlo041f" fileName="UISkill/asset/gf_k4.png" xy="148,46" size="374,70"/>
-    <text id="n29_qlo0" name="describeTxt" xy="146,37" size="378,87" fontSize="16" color="#ff33cc" vAlign="middle" leading="0" autoSize="none" text="After hitting the cue ball with a jump shot, the ball bounced high into the air, landed on the table, and directly pocketed the next ball we needed to make "/>
+    <text id="n29_qlo0" name="describeTxt" xy="146,48" size="378,69" fontSize="16" color="#ff33cc" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="After hitting the cue ball with a jump shot, the ball bounced high into the air, landed on the table, and directly pocketed the next ball we needed to make "/>
     <text id="n32_qlo0" name="n32" xy="214,166" size="310,22" fontSize="14" color="#696b80" bold="true" text="One extra ball is granted with each level-up."/>
   </displayList>
 </component>

+ 3 - 3
art/fgui/assets/game/UISkill/component/skillItem.xml

@@ -8,12 +8,12 @@
     <image id="n31_qlo0" name="n31" src="qlo041d" fileName="UISkill/asset/gf_k2.png" xy="0,0" size="543,220"/>
     <image id="n6_qlo0" name="n6" src="qlo041c" fileName="UISkill/asset/gf_k1.png" xy="0,-1" size="543,220"/>
     <loader id="n33_tumi" name="skillImg" xy="8,51" size="136,137" url="ui://isxx5ak7qlo0417" autoSize="true" clearOnPublish="true"/>
-    <text id="n24_qlo0" name="nameTxt" xy="3,3" size="101,32" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" text="从天而降"/>
-    <text id="n39_lp3l" name="levelTxt" xy="121,3" size="95,32" fontSize="22" color="#ffffff" vAlign="middle" vars="true" autoSize="none" text="Lv.{ganfa=1}">
+    <text id="n24_qlo0" name="nameTxt" xy="3,3" size="200,32" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" text="Fall from the sky"/>
+    <text id="n39_lp3l" name="levelTxt" xy="210,3" size="95,32" fontSize="22" color="#ffffff" vAlign="middle" vars="true" autoSize="none" text="Lv.{ganfa=1}">
       <gearDisplay controller="c1" pages="0"/>
     </text>
     <image id="n28_qlo0" name="n28" src="qlo041f" fileName="UISkill/asset/gf_k4.png" xy="148,51" size="374,81"/>
-    <text id="n29_qlo0" name="describeTxt" xy="149,47" size="372,90" fontSize="17" color="#ff0033" leading="1" autoSize="none" text="After jumping the bat, the ball jumps high and hits the table, directly hitting the next ball that our team needs to score except for Black Eight."/>
+    <text id="n29_qlo0" name="describeTxt" xy="149,56" size="372,80" fontSize="17" color="#ff0033" align="center" leading="1" autoSize="none" bold="true" text="After jumping the bat, the ball jumps high and hits the table, directly hitting the next ball that our team needs to score except for Black Eight."/>
     <text id="n32_qlo0" name="n32" xy="245,193" size="237,22" fontSize="14" color="#ffffff" autoSize="none" text="Each upgrade adds an extra ball"/>
     <component id="n12_qlo0" name="mutiBtn" src="qlo041t" fileName="UISkill/component/Component28.xml" xy="172,141" visible="false"/>
     <component id="n41_c50v" name="tryNode" src="c50vv4y6" fileName="UISkill/component/Component142.xml" xy="418,0" size="125,35"/>

+ 3 - 3
art/fgui/assets/game/UISkill/component/skillItem_1.xml

@@ -9,11 +9,11 @@
       <gearDisplay controller="c1" pages="0"/>
     </image>
     <loader id="n33_tumi" name="skillImg" xy="8,43" size="136,137" url="ui://isxx5ak7qlo0417" autoSize="true" clearOnPublish="true"/>
-    <text id="n24_qlo0" name="nameTxt" xy="3,3" size="101,32" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" text="从天而降"/>
-    <text id="n25_qlo0" name="levelTxt" xy="121,3" size="95,32" fontSize="22" color="#696b80" vAlign="middle" vars="true" autoSize="none" text="Lv.{ganfa=1}"/>
+    <text id="n24_qlo0" name="nameTxt" xy="3,3" size="192,32" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" text="Fall from the sky"/>
+    <text id="n25_qlo0" name="levelTxt" xy="211,3" size="95,32" fontSize="22" color="#696b80" vAlign="middle" vars="true" autoSize="none" text="Lv.{ganfa=1}"/>
     <image id="n28_qlo0" name="n28" src="qlo041f" fileName="UISkill/asset/gf_k4.png" xy="148,46" size="374,81"/>
     <text id="n29_qlo0" name="describeTxt" xy="163,53" size="349,79" fontSize="19" color="#696b80" autoSize="none" text="跳杆击球后,球高高跃起,砸在桌面上,直接打进我方除黑八外需进的下一颗球。"/>
-    <text id="n32_qlo0" name="n32" xy="262,190" size="144,22" fontSize="14" color="#696b80" text="每次升级额外多一个球"/>
+    <text id="n32_qlo0" name="n32" xy="160,190" size="362,22" fontSize="14" color="#ffffff" autoSize="none" bold="true" text="You get one additional ball with each level-up."/>
     <text id="n38_lp3l" name="maxTxt" xy="311,150" size="46,22" fontSize="14" color="#696b80" text="已满级"/>
     <component id="n12_qlo0" name="mutiBtn" src="qlo041t" fileName="UISkill/component/Component28.xml" xy="268,138" group="n34_wji1" visible="false"/>
     <component id="n11_qlo0" name="normalBtn" src="qlo041r" fileName="UISkill/component/Component26.xml" xy="268,138" group="n34_wji1"/>

+ 1 - 1
art/fgui/assets/game/_sharecomponent/Airframe.xml

@@ -3,6 +3,6 @@
   <displayList>
     <image id="n26_brgy" name="n26" src="brgy3uu" fileName="UIGameEnd/asset/zs4.png" xy="0,0" size="270,58"/>
     <text id="n27_brgy" name="n27" xy="34,14" size="229,32" fontSize="22" color="#52719d" align="center" vAlign="middle" autoSize="none" text="Great! Keep going!&#xA;"/>
-    <text id="n28_g4yb" name="n28" xy="34,14" size="229,32" fontSize="22" color="#52719d" align="center" vAlign="middle" autoSize="none" text="真棒呀,继续加油哦!&#xA;"/>
+    <text id="n28_g4yb" name="n28" xy="34,14" size="229,32" fontSize="22" color="#52719d" align="center" vAlign="middle" autoSize="none" text="Great! Keep going!&#xA;"/>
   </displayList>
 </component>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<packageDescription id="isxx5ak7">
+<packageDescription id="isxx5ak7" hasFavorites="true">
   <resources>
     <component id="kt443qc" name="UIMain.xml" path="/UIMain/" exported="true"/>
     <component id="kt443qd" name="startBtn.xml" path="/UIMain/component/"/>
@@ -14,7 +14,7 @@
     <component id="sdh33qr" name="clickNode.xml" path="/UIGame/component/"/>
     <component id="sdh33qs" name="HelpLine.xml" path="/UIGame/component/" exported="true"/>
     <component id="hkrz3qt" name="UIMsg.xml" path="/UIMsg/" exported="true"/>
-    <component id="hkrz3qu" name="topNode.xml" path="/UIGame/component/"/>
+    <component id="hkrz3qu" name="topNode.xml" path="/UIGame/component/" favorite="true"/>
     <image id="hkrz3qv" name="q1.png" path="/_exportasset/" exported="true"/>
     <image id="hkrz3qw" name="q10.png" path="/_exportasset/" exported="true"/>
     <image id="hkrz3qx" name="q11.png" path="/_exportasset/" exported="true"/>
@@ -1174,7 +1174,7 @@
     <component id="jaakv54f" name="Component15.xml" path="/UILevelSelect/UIMain/component/"/>
     <component id="jaakv54g" name="Component16.xml" path="/UILevelSelect/UIMain/component/"/>
     <component id="jaakv54h" name="Component2.xml" path="/UILevelSelect/UIMain/component/"/>
-    <component id="jaakv54i" name="Component3.xml" path="/UILevelSelect/UIMain/component/"/>
+    <component id="jaakv54i" name="Component3.xml" path="/UILevelSelect/UIMain/component/" favorite="true"/>
     <component id="jaakv54j" name="Component35.xml" path="/UILevelSelect/UIMain/component/"/>
     <component id="jaakv54k" name="Component36.xml" path="/UILevelSelect/UIMain/component/"/>
     <component id="jaakv54l" name="Component37.xml" path="/UILevelSelect/UIMain/component/"/>

+ 1 - 1
art/fgui/assets/loading/UILoading.xml

@@ -9,7 +9,7 @@
       <ProgressBar value="100" max="100"/>
     </component>
     <image id="n13_hkrz" name="n13" src="hkrz1s" fileName="assets/logo.png" xy="419,275" size="496,200" group="n18_ghnw"/>
-    <text id="n4_g4jo" name="txtLoad" xy="292,599" size="750,36" group="n18_ghnw" fontSize="26" color="#ffffff" align="center" letterSpacing="6" autoSize="none" strokeColor="#000000" text="摆球中...">
+    <text id="n4_g4jo" name="txtLoad" xy="292,599" size="750,36" group="n18_ghnw" fontSize="26" color="#ffffff" align="center" letterSpacing="6" autoSize="none" strokeColor="#000000" text="Loading...">
       <relation target="" sidePair="center-center"/>
     </text>
     <text id="n19_8x78" name="n19" xy="360,690" size="696,64" group="n18_ghnw" fontSize="20" color="#ffffff" align="center" vAlign="middle" leading="5" autoSize="none" text="Play games in moderation to sharpen your mind; overindulgence harms your health. Manage time wisely and embrace a healthy lifestyle.">

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


+ 34 - 22
client/laya/bin/js/bundle.js

@@ -4621,7 +4621,7 @@
                 this.ui.myNode.conditionTxt.text = "Pocket all the balls on the table";
             }
             else {
-                this.ui.myNode.conditionTxt.text = "奖励关卡";
+                this.ui.myNode.conditionTxt.text = "Reward";
             }
             let localData = DataMgr.getPlaceBallLevel(this.level);
             let getAward = localData.getAward;
@@ -4660,6 +4660,7 @@
             if (DataMgr.powerEnough()) {
                 this.ui.myNode.startBtn.touchable = false;
                 this.ui.myNode.startBtn.powerEft.t0.play(Laya.Handler.create(this, () => {
+                    console.log('zh:startGame ');
                     this.ui.myNode.startBtn.touchable = true;
                     DataMgr.setPower(-1);
                     xGame.eventMgr.event(POWER_TIME);
@@ -5045,7 +5046,7 @@
             this.ui.myNode.selfNode.c1.selectedIndex = this.myIndex < 4 ? this.myIndex - 1 : 3;
             this.ui.myNode.selfNode.rankTxt.text = this.myIndex > 50 ? "未上榜" : this.myIndex.toString();
             this.ui.myNode.selfNode.valueTxt.text = this.myStar + "";
-            this.ui.myNode.selfNode.nameTxt.text = Moyu.platType < 11 ? self.nickName : "我自己";
+            this.ui.myNode.selfNode.nameTxt.text = Moyu.platType < 11 ? self.nickName : "myself";
             xGame.common.createHead(this.ui.myNode.selfNode.headNode.head.myIcon, self.headIcon);
         }
         updateItemData(data) {
@@ -5064,7 +5065,7 @@
                     let data = this.rankList[i];
                     if (data.rankScore < this.myStar && this.myIndex > 50) {
                         this.myIndex = i + 1;
-                        let user = { headIcon: self.headIcon, nickName: "我自己" };
+                        let user = { headIcon: self.headIcon, nickName: "myself" };
                         let ud = { user: user, data: {} };
                         let md = { rankScore: this.myStar.toString(), userId: self.userId, userData: JSON.stringify(ud) };
                         if (Moyu.platType < 11) {
@@ -5749,6 +5750,7 @@
             this.data = data;
             this.index = uiIndex;
             this.initSelf();
+            console.log('zh:SkillDisplay constructor this.skillData=', data);
         }
         initSelf() {
             this.ui.normalBtn.onClick(this, this.clickAddLevel);
@@ -5786,10 +5788,15 @@
             }, EAdType.upSkill);
         }
         startGame() {
+            if (this.data.index == 3) {
+                alert('期待吧');
+                return;
+            }
             xGame.soundMgr.playSound(xGame.common.btnClickStr);
             let needCoin = xGame.common.bigMoveNeedCoin;
             xGame.common.passAwardCoin = 2000;
             let guide = DataMgr.getSkillGuide();
+            console.log('zh:startGame guide=' + guide);
             xGame.common.temSelfLevel = 0;
             if (guide == 0) {
                 needCoin = 0;
@@ -5875,10 +5882,9 @@
             let nameList = xGame.common.skillNameList;
             let iconList = xGame.common.skillIconList;
             let describeList = [
-                "跳杆击球后,球高高跃起,砸在桌面上,直接打进额外1颗球",
-                "普通击球后,球杆向随机方向—扫,将杆子范围内1颗可击打球扫入球袋",
-                "我方击球后,在场地上将随机1颗球冻结,敌方无法击打冰冻球,且其他球碰到冰冻球会弹开",
-                "击球后在球桌上斩出一刀,并击飞斩中的球。(球不会飞出球桌)"
+                "Jump shot executed — ball bounced and pocketed an extra one!",
+                "Bonus Sweep: A random follow-up strike hits 1 extra ball after your shot!",
+                "Freeze Effect: Your shot freezes 1 random ball — enemy can’t hit it, and others bounce off!"
             ];
             let data;
             for (let index = 0; index < nameList.length; index++) {
@@ -6035,7 +6041,7 @@
             for (let index = 1; index <= 3; index++) {
                 let node = this.ui.myNode["type" + index];
                 node.need.text = cfg[index].need;
-                node.tipsTxt.text = `最低${cfg[index].need}可入场`;
+                node.tipsTxt.text = `Min ${cfg[index].need} Eligible`;
                 node.peopleTxt.text = this.getRandPeople(index - 1);
             }
         }
@@ -9924,7 +9930,7 @@
         updateDiamondShare() {
             let data = DataMgr.getShareDiamondTimes();
             if (data >= xGame.common.maxShareDiamondTimes) {
-                this.ui.myNode.node1.shareTxt.text = "明日再来";
+                this.ui.myNode.node1.shareTxt.text = "Available Tomorrow";
                 this.ui.myNode.node1.touchable = false;
             }
             else {
@@ -10533,9 +10539,9 @@
         getNameStr(type) {
             switch (type) {
                 case Prop.diamond:
-                    return "钻石";
+                    return "Diamond";
                 case Prop.coin:
-                    return "金币";
+                    return "Coins";
                 case Prop.gan1:
                 case Prop.gan2:
                 case Prop.gan3:
@@ -10584,8 +10590,8 @@
                 normalStar: 12000,
                 wxStar: 12001
             };
-            this.skillNameList = ["从天而降", "横扫千军", "冰冻杆法", "关公杆法"];
-            this.skillIconList = ["gf_jn1", "gf_jn2", "gf_jn4", "gf_jn6"];
+            this.skillNameList = ["Fall from the sky", "Unstoppable Force", "Freeze Shot", "Coming Soon"];
+            this.skillIconList = ["gf_jn1", "gf_jn2", "gf_jn4", "gf_jn4"];
             this.btnClickStr = "buttonclick";
             this.maxSkillLevel = 10;
             this.upSkillLevel = false;
@@ -18759,7 +18765,7 @@
                 this.ui.myNode.conditionTxt.text = "Pocket all the balls on the table";
             }
             else {
-                this.ui.myNode.conditionTxt.text = "奖励关卡";
+                this.ui.myNode.conditionTxt.text = "Reward";
             }
             let localData = DataMgr.getPlaceBallLevel(this.level);
             let getAward = localData.getAward;
@@ -18798,6 +18804,7 @@
             if (DataMgr.powerEnough()) {
                 this.ui.myNode.startBtn.touchable = false;
                 this.ui.myNode.startBtn.powerEft.t0.play(Laya.Handler.create(this, () => {
+                    console.log('zh:startGame ');
                     this.ui.myNode.startBtn.touchable = true;
                     DataMgr.setPower(-1);
                     xGame.eventMgr.event(POWER_TIME);
@@ -19106,6 +19113,7 @@
             this.data = data;
             this.index = uiIndex;
             this.initSelf();
+            console.log('zh:SkillDisplay constructor this.skillData=', data);
         }
         initSelf() {
             this.ui.normalBtn.onClick(this, this.clickAddLevel);
@@ -19143,10 +19151,15 @@
             }, EAdType.upSkill);
         }
         startGame() {
+            if (this.data.index == 3) {
+                alert('期待吧');
+                return;
+            }
             xGame.soundMgr.playSound(xGame.common.btnClickStr);
             let needCoin = xGame.common.bigMoveNeedCoin;
             xGame.common.passAwardCoin = 2000;
             let guide = DataMgr.getSkillGuide();
+            console.log('zh:startGame guide=' + guide);
             xGame.common.temSelfLevel = 0;
             if (guide == 0) {
                 needCoin = 0;
@@ -19232,10 +19245,9 @@
             let nameList = xGame.common.skillNameList;
             let iconList = xGame.common.skillIconList;
             let describeList = [
-                "跳杆击球后,球高高跃起,砸在桌面上,直接打进额外1颗球",
-                "普通击球后,球杆向随机方向—扫,将杆子范围内1颗可击打球扫入球袋",
-                "我方击球后,在场地上将随机1颗球冻结,敌方无法击打冰冻球,且其他球碰到冰冻球会弹开",
-                "击球后在球桌上斩出一刀,并击飞斩中的球。(球不会飞出球桌)"
+                "Jump shot executed — ball bounced and pocketed an extra one!",
+                "Bonus Sweep: A random follow-up strike hits 1 extra ball after your shot!",
+                "Freeze Effect: Your shot freezes 1 random ball — enemy can’t hit it, and others bounce off!"
             ];
             let data;
             for (let index = 0; index < nameList.length; index++) {
@@ -19372,7 +19384,7 @@
         updateDiamondShare() {
             let data = DataMgr.getShareDiamondTimes();
             if (data >= xGame.common.maxShareDiamondTimes) {
-                this.ui.myNode.node1.shareTxt.text = "明日再来";
+                this.ui.myNode.node1.shareTxt.text = "Available Tomorrow";
                 this.ui.myNode.node1.touchable = false;
             }
             else {
@@ -19848,7 +19860,7 @@
             this.ui.myNode.selfNode.c1.selectedIndex = this.myIndex < 4 ? this.myIndex - 1 : 3;
             this.ui.myNode.selfNode.rankTxt.text = this.myIndex > 50 ? "未上榜" : this.myIndex.toString();
             this.ui.myNode.selfNode.valueTxt.text = this.myStar + "";
-            this.ui.myNode.selfNode.nameTxt.text = Moyu.platType < 11 ? self.nickName : "我自己";
+            this.ui.myNode.selfNode.nameTxt.text = Moyu.platType < 11 ? self.nickName : "myself";
             xGame.common.createHead(this.ui.myNode.selfNode.headNode.head.myIcon, self.headIcon);
         }
         updateItemData(data) {
@@ -19867,7 +19879,7 @@
                     let data = this.rankList[i];
                     if (data.rankScore < this.myStar && this.myIndex > 50) {
                         this.myIndex = i + 1;
-                        let user = { headIcon: self.headIcon, nickName: "我自己" };
+                        let user = { headIcon: self.headIcon, nickName: "myself" };
                         let ud = { user: user, data: {} };
                         let md = { rankScore: this.myStar.toString(), userId: self.userId, userData: JSON.stringify(ud) };
                         if (Moyu.platType < 11) {
@@ -20501,7 +20513,7 @@
             for (let index = 1; index <= 3; index++) {
                 let node = this.ui.myNode["type" + index];
                 node.need.text = cfg[index].need;
-                node.tipsTxt.text = `最低${cfg[index].need}可入场`;
+                node.tipsTxt.text = `Min ${cfg[index].need} Eligible`;
                 node.peopleTxt.text = this.getRandPeople(index - 1);
             }
         }

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


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


File diff suppressed because it is too large
+ 0 - 0
client/laya/release/bytedancegame/libs/moyu.js


File diff suppressed because it is too large
+ 0 - 0
client/laya/release/newTable/libs/moyu.js


File diff suppressed because it is too large
+ 0 - 0
client/laya/release/web/libs/moyu.js


File diff suppressed because it is too large
+ 0 - 0
client/laya/release/web/res/json/npc.json


+ 1 - 1
client/laya/src/ui/UIAddProp.ts

@@ -69,7 +69,7 @@ export default class UIAddProp extends UIBase {
     updateDiamondShare() {
         let data = DataMgr.getShareDiamondTimes();
         if (data >= xGame.common.maxShareDiamondTimes) {
-            this.ui.myNode.node1.shareTxt.text = "明日再来"
+            this.ui.myNode.node1.shareTxt.text = "Available Tomorrow"
             this.ui.myNode.node1.touchable = false;
         }
         else {

+ 2 - 2
client/laya/src/ui/UIGetAward.ts

@@ -94,9 +94,9 @@ export default class UIGetAward extends UIBase {
     public getNameStr(type) {
         switch (type) {
             case Prop.diamond:
-                return "钻石";
+                return "Diamond";
             case Prop.coin:
-                return "金币";
+                return "Coins";
             case Prop.gan1:
             case Prop.gan2:
             case Prop.gan3:

+ 2 - 1
client/laya/src/ui/UILevelProp.ts

@@ -73,7 +73,7 @@ export default class UILevelProp extends UIBase {
             this.ui.myNode.conditionTxt.text = "Pocket all the balls on the table";
         }
         else {
-            this.ui.myNode.conditionTxt.text = "奖励关卡"//`累计打进${this.data.ball}个球`;
+            this.ui.myNode.conditionTxt.text = "Reward"//`累计打进${this.data.ball}个球`;
         }
         let localData = DataMgr.getPlaceBallLevel(this.level);
         let getAward = localData.getAward;
@@ -114,6 +114,7 @@ export default class UILevelProp extends UIBase {
         if (DataMgr.powerEnough()) {
             this.ui.myNode.startBtn.touchable = false;
             this.ui.myNode.startBtn.powerEft.t0.play(Laya.Handler.create(this, () => {
+                console.log('zh:startGame ')
                 //
                 this.ui.myNode.startBtn.touchable = true;
                 DataMgr.setPower(-1);

+ 1 - 1
client/laya/src/ui/UIModeSelection.ts

@@ -36,7 +36,7 @@ export default class UIModeSelection extends UIBase {
         for (let index = 1; index <= 3; index++) {
             let node = this.ui.myNode["type" + index];
             node.need.text = cfg[index].need;
-            node.tipsTxt.text = `最低${cfg[index].need}可入场`;
+            node.tipsTxt.text = `Min ${cfg[index].need} Eligible`;
             node.peopleTxt.text = this.getRandPeople(index - 1);
         }
     }

+ 3 - 4
client/laya/src/ui/UISkill.ts

@@ -87,10 +87,9 @@ export default class UISkill extends UIBase {
         let nameList = xGame.common.skillNameList;
         let iconList = xGame.common.skillIconList;
         let describeList = [
-            "跳杆击球后,球高高跃起,砸在桌面上,直接打进额外1颗球",//击球后球高高跃起召唤神龙,利用神龙之力令额外1颗球移动起来产生撞击
-            "普通击球后,球杆向随机方向—扫,将杆子范围内1颗可击打球扫入球袋",
-            "我方击球后,在场地上将随机1颗球冻结,敌方无法击打冰冻球,且其他球碰到冰冻球会弹开",
-            "击球后在球桌上斩出一刀,并击飞斩中的球。(球不会飞出球桌)"
+            "Jump shot executed — ball bounced and pocketed an extra one!",//击球后球高高跃起召唤神龙,利用神龙之力令额外1颗球移动起来产生撞击
+            "Bonus Sweep: A random follow-up strike hits 1 extra ball after your shot!",
+            "Freeze Effect: Your shot freezes 1 random ball — enemy can’t hit it, and others bounce off!"
         ];
         //
         let data: any;

+ 12 - 0
client/laya/src/ui/item/SkillDisplay.ts

@@ -21,6 +21,7 @@ export default class SkillDisplay {
         this.data = data;
         this.index = uiIndex;
         this.initSelf();
+        console.log('zh:SkillDisplay constructor this.skillData=', data)
     }
     initSelf() {
         this.ui.normalBtn.onClick(this, this.clickAddLevel);
@@ -73,10 +74,21 @@ export default class SkillDisplay {
         }, EAdType.upSkill)
     }
     startGame() {
+        //如果是关公刀法就提示返回
+        if (this.data.index == 3) {
+            alert('期待吧')
+            return;
+        }
+
+
+
+
         xGame.soundMgr.playSound(xGame.common.btnClickStr);
         let needCoin = xGame.common.bigMoveNeedCoin;
         xGame.common.passAwardCoin = 2000;
         let guide = DataMgr.getSkillGuide();
+        console.log('zh:startGame guide='+guide)
+
         xGame.common.temSelfLevel = 0;
         if (guide == 0) {
             needCoin = 0;

+ 2 - 2
client/laya/src/utils/Common.ts

@@ -114,8 +114,8 @@ export default class Common {
         wxStar: 12001
     }
     //
-    skillNameList = ["从天而降", "横扫千军", "冰冻杆法", "关公杆法"];
-    skillIconList = ["gf_jn1", "gf_jn2", "gf_jn4", "gf_jn6"];
+    skillNameList = ["Fall from the sky", "Unstoppable Force", "Freeze Shot","Coming Soon"];
+    skillIconList = ["gf_jn1", "gf_jn2", "gf_jn4", "gf_jn4"];
     btnClickStr: string = "buttonclick";
     //大招可升级到的最大等级
     maxSkillLevel: number = 10;

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