1

art/fgui/.objs/workspace.json

@@ -8,22 +8,24 @@
   ],
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://isxx5ak7kt443qh"
+    "ui://isxx5ak7jaakv51j"
   ],
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://isxx5ak7kt443qh",
+  "doc.activeDoc": "ui://isxx5ak7jaakv51j",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
-    "/UIGame/",
+    "/UILevelProp/",
     "isxx5ak7",
-    "/UIGame/component/",
+    "/UILevelProp/component/",
     "isxx5ak7",
-    "/_exportasset/",
+    "/UISkill/",
+    "isxx5ak7",
+    "/UISkill/component/",
     "isxx5ak7",
     "/windows/"
   ],

art/fgui/assets/game/UIAddProp/component/hb_jinbi1.xml

@@ -20,8 +20,8 @@
     </group>
     <text id="n42_ehto" name="n42" xy="48,137" size="118,39" font="Arial" fontSize="28" color="#ffffff" align="center" italic="true" text="gold coin"/>
     <image id="n46_xtc7" name="n46" src="jaakv562" fileName="UIAddProp/asset/biaoqian.png" xy="125,298"/>
-    <text id="n47_xtc7" name="n47" xy="147,322" size="30,23" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="Gift"/>
-    <text id="n48_xtc7" name="n48" xy="142,338" size="40,26" font="Arial" fontSize="18" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="25%"/>
+    <text id="n47_xtc7" name="n47" xy="147,322" pivot="0.5,0.5" size="30,23" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="Gift"/>
+    <text id="n48_xtc7" name="n48" xy="142,338" pivot="0.5,0.5" size="40,26" font="Arial" fontSize="18" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="25%"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
   <transition name="t0" autoPlay="true">

art/fgui/assets/game/UIAddProp/component/hb_jinbi2.xml

@@ -16,8 +16,8 @@
     </group>
     <text id="n42_ehto" name="n42" xy="48,137" size="118,39" fontSize="28" color="#ffffff" align="center" italic="true" text="gold coin"/>
     <image id="n43_xtc7" name="n43" src="jaakv562" fileName="UIAddProp/asset/biaoqian.png" xy="125,298"/>
-    <text id="n44_xtc7" name="n44" xy="145,323" size="30,23" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="Gift"/>
-    <text id="n45_xtc7" name="n45" xy="141,339" size="40,26" font="Arial" fontSize="18" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="25%"/>
+    <text id="n44_xtc7" name="n44" xy="145,323" pivot="0.5,0.5" size="30,23" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="Gift"/>
+    <text id="n45_xtc7" name="n45" xy="140,339" pivot="0.5,0.5" size="40,26" font="Arial" fontSize="18" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="25%"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
   <transition name="t0" autoPlay="true">

art/fgui/assets/game/UIAddProp/component/hb_jinbi3.xml

@@ -16,8 +16,8 @@
     </group>
     <text id="n42_ehto" name="n42" xy="48,137" size="118,39" fontSize="28" color="#ffffff" align="center" italic="true" text="gold coin"/>
     <image id="n43_xtc7" name="n43" src="jaakv562" fileName="UIAddProp/asset/biaoqian.png" xy="125,298"/>
-    <text id="n44_xtc7" name="n44" xy="147,324" size="30,23" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="Gift"/>
-    <text id="n45_xtc7" name="n45" xy="143,340" size="40,26" font="Arial" fontSize="18" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="25%"/>
+    <text id="n44_xtc7" name="n44" xy="147,324" pivot="0.5,0.5" size="30,23" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="Gift"/>
+    <text id="n45_xtc7" name="n45" xy="143,340" pivot="0.5,0.5" size="40,26" font="Arial" fontSize="18" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="25%"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
   <transition name="t0" autoPlay="true">

art/fgui/assets/game/UIAddProp/component/hb_zs1.xml

@@ -11,20 +11,20 @@
     <text id="n27_ehto" name="n27" xy="1,15" pivot="0.5,0.5" size="57,23" rotation="-47" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="Activity"/>
     <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,404" size="51,43" group="n41_ehto" scale="0.9,0.9"/>
-    <image id="n44_ehto" name="n44" src="ehtov4fk" fileName="UIAddProp/asset/hb_fx.png" xy="30,412" size="27,27" group="n41_ehto"/>
-    <text id="n40_ehto" name="diamondTxt" xy="112,404" size="84,39" group="n41_ehto" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="+2000">
+    <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,391" pivot="0.5,0.5"/>
+    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="64,398" size="51,43" group="n41_ehto" scale="0.9,0.9"/>
+    <image id="n44_ehto" name="n44" src="ehtov4fk" fileName="UIAddProp/asset/hb_fx.png" xy="30,406" size="27,27" group="n41_ehto"/>
+    <text id="n40_ehto" name="diamondTxt" xy="112,398" pivot="0.5,0.5" size="84,39" group="n41_ehto" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="+2000">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
-    <group id="n41_ehto" name="n41" xy="30,404" size="166,43" advanced="true">
+    <group id="n41_ehto" name="n41" xy="30,398" size="166,43" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="n38_ehto" sidePair="center-center"/>
     </group>
     <image id="n45_ehto" name="n45" src="ehtov4fh" fileName="UIAddProp/asset/hb_bq_s.png" xy="206,392"/>
     <image id="n47_sw70" name="n47" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="50,402" size="51,42" group="n50_sw70" scale="0.9,0.9"/>
     <image id="n48_sw70" name="n48" src="ehtov4fs" fileName="UIAddProp/asset/hb_sp.png" xy="10,411" size="33,23" group="n50_sw70"/>
-    <text id="n49_sw70" name="randTxt" xy="103,403" size="115,39" group="n50_sw70" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="50~100">
+    <text id="n49_sw70" name="randTxt" xy="103,403" size="115,39" group="n50_sw70" font="Arial" fontSize="28" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="50~100">
       <relation target="n47_sw70" sidePair="left-right"/>
     </text>
     <group id="n50_sw70" name="n50" xy="10,402" size="208,42" advanced="true">

art/fgui/assets/game/UIAddProp/component/hb_zs2.xml

@@ -6,13 +6,13 @@
     <text id="n26_ehto" name="n26" xy="10,44" pivot="0.5,0.5" size="206,116" fontSize="28" color="#522cce" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#ffffff" text="Get diamonds by &#xA;watching videos."/>
     <text id="n27_ehto" name="n27" xy="-11,19" pivot="0.5,0.5" size="81,23" rotation="-47" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="middle" leading="0" bold="true" strokeColor="#000000" text="Timed limit"/>
     <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="86,405" size="51,43" group="n41_ehto" scale="0.9,0.9"/>
-    <image id="n44_ehto" name="n44" src="ehtov4fs" fileName="UIAddProp/asset/hb_sp.png" xy="35,413" size="33,24" group="n41_ehto"/>
-    <text id="n40_ehto" name="diamondTxt" xy="138,406" size="52,39" group="n41_ehto" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="+20">
+    <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,392" pivot="0.5,0.5"/>
+    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="81,400" size="51,43" group="n41_ehto" scale="0.9,0.9"/>
+    <image id="n44_ehto" name="n44" src="ehtov4fs" fileName="UIAddProp/asset/hb_sp.png" xy="41,406" size="33,24" group="n41_ehto"/>
+    <text id="n40_ehto" name="diamondTxt" xy="133,400" pivot="0.5,0.5" size="52,39" group="n41_ehto" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="+20">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
-    <group id="n41_ehto" name="n41" xy="35,405" size="155,43" advanced="true">
+    <group id="n41_ehto" name="n41" xy="41,400" size="144,43" advanced="true">
       <relation target="n38_ehto" sidePair="center-center"/>
     </group>
     <image id="n45_ehto" name="n45" src="ehtov4fh" fileName="UIAddProp/asset/hb_bq_s.png" xy="206,392"/>

art/fgui/assets/game/UIAddProp/component/hb_zs3.xml

@@ -6,8 +6,8 @@
     <text id="n26_ehto" name="n26" xy="15,46" pivot="0.5,0.5" size="195,113" fontSize="28" color="#522cce" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#ffffff" text="Challenge the Cue Ball &#xA;Arrangement Master!"/>
     <text id="n27_ehto" name="n27" xy="-5,21" pivot="0.5,0.5" size="60,23" rotation="-47" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="Hotspot"/>
     <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="4,404" size="218,42" font="Arial" fontSize="30" color="#ffffff" align="center" bold="true" strokeColor="#000000" text="Challenge Now"/>
+    <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,391"/>
+    <text id="n47_ehto" name="n47" xy="10,400" pivot="0.5,0.5" size="206,39" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="Challenge Now"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
   <transition name="t0" autoPlay="true">

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="1"/>
+  <controller name="c1" alias="按钮" exported="true" pages="0,使用中,1,点击使用,2,钻石购买" selected="0"/>
   <displayList>
     <image id="n12_qlo0" name="n12" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="-49,-16" pivot="0.5,0.5" size="231,74" aspect="true" scale="0.6,0.6">
       <gearDisplay controller="c1" pages="1,2"/>
@@ -10,12 +10,12 @@
       <gearDisplay controller="c1" pages="0"/>
     </image>
     <image id="n13_s46i" name="n13" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="24,7" pivot="0.5,0.5" size="33,27" group="n15_s46i" aspect="true" scale="0.8,0.8"/>
-    <text id="n14_s46i" name="diamondTxt" xy="56,5" pivot="0.5,0.5" size="52,30" group="n15_s46i" fontSize="21" color="#ffffff" vAlign="middle" leading="0" autoSize="none" strokeColor="#000000" text="3000"/>
+    <text id="n14_s46i" name="diamondTxt" xy="56,5" pivot="0.5,0.5" size="52,30" group="n15_s46i" fontSize="21" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" strokeColor="#000000" text="3000"/>
     <group id="n15_s46i" name="n15" xy="24,5" size="84,30" advanced="true">
       <gearDisplay controller="c1" pages="2"/>
       <relation target="n12_qlo0" sidePair="center-center"/>
     </group>
-    <text id="n16_wcn5" name="n16" xy="44,5" pivot="0.5,0.5" size="43,30" fontSize="21" color="#ffffff" leading="0" bold="true" strokeColor="#000000" text="Use">
+    <text id="n16_wcn5" name="n16" xy="32,5" pivot="0.5,0.5" size="66,30" fontSize="21" color="#ffffff" align="center" leading="0" bold="true" strokeColor="#000000" text="In use">
       <gearDisplay controller="c1" pages="0,1"/>
       <gearText controller="c1" pages="0,1" values="In use|Use" default="使用中"/>
     </text>

client/laya/bin/js/bundle.js

@@ -5449,11 +5449,11 @@
                     temp.purchaseBtn.c1.selectedIndex = 0;
                     temp.purchaseBtn.diamondTxt.text = curData.price + "";
                 }
-                temp.purchaseBtn.offClick(this, this.clickSecretary);
-                temp.purchaseBtn.onClick(this, this.clickSecretary, [getWoman, curUse, womanIndex, curData.price]);
+                temp.purchaseBtn.visible = false;
             }
         }
         clickSecretary(getWoman, curUse, womanIndex, needDiamond) {
+            console.log('zh: 点击了clickSecretary ');
             xGame.soundMgr.playSound(xGame.common.btnClickStr);
             if (getWoman) {
                 if (curUse != womanIndex) {
@@ -20421,11 +20421,11 @@
                     temp.purchaseBtn.c1.selectedIndex = 0;
                     temp.purchaseBtn.diamondTxt.text = curData.price + "";
                 }
-                temp.purchaseBtn.offClick(this, this.clickSecretary);
-                temp.purchaseBtn.onClick(this, this.clickSecretary, [getWoman, curUse, womanIndex, curData.price]);
+                temp.purchaseBtn.visible = false;
             }
         }
         clickSecretary(getWoman, curUse, womanIndex, needDiamond) {
+            console.log('zh: 点击了clickSecretary ');
             xGame.soundMgr.playSound(xGame.common.btnClickStr);
             if (getWoman) {
                 if (curUse != womanIndex) {

client/laya/bin/js/cfgTable.js

@@ -66,7 +66,7 @@ cfgTable.aiskillData={
 cfgTable.ballrodData={
     [1]:{
         id:1,
-        name:'wooden club',
+        name:'Crimson Edge',
         price:0,
         describe:'rookie',
         quality:0,
@@ -77,7 +77,7 @@ cfgTable.ballrodData={
     },
     [2]:{
         id:2,
-        name:'mic club',
+        name:'Violet Glaze',
         price:1000,
         describe:'master',
         quality:1,
@@ -88,7 +88,7 @@ cfgTable.ballrodData={
     },
     [3]:{
         id:3,
-        name:'magic club',
+        name:'Vine Pact',
         price:1500,
         describe:'master',
         quality:1,
@@ -99,7 +99,7 @@ cfgTable.ballrodData={
     },
     [4]:{
         id:4,
-        name:'Christmas tree club',
+        name:'Blaze Chain',
         price:2000,
         describe:'master',
         quality:1,
@@ -110,7 +110,7 @@ cfgTable.ballrodData={
     },
     [5]:{
         id:5,
-        name:'Prison Fire Sword',
+        name:'Dragon Rainbow',
         price:3000,
         describe:'legend',
         quality:2,
@@ -121,7 +121,7 @@ cfgTable.ballrodData={
     },
     [6]:{
         id:6,
-        name:'classics club',
+        name:'Brown Ease',
         price:0,
         describe:'rookie',
         quality:0,

client/laya/src/ui/UISecretary.ts

@@ -160,11 +160,14 @@ export default class UISecretary extends UIBase {
                 temp.purchaseBtn.c1.selectedIndex = 0;
                 temp.purchaseBtn.diamondTxt.text = curData.price + "";
             }
-            temp.purchaseBtn.offClick(this, this.clickSecretary);
-            temp.purchaseBtn.onClick(this, this.clickSecretary, [getWoman, curUse, womanIndex, curData.price]);
+            //就1个小秘书，所以注释了
+               temp.purchaseBtn.visible = false;//直接隐藏掉
+            //temp.purchaseBtn.offClick(this, this.clickSecretary);
+            //temp.purchaseBtn.onClick(this, this.clickSecretary, [getWoman, curUse, womanIndex, curData.price]);
         }
     }
     clickSecretary(getWoman, curUse, womanIndex, needDiamond) {
+        console.log('zh: 点击了clickSecretary ')
         xGame.soundMgr.playSound(xGame.common.btnClickStr);
         if (getWoman) {
             if (curUse != womanIndex) {