111

art/fgui/assets/game/UIDraw/component/UITurntable_com3.xml

@@ -2,7 +2,7 @@
 <component size="261,84">
   <displayList>
     <image id="n48_hxtr" name="n48" src="brgy3uu" fileName="UIGameEnd/asset/zs4.png" xy="0,0" pivot="0,0.842" size="261,84" alpha="0.3"/>
-    <text id="n49_hxtr" name="womanTxt" xy="29,9" pivot="-0.153,0.875" size="221,69" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" autoSize="none" bold="true" text="I will also wait for you tomorrow"/>
+    <text id="n49_hxtr" name="womanTxt" xy="29,9" pivot="-0.153,0.875" size="221,69" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="I will also wait for you tomorrow."/>
   </displayList>
   <transition name="t0" options="2" autoPlay="true">
     <item time="0" type="Rotation" target="n48_hxtr" tween="true" startValue="0" endValue="-0.71" duration="30"/>

art/fgui/assets/game/UIGameEnd/component/Component30.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="0"/>
+  <controller name="c1" alias="结算奖励" exported="true" pages="0,奖励,1,未获得,2,已获得" selected="1"/>
   <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://isxx5ak7wehi3uj" align="center" vAlign="middle"/>
     <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="-15,75" size="100,29" font="Arial" fontSize="18" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" text="Unobtained">
+    <text id="n50_p4tr" name="n50" xy="-15,75" size="100,29" font="Arial" fontSize="17" color="#ffffff" align="center" vAlign="middle" leading="0" 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"/>

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="-17,74" size="100,29" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="Unobtained">
+    <text id="n50_p4tr" name="n50" xy="-15,76" size="100,29" font="Arial" 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"/>

art/fgui/assets/game/UIGameEnd/component/Component97.xml

@@ -3,8 +3,8 @@
   <controller name="c1" alias="结算" exported="true" pages="0,chenggong,1,shibai,2,完美过关,3,过关,4,闯关失败" selected="4"/>
   <displayList>
     <image id="n46_g1gi" name="n46" src="wehi3ub" fileName="UIGameEnd/asset/js_bz1.png" xy="0,0" pivot="0.5,0.5" size="648,80"/>
-    <component id="n48_g1gi" name="diamondNode" src="p4tr41y" fileName="UIGameEnd/component/Component30.xml" xy="231,8" controller="c1,0"/>
-    <component id="n49_g1gi" name="coinNode" src="p4tr41z" fileName="UIGameEnd/component/Component30_1.xml" xy="385,8" controller="c1,0"/>
+    <component id="n48_g1gi" name="diamondNode" src="p4tr41y" fileName="UIGameEnd/component/Component30.xml" xy="228,8" size="66,104" controller="c1,0"/>
+    <component id="n49_g1gi" name="coinNode" src="p4tr41z" fileName="UIGameEnd/component/Component30_1.xml" xy="388,8" size="66,104" controller="c1,0"/>
   </displayList>
   <transition name="t0" autoPlay="true">
     <item time="0" type="Alpha" target="n46_g1gi" tween="true" startValue="0" endValue="1" duration="24"/>

art/fgui/assets/game/UIModeSelection/component/ModeSelection_com1.xml

@@ -13,11 +13,11 @@
     <text id="n33_lrxg" name="n33" xy="73,57" size="166,49" fontSize="36" color="#ffffff" align="center" vAlign="middle" bold="true" text="beginner">
       <relation target="" sidePair="center-center"/>
     </text>
-    <image id="n27_lrxg" name="coinImg" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="114,301" pivot="0.5,0.5" size="24,24" group="n35_lrxg" aspect="true"/>
-    <text id="n28_lrxg" name="need" xy="139,296" size="60,36" group="n35_lrxg" font="Arial" fontSize="26" color="#ffffff" bold="true" strokeColor="#000000" text="2000">
+    <image id="n27_lrxg" name="coinImg" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="112,308" pivot="0.5,0.5" size="24,24" group="n35_lrxg" aspect="true"/>
+    <text id="n28_lrxg" name="need" xy="137,302" size="60,36" group="n35_lrxg" font="Arial" fontSize="26" color="#ffffff" bold="true" strokeColor="#000000" text="2000">
       <relation target="n27_lrxg" sidePair="left-right"/>
     </text>
-    <group id="n35_lrxg" name="n35" xy="114,296" size="85,36" advanced="true">
+    <group id="n35_lrxg" name="n35" xy="112,302" size="85,36" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <image id="n29_lrxg" name="n29" src="avag460" fileName="UIModeSelection/asset2/msxz1_16.png" xy="197,366">

art/fgui/assets/game/UIModeSelection/component/ModeSelection_com123.xml

@@ -4,8 +4,8 @@
     <component id="n22_lrxg" name="type1" src="lrxgv50m" fileName="UIModeSelection/component/ModeSelection_com1.xml" xy="0,-1"/>
     <component id="n36_lrxg" name="type2" src="lrxgv50n" fileName="UIModeSelection/component/ModeSelection_com2.xml" xy="350,0"/>
     <component id="n37_lrxg" name="type3" src="lrxgv50o" fileName="UIModeSelection/component/ModeSelection_com3.xml" xy="696,0"/>
-    <text id="n38_lrxg" name="n38" xy="323,428" size="364,34" alpha="0.6" font="Arial" fontSize="24" color="#ffffff" align="center" bold="true" strokeColor="#000000" text="Click on the blank area to close">
-      <relation target="n22_lrxg" sidePair="center-center,top-bottom"/>
+    <text id="n38_lrxg" name="n38" xy="320,427" size="428,34" alpha="0.9" font="Arial" fontSize="24" color="#ffffff" align="center" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="Click on the blank area to close">
+      <relation target="n36_lrxg" sidePair="center-center,bottom-bottom"/>
     </text>
   </displayList>
   <transition name="t0" autoPlay="true">

art/fgui/assets/game/UIModeSelection/component/ModeSelection_com2.xml

@@ -13,11 +13,11 @@
     <text id="n33_lrxg" name="n33" xy="100,57" size="112,49" font="Arial" fontSize="36" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="expert">
       <relation target="" sidePair="center-center"/>
     </text>
-    <image id="n27_lrxg" name="coinImg" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="114,306" pivot="0.5,0.5" size="24,24" group="n35_lrxg" aspect="true"/>
-    <text id="n28_lrxg" name="need" xy="138,301" size="60,36" group="n35_lrxg" font="Arial" fontSize="26" color="#ffffff" bold="true" strokeColor="#000000" text="2000">
+    <image id="n27_lrxg" name="coinImg" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="114,311" pivot="0.5,0.5" size="24,24" group="n35_lrxg" aspect="true"/>
+    <text id="n28_lrxg" name="need" xy="138,305" size="60,36" group="n35_lrxg" font="Arial" fontSize="26" color="#ffffff" bold="true" strokeColor="#000000" text="2000">
       <relation target="n27_lrxg" sidePair="left-right"/>
     </text>
-    <group id="n35_lrxg" name="n35" xy="114,301" size="84,36" advanced="true">
+    <group id="n35_lrxg" name="n35" xy="114,305" size="84,36" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <image id="n29_lrxg" name="n29" src="avag460" fileName="UIModeSelection/asset2/msxz1_16.png" xy="196,366">

art/fgui/assets/game/UIModeSelection/component/ModeSelection_com3.xml

@@ -13,11 +13,11 @@
     <text id="n33_lrxg" name="n33" xy="94,57" size="122,49" font="Arial" fontSize="36" color="#ffffff" align="center" vAlign="middle" bold="true" text="master">
       <relation target="" sidePair="center-center"/>
     </text>
-    <image id="n27_lrxg" name="coinImg" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="114,306" pivot="0.5,0.5" size="24,24" group="n35_lrxg" aspect="true"/>
-    <text id="n28_lrxg" name="need" xy="139,301" size="60,36" group="n35_lrxg" font="Arial" fontSize="26" color="#ffffff" bold="true" strokeColor="#000000" text="2000">
+    <image id="n27_lrxg" name="coinImg" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="114,312" pivot="0.5,0.5" size="24,24" group="n35_lrxg" aspect="true"/>
+    <text id="n28_lrxg" name="need" xy="139,306" size="60,36" group="n35_lrxg" font="Arial" fontSize="26" color="#ffffff" bold="true" strokeColor="#000000" text="2000">
       <relation target="n27_lrxg" sidePair="left-right"/>
     </text>
-    <group id="n35_lrxg" name="n35" xy="114,301" size="85,36" advanced="true">
+    <group id="n35_lrxg" name="n35" xy="114,306" size="85,36" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <image id="n29_lrxg" name="n29" src="avag460" fileName="UIModeSelection/asset2/msxz1_16.png" xy="197,366">

art/fgui/assets/game/UISkill/component/Component26.xml

@@ -2,7 +2,7 @@
 <component size="132,40" pivot="0.5,0.5" extention="Button" designImageLayer="1">
   <displayList>
     <image id="n11_qlo0" name="n11" src="hkrz3ta" fileName="_shareasset/ty_an1.png" xy="0,0" size="220,68" aspect="true" scale="0.6,0.6"/>
-    <text id="n30_qlo0" name="n30" xy="0,1" size="131,37" font="Arial" fontSize="19" color="#ffffff" align="center" vAlign="middle" leading="1" vars="true" autoSize="none" bold="true" text="Raise level {lan=1}"/>
+    <text id="n30_qlo0" name="n30" xy="0,1" size="131,37" font="Arial" fontSize="19" color="#ffffff" align="center" vAlign="middle" leading="0" vars="true" autoSize="none" bold="true" text="Raise Lv {lan=1}"/>
     <image id="n34_qlo0" name="n34" src="hkrz3te" fileName="_shareasset/1.png" xy="1,-1" size="18,12" aspect="true"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.04"/>

art/fgui/assets/game/UISkill/component/Component28.xml

@@ -2,7 +2,7 @@
 <component size="132,41" pivot="0.5,0.5" extention="Button">
   <displayList>
     <image id="n12_qlo0" name="n12" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,0" size="220,68" aspect="true" scale="0.6,0.6"/>
-    <text id="n31_qlo0" name="n31" xy="31,-3" size="103,48" fontSize="17" color="#ffffff" vars="true" autoSize="none" text="Raise level  &#xA;by {huang=3}"/>
+    <text id="n31_qlo0" name="n31" xy="31,-3" size="103,48" fontSize="17" color="#ffffff" align="center" vAlign="middle" vars="true" autoSize="none" text="Raise Lv  {huang=3}"/>
     <text id="n32_qlo0" name="curTxt" xy="3,19" size="26,22" fontSize="14" color="#ffffff" align="center" text="2/1"/>
     <image id="n33_qlo0" name="n33" src="hkrz3te" fileName="_shareasset/1.png" xy="4,6" size="21,15" aspect="true"/>
   </displayList>

art/fgui/assets/game/UISkill/component/Component98.xml

@@ -2,7 +2,7 @@
 <component size="56,116" pivot="0.5,0.5" extention="Button">
   <displayList>
     <image id="n8_qlo0" name="n8" src="qlo041e" fileName="UISkill/asset/gf_k3.png" xy="0,0" size="56,116"/>
-    <text id="n40_qlo0" name="n40" xy="17,2" size="22,99" font="Arial" fontSize="24" color="#ffffff" vAlign="middle" autoSize="none" bold="true" text="CUE"/>
+    <text id="n40_qlo0" name="n40" xy="15,8" size="25,99" font="Arial" fontSize="25" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="CUE"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
 </component>

art/fgui/assets/game/UISkill/component/skillItem.xml

@@ -13,7 +13,7 @@
       <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,52" size="372,80" font="Arial" fontSize="17" color="#1b3550" 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="156,57" size="358,69" font="Arial" fontSize="17" color="#1b3550" 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="n32_qlo0" name="n32" xy="174,187" size="306,23" font="Arial" fontSize="15" color="#ffffff" leading="1" 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"/>

art/fgui/assets/game/UISkill/component/skillItem_1.xml

@@ -12,7 +12,7 @@
     <text id="n24_qlo0" name="nameTxt" xy="3,3" size="192,32" font="Arial" 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" font="Arial" 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="n29_qlo0" name="describeTxt" xy="152,45" size="366,79" font="Arial" fontSize="19" color="#696b80" autoSize="none" text="跳杆击球后，球高高跃起，砸在桌面上，直接打进我方除黑八外需进的下一颗球。"/>
     <text id="n32_qlo0" name="n32" xy="160,190" size="362,22" font="Arial" 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"/>

client/laya/bin/js/bundle.js

@@ -5831,10 +5831,12 @@
             this.isEject = false;
             this.moneyNode = new MoneyNode(this.ui.moneyNode);
             this.initSkillData();
+            console.log('zh:aaaaaa1111111111');
             this.addUIClick(this.ui.closeNode.closeBtn, this.returnUIMain);
             this.ui.skillNode.skillList.itemRenderer = Laya.Handler.create(this, this.updateSkillItem, null, false);
+            console.log('zh:aaaaaa22222222');
             this.displayList = [];
-            this.ui.skillNode.skillList.numItems = 4;
+            this.ui.skillNode.skillList.numItems = 3;
             this.addUIClick(this.ui, this.interuptSecretary);
             this.addUIClick(this.ui.guideNode.guideBtn, this.enterGuideLevel);
             this.ui.talkNode.visible = false;
@@ -5884,6 +5886,7 @@
                 "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!"
             ];
+            console.log('zh:initSkillData  111111111');
             let data;
             for (let index = 0; index < nameList.length; index++) {
                 data = {};
@@ -10591,8 +10594,8 @@
                 normalStar: 12000,
                 wxStar: 12001
             };
-            this.skillNameList = ["Fall from the sky", "Unstoppable Force", "Freeze Shot", "Coming Soon"];
-            this.skillIconList = ["gf_jn1", "gf_jn2", "gf_jn4", "gf_jn4"];
+            this.skillNameList = ["Fall from the sky", "Unstoppable Force", "Freeze Shot"];
+            this.skillIconList = ["gf_jn1", "gf_jn2", "gf_jn4"];
             this.btnClickStr = "buttonclick";
             this.maxSkillLevel = 10;
             this.upSkillLevel = false;
@@ -19118,10 +19121,12 @@
             this.isEject = false;
             this.moneyNode = new MoneyNode$1(this.ui.moneyNode);
             this.initSkillData();
+            console.log('zh:aaaaaa1111111111');
             this.addUIClick(this.ui.closeNode.closeBtn, this.returnUIMain);
             this.ui.skillNode.skillList.itemRenderer = Laya.Handler.create(this, this.updateSkillItem, null, false);
+            console.log('zh:aaaaaa22222222');
             this.displayList = [];
-            this.ui.skillNode.skillList.numItems = 4;
+            this.ui.skillNode.skillList.numItems = 3;
             this.addUIClick(this.ui, this.interuptSecretary);
             this.addUIClick(this.ui.guideNode.guideBtn, this.enterGuideLevel);
             this.ui.talkNode.visible = false;
@@ -19171,6 +19176,7 @@
                 "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!"
             ];
+            console.log('zh:initSkillData  111111111');
             let data;
             for (let index = 0; index < nameList.length; index++) {
                 data = {};

client/laya/src/ui/UISkill.ts

@@ -23,12 +23,14 @@ export default class UISkill extends UIBase {
         this.moneyNode = new MoneyNode(this.ui.moneyNode);
         //
         this.initSkillData();
-        //
+        console.log('zh:aaaaaa1111111111')
         this.addUIClick(this.ui.closeNode.closeBtn, this.returnUIMain);
         this.ui.skillNode.skillList.itemRenderer = Laya.Handler.create(this, this.updateSkillItem, null, false);
+          console.log('zh:aaaaaa22222222')
         //
         this.displayList = [];
-        this.ui.skillNode.skillList.numItems = 4;
+        //this.ui.skillNode.skillList.numItems = 4;  OLD
+        this.ui.skillNode.skillList.numItems = 3;
         //
         this.addUIClick(this.ui, this.interuptSecretary);
         this.addUIClick(this.ui.guideNode.guideBtn, this.enterGuideLevel);
@@ -91,6 +93,7 @@ export default class UISkill extends UIBase {
             "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!"
         ];
+        console.log('zh:initSkillData  111111111')
         //
         let data: any;
         for (let index = 0; index < nameList.length; index++) {

client/laya/src/utils/Common.ts

@@ -114,8 +114,10 @@ export default class Common {
         wxStar: 12001
     }
     //
-    skillNameList = ["Fall from the sky", "Unstoppable Force", "Freeze Shot","Coming Soon"];
-    skillIconList = ["gf_jn1", "gf_jn2", "gf_jn4", "gf_jn4"];
+   // skillNameList = ["Fall from the sky", "Unstoppable Force", "Freeze Shot","Coming Soon"];
+    skillNameList = ["Fall from the sky", "Unstoppable Force", "Freeze Shot"];
+    //skillIconList = ["gf_jn1", "gf_jn2", "gf_jn4", "gf_jn4"];
+    skillIconList = ["gf_jn1", "gf_jn2", "gf_jn4"];
     btnClickStr: string = "buttonclick";
     //大招可升级到的最大等级
     maxSkillLevel: number = 10;