1

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

@@ -0,0 +1 @@
+{}

art/fgui/.objs/workspace.json

@@ -7,16 +7,25 @@
     "/"
   ],
   "libview.iconScale": 0,
-  "doc.openedDocs": [],
+  "doc.openedDocs": [
+    "ui://isxx5ak7j69a40z",
+    "ui://isxx5ak7jaakv55x",
+    "ui://isxx5ak7m2h4v4e8",
+    "ui://isxx5ak7qlo041q",
+    "ui://isxx5ak7uqohv4m3"
+  ],
   "test.device": "Huawei Mate20 Pro",
   "canvasColor": 10066329,
   "auxline2": true,
+  "doc.activeDoc": "ui://isxx5ak7j69a40z",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
-    "/UIDraw/"
+    "/UISkill/",
+    "isxx5ak7",
+    "/UISkill/component/"
   ],
   "auxline1": true,
   "snapToGrid": true,

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

@@ -66,9 +66,6 @@
     <component id="n84_jpsz" name="n84" src="jpszv4ni" fileName="_sharecomponent/Component141.xml" xy="792,130" scale="0.8,0.8" visible="false">
       <relation target="n45_ixm4" sidePair="middle-middle,left-left"/>
     </component>
-    <component id="n90_p8p3" name="n_Logout" src="p8p3v58c" fileName="UIMain/component/Component_dl_zc.xml" xy="403,28" size="152,70" group="n94_p8p3" controller="c1,4"/>
-    <component id="n91_p8p3" name="n_zhuCe" src="p8p3v58c" fileName="UIMain/component/Component_dl_zc.xml" xy="403,28" size="152,70" group="n94_p8p3" controller="c1,1"/>
-    <group id="n94_p8p3" name="n94" xy="403,28" size="152,70"/>
     <component id="n101_e1lx" name="n_moni_pay_ok" src="e1lxv59z" fileName="UIMain/Component1_debug_pay_ok.xml" xy="815,304"/>
   </displayList>
 </component>

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

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="96,96">
+  <controller name="c1" pages="0,login,1,exit" selected="1"/>
   <displayList>
-    <image id="n102_ijwr" name="n102" src="so7lv58s" fileName="UIUser/asset/log in.png" xy="0,0"/>
+    <image id="n102_ijwr" name="n102" src="so7lv58s" fileName="UIUser/asset/log in.png" xy="0,0">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n103_wss0" name="n103" src="wss0v5a2" fileName="UIMain/asset/logout.png" xy="0,0">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
   </displayList>
 </component>

art/fgui/assets/game/UISecretary/UIFuli/component/Button_h.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="218,86" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="1"/>
   <displayList>
     <image id="n0_loyp" name="n0" src="im8nv59j" fileName="UISecretary/UIFuli/asset/btn_h.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_loyp" name="n1" xy="22,23" size="174,39" fontSize="28" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="No,think you"/>
+    <text id="n1_loyp" name="n1" xy="18,23" size="182,39" fontSize="28" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="No,thank you"/>
   </displayList>
   <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

art/fgui/assets/game/UIUser/UILogin.xml

@@ -11,12 +11,12 @@
       <Button titleColor="#000000"/>
     </component>
     <component id="n3_nnz5" name="btn_login" src="nnz5v587" fileName="UIUser/component/Button_login.xml" xy="586,565"/>
-    <image id="n30_so7l" name="n30" src="so7lv58s" fileName="UIUser/asset/log in.png" xy="796,87"/>
     <image id="n31_so7l" name="n31" src="so7lv58r" fileName="UIUser/asset/输入框.png" xy="823,344" group="n38_so7l"/>
     <text id="n36_so7l" name="txt_up" xy="827,353" size="300,42" group="n38_so7l" blend="screen" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="height" bold="true" text="" input="true" maxLength="20"/>
     <group id="n38_so7l" name="n38" xy="823,344" size="309,59"/>
     <image id="n32_so7l" name="n32" src="so7lv58r" fileName="UIUser/asset/输入框.png" xy="819,234" group="n39_so7l"/>
     <text id="n35_so7l" name="txt_ua" xy="823,242" size="300,44" group="n39_so7l" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="" input="true" maxLength="20"/>
     <group id="n39_so7l" name="n39" xy="819,234" size="309,59"/>
+    <image id="n40_wss0" name="n40" src="wss0v5a1" fileName="UIUser/asset/denglu1.png" xy="787,88"/>
   </displayList>
 </component>

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="0"/>
+  <controller name="c1" alias="按钮" exported="true" pages="0,换人再战,1,下一关要看视频,2,下一关不用看视频,3,开心收下,4,下一关要花费金币,5,立即挑战,6,知道了,7,领取,8,已领取,9,免费抽奖,10,普通领取,11,体力+开始游戏,21,连点开箱,22,连点开箱+视频,23,体力挑战下一关,24,三倍领取" selected="15"/>
   <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"/>
@@ -8,24 +8,24 @@
     <image id="n24_wcn5" name="n24" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,0" size="239,73" aspect="true" grayed="true">
       <gearDisplay controller="c1" pages="8"/>
     </image>
-    <text id="n1_hkrz" name="n1" xy="7,16" size="224,43" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="Change rival">
+    <text id="n1_hkrz" name="n1" xy="0,12" size="224,43" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="开始游戏">
       <gearDisplay controller="c1" pages="0,4,21"/>
       <gearXY controller="c1" pages="0,4,21" values="7,16|7,27|7,11" default="0,12"/>
       <gearText controller="c1" pages="0,3,4,5,6,21" values="Change rival|start|next level|Start|Start|Unpacking" default="开始游戏"/>
     </text>
-    <text id="n3_p4tr" name="n3" xy="44,11" size="189,44" font="Arial" fontSize="32" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="next level">
+    <text id="n3_p4tr" name="n3" xy="44,11" size="189,44" font="Arial" fontSize="32" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="下一关">
       <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="3,4" size="232,65" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" strokeColor="#000000" text="OK">
+    <text id="n23_lp3l" name="n23" xy="3,4" size="232,65" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" strokeColor="#000000" text="知道了">
       <gearDisplay controller="c1" pages="6,7,8"/>
       <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="190,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="190,44" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="Rewards x3">
       <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="下一关"/>
+      <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|Rewards x3" default="下一关"/>
     </text>
-    <image id="n5_p4tr" name="n5" src="hkrz3te" fileName="_shareasset/1.png" xy="46,22" size="42,30" aspect="true">
+    <image id="n5_p4tr" name="n5" src="hkrz3te" fileName="_shareasset/1.png" xy="6,21" size="42,30" aspect="true">
       <gearDisplay controller="c1" pages="1,9,22,24"/>
       <gearXY controller="c1" pages="1,9,22,24" values="3,22|4,21|7,21|6,21" default="46,22"/>
     </image>

art/fgui/assets/game/package.xml

@@ -1351,6 +1351,10 @@
     <image id="udljv59y" name="qd_bg.png" path="/UISign/asset/"/>
     <component id="e1lxv59z" name="Component1_debug_pay_ok.xml" path="/UIMain/"/>
     <component id="ijwrv5a0" name="Component_denglu.xml" path="/UIMain/component/"/>
+    <image id="wss0v5a1" name="denglu1.png" path="/UIUser/asset/"/>
+    <image id="wss0v5a2" name="logout.png" path="/UIMain/asset/"/>
+    <image id="wss0v5a3" name="qd_bg.jpg" path="/UIMain/asset/new2025/yasuoDir/"/>
+    <image id="wss0v5a4" name="Login.png" path="/UIUser/asset/"/>
   </resources>
   <publish name="game" path="..\..\client\laya\bin\asset\fgui" packageCount="2" genCode="true" codePath="..\..\client\laya\src\fgui\res"/>
 </packageDescription>

client/laya/bin/js/bundle.js

@@ -1281,6 +1281,11 @@
                 console.log('zh: VIP SPID = 1,免除插页AD');
                 return false;
             }
+            let boo7 = this.checkAdForUserOrderForSpid17(7);
+            if (boo7) {
+                console.log('zh: VIP SPID = 7,免除任何AD');
+                return false;
+            }
             console.log('zh:showInternAd start');
             if (!Laya.Browser.onAndroid) {
                 console.log('zh:showInternAd 非android dev');
@@ -1326,6 +1331,10 @@
                     console.log('zh:检查    userInfo.buySpidsX[' + spid + '] ' + userInfo.buySpids[spid]);
                 }
                 let boo = userInfo.buySpids[spid];
+                if (!boo) {
+                    console.log('zh:刷新一下用户的AD权利');
+                    DataMgr.loadUserSpOrderForAd();
+                }
                 console.log('zh:检查是否免AD   SPID=' + spid + '=  免除AD？=' + boo);
                 return boo;
             }
@@ -4571,8 +4580,6 @@
             this.talkNode = (this.getChild("talkNode"));
             this.n83 = (this.getChild("n83"));
             this.n84 = (this.getChild("n84"));
-            this.n_Logout = (this.getChild("n_Logout"));
-            this.n_zhuCe = (this.getChild("n_zhuCe"));
             this.n_moni_pay_ok = (this.getChild("n_moni_pay_ok"));
         }
     }
@@ -6971,11 +6978,11 @@
             this.closeBtn = (this.getChild("closeBtn"));
             this.btn_gotoReg = (this.getChild("btn_gotoReg"));
             this.btn_login = (this.getChild("btn_login"));
-            this.n30 = (this.getChild("n30"));
             this.n31 = (this.getChild("n31"));
             this.txt_up = (this.getChild("txt_up"));
             this.n32 = (this.getChild("n32"));
             this.txt_ua = (this.getChild("txt_ua"));
+            this.n40 = (this.getChild("n40"));
         }
     }
     ui_UILogin.URL = "ui://isxx5ak7bobav57u";
@@ -7163,6 +7170,7 @@
                 let token = userInfo.token;
                 let ggSpid = 'com.vadltq.strike.ball.cue.noads.pack';
                 JSBridgeUtils.instance.startGgPay(token, ggSpid, 1);
+                DataMgr.loadUserSpOrderForAd();
                 return;
             }
             else {
@@ -7248,6 +7256,7 @@
                 let token = userInfo.token;
                 let ggSpid = 'com.vadltq.strike.ball.cue.passcard';
                 JSBridgeUtils.instance.startGgPay(token, ggSpid, 7);
+                DataMgr.loadUserSpOrderForAd();
                 return;
             }
             else {
@@ -7576,15 +7585,16 @@
                     let dui12 = xGame.uiMgr.getUI(UIAddCoin);
                     dui12.qjff_AD_for_UIAddCoin();
                     break;
-                case '111a':
-                    let dui14 = xGame.uiMgr.getUI(UISign);
-                    dui14.qjff_AD_for_uisign();
+                case 'app_sign_for_buyProduct_onSuccess':
+                    console.log('zh:收到APP通知，需要更新用户游戏资产信息app_sign_for_buyProduct_onSuccess ');
+                    DataMgr.getUserZiChanInfo();
+                    console.log("zh:更新用户资产信息结束");
                     break;
-                case '222a':
+                case '222axxxxxx':
                     let dui15 = xGame.uiMgr.getUI(UISign);
                     dui15.qjff_AD_for_uisign();
                     break;
-                case '333a':
+                case '333axsxxxxxx':
                     let dui16 = xGame.uiMgr.getUI(UISign);
                     dui16.qjff_AD_for_uisign();
                     break;
@@ -7641,6 +7651,12 @@
             DataMgr.setDiamond2(0);
             this.setDefaultQiuGanInfo();
             DataMgr.setPlaceBallLevelList("");
+            DataMgr.setChallengeMode_overLev(1);
+            this.setDefaultSignData();
+        }
+        setDefaultSignData() {
+            DataMgr.setSignData(1);
+            DataMgr.setSignTime(new Date().getTime());
         }
         setDefaultQiuGanInfo() {
             DataMgr.setBallRod(0, 1);
@@ -7657,7 +7673,12 @@
             Moyu.updateUserInfo(defUsername);
         }
         gotoLogin() {
-            xGame.uiMgr.Show(UILogin);
+            if (this.ui.n_dengLu.c1.selectedIndex == 0) {
+                xGame.uiMgr.Show(UILogin);
+            }
+            if (this.ui.n_dengLu.c1.selectedIndex == 1) {
+                this.Logout();
+            }
         }
         gotoRegUser() {
             xGame.uiMgr.Show(UIReg);
@@ -7724,14 +7745,12 @@
             });
         }
         c_btn_for_user() {
-            this.ui.n_Logout.visible = false;
-            this.ui.n_dengLu.visible = false;
-            this.ui.n_zhuCe.visible = false;
+            this.ui.n_dengLu.c1.selectedIndex = 0;
             if (LocalStorageManager.hasJosnKey(keyForLoginInfo)) {
-                this.ui.n_Logout.visible = true;
+                this.ui.n_dengLu.c1.selectedIndex = 1;
             }
             else {
-                this.ui.n_dengLu.visible = true;
+                this.ui.n_dengLu.c1.selectedIndex = 0;
             }
         }
         changeSecretary(curUse) {
@@ -7771,13 +7790,12 @@
             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.n_Logout, this.Logout);
             this.addUIClick(this.ui.n_dengLu, this.gotoLogin);
-            this.addUIClick(this.ui.n_zhuCe, this.gotoRegUser);
             this.addUIClick(this.ui.n_moni_pay_ok, this.start_debug_for_moni_payOk);
         }
         show(showFailWords) {
             super.show();
+            DataMgr.loadUserSpOrderForAd();
             this.moneyNode.ui.c1.selectedIndex = 1;
             this.playSecretaryIdle();
             xGame.soundMgr.playMusic("caromhall01", 0);
@@ -7859,6 +7877,7 @@
             xGame.common.secretary.play(data, 0, true, parent);
         }
         startGame(type) {
+            console.log("zh:@@@@@@@@@@@@@@@@@@@@startGame=", type);
             if (!this.isReadyForLoadNetSource()) {
                 return;
             }
@@ -7870,7 +7889,7 @@
                     console.log('zh:进入经典模式111111111');
                     if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark) {
                         let db_over_lev = DataMgr.getChallengeMode_overLev();
-                        console.log('zh:classic db_over_lev=', db_over_lev);
+                        console.log('zh:classic 经典模式  db_over_lev=', db_over_lev);
                         if (db_over_lev < DataMgr.DIY_challengeMode_overLev_jieSuo_Classic) {
                             console.log('zh:判断是否可以玩该模式classic =NO');
                             let tipStr = 'You must complete ' + DataMgr.DIY_challengeMode_overLev_jieSuo_Classic + ' levels in Challenge Mode to unlock Classic Mode.';
@@ -7878,7 +7897,7 @@
                             return;
                         }
                         else {
-                            console.log('zh:可以玩该模式classic  66666666666666');
+                            console.log('zh:可以玩该模式classic');
                             this.beginGame();
                         }
                     }
@@ -7894,7 +7913,7 @@
                         break;
                     }
                 case GameMode.bigMove:
-                    console.error('zh:bigMove check');
+                    console.error('zh:bigMove check   大招');
                     let guide = DataMgr.getSkillGuide();
                     if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark && guide == 1) {
                         let db_over_lev = DataMgr.getChallengeMode_overLev();
@@ -7935,6 +7954,7 @@
             console.log('zh:beginGame 2 go');
             if (xGame.common.gameMode == GameMode.classic) {
                 if (isNice) {
+                    console.log('zh:进入巅峰赛');
                     this.enterClassic();
                 }
                 else {
@@ -11432,10 +11452,12 @@
                 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;
@@ -12552,7 +12574,7 @@
                 normalStar: 12000,
                 wxStar: 12001
             };
-            this.skillNameList = ["Surging Break", "Skyfall Shot", "Frost Lock"];
+            this.skillNameList = ["Skyfall Shot", "Surging Break", "Frost Lock"];
             this.skillIconList = ["gf_jn1", "gf_jn2", "gf_jn4"];
             this.btnClickStr = "buttonclick";
             this.maxSkillLevel = 10;
@@ -14350,7 +14372,9 @@
             return (fgui.UIPackage.createObject("game", "Component_denglu"));
         }
         onConstruct() {
+            this.c1 = this.getController("c1");
             this.n102 = (this.getChild("n102"));
+            this.n103 = (this.getChild("n103"));
         }
     }
     ui_Component_denglu.URL = "ui://isxx5ak7ijwrv5a0";
@@ -15661,17 +15685,6 @@
     }
     ui_ranking_com13.URL = "ui://isxx5ak7p7rrv4qa";
 
-    class ui_Component_dl_zc extends fgui.GButton {
-        static createInstance() {
-            return (fgui.UIPackage.createObject("game", "Component_dl_zc"));
-        }
-        onConstruct() {
-            this.c1 = this.getController("c1");
-            this.n0 = (this.getChild("n0"));
-        }
-    }
-    ui_Component_dl_zc.URL = "ui://isxx5ak7p8p3v58c";
-
     class ui_Component122 extends fgui.GComponent {
         static createInstance() {
             return (fgui.UIPackage.createObject("game", "Component122"));
@@ -16926,7 +16939,6 @@
             fgui.UIObjectFactory.setExtension(ui_ranking_com10.URL, ui_ranking_com10);
             fgui.UIObjectFactory.setExtension(ui_ranking_com11.URL, ui_ranking_com11);
             fgui.UIObjectFactory.setExtension(ui_ranking_com13.URL, ui_ranking_com13);
-            fgui.UIObjectFactory.setExtension(ui_Component_dl_zc.URL, ui_Component_dl_zc);
             fgui.UIObjectFactory.setExtension(ui_Component122.URL, ui_Component122);
             fgui.UIObjectFactory.setExtension(ui_skillItem.URL, ui_skillItem);
             fgui.UIObjectFactory.setExtension(ui_Component26.URL, ui_Component26);
@@ -18851,6 +18863,10 @@
             if (objStr) {
                 let obj = JSON.parse(objStr);
                 this.userData.placeBallData = obj;
+                let cd = obj.length;
+                console.log('zh:setPlaceBallLevelList cd=' + cd);
+                xGame.common.placeBallCurLevel = cd;
+                DataMgr.setChallengeMode_overLev(cd);
                 this.saveUserData();
             }
             else {
@@ -20442,10 +20458,12 @@
                 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;
@@ -24162,6 +24180,7 @@
                 let token = userInfo.token;
                 let ggSpid = 'com.vadltq.strike.ball.cue.noads.pack';
                 JSBridgeUtils.instance.startGgPay(token, ggSpid, 1);
+                DataMgr.loadUserSpOrderForAd();
                 return;
             }
             else {
@@ -24236,6 +24255,7 @@
                 let token = userInfo.token;
                 let ggSpid = 'com.vadltq.strike.ball.cue.passcard';
                 JSBridgeUtils.instance.startGgPay(token, ggSpid, 7);
+                DataMgr.loadUserSpOrderForAd();
                 return;
             }
             else {
@@ -24650,15 +24670,16 @@
                     let dui12 = xGame.uiMgr.getUI(UIAddCoin$1);
                     dui12.qjff_AD_for_UIAddCoin();
                     break;
-                case '111a':
-                    let dui14 = xGame.uiMgr.getUI(UISign$1);
-                    dui14.qjff_AD_for_uisign();
+                case 'app_sign_for_buyProduct_onSuccess':
+                    console.log('zh:收到APP通知，需要更新用户游戏资产信息app_sign_for_buyProduct_onSuccess ');
+                    DataMgr.getUserZiChanInfo();
+                    console.log("zh:更新用户资产信息结束");
                     break;
-                case '222a':
+                case '222axxxxxx':
                     let dui15 = xGame.uiMgr.getUI(UISign$1);
                     dui15.qjff_AD_for_uisign();
                     break;
-                case '333a':
+                case '333axsxxxxxx':
                     let dui16 = xGame.uiMgr.getUI(UISign$1);
                     dui16.qjff_AD_for_uisign();
                     break;
@@ -24715,6 +24736,12 @@
             DataMgr.setDiamond2(0);
             this.setDefaultQiuGanInfo();
             DataMgr.setPlaceBallLevelList("");
+            DataMgr.setChallengeMode_overLev(1);
+            this.setDefaultSignData();
+        }
+        setDefaultSignData() {
+            DataMgr.setSignData(1);
+            DataMgr.setSignTime(new Date().getTime());
         }
         setDefaultQiuGanInfo() {
             DataMgr.setBallRod(0, 1);
@@ -24731,7 +24758,12 @@
             Moyu.updateUserInfo(defUsername);
         }
         gotoLogin() {
-            xGame.uiMgr.Show(UILogin$1);
+            if (this.ui.n_dengLu.c1.selectedIndex == 0) {
+                xGame.uiMgr.Show(UILogin$1);
+            }
+            if (this.ui.n_dengLu.c1.selectedIndex == 1) {
+                this.Logout();
+            }
         }
         gotoRegUser() {
             xGame.uiMgr.Show(UIReg$1);
@@ -24798,14 +24830,12 @@
             });
         }
         c_btn_for_user() {
-            this.ui.n_Logout.visible = false;
-            this.ui.n_dengLu.visible = false;
-            this.ui.n_zhuCe.visible = false;
+            this.ui.n_dengLu.c1.selectedIndex = 0;
             if (LocalStorageManager.hasJosnKey(keyForLoginInfo)) {
-                this.ui.n_Logout.visible = true;
+                this.ui.n_dengLu.c1.selectedIndex = 1;
             }
             else {
-                this.ui.n_dengLu.visible = true;
+                this.ui.n_dengLu.c1.selectedIndex = 0;
             }
         }
         changeSecretary(curUse) {
@@ -24845,13 +24875,12 @@
             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.n_Logout, this.Logout);
             this.addUIClick(this.ui.n_dengLu, this.gotoLogin);
-            this.addUIClick(this.ui.n_zhuCe, this.gotoRegUser);
             this.addUIClick(this.ui.n_moni_pay_ok, this.start_debug_for_moni_payOk);
         }
         show(showFailWords) {
             super.show();
+            DataMgr.loadUserSpOrderForAd();
             this.moneyNode.ui.c1.selectedIndex = 1;
             this.playSecretaryIdle();
             xGame.soundMgr.playMusic("caromhall01", 0);
@@ -24933,6 +24962,7 @@
             xGame.common.secretary.play(data, 0, true, parent);
         }
         startGame(type) {
+            console.log("zh:@@@@@@@@@@@@@@@@@@@@startGame=", type);
             if (!this.isReadyForLoadNetSource()) {
                 return;
             }
@@ -24944,7 +24974,7 @@
                     console.log('zh:进入经典模式111111111');
                     if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark) {
                         let db_over_lev = DataMgr.getChallengeMode_overLev();
-                        console.log('zh:classic db_over_lev=', db_over_lev);
+                        console.log('zh:classic 经典模式  db_over_lev=', db_over_lev);
                         if (db_over_lev < DataMgr.DIY_challengeMode_overLev_jieSuo_Classic) {
                             console.log('zh:判断是否可以玩该模式classic =NO');
                             let tipStr = 'You must complete ' + DataMgr.DIY_challengeMode_overLev_jieSuo_Classic + ' levels in Challenge Mode to unlock Classic Mode.';
@@ -24952,7 +24982,7 @@
                             return;
                         }
                         else {
-                            console.log('zh:可以玩该模式classic  66666666666666');
+                            console.log('zh:可以玩该模式classic');
                             this.beginGame();
                         }
                     }
@@ -24968,7 +24998,7 @@
                         break;
                     }
                 case GameMode.bigMove:
-                    console.error('zh:bigMove check');
+                    console.error('zh:bigMove check   大招');
                     let guide = DataMgr.getSkillGuide();
                     if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark && guide == 1) {
                         let db_over_lev = DataMgr.getChallengeMode_overLev();
@@ -25009,6 +25039,7 @@
             console.log('zh:beginGame 2 go');
             if (xGame.common.gameMode == GameMode.classic) {
                 if (isNice) {
+                    console.log('zh:进入巅峰赛');
                     this.enterClassic();
                 }
                 else {

client/laya/src/data/DataMgr.ts

@@ -449,6 +449,11 @@ export default class DataMgr {
             let obj = JSON.parse(objStr);
             this.userData.placeBallData = obj;
 
+            let cd = obj.length;
+            console.log('zh:setPlaceBallLevelList cd=' + cd);
+            xGame.common.placeBallCurLevel = cd;
+            DataMgr.setChallengeMode_overLev(cd);
+
             // arr.push({
             //     star: star,
             //     play: true,
@@ -859,7 +864,6 @@ export default class DataMgr {
                     let signData = d.signData;
                     let placeBallData = d.placeBallData;
 
-
                     DataMgr.setDiamondFormServer(zuanShi);
                     DataMgr.setCoinFormServer(jinBi);
                     console.log('zh:更新球杆信息')

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

@@ -198,7 +198,6 @@ import ui_ranking_com9 from "./ui_ranking_com9";
 import ui_ranking_com10 from "./ui_ranking_com10";
 import ui_ranking_com11 from "./ui_ranking_com11";
 import ui_ranking_com13 from "./ui_ranking_com13";
-import ui_Component_dl_zc from "./ui_Component_dl_zc";
 import ui_Component122 from "./ui_Component122";
 import ui_skillItem from "./ui_skillItem";
 import ui_Component26 from "./ui_Component26";
@@ -477,7 +476,6 @@ export default class gameBinder {
 		fgui.UIObjectFactory.setExtension(ui_ranking_com10.URL, ui_ranking_com10);
 		fgui.UIObjectFactory.setExtension(ui_ranking_com11.URL, ui_ranking_com11);
 		fgui.UIObjectFactory.setExtension(ui_ranking_com13.URL, ui_ranking_com13);
-		fgui.UIObjectFactory.setExtension(ui_Component_dl_zc.URL, ui_Component_dl_zc);
 		fgui.UIObjectFactory.setExtension(ui_Component122.URL, ui_Component122);
 		fgui.UIObjectFactory.setExtension(ui_skillItem.URL, ui_skillItem);
 		fgui.UIObjectFactory.setExtension(ui_Component26.URL, ui_Component26);

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

@@ -2,7 +2,9 @@
 
 export default class ui_Component_denglu extends fgui.GComponent {
 
+	public c1:fgui.Controller;
 	public n102:fgui.GImage;
+	public n103:fgui.GImage;
 	public static URL:string = "ui://isxx5ak7ijwrv5a0";
 
 	public static createInstance():ui_Component_denglu {
@@ -10,6 +12,8 @@ export default class ui_Component_denglu extends fgui.GComponent {
 	}
 
 	protected onConstruct():void {
+		this.c1 = this.getController("c1");
 		this.n102 = <fgui.GImage>(this.getChild("n102"));
+		this.n103 = <fgui.GImage>(this.getChild("n103"));
 	}
 }

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

@@ -1,17 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-export default class ui_Component_dl_zc extends fgui.GButton {
-
-	public c1:fgui.Controller;
-	public n0:fgui.GTextField;
-	public static URL:string = "ui://isxx5ak7p8p3v58c";
-
-	public static createInstance():ui_Component_dl_zc {
-		return <ui_Component_dl_zc>(fgui.UIPackage.createObject("game", "Component_dl_zc"));
-	}
-
-	protected onConstruct():void {
-		this.c1 = this.getController("c1");
-		this.n0 = <fgui.GTextField>(this.getChild("n0"));
-	}
-}

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

@@ -14,11 +14,11 @@ export default class ui_UILogin extends fgui.GComponent {
 	public closeBtn:ui_Component86;
 	public btn_gotoReg:ui_Button_reg;
 	public btn_login:ui_Button_login;
-	public n30:fgui.GImage;
 	public n31:fgui.GImage;
 	public txt_up:fgui.GTextInput;
 	public n32:fgui.GImage;
 	public txt_ua:fgui.GTextInput;
+	public n40:fgui.GImage;
 	public static URL:string = "ui://isxx5ak7bobav57u";
 
 	public static createInstance():ui_UILogin {
@@ -34,10 +34,10 @@ export default class ui_UILogin extends fgui.GComponent {
 		this.closeBtn = <ui_Component86>(this.getChild("closeBtn"));
 		this.btn_gotoReg = <ui_Button_reg>(this.getChild("btn_gotoReg"));
 		this.btn_login = <ui_Button_login>(this.getChild("btn_login"));
-		this.n30 = <fgui.GImage>(this.getChild("n30"));
 		this.n31 = <fgui.GImage>(this.getChild("n31"));
 		this.txt_up = <fgui.GTextInput>(this.getChild("txt_up"));
 		this.n32 = <fgui.GImage>(this.getChild("n32"));
 		this.txt_ua = <fgui.GTextInput>(this.getChild("txt_ua"));
+		this.n40 = <fgui.GImage>(this.getChild("n40"));
 	}
 }

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

@@ -21,7 +21,6 @@ import ui_Component112 from "./ui_Component112";
 import ui_Component60 from "./ui_Component60";
 import ui_dh_zuanshi from "./ui_dh_zuanshi";
 import ui_Component141 from "./ui_Component141";
-import ui_Component_dl_zc from "./ui_Component_dl_zc";
 import ui_Component1_debug_pay_ok from "./ui_Component1_debug_pay_ok";
 
 export default class ui_UIMain extends fgui.GComponent {
@@ -58,8 +57,6 @@ export default class ui_UIMain extends fgui.GComponent {
 	public talkNode:ui_Component60;
 	public n83:ui_dh_zuanshi;
 	public n84:ui_Component141;
-	public n_Logout:ui_Component_dl_zc;
-	public n_zhuCe:ui_Component_dl_zc;
 	public n_moni_pay_ok:ui_Component1_debug_pay_ok;
 	public static URL:string = "ui://isxx5ak7kt443qc";
 
@@ -100,8 +97,6 @@ export default class ui_UIMain extends fgui.GComponent {
 		this.talkNode = <ui_Component60>(this.getChild("talkNode"));
 		this.n83 = <ui_dh_zuanshi>(this.getChild("n83"));
 		this.n84 = <ui_Component141>(this.getChild("n84"));
-		this.n_Logout = <ui_Component_dl_zc>(this.getChild("n_Logout"));
-		this.n_zhuCe = <ui_Component_dl_zc>(this.getChild("n_zhuCe"));
 		this.n_moni_pay_ok = <ui_Component1_debug_pay_ok>(this.getChild("n_moni_pay_ok"));
 	}
 }

client/laya/src/ui/UIFuli1.ts

@@ -41,6 +41,7 @@ export default class UIFuli1 extends UIBase {
             let token = userInfo.token;
             let ggSpid = 'com.vadltq.strike.ball.cue.noads.pack';
             JSBridgeUtils.instance.startGgPay(token, ggSpid, 1);
+            DataMgr.loadUserSpOrderForAd();
             return;
         } else {
             xGame.uiMgr.Show(UIMsg, TIP_MSG_key.pleaseLoginIn)

client/laya/src/ui/UIFuli2.ts

@@ -35,7 +35,7 @@ export default class UIFuli2 extends UIBase {
         this.y = (Laya.stage.height - this.height) / 2;
     }
     closeSelf() {
-          DataMgr.loadUserSpOrderForAd();
+        DataMgr.loadUserSpOrderForAd();
         this.hide();
     }
     gotoBuy() {
@@ -43,7 +43,8 @@ export default class UIFuli2 extends UIBase {
         if (userInfo != null) {
             let token = userInfo.token;
             let ggSpid = 'com.vadltq.strike.ball.cue.passcard';
-            JSBridgeUtils.instance.startGgPay(token, ggSpid,7);
+            JSBridgeUtils.instance.startGgPay(token, ggSpid, 7);
+            DataMgr.loadUserSpOrderForAd();
             return;
         } else {
             xGame.uiMgr.Show(UIMsg, TIP_MSG_key.pleaseLoginIn)
@@ -72,9 +73,9 @@ export default class UIFuli2 extends UIBase {
                     return;
                 }
                 if (code == 200) {
-                    
+
                     xGame.uiMgr.Show(UIMsg, msg)
-                     DataMgr.loadUserSpOrderForAd();
+                    DataMgr.loadUserSpOrderForAd();
                     DataMgr.getUserZiChanInfo();
                     this.closeSelf();
                 } else {

client/laya/src/ui/UIGame.ts

@@ -239,10 +239,12 @@ export class UIGame extends UIBase {
             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, () => {

client/laya/src/ui/UIGameEnd.ts

@@ -459,6 +459,7 @@ export default class UIGameEnd extends UIBase {
 
             this.diyGameDataUtilForGameWin();
             this.updateGamePlaceBallData2Server();
+            
 
         }
         else {

client/laya/src/ui/UIMain.ts

@@ -110,15 +110,17 @@ export default class UIMain extends UIBase {
             //    // SkillDisplay s=new SkillDisplay();//改为插屏了
             //   //  s.qjff_AD_for_skilldisplay_clickAddLevel();
             //     break;
-            case '111a':
-                let dui14 = <UISign>xGame.uiMgr.getUI(UISign);
-                dui14.qjff_AD_for_uisign();
+            //当APP中购买成功之后，需要回调这里，然后通知更新用户资产信息
+            case 'app_sign_for_buyProduct_onSuccess':
+                console.log('zh:收到APP通知，需要更新用户游戏资产信息app_sign_for_buyProduct_onSuccess ');
+                DataMgr.getUserZiChanInfo();
+                console.log("zh:更新用户资产信息结束");
                 break;
-            case '222a':
+            case '222axxxxxx':
                 let dui15 = <UISign>xGame.uiMgr.getUI(UISign);
                 dui15.qjff_AD_for_uisign();
                 break;
-            case '333a':
+            case '333axsxxxxxx':
                 let dui16 = <UISign>xGame.uiMgr.getUI(UISign);
                 dui16.qjff_AD_for_uisign();
                 break;
@@ -202,7 +204,7 @@ export default class UIMain extends UIBase {
         //     console.log('zh: 1秒后  showFuLiSp1')
         //     this.showFuLiSp1();
         // })
-      
+
 
 
 
@@ -221,6 +223,16 @@ export default class UIMain extends UIBase {
         DataMgr.setDiamond2(0);
         this.setDefaultQiuGanInfo();
         DataMgr.setPlaceBallLevelList("");
+        DataMgr.setChallengeMode_overLev(1);
+        this.setDefaultSignData();
+    }
+    /**
+     *  默认签到数据
+     * @param val 
+     */
+    setDefaultSignData() {
+        DataMgr.setSignData(1);
+        DataMgr.setSignTime(new Date().getTime());
     }
 
     /**
@@ -248,7 +260,19 @@ export default class UIMain extends UIBase {
     }
 
     gotoLogin() {
-        xGame.uiMgr.Show(UILogin);
+        // if (LocalStorageManager.hasJosnKey(keyForLoginInfo)) {
+        //     this.ui.n_dengLu.c1.selectedIndex = 1;
+        // } else {
+        //     this.ui.n_dengLu.c1.selectedIndex = 0
+        // }
+        if (this.ui.n_dengLu.c1.selectedIndex == 0) {
+            xGame.uiMgr.Show(UILogin);
+        }
+        if (this.ui.n_dengLu.c1.selectedIndex == 1) {
+            this.Logout();
+        }
+
+
     }
     gotoRegUser() {
         xGame.uiMgr.Show(UIReg);
@@ -332,13 +356,12 @@ export default class UIMain extends UIBase {
      * 登录注册退出
      */
     c_btn_for_user() {
-        this.ui.n_Logout.visible = false;
-        this.ui.n_dengLu.visible = false;
-        this.ui.n_zhuCe.visible = false;
+        this.ui.n_dengLu.c1.selectedIndex = 0
+
         if (LocalStorageManager.hasJosnKey(keyForLoginInfo)) {
-            this.ui.n_Logout.visible = true;
+            this.ui.n_dengLu.c1.selectedIndex = 1;
         } else {
-            this.ui.n_dengLu.visible = true;
+            this.ui.n_dengLu.c1.selectedIndex = 0
         }
     }
 
@@ -389,9 +412,7 @@ export default class UIMain extends UIBase {
         this.addUIClick(this.ui.rankBtn, this.openRanking);
 
         //退出登录
-        this.addUIClick(this.ui.n_Logout, this.Logout);
         this.addUIClick(this.ui.n_dengLu, this.gotoLogin);
-        this.addUIClick(this.ui.n_zhuCe, this.gotoRegUser);
         // this.addUIClick(this.ui.n_fuli, this.showFuLiSp7);
 
         //调试专用
@@ -401,7 +422,7 @@ export default class UIMain extends UIBase {
     public show(showFailWords): void {
         super.show();
 
-
+        DataMgr.loadUserSpOrderForAd();
 
         //
         this.moneyNode.ui.c1.selectedIndex = 1;
@@ -512,6 +533,7 @@ 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;
         }
@@ -530,14 +552,14 @@ export default class UIMain extends UIBase {
                 //zhdiy - challenge mode作为教学练习关，完成2关解锁classic，
                 if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark) {
                     let db_over_lev = DataMgr.getChallengeMode_overLev();
-                    console.log('zh:classic db_over_lev=', db_over_lev);
+                    console.log('zh:classic 经典模式  db_over_lev=', db_over_lev);
                     if (db_over_lev < DataMgr.DIY_challengeMode_overLev_jieSuo_Classic) {
                         console.log('zh:判断是否可以玩该模式classic =NO');
                         let tipStr = 'You must complete ' + DataMgr.DIY_challengeMode_overLev_jieSuo_Classic + ' levels in Challenge Mode to unlock Classic Mode.';
                         xGame.uiMgr.Show(UIMsg, tipStr);
                         return;
                     } else {
-                        console.log('zh:可以玩该模式classic  66666666666666');
+                        console.log('zh:可以玩该模式classic');
                         this.beginGame();
                     }
                 } else {
@@ -552,7 +574,7 @@ export default class UIMain extends UIBase {
                     break;
                 }
             case GameMode.bigMove:
-                console.error('zh:bigMove check');
+                console.error('zh:bigMove check   大招');
                 let guide = DataMgr.getSkillGuide();
                 //zhdiy - challenge mode作为教学练习关，完成2关解锁classic，
                 if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark && guide == 1) {
@@ -599,6 +621,7 @@ export default class UIMain extends UIBase {
             //   xGame.uiMgr.Show(UIMsg, "Coming Soon")
             if (isNice) {
                 //巅峰赛直接进入
+                console.log('zh:进入巅峰赛');
                 this.enterClassic();
             }
             else {

client/laya/src/utils/Common.ts

@@ -115,7 +115,7 @@ export default class Common {
     }
     //
     // skillNameList = ["Fall from the sky", "Unstoppable Force", "Freeze Shot","Coming Soon"];
-    skillNameList = ["Surging Break", "Skyfall Shot", "Frost Lock"];
+    skillNameList = ["Skyfall Shot","Surging Break" , "Frost Lock"];
     //skillIconList = ["gf_jn1", "gf_jn2", "gf_jn4", "gf_jn4"];
     skillIconList = ["gf_jn1", "gf_jn2", "gf_jn4"];
     btnClickStr: string = "buttonclick";

client/laya/src/utils/JSBridgeUtils.ts

@@ -9,7 +9,7 @@
  * 
  * 
  */
-
+import DataMgr from "../data/DataMgr";
 import { keyForLoginInfo, TIP_MSG_key } from "../data/Define";
 import { LocalStorageManager } from "../utils/LocalStorageManager";
 import GlobalManager from "./GlobalManager";
@@ -85,7 +85,12 @@ export default class JSBridgeUtils {
             console.log('zh: VIP SPID = 1,免除插页AD')
             return false;
         }
-
+        //7 = 完全无AD
+        let boo7 = this.checkAdForUserOrderForSpid17(7);
+        if (boo7) {
+            console.log('zh: VIP SPID = 7,免除任何AD')
+            return false;
+        }
 
 
         console.log('zh:showInternAd start');
@@ -137,7 +142,7 @@ export default class JSBridgeUtils {
      * @param spid   固定值1  或者7 
      * @returns 
      */
-    private checkAdForUserOrderForSpid17(spid: number): boolean  {
+    private checkAdForUserOrderForSpid17(spid: number): boolean {
         let userInfo = LocalStorageManager.getItem(keyForLoginInfo);
         if (userInfo != null) {
             if (!userInfo.buySpids) {
@@ -146,7 +151,11 @@ export default class JSBridgeUtils {
                 console.log('zh:检查    userInfo.buySpidsX[' + spid + '] ' + userInfo.buySpids[spid])
             }
             let boo = userInfo.buySpids[spid];
-            console.log('zh:检查是否免AD   SPID=' + spid + '=  免除AD？=' + boo );
+            if (!boo) {
+                console.log('zh:刷新一下用户的AD权利');
+                DataMgr.loadUserSpOrderForAd();
+            }
+            console.log('zh:检查是否免AD   SPID=' + spid + '=  免除AD？=' + boo);
             return boo;
         }
         return false;