1
0
dzduole 1 өдөр өмнө
parent
commit
e10211b659

+ 3 - 3
art/fgui/.objs/metas/isxx5ak7/kt443qc.info

@@ -5,6 +5,9 @@
       "locked": true,
       "hidden": true
     },
+    "n44_ixm4": {
+      "collapsed": true
+    },
     "n84_jpsz": {
       "hidden": true
     },
@@ -19,9 +22,6 @@
     },
     "n83_jpsz": {
       "hidden": true
-    },
-    "n46_ixm4": {
-      "collapsed": true
     }
   },
   "fitScreen": "FitSize",

+ 14 - 15
art/fgui/assets/game/UIMain/UIMain.xml

@@ -10,10 +10,6 @@
     <loader id="n13_ixm4" name="secretary" xy="133,81" size="626,951" scale="0.7,0.7" url="ui://isxx5ak7wehi3ut" clearOnPublish="true">
       <relation target="n10_ixm4" sidePair="left-right,bottom-bottom%"/>
     </loader>
-    <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"/>
-    </component>
     <component id="n23_ixm4" name="moneyNode" src="wehi3ug" fileName="UIMoney/UIMoney.xml" xy="539,39" size="794,46" controller="c1,1">
       <relation target="n10_ixm4" sidePair="right-right%"/>
     </component>
@@ -26,18 +22,21 @@
       <relation target="n10_ixm4" sidePair="width-width,center-center"/>
       <relation target="" sidePair=""/>
     </group>
-    <component id="n34_ixm4" name="signBtn" src="ixm43xu" fileName="UIMain/component/Component11.xml" xy="1221,119" size="107,96" group="n45_ixm4"/>
-    <component id="n35_ixm4" name="drawBtn" src="ixm43xv" fileName="UIMain/component/Component12.xml" xy="1084,119" size="107,96" group="n45_ixm4"/>
-    <component id="n103_ijwr" name="n_dengLu" src="ijwrv5a0" fileName="UIMain/component/Component_denglu.xml" xy="762,121" group="n45_ixm4"/>
-    <component id="n56_mnrs" name="settingNode" src="mnrs42t" fileName="UIMain/component/UISetting.xml" xy="888,119" size="166,96" group="n45_ixm4" controller="c1,0"/>
-    <group id="n45_ixm4" name="n45" xy="762,119" size="566,98" advanced="true">
+    <component id="n103_ijwr" name="n_dengLu" src="ijwrv5a0" fileName="UIMain/component/Component_denglu.xml" xy="730,121" group="n45_ixm4"/>
+    <component id="n56_mnrs" name="settingNode" src="mnrs42t" fileName="UIMain/component/UISetting.xml" xy="831,119" size="166,96" group="n45_ixm4" controller="c1,0"/>
+    <component id="n35_ixm4" name="drawBtn" src="ixm43xv" fileName="UIMain/component/Component12.xml" xy="1000,119" size="107,96" group="n45_ixm4"/>
+    <component id="n34_ixm4" name="signBtn" src="ixm43xu" fileName="UIMain/component/Component11.xml" xy="1112,119" size="107,96" group="n45_ixm4"/>
+    <component id="n15_ixm4" name="shopBtn" src="n43d3vn" fileName="UIMain/component/dh_zy_sc_guang.xml" xy="1224,126" size="110,85" group="n45_ixm4"/>
+    <group id="n45_ixm4" name="n45" xy="730,119" size="604,98" advanced="true">
       <relation target="n10_ixm4" sidePair="left-right%"/>
     </group>
-    <component id="n86_r4l5" name="ganFaMoShiBtn" src="r4l5v577" fileName="UIMain/component/Component1302.xml" xy="1022,665" size="169,85" group="n46_ixm4"/>
-    <component id="n27_ixm4" name="secretaryBtn" src="ixm43xw" fileName="UIMain/component/Component13.xml" xy="858,665" size="169,85" group="n46_ixm4"/>
-    <component id="n87_ixgm" name="rankBtn" src="ixgmv57c" fileName="UIMain/component/Component_phb.xml" xy="694,665" size="169,85" group="n46_ixm4"/>
-    <group id="n46_ixm4" name="n46" xy="694,665" size="496,85" advanced="true">
-      <relation target="n15_ixm4" sidePair="right-right"/>
+    <component id="n86_r4l5" name="ganFaMoShiBtn" src="r4l5v577" fileName="UIMain/component/Component1302.xml" xy="1224,665" size="110,85" group="n46_ixm4">
+      <relation target="n10_ixm4" sidePair="bottom-bottom"/>
+    </component>
+    <component id="n27_ixm4" name="secretaryBtn" src="ixm43xw" fileName="UIMain/component/Component13.xml" xy="1084,665" size="110,85" group="n46_ixm4"/>
+    <component id="n87_ixgm" name="rankBtn" src="ixgmv57c" fileName="UIMain/component/Component_phb.xml" xy="944,665" size="110,85" group="n46_ixm4"/>
+    <group id="n46_ixm4" name="n46" xy="944,665" size="390,85" advanced="true">
+      <relation target="n10_ixm4" sidePair="right-right,bottom-bottom"/>
     </group>
     <component id="n70_vhzh" name="liucheng1" src="vhzhv4hk" fileName="UIMain/asset/Component111_11.xml" xy="-1,0" group="n76_vhzh">
       <relation target="n10_ixm4" sidePair="center-center,middle-middle"/>
@@ -63,7 +62,7 @@
       <relation target="n13_ixm4" sidePair="left-left,top-top"/>
     </component>
     <component id="n83_jpsz" name="n83" src="jpszv4n9" fileName="_sharecomponent/dh_zuanshi.xml" xy="457,12"/>
-    <component id="n84_jpsz" name="n84" src="jpszv4ni" fileName="_sharecomponent/Component141.xml" xy="792,130" scale="0.8,0.8" visible="false">
+    <component id="n84_jpsz" name="n84" src="jpszv4ni" fileName="_sharecomponent/Component141.xml" xy="760,130" scale="0.8,0.8" visible="false">
       <relation target="n45_ixm4" sidePair="middle-middle,left-left"/>
     </component>
     <component id="n101_e1lx" name="n_moni_pay_ok" src="e1lxv59z" fileName="UIMain/Component1_debug_pay_ok.xml" xy="815,304"/>

+ 1 - 1
art/fgui/assets/game/UIMain/component/Component1302.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="110,85">
   <displayList>
-    <loader id="n2_r4l5" name="n2" xy="32,0" size="51,57" url="ui://isxx5ak7ry45v56o"/>
+    <loader id="n2_r4l5" name="n2" xy="29,0" size="51,57" url="ui://isxx5ak7ry45v56o"/>
     <loader id="n3_r4l5" name="n3" xy="0,64" size="110,21" url="ui://isxx5ak7ry45v56n"/>
   </displayList>
 </component>

+ 2 - 18
art/fgui/assets/game/UIMain/component/dh_zy_shangcheng.xml

@@ -1,23 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="280,100" mask="n0_osxc">
   <displayList>
-    <image id="n0_osxc" name="n0" src="n43d3vq" fileName="UIGame/zy/img/zjm_sc.png" xy="4,7"/>
-    <image id="n3_osxc" name="n3" src="n43d3x1" fileName="UIGame/zy/img/zjm_g.png" xy="-242,-66" pivot="0.5,0.5" size="270,219" rotation="-34"/>
+    <image id="n0_osxc" name="n0" src="n43d3vq" fileName="UIMain/asset/zjm_sc.png" xy="4,7"/>
+    <image id="n3_osxc" name="n3" src="n43d3x1" fileName="UIMain/asset/zjm_g.png" xy="-242,-66" pivot="0.5,0.5" size="270,219" rotation="-34"/>
   </displayList>
-  <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
-    <item time="0" type="Alpha" target="n3_osxc" tween="true" startValue="0" endValue="0.75" duration="6" ease="Linear"/>
-    <item time="0" type="XY" target="n3_osxc" tween="true" startValue="-193,-66.5" endValue="-78,-66.5" duration="12" ease="Linear"/>
-    <item time="6" type="Alpha" target="n3_osxc" tween="true" startValue="0.75" endValue="0.95" duration="6" ease="Linear"/>
-    <item time="12" type="Alpha" target="n3_osxc" tween="true" startValue="0.95" endValue="1" duration="6"/>
-    <item time="12" type="XY" target="n3_osxc" tween="true" startValue="-78,-66.5" endValue="203,-66.5" duration="12" ease="Linear"/>
-    <item time="18" type="Alpha" target="n3_osxc" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
-    <item time="25" type="XY" target="n3_osxc" tween="true" startValue="-242,-66.5" endValue="-193,-66.5" duration="71" ease="Linear"/>
-    <item time="96" type="Alpha" target="n3_osxc" tween="true" startValue="0" endValue="0.75" duration="6" ease="Linear"/>
-    <item time="96" type="XY" target="n3_osxc" tween="true" startValue="-193,-66.5" endValue="-78,-66.5" duration="12" ease="Linear"/>
-    <item time="102" type="Alpha" target="n3_osxc" tween="true" startValue="0.75" endValue="0.95" duration="6" ease="Linear"/>
-    <item time="108" type="Alpha" target="n3_osxc" tween="true" startValue="0.95" endValue="1" duration="6"/>
-    <item time="108" type="XY" target="n3_osxc" tween="true" startValue="-78,-66.5" endValue="203,-66.5" duration="12" ease="Linear"/>
-    <item time="114" type="Alpha" target="n3_osxc" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
-    <item time="121" type="XY" target="n3_osxc" tween="true" startValue="-242,-66.5" endValue="-242,-66.5" duration="95" ease="Linear"/>
-  </transition>
 </component>

+ 5 - 5
art/fgui/assets/game/_sharecomponent/shareBtn.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="165,51" pivot="0.5,0.5" extention="Button">
-  <controller name="c1" alias="小按钮" exported="true" pages="0,分享,1,拿来吧你,2,退出,3,悔球,4,使用,5,继续,12,充满体力,13,立即体验,14,确定" selected="8"/>
+  <controller name="c1" alias="小按钮" exported="true" pages="0,分享,1,拿来吧你,2,退出,3,悔球,4,使用,5,继续,12,充满体力,13,立即体验,14,确定" selected="3"/>
   <displayList>
     <image id="n2_hkrz" name="n2" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,0" size="165,51" aspect="true"/>
-    <text id="n1_hkrz" name="n1" xy="0,3" size="164,48" font="Arial" fontSize="22" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="确定&#xA;">
+    <text id="n1_hkrz" name="n1" xy="14,0" size="164,48" font="Arial" fontSize="22" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="Undo">
       <gearDisplay controller="c1" pages="0,3,4"/>
       <gearXY controller="c1" pages="3,4" values="14,0|23,3" default="0,3"/>
-      <gearText controller="c1" pages="0,3,4,14" values="share|undo a shot|USE|确定&#xA;" default="悔球"/>
+      <gearText controller="c1" pages="0,3,4,14" values="share|Undo|USE|确定&#xA;" default="悔球"/>
     </text>
     <text id="n3_p4tr" name="n3" xy="11,11" size="142,29" font="Arial" fontSize="20" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="充满体力">
       <gearDisplay controller="c1" pages="1,12,13"/>
       <gearText controller="c1" pages="1,12,13" values="Get|Full of energy|Now" default="充满体力"/>
     </text>
-    <image id="n4_p4tr" name="n4" src="hkrz3te" fileName="_shareasset/1.png" xy="19,14" pivot="0.5,0.5" size="28,20" aspect="true">
+    <image id="n4_p4tr" name="n4" src="hkrz3te" fileName="_shareasset/1.png" xy="1,15" pivot="0.5,0.5" size="28,20" aspect="true">
       <gearDisplay controller="c1" pages="1,3,4,12,13"/>
       <gearXY controller="c1" pages="3,4,12" values="1,15|37,14|2,0" default="19,14"/>
     </image>
-    <text id="n5_mnrs" name="n5" xy="1,1" size="164,48" font="Arial" fontSize="26" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="OK">
+    <text id="n5_mnrs" name="n5" xy="1,1" size="164,48" font="Arial" fontSize="26" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="退出&#xA;">
       <gearDisplay controller="c1" pages="2,14"/>
       <gearText controller="c1" pages="2,14" values="Exit|OK" default="退出&#xA;"/>
     </text>

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


+ 47 - 38
client/laya/bin/js/bundle.js

@@ -4551,7 +4551,6 @@
             this.n47 = (this.getChild("n47"));
             this.n10 = (this.getChild("n10"));
             this.secretary = (this.getChild("secretary"));
-            this.shopBtn = (this.getChild("shopBtn"));
             this.moneyNode = (this.getChild("moneyNode"));
             this.headNode = (this.getChild("headNode"));
             this.bigMoveBtn = (this.getChild("bigMoveBtn"));
@@ -4559,10 +4558,11 @@
             this.classicBtn = (this.getChild("classicBtn"));
             this.globalBtn = (this.getChild("globalBtn"));
             this.n44 = (this.getChild("n44"));
-            this.signBtn = (this.getChild("signBtn"));
-            this.drawBtn = (this.getChild("drawBtn"));
             this.n_dengLu = (this.getChild("n_dengLu"));
             this.settingNode = (this.getChild("settingNode"));
+            this.drawBtn = (this.getChild("drawBtn"));
+            this.signBtn = (this.getChild("signBtn"));
+            this.shopBtn = (this.getChild("shopBtn"));
             this.n45 = (this.getChild("n45"));
             this.ganFaMoShiBtn = (this.getChild("ganFaMoShiBtn"));
             this.secretaryBtn = (this.getChild("secretaryBtn"));
@@ -7588,7 +7588,6 @@
                 case 'app_sign_for_buyProduct_onSuccess':
                     console.log('zh:收到APP通知,需要更新用户游戏资产信息app_sign_for_buyProduct_onSuccess ');
                     DataMgr.getUserZiChanInfo();
-                    console.log("zh:更新用户资产信息结束");
                     break;
                 case '222axxxxxx':
                     let dui15 = xGame.uiMgr.getUI(UISign);
@@ -7778,7 +7777,7 @@
         addEvent() {
             this.addUIClick(this.ui.classicBtn, this.startGame, [GameMode.classic]);
             this.addUIClick(this.ui.bigMoveBtn, this.startGame, [GameMode.bigMove]);
-            this.addUIClick(this.ui.ganFaMoShiBtn, this.startGame, [GameMode.bigMove]);
+            this.addUIClick(this.ui.ganFaMoShiBtn, this.openShopView0);
             this.addUIClick(this.ui.globalBtn, this.startGlobal);
             this.addUIClick(this.ui.placeBallBtn, this.startPlaceBall);
             this.addUIClick(this.ui.headNode, this.onGetUserInfo, [true]);
@@ -7860,7 +7859,7 @@
             }
         }
         ensureSecretary() {
-            console.log('zh: ensureSecretary   ensureSecretaryensureSecretaryensureSecretaryensureSecretaryensureSecretary');
+            console.log('zh: ensureSecretary   ');
             this.ui.secretaryGuide.visible = false;
             this.ui.enterGuide.visible = true;
             this.ui.wordsNode.t0.play();
@@ -7877,14 +7876,14 @@
             xGame.common.secretary.play(data, 0, true, parent);
         }
         startGame(type) {
-            console.log("zh:@@@@@@@@@@@@@@@@@@@@startGame=", type);
             if (!this.isReadyForLoadNetSource()) {
                 return;
             }
             xGame.common.gameMode = type;
             Moyu.sendDataEvent("PlayGame", { type: type });
-            console.log('zh:进入游戏gameMode =' + xGame.common.gameMode);
-            switch (xGame.common.gameMode) {
+            let gm = xGame.common.gameMode;
+            console.log('zh:进入游戏gameMode =' + gm);
+            switch (gm) {
                 case GameMode.classic:
                     console.log('zh:进入经典模式111111111');
                     if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark) {
@@ -7910,15 +7909,16 @@
                         else {
                             this.beginGame();
                         }
-                        break;
                     }
+                    break;
                 case GameMode.bigMove:
-                    console.error('zh:bigMove check   大招');
+                    console.info('zh:bigMove check   大招');
                     let guide = DataMgr.getSkillGuide();
                     if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark && guide == 1) {
                         let db_over_lev = DataMgr.getChallengeMode_overLev();
                         console.log('zh:bigMove db_over_lev=', db_over_lev);
                         if (db_over_lev < DataMgr.DIY_challengeMode_overLev_jieSuo_rodMethod) {
+                            console.log('zh:提示不可以玩');
                             let tipStr = 'Complete ' + DataMgr.DIY_challengeMode_overLev_jieSuo_rodMethod + ' levels in Challenge Mode to unlock the Rod Method Mode';
                             xGame.uiMgr.Show(UIMsg, tipStr);
                             return;
@@ -7951,30 +7951,36 @@
             else {
                 console.log('zh:新手引导,不显示AD  ');
             }
-            console.log('zh:beginGame 2 go');
+            console.log('zh:beginGame  gameMode=' + xGame.common.gameMode);
+            console.log('zh:beginGame 1');
             if (xGame.common.gameMode == GameMode.classic) {
+                console.log('zh:beginGame 2');
                 if (isNice) {
                     console.log('zh:进入巅峰赛');
                     this.enterClassic();
                 }
                 else {
+                    console.log('zh:beginGame 3-1');
                     xGame.uiMgr.Show(UIModeSelection, () => {
-                        console.log('zh:BBBBBBBBBBBBBBB');
+                        console.log('zh:beginGame 3-2');
                         this.enterClassic();
                     });
                 }
             }
             else if (xGame.common.gameMode == GameMode.bigMove) {
+                console.log('zh:beginGame 5');
                 this.ui.enterGuide.visible = false;
                 xGame.uiMgr.Show(UISkill);
             }
         }
         enterClassic() {
+            console.log('zh:beginGame 7');
             xGame.uiMgr.Show(UIGame);
             xGame.uiMgr.Show(UIMatching, () => {
                 if (!this.isHide)
                     this.hide();
                 xGame.common.gameUI.ui.alpha = 1;
+                console.log('zh:beginGame 8');
                 xGame.common.gameUI.startGame();
                 xGame.uiMgr.Hide(UIGameEnd);
             });
@@ -8053,9 +8059,8 @@
                 Moyu.initUser(this, this.freshUser, force);
             }
             this.freshUser();
-            console.log('zh:5秒后更新用戶資產信息');
+            console.log('zh:5秒后更新用信息');
             setTimeout(() => {
-                console.log('setTimeout 5秒over 執行');
                 DataMgr.getUserZiChanInfo();
             }, 5000);
         }
@@ -8122,6 +8127,9 @@
             Moyu.sendDataEvent("secretary");
         }
         openShopView() {
+            xGame.uiMgr.Show(UIShop, 1);
+        }
+        openShopView0() {
             xGame.uiMgr.Show(UIShop, 0);
         }
         openSignView() {
@@ -11452,12 +11460,10 @@
                 xGame.common.d3World.tableSrc.gameObj.transform.localPositionY = 0;
                 switch (xGame.common.gameMode) {
                     case GameMode.classic:
-                        alert("经典模式");
                         xGame.common.d3World.d3Hand.gameObj.active = true;
                         this.playPutBallD3Ani();
                         break;
                     case GameMode.bigMove:
-                        alert("大招模式");
                         this.enterGame();
                         Laya.timer.once(500, this, () => {
                             this.ui.topNode.middleNode.visible = true;
@@ -15376,7 +15382,6 @@
         onConstruct() {
             this.n0 = (this.getChild("n0"));
             this.n3 = (this.getChild("n3"));
-            this.t0 = this.getTransition("t0");
         }
     }
     ui_dh_zy_shangcheng.URL = "ui://isxx5ak7n43d3vo";
@@ -18789,6 +18794,7 @@
             }
             this.userData.coin = val;
             this.saveUserData();
+            console.log('zh:通知更新金币变化' + val);
             xGame.eventMgr.event(COIN_CHANGE);
         }
         static getCoin() {
@@ -18824,6 +18830,7 @@
             }
             this.userData.diamond = val;
             this.saveUserData();
+            console.log('zh:通知更新钻石变化' + val);
             xGame.eventMgr.event(DIAMOND_CHANGE);
         }
         static getDiamond() {
@@ -18977,7 +18984,6 @@
             this.saveUserData();
         }
         static setBallRodFormServer(haveQiuGanJsonStr) {
-            console.log('zh:haveQiuGanJsonStr = ' + haveQiuGanJsonStr);
             if (!haveQiuGanJsonStr) {
                 console.log("setBallRodFormServer数据为空或未定义");
                 return;
@@ -18988,8 +18994,6 @@
                 let v = haveQiuGanJsonObj[key];
                 let k = parseInt(key);
                 let idx = k - 1;
-                console.log('zh:开始更新IDX = ' + idx);
-                console.log('this.userData.ballRod[idx]===' + this.userData.ballRod[idx]);
                 this.userData.ballRod[idx] = v;
             });
         }
@@ -19180,7 +19184,6 @@
             let reqData = xGame.httpMgr.getReqData();
             xGame.httpMgr.sendPost2025('user/getUserGameInfo', reqData, (res) => {
                 try {
-                    console.log('zh:buySp res = ' + JSON.stringify(res));
                     let code = res.code;
                     let msg = res.msg;
                     if (code == 401) {
@@ -19197,15 +19200,14 @@
                         let placeBallData = d.placeBallData;
                         DataMgr.setDiamondFormServer(zuanShi);
                         DataMgr.setCoinFormServer(jinBi);
-                        console.log('zh:更新球杆信息');
                         DataMgr.setBallRodFormServer(haveQiuGanJson);
-                        console.log('zh:更新关卡信息');
                         DataMgr.setPlaceBallLevelList(placeBallData);
                         if (signData && signData > 0) {
                             DataMgr.setSignData(signData);
                         }
                     }
                     else {
+                        console.log("zh:更新用户资产信息error" + msg);
                         alert(msg);
                     }
                 }
@@ -19214,6 +19216,7 @@
                     alert(error);
                 }
                 finally {
+                    console.log("zh:更新用户资产信息结束");
                 }
             });
         }
@@ -20458,12 +20461,10 @@
                 xGame.common.d3World.tableSrc.gameObj.transform.localPositionY = 0;
                 switch (xGame.common.gameMode) {
                     case GameMode.classic:
-                        alert("经典模式");
                         xGame.common.d3World.d3Hand.gameObj.active = true;
                         this.playPutBallD3Ani();
                         break;
                     case GameMode.bigMove:
-                        alert("大招模式");
                         this.enterGame();
                         Laya.timer.once(500, this, () => {
                             this.ui.topNode.middleNode.visible = true;
@@ -24673,7 +24674,6 @@
                 case 'app_sign_for_buyProduct_onSuccess':
                     console.log('zh:收到APP通知,需要更新用户游戏资产信息app_sign_for_buyProduct_onSuccess ');
                     DataMgr.getUserZiChanInfo();
-                    console.log("zh:更新用户资产信息结束");
                     break;
                 case '222axxxxxx':
                     let dui15 = xGame.uiMgr.getUI(UISign$1);
@@ -24863,7 +24863,7 @@
         addEvent() {
             this.addUIClick(this.ui.classicBtn, this.startGame, [GameMode.classic]);
             this.addUIClick(this.ui.bigMoveBtn, this.startGame, [GameMode.bigMove]);
-            this.addUIClick(this.ui.ganFaMoShiBtn, this.startGame, [GameMode.bigMove]);
+            this.addUIClick(this.ui.ganFaMoShiBtn, this.openShopView0);
             this.addUIClick(this.ui.globalBtn, this.startGlobal);
             this.addUIClick(this.ui.placeBallBtn, this.startPlaceBall);
             this.addUIClick(this.ui.headNode, this.onGetUserInfo, [true]);
@@ -24945,7 +24945,7 @@
             }
         }
         ensureSecretary() {
-            console.log('zh: ensureSecretary   ensureSecretaryensureSecretaryensureSecretaryensureSecretaryensureSecretary');
+            console.log('zh: ensureSecretary   ');
             this.ui.secretaryGuide.visible = false;
             this.ui.enterGuide.visible = true;
             this.ui.wordsNode.t0.play();
@@ -24962,14 +24962,14 @@
             xGame.common.secretary.play(data, 0, true, parent);
         }
         startGame(type) {
-            console.log("zh:@@@@@@@@@@@@@@@@@@@@startGame=", type);
             if (!this.isReadyForLoadNetSource()) {
                 return;
             }
             xGame.common.gameMode = type;
             Moyu.sendDataEvent("PlayGame", { type: type });
-            console.log('zh:进入游戏gameMode =' + xGame.common.gameMode);
-            switch (xGame.common.gameMode) {
+            let gm = xGame.common.gameMode;
+            console.log('zh:进入游戏gameMode =' + gm);
+            switch (gm) {
                 case GameMode.classic:
                     console.log('zh:进入经典模式111111111');
                     if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark) {
@@ -24995,15 +24995,16 @@
                         else {
                             this.beginGame();
                         }
-                        break;
                     }
+                    break;
                 case GameMode.bigMove:
-                    console.error('zh:bigMove check   大招');
+                    console.info('zh:bigMove check   大招');
                     let guide = DataMgr.getSkillGuide();
                     if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark && guide == 1) {
                         let db_over_lev = DataMgr.getChallengeMode_overLev();
                         console.log('zh:bigMove db_over_lev=', db_over_lev);
                         if (db_over_lev < DataMgr.DIY_challengeMode_overLev_jieSuo_rodMethod) {
+                            console.log('zh:提示不可以玩');
                             let tipStr = 'Complete ' + DataMgr.DIY_challengeMode_overLev_jieSuo_rodMethod + ' levels in Challenge Mode to unlock the Rod Method Mode';
                             xGame.uiMgr.Show(UIMsg$1, tipStr);
                             return;
@@ -25036,30 +25037,36 @@
             else {
                 console.log('zh:新手引导,不显示AD  ');
             }
-            console.log('zh:beginGame 2 go');
+            console.log('zh:beginGame  gameMode=' + xGame.common.gameMode);
+            console.log('zh:beginGame 1');
             if (xGame.common.gameMode == GameMode.classic) {
+                console.log('zh:beginGame 2');
                 if (isNice) {
                     console.log('zh:进入巅峰赛');
                     this.enterClassic();
                 }
                 else {
+                    console.log('zh:beginGame 3-1');
                     xGame.uiMgr.Show(UIModeSelection$1, () => {
-                        console.log('zh:BBBBBBBBBBBBBBB');
+                        console.log('zh:beginGame 3-2');
                         this.enterClassic();
                     });
                 }
             }
             else if (xGame.common.gameMode == GameMode.bigMove) {
+                console.log('zh:beginGame 5');
                 this.ui.enterGuide.visible = false;
                 xGame.uiMgr.Show(UISkill$1);
             }
         }
         enterClassic() {
+            console.log('zh:beginGame 7');
             xGame.uiMgr.Show(UIGame$1);
             xGame.uiMgr.Show(UIMatching$1, () => {
                 if (!this.isHide)
                     this.hide();
                 xGame.common.gameUI.ui.alpha = 1;
+                console.log('zh:beginGame 8');
                 xGame.common.gameUI.startGame();
                 xGame.uiMgr.Hide(UIGameEnd$1);
             });
@@ -25138,9 +25145,8 @@
                 Moyu.initUser(this, this.freshUser, force);
             }
             this.freshUser();
-            console.log('zh:5秒后更新用戶資產信息');
+            console.log('zh:5秒后更新用信息');
             setTimeout(() => {
-                console.log('setTimeout 5秒over 執行');
                 DataMgr.getUserZiChanInfo();
             }, 5000);
         }
@@ -25207,6 +25213,9 @@
             Moyu.sendDataEvent("secretary");
         }
         openShopView() {
+            xGame.uiMgr.Show(UIShop$1, 1);
+        }
+        openShopView0() {
             xGame.uiMgr.Show(UIShop$1, 0);
         }
         openSignView() {

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
client/laya/bin/js/bundle.js.map


+ 10 - 18
client/laya/src/data/DataMgr.ts

@@ -347,6 +347,7 @@ export default class DataMgr {
         }
         this.userData.coin = val;
         this.saveUserData();
+        console.log('zh:通知更新金币变化'+val);
         xGame.eventMgr.event(COIN_CHANGE);
     }
 
@@ -398,6 +399,7 @@ export default class DataMgr {
         }
         this.userData.diamond = val;
         this.saveUserData();
+         console.log('zh:通知更新钻石变化'+val);
         xGame.eventMgr.event(DIAMOND_CHANGE);
     }
 
@@ -582,7 +584,7 @@ export default class DataMgr {
      * @param haveQiuGanJsonObj 
      */
     public static setBallRodFormServer(haveQiuGanJsonStr) {
-        console.log('zh:haveQiuGanJsonStr = ' + haveQiuGanJsonStr)
+        //console.log('zh:haveQiuGanJsonStr = ' + haveQiuGanJsonStr)
         if (!haveQiuGanJsonStr) {
             // 处理 null、undefined、空字符串、0 等情况
             console.log("setBallRodFormServer数据为空或未定义");
@@ -601,9 +603,8 @@ export default class DataMgr {
             //key 就是球杆的id 就是:123456  v=是否拥有(购买)
             let k = parseInt(key);
             let idx = k - 1;
-            console.log('zh:开始更新IDX = ' + idx)
-            console.log('this.userData.ballRod[idx]===' + this.userData.ballRod[idx])
-
+            //console.log('zh:开始更新IDX = ' + idx)
+            //console.log('this.userData.ballRod[idx]===' + this.userData.ballRod[idx])
             this.userData.ballRod[idx] = v;
         });
         // this.saveUserData();
@@ -842,11 +843,9 @@ export default class DataMgr {
             return;
         }
         let reqData = xGame.httpMgr.getReqData();
-        // let pd: any = JSON.parse(reqData);
-        // reqData = JSON.stringify(pd);
         xGame.httpMgr.sendPost2025('user/getUserGameInfo', reqData, (res) => {
             try {
-                console.log('zh:buySp res = ' + JSON.stringify(res))
+                // console.log('zh:buySp res = ' + JSON.stringify(res))
                 let code = res.code;
                 let msg = res.msg;
                 if (code == 401) {
@@ -863,25 +862,18 @@ export default class DataMgr {
                     let haveQiuGanJson = d.haveQiuGanJson;
                     let signData = d.signData;
                     let placeBallData = d.placeBallData;
-
                     DataMgr.setDiamondFormServer(zuanShi);
                     DataMgr.setCoinFormServer(jinBi);
-                    console.log('zh:更新球杆信息')
+                    // console.log('zh:更新球杆信息')
                     DataMgr.setBallRodFormServer(haveQiuGanJson);
-
-                    console.log('zh:更新关卡信息')
+                    // console.log('zh:更新关卡信息')
                     DataMgr.setPlaceBallLevelList(placeBallData);
-
                     if (signData && signData > 0) {
                         DataMgr.setSignData(signData);
                     }
 
-                    // "noAdAll": 0,
-                    // "noAdChaping": 0,
-                    // "noAdJiangli": 0,
-                    // "gameChallengeLev": 0
-                    //xGame.uiMgr.Show(UIMsg, msg)
                 } else {
+                     console.log("zh:更新用户资产信息error"+msg);
                     alert(msg);
                 }
                 // if (Laya.Browser.onAndroid) {
@@ -891,7 +883,7 @@ export default class DataMgr {
                 console.log('error=' + error);
                 alert(error);
             } finally {
-
+                console.log("zh:更新用户资产信息结束");
             }
         });
     }

+ 9 - 9
client/laya/src/fgui/res/game/ui_UIMain.ts

@@ -1,16 +1,16 @@
 /** This is an automatically generated class by FairyGUI. Please do not modify it. **/
 
-import ui_dh_zy_sc_guang from "./ui_dh_zy_sc_guang";
 import ui_UIMoney from "./ui_UIMoney";
 import ui_Component3 from "./ui_Component3";
 import ui_dh_zy_wanfa from "./ui_dh_zy_wanfa";
 import ui_dh_zy_ganfa from "./ui_dh_zy_ganfa";
 import ui_Component7 from "./ui_Component7";
 import ui_Component8 from "./ui_Component8";
-import ui_Component11 from "./ui_Component11";
-import ui_Component12 from "./ui_Component12";
 import ui_Component_denglu from "./ui_Component_denglu";
 import ui_UISetting from "./ui_UISetting";
+import ui_Component12 from "./ui_Component12";
+import ui_Component11 from "./ui_Component11";
+import ui_dh_zy_sc_guang from "./ui_dh_zy_sc_guang";
 import ui_Component1302 from "./ui_Component1302";
 import ui_Component13 from "./ui_Component13";
 import ui_Component_phb from "./ui_Component_phb";
@@ -28,7 +28,6 @@ export default class ui_UIMain extends fgui.GComponent {
 	public n47:fgui.GGraph;
 	public n10:fgui.GImage;
 	public secretary:fgui.GLoader;
-	public shopBtn:ui_dh_zy_sc_guang;
 	public moneyNode:ui_UIMoney;
 	public headNode:ui_Component3;
 	public bigMoveBtn:ui_dh_zy_wanfa;
@@ -36,10 +35,11 @@ export default class ui_UIMain extends fgui.GComponent {
 	public classicBtn:ui_Component7;
 	public globalBtn:ui_Component8;
 	public n44:fgui.GGroup;
-	public signBtn:ui_Component11;
-	public drawBtn:ui_Component12;
 	public n_dengLu:ui_Component_denglu;
 	public settingNode:ui_UISetting;
+	public drawBtn:ui_Component12;
+	public signBtn:ui_Component11;
+	public shopBtn:ui_dh_zy_sc_guang;
 	public n45:fgui.GGroup;
 	public ganFaMoShiBtn:ui_Component1302;
 	public secretaryBtn:ui_Component13;
@@ -68,7 +68,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.shopBtn = <ui_dh_zy_sc_guang>(this.getChild("shopBtn"));
 		this.moneyNode = <ui_UIMoney>(this.getChild("moneyNode"));
 		this.headNode = <ui_Component3>(this.getChild("headNode"));
 		this.bigMoveBtn = <ui_dh_zy_wanfa>(this.getChild("bigMoveBtn"));
@@ -76,10 +75,11 @@ export default class ui_UIMain extends fgui.GComponent {
 		this.classicBtn = <ui_Component7>(this.getChild("classicBtn"));
 		this.globalBtn = <ui_Component8>(this.getChild("globalBtn"));
 		this.n44 = <fgui.GGroup>(this.getChild("n44"));
-		this.signBtn = <ui_Component11>(this.getChild("signBtn"));
-		this.drawBtn = <ui_Component12>(this.getChild("drawBtn"));
 		this.n_dengLu = <ui_Component_denglu>(this.getChild("n_dengLu"));
 		this.settingNode = <ui_UISetting>(this.getChild("settingNode"));
+		this.drawBtn = <ui_Component12>(this.getChild("drawBtn"));
+		this.signBtn = <ui_Component11>(this.getChild("signBtn"));
+		this.shopBtn = <ui_dh_zy_sc_guang>(this.getChild("shopBtn"));
 		this.n45 = <fgui.GGroup>(this.getChild("n45"));
 		this.ganFaMoShiBtn = <ui_Component1302>(this.getChild("ganFaMoShiBtn"));
 		this.secretaryBtn = <ui_Component13>(this.getChild("secretaryBtn"));

+ 0 - 2
client/laya/src/fgui/res/game/ui_dh_zy_shangcheng.ts

@@ -4,7 +4,6 @@ export default class ui_dh_zy_shangcheng extends fgui.GComponent {
 
 	public n0:fgui.GImage;
 	public n3:fgui.GImage;
-	public t0:fgui.Transition;
 	public static URL:string = "ui://isxx5ak7n43d3vo";
 
 	public static createInstance():ui_dh_zy_shangcheng {
@@ -14,6 +13,5 @@ export default class ui_dh_zy_shangcheng extends fgui.GComponent {
 	protected onConstruct():void {
 		this.n0 = <fgui.GImage>(this.getChild("n0"));
 		this.n3 = <fgui.GImage>(this.getChild("n3"));
-		this.t0 = this.getTransition("t0");
 	}
 }

+ 6 - 6
client/laya/src/ui/UIGame.ts

@@ -105,10 +105,10 @@ export class UIGame extends UIBase {
         // this.addUIClick(this.ui.guideNode.guideBtn, this.clickHelpLineBtn, [true]);
 
 
-                    //   CustomAlert.show("提示", "确2定执行此操作吗?", [
-                    //     { label: "取消", handler: () => console.log("取消") },
-                    //     { label: "确定", handler: () => console.log("确定") }
-                    // ]);
+        //   CustomAlert.show("提示", "确2定执行此操作吗?", [
+        //     { label: "取消", handler: () => console.log("取消") },
+        //     { label: "确定", handler: () => console.log("确定") }
+        // ]);
 
     }
 
@@ -239,12 +239,12 @@ export class UIGame extends UIBase {
             xGame.common.d3World.tableSrc.gameObj.transform.localPositionY = 0;
             switch (xGame.common.gameMode) {
                 case GameMode.classic:
-                    alert("经典模式")
+                    /// alert("经典模式")
                     xGame.common.d3World.d3Hand.gameObj.active = true;
                     this.playPutBallD3Ani();
                     break;
                 case GameMode.bigMove:
-                     alert("大招模式")
+                    //  alert("大招模式")
                     this.enterGame();
                     //播放分数动画
                     Laya.timer.once(500, this, () => {

+ 32 - 16
client/laya/src/ui/UIMain.ts

@@ -114,7 +114,7 @@ export default class UIMain extends UIBase {
             case 'app_sign_for_buyProduct_onSuccess':
                 console.log('zh:收到APP通知,需要更新用户游戏资产信息app_sign_for_buyProduct_onSuccess ');
                 DataMgr.getUserZiChanInfo();
-                console.log("zh:更新用户资产信息结束");
+
                 break;
             case '222axxxxxx':
                 let dui15 = <UISign>xGame.uiMgr.getUI(UISign);
@@ -165,6 +165,7 @@ export default class UIMain extends UIBase {
         xGame.eventMgr.on(LOGIN_IN, this, this.event_login_in);
 
         //////  xGame.eventMgr.event(GET_USER_INFO);
+        //xGame.eventMgr.on(COIN_CHANGE)
 
 
         let curUse = DataMgr.getCurSecretary();
@@ -393,7 +394,8 @@ export default class UIMain extends UIBase {
     private addEvent(): void {
         this.addUIClick(this.ui.classicBtn, this.startGame, [GameMode.classic]);
         this.addUIClick(this.ui.bigMoveBtn, this.startGame, [GameMode.bigMove])
-        this.addUIClick(this.ui.ganFaMoShiBtn, this.startGame, [GameMode.bigMove])
+       // this.addUIClick(this.ui.ganFaMoShiBtn, this.startGame, [GameMode.bigMove])
+       this.addUIClick(this.ui.ganFaMoShiBtn, this.openShopView0)//原先右下角的干法模式改为链接到shop
         //
         this.addUIClick(this.ui.globalBtn, this.startGlobal);
         //  this.addUIClick(this.ui.weeklyBtn, this.startWeekly);
@@ -510,7 +512,7 @@ export default class UIMain extends UIBase {
         }
     }
     ensureSecretary() {
-        console.log('zh: ensureSecretary   ensureSecretaryensureSecretaryensureSecretaryensureSecretaryensureSecretary')
+        console.log('zh: ensureSecretary   ');
         this.ui.secretaryGuide.visible = false;
         this.ui.enterGuide.visible = true;
         this.ui.wordsNode.t0.play();
@@ -533,20 +535,17 @@ export default class UIMain extends UIBase {
         xGame.common.secretary.play(data, 0, true, parent);
     }
     startGame(type: GameMode) {
-        console.log("zh:@@@@@@@@@@@@@@@@@@@@startGame=", type);
         if (!this.isReadyForLoadNetSource()) {
             return;
         }
         //  console.log('zh: 停止播放主頁面背景音乐');
         // xGame.soundMgr.stopMusic();
-
-
         //进入游戏页面
         xGame.common.gameMode = type;
-        //
         Moyu.sendDataEvent("PlayGame", { type: type });
-        console.log('zh:进入游戏gameMode =' + xGame.common.gameMode);
-        switch (xGame.common.gameMode) {
+        let gm = xGame.common.gameMode;
+        console.log('zh:进入游戏gameMode =' + gm);
+        switch (gm) {
             case GameMode.classic:
                 console.log('zh:进入经典模式111111111');
                 //zhdiy - challenge mode作为教学练习关,完成2关解锁classic,
@@ -571,16 +570,17 @@ export default class UIMain extends UIBase {
                     else {
                         this.beginGame();
                     }
-                    break;
                 }
+                break;
             case GameMode.bigMove:
-                console.error('zh:bigMove check   大招');
+                console.info('zh:bigMove check   大招');
                 let guide = DataMgr.getSkillGuide();
                 //zhdiy - challenge mode作为教学练习关,完成2关解锁classic,
                 if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark && guide == 1) {
                     let db_over_lev = DataMgr.getChallengeMode_overLev();
                     console.log('zh:bigMove db_over_lev=', db_over_lev);
                     if (db_over_lev < DataMgr.DIY_challengeMode_overLev_jieSuo_rodMethod) {
+                        console.log('zh:提示不可以玩')
                         let tipStr = 'Complete ' + DataMgr.DIY_challengeMode_overLev_jieSuo_rodMethod + ' levels in Challenge Mode to unlock the Rod Method Mode';
                         xGame.uiMgr.Show(UIMsg, tipStr);
                         return;
@@ -616,8 +616,11 @@ export default class UIMain extends UIBase {
         }
 
 
-        console.log('zh:beginGame 2 go');
+        console.log('zh:beginGame  gameMode=' + xGame.common.gameMode)
+        console.log('zh:beginGame 1');
+
         if (xGame.common.gameMode == GameMode.classic) {
+            console.log('zh:beginGame 2');
             //   xGame.uiMgr.Show(UIMsg, "Coming Soon")
             if (isNice) {
                 //巅峰赛直接进入
@@ -625,23 +628,27 @@ export default class UIMain extends UIBase {
                 this.enterClassic();
             }
             else {
+                console.log('zh:beginGame 3-1');
+                /////////下面的代码是原油的逻辑,但是我怀疑有问题
                 xGame.uiMgr.Show(UIModeSelection, () => {
-                    console.log('zh:BBBBBBBBBBBBBBB');
+                    console.log('zh:beginGame 3-2');
                     this.enterClassic();
                 })
             }
         }
         else if (xGame.common.gameMode == GameMode.bigMove) {
+            console.log('zh:beginGame 5');
             this.ui.enterGuide.visible = false;
             xGame.uiMgr.Show(UISkill);
         }
     }
     enterClassic() {
-
+        console.log('zh:beginGame 7');
         xGame.uiMgr.Show(UIGame);
         xGame.uiMgr.Show(UIMatching, () => {
             if (!this.isHide) this.hide();
             xGame.common.gameUI.ui.alpha = 1;
+            console.log('zh:beginGame 8');
             xGame.common.gameUI.startGame();
             xGame.uiMgr.Hide(UIGameEnd);
         });
@@ -757,13 +764,13 @@ export default class UIMain extends UIBase {
         this.freshUser();
 
 
-        console.log('zh:5秒后更新用戶資產信息')
+        console.log('zh:5秒后更新用户信息');
         // Laya.timer.once(5000, this, () => {
         //     console.log('zh:5秒over 更新用戶資產信息')
         //     DataMgr.getUserZiChanInfo();
         // });
         setTimeout(() => {
-            console.log('setTimeout 5秒over 執行');
+            // console.log('setTimeout 5秒over 執行');
             DataMgr.getUserZiChanInfo();
         }, 5000);
 
@@ -835,7 +842,16 @@ export default class UIMain extends UIBase {
         xGame.uiMgr.Show(UISecretary);
         Moyu.sendDataEvent("secretary");
     }
+    /**
+     * 默认展示钻石tab
+     */
     openShopView() {
+        xGame.uiMgr.Show(UIShop, 1);
+    }
+    /**
+     * 默认展示球杆tab
+     */
+    openShopView0() {
         xGame.uiMgr.Show(UIShop, 0);
     }
     openSignView() {

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

@@ -36,6 +36,7 @@ export default class UIModeSelection extends UIBase {
        // this.updateSelf();
     }
     public show(callback): void {
+       // console.log("zh:uimodeSelection.ts  show calllback="+ callback);
         this.updateSelf();
         
         super.show();

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно