1

art/fgui/.objs/metas/isxx5ak7/kt443qc.info

@@ -5,22 +5,19 @@
       "locked": true,
       "hidden": true
     },
-    "n84_jpsz": {
+    "n83_jpsz": {
       "hidden": true
     },
-    "n77_vhzh": {
-      "collapsed": true,
-      "locked": true,
+    "n84_jpsz": {
       "hidden": true
     },
     "n48_hxtr": {
       "locked": true,
       "hidden": true
     },
-    "n83_jpsz": {
-      "hidden": true
-    },
-    "n33_ixm4": {
+    "n77_vhzh": {
+      "collapsed": true,
+      "locked": true,
       "hidden": true
     }
   },

art/fgui/assets/game/UIMain/UIMain.xml

@@ -10,10 +10,6 @@
     <loader id="n13_ixm4" name="secretary" xy="134,81" size="626,951" scale="0.7,0.7" url="ui://isxx5ak7wehi3ut" clearOnPublish="true">
       <relation target="n10_ixm4" sidePair="left-right,bottom-bottom%"/>
     </loader>
-    <image id="n33_ixm4" name="n33" src="n43d3x0" fileName="UIMain/asset/zjm_db6.png" xy="0,660" size="1335,90">
-      <relation target="n10_ixm4" sidePair="bottom-bottom"/>
-      <relation target="" sidePair="width-width"/>
-    </image>
     <component id="n15_ixm4" name="shopBtn" src="n43d3vn" fileName="UIMain/component/dh_zy_sc_guang.xml" xy="1182,662" size="110,85">
       <relation target="" sidePair="right-right"/>
       <relation target="n10_ixm4" sidePair="bottom-bottom"/>

art/fgui/assets/game/UIMoney/UIMoney.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="900,50">
-  <controller name="c1" alias="货币栏" exported="true" pages="0,金币,1,金币+钻石,13,金币+体力+钻石,14,金币+体力,15,体力+钻石,16,体力,17,钻石" selected="2"/>
+  <controller name="c1" alias="货币栏" exported="true" pages="0,金币,1,金币+钻石,13,金币+体力+钻石,14,金币+体力,15,体力+钻石,16,体力,17,钻石" selected="0"/>
   <displayList>
     <image id="n4_wehi" name="n4" src="wehi3um" fileName="UIMoney/asset/ty_dk.png" xy="350,0" size="219,50">
       <gearDisplay controller="c1" pages="0,1,13,14"/>
@@ -38,7 +38,7 @@
     <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}">
+    <text id="n16_jpsz" name="powerTimeTxt" xy="126,45" size="132,24" fontSize="16" color="#ffffff" align="center" vAlign="middle" vars="true" text="回满倒计时: {time=00:56}">
       <gearDisplay controller="c1" pages="13,14,15,16"/>
     </text>
   </displayList>

art/fgui/assets/game/UISecretary/UIShop/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="46,6" size="82,29" fontSize="20" color="#ffffff" vars="true" text="LevUp {lan=1}"/>
+    <text id="n30_qlo0" name="n30" xy="46,5" size="78,29" fontSize="20" color="#ffffff" vars="true" text="LevUp {lan=1}"/>
     <image id="n34_qlo0" name="n34" src="hkrz3te" fileName="_shareasset/1.png" xy="16,10" size="26,19" aspect="true"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.04"/>

art/fgui/assets/game/UISecretary/UIShop/component/Component28_11.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="132,41" pivot="0.5,0.5" extention="Button">
-  <controller name="c1" alias="按钮" exported="true" pages="0,使用中,1,点击使用,2,钻石购买" selected="0"/>
+  <controller name="c1" alias="按钮" exported="true" pages="0,使用中,1,点击使用,2,钻石购买" selected="2"/>
   <displayList>
     <image id="n12_qlo0" name="n12" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="-54,-17" pivot="0.5,0.5" size="240,74" aspect="true" scale="0.6,0.6">
       <gearDisplay controller="c1" pages="1,2"/>
@@ -9,18 +9,19 @@
     <image id="n17_wcn5" name="n17" src="hkrz3ta" fileName="_shareasset/ty_an1.png" xy="-54,-17" pivot="0.5,0.5" size="240,74" aspect="true" scale="0.6,0.6">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <image id="n13_s46i" name="n13" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="21,8" pivot="0.5,0.5" size="33,27" group="n15_s46i" aspect="true"/>
-    <text id="n14_s46i" name="diamondTxt" xy="59,5" pivot="0.5,0.5" size="56,32" group="n15_s46i" fontSize="22" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" text="3000">
+    <image id="n13_s46i" name="n13" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="21,7" pivot="0.5,0.5" size="33,27" group="n15_s46i" aspect="true"/>
+    <text id="n14_s46i" name="diamondTxt" xy="61,4" pivot="0.5,0.5" size="52,32" group="n15_s46i" fontSize="22" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" text="3000">
       <relation target="n13_s46i" sidePair="left-left"/>
     </text>
-    <group id="n15_s46i" name="n15" xy="21,5" size="93,32" advanced="true">
+    <group id="n15_s46i" name="n15" xy="21,4" size="93,32" advanced="true">
       <gearDisplay controller="c1" pages="2"/>
       <relation target="n12_qlo0" sidePair="center-center"/>
     </group>
-    <text id="n16_wcn5" name="n16" xy="32,5" pivot="0.5,0.5" size="67,30" fontSize="21" color="#ffffff" bold="true" strokeColor="#000000" text="In use">
+    <text id="n16_wcn5" name="n16" xy="32,5" pivot="0.5,0.5" size="67,30" fontSize="21" color="#ffffff" bold="true" strokeColor="#000000" text="使用中">
       <gearDisplay controller="c1" pages="0,1"/>
       <gearText controller="c1" pages="0,1" values="In use|Click to use" default="使用中"/>
     </text>
+    <text id="n18_kh6z" name="n18" xy="0,-4" size="58,42" fontSize="30" text="FFF"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.04"/>
 </component>

art/fgui/assets/game/UISecretary/component/Component118.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="291,64" pivot="0.5,0.5" extention="Button" designImageLayer="1">
-  <controller name="c1" alias="按钮" exported="true" pages="0,钻石购买,1,使用中,2,点击使用" selected="0"/>
+  <controller name="c1" alias="按钮" exported="true" pages="0,钻石购买,1,使用中,2,点击使用" selected="2"/>
   <displayList>
     <image id="n14_wcn5" name="n14" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,63" size="291,70" scale="1,-0.9">
       <gearDisplay controller="c1" pages="0,2"/>
@@ -8,15 +8,15 @@
     <image id="n9_u8ei" name="n9" src="hkrz3ta" fileName="_shareasset/ty_an1.png" xy="0,63" size="291,70" scale="1,-0.9">
       <gearDisplay controller="c1" pages="1"/>
     </image>
-    <image id="n10_u8ei" name="n10" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="82,14" pivot="0.5,0.5" size="42,34" group="n13_u8ei" aspect="true"/>
-    <text id="n11_u8ei" name="diamondTxt" xy="132,10" size="76,42" group="n13_u8ei" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="3000">
+    <image id="n10_u8ei" name="n10" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="82,15" pivot="0.5,0.5" size="42,34" group="n13_u8ei" aspect="true"/>
+    <text id="n11_u8ei" name="diamondTxt" xy="132,11" size="76,42" group="n13_u8ei" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="3000">
       <relation target="n10_u8ei" sidePair="left-left"/>
     </text>
-    <group id="n13_u8ei" name="n13" xy="82,10" size="126,42" advanced="true">
+    <group id="n13_u8ei" name="n13" xy="82,11" size="126,42" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="n9_u8ei" sidePair="center-center"/>
     </group>
-    <text id="n15_wcn5" name="n15" xy="98,10" pivot="0.5,0.5" size="94,42" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" bold="true" text="已拥有">
+    <text id="n15_wcn5" name="n15" xy="59,11" pivot="0.5,0.5" size="172,42" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" bold="true" text="Click to use">
       <gearDisplay controller="c1" pages="1,2"/>
       <gearText controller="c1" pages="1,2" values="In use|Click to use" default="已拥有"/>
     </text>

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

@@ -2,7 +2,7 @@
 <component size="134,42" pivot="0.5,0.5" extention="Button">
   <displayList>
     <image id="n35_ihpy" name="n35" src="hkrz3tg" fileName="_shareasset/gf_an2.png" xy="0,0" size="134,42" aspect="true"/>
-    <text id="n36_ihpy" name="n36" xy="6,-3" size="122,43" font="Arial" fontSize="19" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" strokeColor="#000000" text="Start"/>
+    <text id="n36_ihpy" name="n36" xy="6,2" size="122,38" font="Arial" fontSize="19" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" strokeColor="#000000" text="Start"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.04"/>
 </component>

client/laya/bin/js/bundle.js

@@ -4243,7 +4243,6 @@
             this.n47 = (this.getChild("n47"));
             this.n10 = (this.getChild("n10"));
             this.secretary = (this.getChild("secretary"));
-            this.n33 = (this.getChild("n33"));
             this.shopBtn = (this.getChild("shopBtn"));
             this.moneyNode = (this.getChild("moneyNode"));
             this.headNode = (this.getChild("headNode"));
@@ -12300,6 +12299,7 @@
             this.diamondTxt = (this.getChild("diamondTxt"));
             this.n15 = (this.getChild("n15"));
             this.n16 = (this.getChild("n16"));
+            this.n18 = (this.getChild("n18"));
         }
     }
     ui_Component28_11.URL = "ui://isxx5ak7g1giv4eh";
@@ -21529,6 +21529,7 @@
             { url: "res/json/classicCfg.json", type: Laya.Loader.JSON },
             { url: "res/json/levelCfg.json", type: Laya.Loader.JSON },
             { url: "res/json/placeBallCfg.json", type: Laya.Loader.JSON },
+            { url: "res/font/arial.ttf", type: Laya.Loader.FONT },
         ];
     }
     function initCallback() {

client/laya/bin/js/cfgTable.js

@@ -903,7 +903,7 @@ cfgTable.signData={
 cfgTable.talkwordsData={
     [1]:{
         id:1,
-        msg:'good shot',
+        msg:'Good shot',
     },
     [2]:{
         id:2,
@@ -915,11 +915,11 @@ cfgTable.talkwordsData={
     },
     [4]:{
         id:4,
-        msg:'Alas, the clearing platform is gone',
+        msg:'Look at me!',
     },
     [5]:{
         id:5,
-        msg:'Surrender, I\'m ready to clear the platform',
+        msg:'I am the true king.',
     },
     [6]:{
         id:6,
@@ -927,7 +927,7 @@ cfgTable.talkwordsData={
     },
     [7]:{
         id:7,
-        msg:'Do you dare to let me touch the ball',
+        msg:'What a talented person!',
     },
     [8]:{
         id:8,

client/laya/src/fgui/res/game/ui_Component28_11.ts

@@ -9,6 +9,7 @@ export default class ui_Component28_11 extends fgui.GButton {
 	public diamondTxt:fgui.GTextField;
 	public n15:fgui.GGroup;
 	public n16:fgui.GTextField;
+	public n18:fgui.GTextField;
 	public static URL:string = "ui://isxx5ak7g1giv4eh";
 
 	public static createInstance():ui_Component28_11 {
@@ -23,5 +24,6 @@ export default class ui_Component28_11 extends fgui.GButton {
 		this.diamondTxt = <fgui.GTextField>(this.getChild("diamondTxt"));
 		this.n15 = <fgui.GGroup>(this.getChild("n15"));
 		this.n16 = <fgui.GTextField>(this.getChild("n16"));
+		this.n18 = <fgui.GTextField>(this.getChild("n18"));
 	}
 }

client/laya/src/fgui/res/game/ui_UIMain.ts

@@ -25,7 +25,6 @@ export default class ui_UIMain extends fgui.GComponent {
 	public n47:fgui.GGraph;
 	public n10:fgui.GImage;
 	public secretary:fgui.GLoader;
-	public n33:fgui.GImage;
 	public shopBtn:ui_dh_zy_sc_guang;
 	public moneyNode:ui_UIMoney;
 	public headNode:ui_Component3;
@@ -63,7 +62,6 @@ export default class ui_UIMain extends fgui.GComponent {
 		this.n47 = <fgui.GGraph>(this.getChild("n47"));
 		this.n10 = <fgui.GImage>(this.getChild("n10"));
 		this.secretary = <fgui.GLoader>(this.getChild("secretary"));
-		this.n33 = <fgui.GImage>(this.getChild("n33"));
 		this.shopBtn = <ui_dh_zy_sc_guang>(this.getChild("shopBtn"));
 		this.moneyNode = <ui_UIMoney>(this.getChild("moneyNode"));
 		this.headNode = <ui_Component3>(this.getChild("headNode"));