1

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

@@ -29,7 +29,7 @@
     <component id="n51_iqrh" name="drawBtn" src="iqrhv4mt" fileName="_sharecomponent/drawBtn.xml" xy="580,630" controller="c1,9">
       <relation target="n4_wcn5" sidePair="center-center,top-bottom"/>
     </component>
-    <component id="n47_wcn5" name="talkNode" src="wcn5v4ld" fileName="UIDraw/component/UITurntable_com3.xml" xy="1033,60">
+    <component id="n47_wcn5" name="talkNode" src="wcn5v4ld" fileName="UIDraw/component/UITurntable_com3.xml" xy="1045,60">
       <relation target="n46_wcn5" sidePair="left-left,top-top"/>
     </component>
   </displayList>

art/fgui/assets/game/UILevelProp/UILevelProp.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1334,750" designImageLayer="1">
-  <displayList>
-    <graph id="n16_xs1r" name="n16" xy="0,0" size="1334,750" alpha="0.6" type="rect" lineSize="0" fillColor="#ff000000">
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <component id="n1_xs1r" name="myNode" src="xs1r482" fileName="UILevelProp/component/Component85.xml" xy="217,71" pivot="0.5,0.5">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </component>
-    <component id="n15_xs1r" name="closeBtn" src="xs1r483" fileName="UILevelProp/component/Component86.xml" xy="1123,96">
-      <relation target="n1_xs1r" sidePair="left-left,top-top"/>
-    </component>
-    <component id="n17_trk9" name="moneyNode" src="wehi3ug" fileName="UIMoney/UIMoney.xml" xy="217,15" controller="c1,13">
-      <relation target="n1_xs1r" sidePair="center-center"/>
-      <relation target="" sidePair="top-top"/>
-    </component>
-  </displayList>
-  <transition name="t1">
-    <item time="0" type="Alpha" target="n16_xs1r" tween="true" startValue="0" endValue="0.6" duration="12"/>
-    <item time="0" type="Alpha" target="n1_xs1r" tween="true" startValue="0" endValue="1" duration="12"/>
-    <item time="0" type="XY" target="n1_xs1r" tween="true" startValue="217,38" endValue="217,92" duration="12"/>
-  </transition>
-</component>

art/fgui/assets/game/UILevelProp/component/Component83.xml

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

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

@@ -36,9 +36,8 @@
     <group id="n45_ixm4" name="n45" xy="923,121" size="411,96" advanced="true">
       <relation target="n10_ixm4" sidePair="left-right%"/>
     </group>
-    <component id="n27_ixm4" name="secretaryBtn" src="ixm43xw" fileName="UIMain/component/Component13.xml" xy="841,662" size="68,85" group="n46_ixm4"/>
-    <component id="n28_ixm4" name="rankBtn" src="ixm43xz" fileName="UIMain/component/Component16.xml" xy="1001,708" size="0,1" group="n46_ixm4"/>
-    <group id="n46_ixm4" name="n46" xy="841,662" size="119,85" advanced="true">
+    <component id="n27_ixm4" name="secretaryBtn" src="ixm43xw" fileName="UIMain/component/Component13.xml" xy="817,662" size="118,85" group="n46_ixm4"/>
+    <group id="n46_ixm4" name="n46" xy="817,662" size="118,85" advanced="true">
       <relation target="n86_r4l5" sidePair="right-right"/>
     </group>
     <component id="n86_r4l5" name="ganFaMoShiBtn" src="r4l5v577" fileName="UIMain/component/Component1302.xml" xy="1016,662" size="110,85">

art/fgui/assets/game/UISecretary/Component122.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="899,569">
   <displayList>
-    <component id="n5_olmj" name="gameNode1" src="uqohv4lo" fileName="UISecretary/SecretaryDisplay.xml" xy="-180,0" pivot="0.5,0.5" scale="0.8,0.8" alpha="0.3"/>
-    <component id="n6_olmj" name="gameNode2" src="uqohv4lo" fileName="UISecretary/SecretaryDisplay.xml" xy="180,0" pivot="0.5,0.5" scale="0.8,0.8" alpha="0.3"/>
     <component id="n7_olmj" name="gameNode3" src="uqohv4lo" fileName="UISecretary/SecretaryDisplay.xml" xy="0,0" pivot="0.5,0.5"/>
   </displayList>
 </component>

art/fgui/assets/game/UISecretary/SecretaryDisplay.xml

@@ -2,7 +2,7 @@
 <component size="899,569">
   <displayList>
     <image id="n2_s46i" name="n2" src="xs1r47m" fileName="UILevelProp/asset/gq3.png" xy="0,0" size="899,569"/>
-    <text id="n3_s46i" name="levelTxt" xy="232,20" pivot="0.5,0.5" size="436,54" font="Arial" fontSize="40" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Hire a secretary"/>
+    <text id="n3_s46i" name="levelTxt" xy="232,20" pivot="0.5,0.5" size="436,54" font="Arial" fontSize="40" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="Hire a secretary"/>
     <image id="n4_s46i" name="n4" src="s46iv4f3" fileName="UISecretary/asset/pqms_rwbg.png" xy="27,101" size="291,368"/>
     <loader id="n6_s46i" name="secretary" xy="58,117" size="626,951" scale="0.37,0.37" url="ui://isxx5ak7wehi3ut" clearOnPublish="true"/>
     <component id="n9_u8ei" name="purchaseBtn" src="u8eiv4i2" fileName="UISecretary/component/Component118.xml" xy="27,467" size="291,63"/>

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

@@ -4,13 +4,7 @@
     <graph id="n0_s46i" name="n0" xy="0,0" size="1334,750" alpha="0.6" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <component id="n7_olmj" name="myNode" src="pf2sv4ic" fileName="UISecretary/component/Component122.xml" xy="217,90">
-      <relation target="" sidePair="center-center"/>
-    </component>
-    <component id="n3_cy72" name="rightBtn" src="cy72v4ib" fileName="UISecretary/component/Component121.xml" xy="1212,337">
-      <relation target="" sidePair="center-center"/>
-    </component>
-    <component id="n5_cy72" name="leftBtn" src="cy72v4ib" fileName="UISecretary/component/Component121.xml" xy="70,344" scale="-1,1">
+    <component id="n7_olmj" name="myNode" src="pf2sv4ic" fileName="UISecretary/Component122.xml" xy="217,90">
       <relation target="" sidePair="center-center"/>
     </component>
     <component id="n1_s46i" name="closeBtn" src="xs1r483" fileName="UILevelProp/component/Component86.xml" xy="1120,79">

art/fgui/assets/game/UISign/UISign.xml

@@ -18,7 +18,7 @@
       <relation target="" sidePair="left-center%"/>
       <relation target="n6_bf9j" sidePair="bottom-bottom"/>
     </loader>
-    <component id="n29_wcn5" name="talkNode" src="wcn5v4ka" fileName="UISign/component/Sign_com8.xml" xy="1047,83">
+    <component id="n29_wcn5" name="talkNode" src="wcn5v4ka" fileName="UISign/component/Sign_com8.xml" xy="1054,83">
       <relation target="n28_wcn5" sidePair="left-left,top-top"/>
     </component>
     <component id="n30_wcn5" name="tripleBtn" src="wehi3ue" fileName="_sharecomponent/cancelBtn2.xml" xy="83,608" size="239,73" scale="0.9,0.9" visible="false" controller="c1,5">

art/fgui/assets/game/UISign/component/tripleBtn.xml

@@ -2,7 +2,7 @@
 <component size="239,73" pivot="0.5,0.5" extention="Button" designImageLayer="1">
   <displayList>
     <image id="n2_hkrz" name="n2" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,0" size="239,73" aspect="true"/>
-    <text id="n4_p4tr" name="n4" xy="69,15" size="149,44" fontSize="28" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Get triple"/>
+    <text id="n4_p4tr" name="n4" xy="69,15" size="149,44" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Get triple"/>
     <image id="n5_p4tr" name="n5" src="hkrz3te" fileName="_shareasset/1.png" xy="24,22" size="42,30" aspect="true"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.04"/>

art/fgui/assets/game/UITips/component/Component42.xml

@@ -17,9 +17,9 @@
       <gearXY controller="c1" pages="0,1" values="323,304|218,304"/>
     </component>
     <group id="n11_mnrs" name="n11" xy="94,304" size="394,51" advanced="true"/>
-    <loader id="n13_kyvx" name="n13" xy="486,-61" pivot="0,1" size="197,356" scale="0.7,0.7" url="ui://isxx5ak7pbejv4lf" align="center" vAlign="bottom" autoSize="true"/>
-    <image id="n14_kyvx" name="n14" src="trk9496" fileName="UIRepentProp/asset/组 43.png" xy="591,17" pivot="0,0.736"/>
-    <text id="n15_kyvx" name="womanTxt" xy="618,26" pivot="-0.147,0.816" size="170,66" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" autoSize="none" bold="true" text="Boss, let&apos;s play a little longer"/>
+    <loader id="n13_kyvx" name="n13" xy="474,-61" pivot="0,1" size="197,356" scale="0.7,0.7" url="ui://isxx5ak7pbejv4lf" align="center" vAlign="bottom" autoSize="true"/>
+    <image id="n14_kyvx" name="n14" src="trk9496" fileName="UIRepentProp/asset/组 43.png" xy="591,86" pivot="0,0.736"/>
+    <text id="n15_kyvx" name="womanTxt" xy="617,94" pivot="-0.147,0.816" size="170,66" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" autoSize="none" bold="true" text="Boss, let&apos;s play a little longer"/>
   </displayList>
   <transition name="t0" autoPlay="true">
     <item time="0" type="Rotation" target="n14_kyvx" tween="true" startValue="0" endValue="-0.71" duration="30"/>

art/fgui/assets/game/_sharecomponent/shareBtn2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="239,73" pivot="0.5,0.5" extention="Button" designImageLayer="1">
-  <controller name="c1" alias="按钮" exported="true" pages="0,换人再战,1,下一关要看视频,2,下一关不用看视频,3,开心收下,4,下一关要花费金币,5,立即挑战,6,知道了,7,领取,8,已领取,9,免费抽奖,10,普通领取,11,体力+开始游戏,21,连点开箱,22,连点开箱+视频,23,体力挑战下一关,24,三倍领取" selected="14"/>
+  <controller name="c1" alias="按钮" exported="true" pages="0,换人再战,1,下一关要看视频,2,下一关不用看视频,3,开心收下,4,下一关要花费金币,5,立即挑战,6,知道了,7,领取,8,已领取,9,免费抽奖,10,普通领取,11,体力+开始游戏,21,连点开箱,22,连点开箱+视频,23,体力挑战下一关,24,三倍领取" selected="7"/>
   <displayList>
     <image id="n2_hkrz" name="n2" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,0" size="239,73" aspect="true">
       <gearDisplay controller="c1" pages="0,1,2,3,4,5,6,7,9,10,11,21,22,23,24"/>
@@ -17,11 +17,11 @@
       <gearDisplay controller="c1" pages="2,5,6"/>
       <gearText controller="c1" pages="0,2,5,6" values="next level|next level|Start|" default="下一关"/>
     </text>
-    <text id="n23_lp3l" name="n23" xy="2,6" size="232,65" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" strokeColor="#000000" text="知道了">
+    <text id="n23_lp3l" name="n23" xy="2,6" size="232,65" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" strokeColor="#000000" text="Receive">
       <gearDisplay controller="c1" pages="6,7,8"/>
-      <gearText controller="c1" pages="0,5,6,7,8" values="OK|OK|OK|receive|Receive" default="知道了"/>
+      <gearText controller="c1" pages="0,5,6,7,8" values="OK|OK|OK|Receive|Receive" default="知道了"/>
     </text>
-    <text id="n4_p4tr" name="n4" xy="39,14" size="196,44" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="Next level">
+    <text id="n4_p4tr" name="n4" xy="39,14" size="196,44" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="下一关">
       <gearDisplay controller="c1" pages="1,9,11,22,23,24"/>
       <gearText controller="c1" pages="0,1,5,6,9,11,22,23,24" values="next level|next level|Next Level|Next Level|Prize draw|Start|Unpacking|Next level|Triple claim" default="下一关"/>
     </text>

art/fgui/assets/game/package.xml

@@ -469,7 +469,7 @@
     <image id="d1pb47i" name="yxz_wz_wdhh2.png" path="/UIGame/asset/"/>
     <image id="d1pb47j" name="yxz_wz_wdhh1.png" path="/UIGame/asset/"/>
     <component id="d1pb47k" name="huihe2.xml" path="/UIGame/component/"/>
-    <component id="xs1r47l" name="UILevelProp.xml" path="/UILevelProp/" exported="true"/>
+    <component id="xs1r47l" name="UILevelProp.xml" path="/UILevelProp/component/" exported="true"/>
     <image id="xs1r47m" name="gq3.png" path="/UILevelProp/asset/" scale="9grid" scale9grid="123,106,755,20"/>
     <image id="xs1r47p" name="gq6.png" path="/UILevelProp/asset/"/>
     <image id="xs1r47q" name="gq7.png" path="/UILevelProp/asset/"/>

client/laya/bin/js/bundle.js

@@ -4084,7 +4084,6 @@
             this.settingNode = (this.getChild("settingNode"));
             this.n45 = (this.getChild("n45"));
             this.secretaryBtn = (this.getChild("secretaryBtn"));
-            this.rankBtn = (this.getChild("rankBtn"));
             this.n46 = (this.getChild("n46"));
             this.ganFaMoShiBtn = (this.getChild("ganFaMoShiBtn"));
             this.liucheng1 = (this.getChild("liucheng1"));
@@ -5135,8 +5134,6 @@
         onConstruct() {
             this.n0 = (this.getChild("n0"));
             this.myNode = (this.getChild("myNode"));
-            this.rightBtn = (this.getChild("rightBtn"));
-            this.leftBtn = (this.getChild("leftBtn"));
             this.closeBtn = (this.getChild("closeBtn"));
             this.t0 = this.getTransition("t0");
         }
@@ -5153,11 +5150,7 @@
             this.contentPane = this.ui;
             this.isEject = false;
             this.addUIClick(this.ui.closeBtn, this.closeSelf);
-            this.addUIClick(this.ui.leftBtn, this.turnLeft);
-            this.addUIClick(this.ui.rightBtn, this.turnRight);
             this.nodeObj = { left: null, right: null, cur: null };
-            this.nodeObj.left = this.ui.myNode.gameNode1;
-            this.nodeObj.right = this.ui.myNode.gameNode2;
             this.nodeObj.cur = this.ui.myNode.gameNode3;
         }
         show() {
@@ -5192,8 +5185,8 @@
             }
         }
         playWoman(node, parent) {
-            let xx = this.ui.myNode.gameNode1.secretary.width / 2;
-            let yy = this.ui.myNode.gameNode1.secretary.height;
+            let xx = this.ui.myNode.gameNode3.secretary.width / 2;
+            let yy = this.ui.myNode.gameNode3.secretary.height;
             let scale = 1.5;
             if (node == this.secretarySpine2) {
                 scale = 1.2;
@@ -5244,19 +5237,7 @@
             let curData;
             for (let index = 0; index < children.length; index++) {
                 temp = children[index];
-                if (index == 2) {
-                    curData = data[this.curIndex];
-                    temp.purchaseBtn.touchable = true;
-                }
-                else {
-                    temp.purchaseBtn.touchable = false;
-                    if (this.curIndex == 1) {
-                        curData = data[2];
-                    }
-                    else {
-                        curData = data[1];
-                    }
-                }
+                curData = data[1];
                 temp.heightTxt.text = curData.height;
                 temp.foodTxt.text = curData.food;
                 temp.historyTxt.text = curData.history;
@@ -6138,7 +6119,6 @@
             this.addUIClick(this.ui.shopBtn, this.openShopView);
             this.addUIClick(this.ui.signBtn, this.openSignView);
             this.addUIClick(this.ui.drawBtn, this.openDrawView);
-            this.addUIClick(this.ui.rankBtn, this.openRanking);
         }
         show(showFailWords) {
             super.show();
@@ -11507,17 +11487,6 @@
     }
     ui_try_com3.URL = "ui://isxx5ak7cj92v4o9";
 
-    class ui_Component121 extends fgui.GButton {
-        static createInstance() {
-            return (fgui.UIPackage.createObject("game", "Component121"));
-        }
-        onConstruct() {
-            this.n3 = (this.getChild("n3"));
-            this.t0 = this.getTransition("t0");
-        }
-    }
-    ui_Component121.URL = "ui://isxx5ak7cy72v4ib";
-
     class ui_huihe1 extends fgui.GComponent {
         static createInstance() {
             return (fgui.UIPackage.createObject("game", "huihe1"));
@@ -12545,15 +12514,6 @@
     }
     ui_Component13.URL = "ui://isxx5ak7ixm43xw";
 
-    class ui_Component16 extends fgui.GButton {
-        static createInstance() {
-            return (fgui.UIPackage.createObject("game", "Component16"));
-        }
-        onConstruct() {
-        }
-    }
-    ui_Component16.URL = "ui://isxx5ak7ixm43xz";
-
     class ui_dh_js_tuowei extends fgui.GComponent {
         static createInstance() {
             return (fgui.UIPackage.createObject("game", "dh_js_tuowei"));
@@ -13661,8 +13621,6 @@
             return (fgui.UIPackage.createObject("game", "Component122"));
         }
         onConstruct() {
-            this.gameNode1 = (this.getChild("gameNode1"));
-            this.gameNode2 = (this.getChild("gameNode2"));
             this.gameNode3 = (this.getChild("gameNode3"));
         }
     }
@@ -14708,7 +14666,6 @@
             fgui.UIObjectFactory.setExtension(ui_try_com1.URL, ui_try_com1);
             fgui.UIObjectFactory.setExtension(ui_try_com2.URL, ui_try_com2);
             fgui.UIObjectFactory.setExtension(ui_try_com3.URL, ui_try_com3);
-            fgui.UIObjectFactory.setExtension(ui_Component121.URL, ui_Component121);
             fgui.UIObjectFactory.setExtension(ui_huihe1.URL, ui_huihe1);
             fgui.UIObjectFactory.setExtension(ui_huihe2.URL, ui_huihe2);
             fgui.UIObjectFactory.setExtension(ui_UIGuanYu.URL, ui_UIGuanYu);
@@ -14788,7 +14745,6 @@
             fgui.UIObjectFactory.setExtension(ui_Component11.URL, ui_Component11);
             fgui.UIObjectFactory.setExtension(ui_Component12.URL, ui_Component12);
             fgui.UIObjectFactory.setExtension(ui_Component13.URL, ui_Component13);
-            fgui.UIObjectFactory.setExtension(ui_Component16.URL, ui_Component16);
             fgui.UIObjectFactory.setExtension(ui_dh_js_tuowei.URL, ui_dh_js_tuowei);
             fgui.UIObjectFactory.setExtension(ui_dh_js_tw_g.URL, ui_dh_js_tw_g);
             fgui.UIObjectFactory.setExtension(ui_dh_js_xingxing.URL, ui_dh_js_xingxing);
@@ -19944,11 +19900,7 @@
             this.contentPane = this.ui;
             this.isEject = false;
             this.addUIClick(this.ui.closeBtn, this.closeSelf);
-            this.addUIClick(this.ui.leftBtn, this.turnLeft);
-            this.addUIClick(this.ui.rightBtn, this.turnRight);
             this.nodeObj = { left: null, right: null, cur: null };
-            this.nodeObj.left = this.ui.myNode.gameNode1;
-            this.nodeObj.right = this.ui.myNode.gameNode2;
             this.nodeObj.cur = this.ui.myNode.gameNode3;
         }
         show() {
@@ -19983,8 +19935,8 @@
             }
         }
         playWoman(node, parent) {
-            let xx = this.ui.myNode.gameNode1.secretary.width / 2;
-            let yy = this.ui.myNode.gameNode1.secretary.height;
+            let xx = this.ui.myNode.gameNode3.secretary.width / 2;
+            let yy = this.ui.myNode.gameNode3.secretary.height;
             let scale = 1.5;
             if (node == this.secretarySpine2) {
                 scale = 1.2;
@@ -20035,19 +19987,7 @@
             let curData;
             for (let index = 0; index < children.length; index++) {
                 temp = children[index];
-                if (index == 2) {
-                    curData = data[this.curIndex];
-                    temp.purchaseBtn.touchable = true;
-                }
-                else {
-                    temp.purchaseBtn.touchable = false;
-                    if (this.curIndex == 1) {
-                        curData = data[2];
-                    }
-                    else {
-                        curData = data[1];
-                    }
-                }
+                curData = data[1];
                 temp.heightTxt.text = curData.height;
                 temp.foodTxt.text = curData.food;
                 temp.historyTxt.text = curData.history;
@@ -20599,7 +20539,6 @@
             this.addUIClick(this.ui.shopBtn, this.openShopView);
             this.addUIClick(this.ui.signBtn, this.openSignView);
             this.addUIClick(this.ui.drawBtn, this.openDrawView);
-            this.addUIClick(this.ui.rankBtn, this.openRanking);
         }
         show(showFailWords) {
             super.show();

client/laya/bin/js/cfgTable.js

@@ -846,22 +846,12 @@ cfgTable.secretaryshopData={
         id:1,
         name:'Luna',
         height:'164',
-        food:'Sichuan cuisine, cantaloupe',
+        food:'Pizza,Cake',
         history:'Luna was born into a not wealthy family. She studied hard since childhood and wanted to bring a prosperous life to her family with her own hands. This was her first job.',
         price:2000,
         nameImg:'xiaoning',
         spine:'mishu',
-    },
-    [2]:{
-        id:2,
-        name:'Xiaoting',
-        height:'168',
-        food:'Glutinous rice balls, cheese',
-        history:'High achieving students who have returned from studying abroad always put in 120% of their energy into their work, but no one knows what they look like in their daily lives',
-        price:2000,
-        nameImg:'xiaoting',
-        spine:'xiaomishu2',
-    },
+    }
 }
 //sign表数据
 cfgTable.signData={

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

@@ -22,7 +22,6 @@ import ui_UITry from "./ui_UITry";
 import ui_try_com1 from "./ui_try_com1";
 import ui_try_com2 from "./ui_try_com2";
 import ui_try_com3 from "./ui_try_com3";
-import ui_Component121 from "./ui_Component121";
 import ui_huihe1 from "./ui_huihe1";
 import ui_huihe2 from "./ui_huihe2";
 import ui_UIGuanYu from "./ui_UIGuanYu";
@@ -102,7 +101,6 @@ import ui_Component10 from "./ui_Component10";
 import ui_Component11 from "./ui_Component11";
 import ui_Component12 from "./ui_Component12";
 import ui_Component13 from "./ui_Component13";
-import ui_Component16 from "./ui_Component16";
 import ui_dh_js_tuowei from "./ui_dh_js_tuowei";
 import ui_dh_js_tw_g from "./ui_dh_js_tw_g";
 import ui_dh_js_xingxing from "./ui_dh_js_xingxing";
@@ -288,7 +286,6 @@ export default class gameBinder {
 		fgui.UIObjectFactory.setExtension(ui_try_com1.URL, ui_try_com1);
 		fgui.UIObjectFactory.setExtension(ui_try_com2.URL, ui_try_com2);
 		fgui.UIObjectFactory.setExtension(ui_try_com3.URL, ui_try_com3);
-		fgui.UIObjectFactory.setExtension(ui_Component121.URL, ui_Component121);
 		fgui.UIObjectFactory.setExtension(ui_huihe1.URL, ui_huihe1);
 		fgui.UIObjectFactory.setExtension(ui_huihe2.URL, ui_huihe2);
 		fgui.UIObjectFactory.setExtension(ui_UIGuanYu.URL, ui_UIGuanYu);
@@ -368,7 +365,6 @@ export default class gameBinder {
 		fgui.UIObjectFactory.setExtension(ui_Component11.URL, ui_Component11);
 		fgui.UIObjectFactory.setExtension(ui_Component12.URL, ui_Component12);
 		fgui.UIObjectFactory.setExtension(ui_Component13.URL, ui_Component13);
-		fgui.UIObjectFactory.setExtension(ui_Component16.URL, ui_Component16);
 		fgui.UIObjectFactory.setExtension(ui_dh_js_tuowei.URL, ui_dh_js_tuowei);
 		fgui.UIObjectFactory.setExtension(ui_dh_js_tw_g.URL, ui_dh_js_tw_g);
 		fgui.UIObjectFactory.setExtension(ui_dh_js_xingxing.URL, ui_dh_js_xingxing);

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

@@ -1,17 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-export default class ui_Component121 extends fgui.GButton {
-
-	public n3:fgui.GImage;
-	public t0:fgui.Transition;
-	public static URL:string = "ui://isxx5ak7cy72v4ib";
-
-	public static createInstance():ui_Component121 {
-		return <ui_Component121>(fgui.UIPackage.createObject("game", "Component121"));
-	}
-
-	protected onConstruct():void {
-		this.n3 = <fgui.GImage>(this.getChild("n3"));
-		this.t0 = this.getTransition("t0");
-	}
-}

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

@@ -4,8 +4,6 @@ import ui_SecretaryDisplay from "./ui_SecretaryDisplay";
 
 export default class ui_Component122 extends fgui.GComponent {
 
-	public gameNode1:ui_SecretaryDisplay;
-	public gameNode2:ui_SecretaryDisplay;
 	public gameNode3:ui_SecretaryDisplay;
 	public static URL:string = "ui://isxx5ak7pf2sv4ic";
 
@@ -14,8 +12,6 @@ export default class ui_Component122 extends fgui.GComponent {
 	}
 
 	protected onConstruct():void {
-		this.gameNode1 = <ui_SecretaryDisplay>(this.getChild("gameNode1"));
-		this.gameNode2 = <ui_SecretaryDisplay>(this.getChild("gameNode2"));
 		this.gameNode3 = <ui_SecretaryDisplay>(this.getChild("gameNode3"));
 	}
 }

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

@@ -1,13 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-export default class ui_Component16 extends fgui.GButton {
-
-	public static URL:string = "ui://isxx5ak7ixm43xz";
-
-	public static createInstance():ui_Component16 {
-		return <ui_Component16>(fgui.UIPackage.createObject("game", "Component16"));
-	}
-
-	protected onConstruct():void {
-	}
-}

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

@@ -12,7 +12,6 @@ import ui_Component11 from "./ui_Component11";
 import ui_Component12 from "./ui_Component12";
 import ui_UISetting from "./ui_UISetting";
 import ui_Component13 from "./ui_Component13";
-import ui_Component16 from "./ui_Component16";
 import ui_Component1302 from "./ui_Component1302";
 import ui_Component111_11 from "./ui_Component111_11";
 import ui_shareBtn2 from "./ui_shareBtn2";
@@ -42,7 +41,6 @@ export default class ui_UIMain extends fgui.GComponent {
 	public settingNode:ui_UISetting;
 	public n45:fgui.GGroup;
 	public secretaryBtn:ui_Component13;
-	public rankBtn:ui_Component16;
 	public n46:fgui.GGroup;
 	public ganFaMoShiBtn:ui_Component1302;
 	public liucheng1:ui_Component111_11;
@@ -82,7 +80,6 @@ export default class ui_UIMain extends fgui.GComponent {
 		this.settingNode = <ui_UISetting>(this.getChild("settingNode"));
 		this.n45 = <fgui.GGroup>(this.getChild("n45"));
 		this.secretaryBtn = <ui_Component13>(this.getChild("secretaryBtn"));
-		this.rankBtn = <ui_Component16>(this.getChild("rankBtn"));
 		this.n46 = <fgui.GGroup>(this.getChild("n46"));
 		this.ganFaMoShiBtn = <ui_Component1302>(this.getChild("ganFaMoShiBtn"));
 		this.liucheng1 = <ui_Component111_11>(this.getChild("liucheng1"));

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

@@ -1,15 +1,12 @@
 /** This is an automatically generated class by FairyGUI. Please do not modify it. **/
 
 import ui_Component122 from "./ui_Component122";
-import ui_Component121 from "./ui_Component121";
 import ui_Component86 from "./ui_Component86";
 
 export default class ui_UISecretary extends fgui.GComponent {
 
 	public n0:fgui.GGraph;
 	public myNode:ui_Component122;
-	public rightBtn:ui_Component121;
-	public leftBtn:ui_Component121;
 	public closeBtn:ui_Component86;
 	public t0:fgui.Transition;
 	public static URL:string = "ui://isxx5ak7s46iv4f1";
@@ -21,8 +18,6 @@ export default class ui_UISecretary extends fgui.GComponent {
 	protected onConstruct():void {
 		this.n0 = <fgui.GGraph>(this.getChild("n0"));
 		this.myNode = <ui_Component122>(this.getChild("myNode"));
-		this.rightBtn = <ui_Component121>(this.getChild("rightBtn"));
-		this.leftBtn = <ui_Component121>(this.getChild("leftBtn"));
 		this.closeBtn = <ui_Component86>(this.getChild("closeBtn"));
 		this.t0 = this.getTransition("t0");
 	}

client/laya/src/ui/UIMain.ts

@@ -104,7 +104,7 @@ export default class UIMain extends UIBase {
         //
         this.addUIClick(this.ui.signBtn, this.openSignView);
         this.addUIClick(this.ui.drawBtn, this.openDrawView);
-        this.addUIClick(this.ui.rankBtn, this.openRanking);
+        //this.addUIClick(this.ui.rankBtn, this.openRanking);
 
     }
     public show(showFailWords): void {

client/laya/src/ui/UISecretary.ts

@@ -21,12 +21,12 @@ export default class UISecretary extends UIBase {
         this.isEject = false;
         //
         this.addUIClick(this.ui.closeBtn, this.closeSelf);
-        this.addUIClick(this.ui.leftBtn, this.turnLeft);
-        this.addUIClick(this.ui.rightBtn, this.turnRight);
+        //this.addUIClick(this.ui.leftBtn, this.turnLeft);
+        //this.addUIClick(this.ui.rightBtn, this.turnRight);
         this.nodeObj = { left: null, right: null, cur: null };
         //
-        this.nodeObj.left = this.ui.myNode.gameNode1;
-        this.nodeObj.right = this.ui.myNode.gameNode2;
+       // this.nodeObj.left = this.ui.myNode.gameNode1;
+        //this.nodeObj.right = this.ui.myNode.gameNode2;
         this.nodeObj.cur = this.ui.myNode.gameNode3;
     }
     public show(): void {
@@ -65,8 +65,8 @@ export default class UISecretary extends UIBase {
         }
     }
     playWoman(node, parent) {
-        let xx = this.ui.myNode.gameNode1.secretary.width / 2;
-        let yy = this.ui.myNode.gameNode1.secretary.height;
+        let xx = this.ui.myNode.gameNode3.secretary.width / 2;
+        let yy = this.ui.myNode.gameNode3.secretary.height;
         let scale = 1.5;
         if (node == this.secretarySpine2) {
             scale = 1.2
@@ -120,21 +120,24 @@ export default class UISecretary extends UIBase {
         let curData: cfgTable.secretaryshop;
         for (let index = 0; index < children.length; index++) {
             temp = <ui_SecretaryDisplay>children[index];
-            if (index == 2) {
-                curData = data[this.curIndex];
-                temp.purchaseBtn.touchable = true;
-            }
-            else {
-                temp.purchaseBtn.touchable = false;
-                if (this.curIndex == 1) {
-                    //当前为小宁
-                    curData = data[2];
-                }
-                else {
-                    //当前为小婷
-                    curData = data[1];
-                }
-            }
+
+            curData = data[1];
+
+            // if (index == 2) {
+            //     curData = data[this.curIndex];
+            //     temp.purchaseBtn.touchable = true;
+            // }
+            // else {
+            //     temp.purchaseBtn.touchable = false;
+            //     if (this.curIndex == 1) {
+            //         //当前为小宁
+            //         curData = data[2];
+            //     }
+            //     else {
+            //         //当前为小婷
+            //         curData = data[1];
+            //     }
+            // }
             //
             temp.heightTxt.text = curData.height;
             temp.foodTxt.text = curData.food;