1

client/laya/bin/js/bundle.js

@@ -1458,13 +1458,12 @@
         }
         getNetworkAvailable() {
             if (!Laya.Browser.onAndroid) {
-                return;
+                return true;
             }
             if (!this.initBridge()) {
-                return;
+                return true;
             }
             let boo = this.bridge.call("getNetworkAvailable");
-            console.log("zh:getNetworkAvailable boo=" + boo);
             return boo;
         }
         showToast2(msg) {
@@ -2022,7 +2021,14 @@
             }, this);
         }
         init() {
-            this.isGuide = DataMgr.getSkillGuide() < 1 || DataMgr.gameData.gameCount < 1;
+            let ggg = 1;
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                ggg = DataMgr.getLianXiGuide();
+            }
+            else {
+                ggg = DataMgr.getSkillGuide();
+            }
+            this.isGuide = ggg < 1 || DataMgr.gameData.gameCount < 1;
             this.awayTime = xGame.tools.random(5000, 10000);
             this.awayNum = 0;
             this.hideTime = Laya.timer.currTimer;
@@ -5140,11 +5146,13 @@
             if (Laya.Browser.onAndroid) {
                 let boo = JSBridgeUtils.instance.getNetworkAvailable();
                 if (!boo) {
+                    console.log('zh:net error ');
                     JSBridgeUtils.instance.showToast2("Network error, reward unavailable");
                     return;
                 }
             }
             if (Laya.Browser.onAndroid) {
+                console.log('zh:android   ad show ');
                 if (JSBridgeUtils.instance.showRewardAd('qjff_AD_for_uipower')) {
                 }
                 else {
@@ -5157,6 +5165,7 @@
             }
         }
         qjff_AD_for_uipower() {
+            console.log('zh:ADD 体力 start');
             DataMgr.setPower(xGame.common.videoPower, true);
             xGame.eventMgr.event(POWER_TIME);
             this.hide();
@@ -5613,12 +5622,23 @@
             this.ui.aiHead.c1.selectedIndex = 1;
             let myData = this.skillSelectData[index];
             this.ui.selfHead.skillImg.url = xGame.common.getGameIconUrl(myData.skillImg);
-            let guide = DataMgr.getSkillGuide();
-            if (guide == 0) {
-                this.ui.selfHead.skillTxt.text = myData.skillName + " Max Level";
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                let guide = DataMgr.getLianXiGuide();
+                if (guide == 0) {
+                    this.ui.selfHead.skillTxt.text = myData.skillName + " Max Level";
+                }
+                else {
+                    this.ui.selfHead.skillTxt.text = myData.skillName + "Lv." + myData.skillLevel;
+                }
             }
             else {
-                this.ui.selfHead.skillTxt.text = myData.skillName + "Lv." + myData.skillLevel;
+                let guide = DataMgr.getSkillGuide();
+                if (guide == 0) {
+                    this.ui.selfHead.skillTxt.text = myData.skillName + " Max Level";
+                }
+                else {
+                    this.ui.selfHead.skillTxt.text = myData.skillName + "Lv." + myData.skillLevel;
+                }
             }
             let aiData = this.skillSelectData[aiInfo.aiType];
             this.ui.aiHead.skillImg.url = xGame.common.getGameIconUrl(aiData.skillImg);
@@ -6778,13 +6798,23 @@
             xGame.soundMgr.playSound(xGame.common.btnClickStr);
             let needCoin = xGame.common.bigMoveNeedCoin;
             xGame.common.passAwardCoin = 2000;
-            let guide = DataMgr.getSkillGuide();
-            console.log('zh:startGame guide=' + guide);
-            xGame.common.temSelfLevel = 0;
-            if (guide == 0) {
-                needCoin = 0;
-                xGame.common.temSelfLevel = 100;
+            let guide = 1;
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                guide = DataMgr.getLianXiGuide();
+                if (guide == 0) {
+                    needCoin = 0;
+                    xGame.common.temSelfLevel = 100;
+                }
+            }
+            else {
+                guide = DataMgr.getSkillGuide();
+                console.log('zh:startGame guide=' + guide);
+                if (guide == 0) {
+                    needCoin = 0;
+                    xGame.common.temSelfLevel = 100;
+                }
             }
+            xGame.common.temSelfLevel = 0;
             if (DataMgr.coinEnough(needCoin)) {
                 DataMgr.setCoin(-needCoin);
                 xGame.common.curPlayerSkillType = this.index;
@@ -7720,7 +7750,13 @@
             let curUse = DataMgr.getCurSecretary();
             this.changeSecretary(curUse);
             this.ui.talkNode.visible = false;
-            let guide = DataMgr.getSkillGuide();
+            let guide = 1;
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                guide = DataMgr.getLianXiGuide();
+            }
+            else {
+                guide = DataMgr.getSkillGuide();
+            }
             if (xGame.common.isNewDay && guide == 1) {
                 xGame.common.isNewDay = false;
                 xGame.soundMgr.playSound("s_main01");
@@ -7916,7 +7952,6 @@
         }
         showGuideForLianxi() {
             let lianXiGuide = DataMgr.getLianXiGuide();
-            console.log('zh: AAAAA练习模式引导判断:lianXiGuide=' + lianXiGuide);
             if (lianXiGuide == 0) {
                 let x = this.ui.placeBallBtn.x;
                 let y = this.ui.placeBallBtn.y;
@@ -8012,27 +8047,50 @@
                     break;
                 case GameMode.bigMove:
                     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;
+                    let tipStr = 'Complete ' + DataMgr.DIY_challengeMode_overLev_jieSuo_rodMethod + ' levels in Challenge Mode to unlock the Rod Method Mode';
+                    if (DataMgr.getGuideDefaultModel() === 1) {
+                        let lianXiGuide = DataMgr.getLianXiGuide();
+                        if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark && lianXiGuide == 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) {
+                                xGame.uiMgr.Show(UIMsg, tipStr);
+                                return;
+                            }
+                            else {
+                                console.log('zh:可以玩');
+                                this.beginGame();
+                                if (DataMgr.getNewUser())
+                                    Moyu.sendDataEvent("gameStart0");
+                            }
                         }
                         else {
-                            console.log('zh:可以玩该模式 bigMove');
                             this.beginGame();
                             if (DataMgr.getNewUser())
                                 Moyu.sendDataEvent("gameStart0");
                         }
                     }
                     else {
-                        this.beginGame();
-                        if (DataMgr.getNewUser())
-                            Moyu.sendDataEvent("gameStart0");
+                        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) {
+                                xGame.uiMgr.Show(UIMsg, tipStr);
+                                return;
+                            }
+                            else {
+                                console.log('zh:可以玩');
+                                this.beginGame();
+                                if (DataMgr.getNewUser())
+                                    Moyu.sendDataEvent("gameStart0");
+                            }
+                        }
+                        else {
+                            this.beginGame();
+                            if (DataMgr.getNewUser())
+                                Moyu.sendDataEvent("gameStart0");
+                        }
                     }
                     break;
                 default:
@@ -8042,7 +8100,13 @@
         }
         beginGame(isNice = false) {
             console.log('zh:beginGame ');
-            let guide = DataMgr.getSkillGuide();
+            let guide = 1;
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                guide = DataMgr.getLianXiGuide();
+            }
+            else {
+                guide = DataMgr.getSkillGuide();
+            }
             if (guide == 1) {
                 console.log('zh:非新手引导，showInternAd  ');
                 JSBridgeUtils.instance.showInternAd('beginGame');
@@ -9168,7 +9232,14 @@
             }
             if (xGame.common.gameMode == GameMode.placeBall)
                 this.selfTurn = true;
-            if (xGame.common.gameMode == GameMode.bigMove && !DataMgr.getSkillGuide()) {
+            let ggg = 1;
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                ggg = DataMgr.getLianXiGuide();
+            }
+            else {
+                ggg = DataMgr.getSkillGuide();
+            }
+            if (xGame.common.gameMode == GameMode.bigMove && !ggg) {
                 this.selfTurn = true;
             }
             xGame.common.gameUI.setTurnAlpha(this.selfTurn);
@@ -9255,9 +9326,14 @@
             }
             this.showLongView = false;
             xGame.common.wordsMgr.comboTimes = 1;
-            let guide = DataMgr.getSkillGuide();
-            if (guide)
-                xGame.eventMgr.event(WAIT_SHOOT);
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                let guide = DataMgr.getLianXiGuide();
+            }
+            else {
+                let guide = DataMgr.getSkillGuide();
+                if (guide)
+                    xGame.eventMgr.event(WAIT_SHOOT);
+            }
             xGame.common.upSkillLevel = false;
             xGame.common.gameStartTime = new Date().getTime();
             this.firstShoot = true;
@@ -9289,8 +9365,8 @@
             if (guide == 0 && xGame.common.gameMode == GameMode.placeBall) {
                 gameUI.n_lxms_yd1.visible = true;
                 let oneBall = this.getOneBallForPlaceBall();
-                gameUI.n_lxms_yd1.fingerNode.x = oneBall.gameObj.x + 15;
-                gameUI.n_lxms_yd1.fingerNode.y = oneBall.gameObj.y;
+                gameUI.n_lxms_yd1.fingerNode.x = oneBall.gameObj.x + 30;
+                gameUI.n_lxms_yd1.fingerNode.y = oneBall.gameObj.y + 15;
             }
             else {
                 gameUI.n_lxms_yd1.visible = false;
@@ -10411,7 +10487,13 @@
             this.callback = callback;
             this.judgeSkill();
             this.leveNum = DataMgr.getBigSkillByIndex(this.curSkill);
-            let guide = DataMgr.getSkillGuide();
+            let guide = 1;
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                guide = DataMgr.getLianXiGuide();
+            }
+            else {
+                guide = DataMgr.getSkillGuide();
+            }
             if (!xGame.common.gameMgr.selfTurn) {
                 this.leveNum = xGame.common.gameMgr.aiSkillLevelNum;
             }
@@ -10425,6 +10507,7 @@
             }
             if (guide == 0) {
                 DataMgr.setSkillGuide(1);
+                DataMgr.setLianXiGuide(1);
                 if (DataMgr.getNewUser()) {
                     Moyu.sendDataEvent("gameFirstPlay");
                     DataMgr.setNewUser();
@@ -11618,7 +11701,14 @@
             this.ui.topNode.selfNameTxt.text = user.nickName;
             xGame.common.createHead(this.ui.topNode.selfHeadLoader, user.headIcon, 80);
             let aiData = xGame.cfgMgr.getRandomUserInfo();
-            if (DataMgr.getSkillGuide() < 1) {
+            let guide = 1;
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                guide = DataMgr.getLianXiGuide();
+            }
+            else {
+                guide = DataMgr.getSkillGuide();
+            }
+            if (guide < 1) {
                 this.ui.topNode.aiNameTxt.text = 'billiards';
                 this.ui.topNode.aiHeadLoader.url = 'res/icon.png';
             }
@@ -11877,7 +11967,6 @@
             this.pressTarget = -1;
         }
         checkGuide() {
-            console.log('zh:111111111111aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafFFFFFFFFFFFFFFFFFF');
             let guide = DataMgr.getSkillGuide();
             if (guide == 0 && xGame.common.gameMode == GameMode.bigMove && xGame.common.guideStep == 1) {
                 xGame.common.guideStep++;
@@ -19490,16 +19579,19 @@
             this.saveUserData();
         }
         static setPower(val, addUp = true) {
-            if (addUp)
+            if (addUp) {
                 this.userData.power += val;
-            else
+            }
+            else {
                 this.userData.power = val;
+            }
             if (this.userData.power >= xGame.common.maxPower) {
                 this.userData.power = xGame.common.maxPower;
             }
             xGame.eventMgr.event(POWER_CHANGE, val);
             this.saveUserData();
             this.updateUserInfo2Server("power");
+            console.log('zh:up tili over = ' + this.userData.power);
         }
         static getPower() {
             return this.userData.power;
@@ -21100,7 +21192,14 @@
             this.ui.topNode.selfNameTxt.text = user.nickName;
             xGame.common.createHead(this.ui.topNode.selfHeadLoader, user.headIcon, 80);
             let aiData = xGame.cfgMgr.getRandomUserInfo();
-            if (DataMgr.getSkillGuide() < 1) {
+            let guide = 1;
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                guide = DataMgr.getLianXiGuide();
+            }
+            else {
+                guide = DataMgr.getSkillGuide();
+            }
+            if (guide < 1) {
                 this.ui.topNode.aiNameTxt.text = 'billiards';
                 this.ui.topNode.aiHeadLoader.url = 'res/icon.png';
             }
@@ -21359,7 +21458,6 @@
             this.pressTarget = -1;
         }
         checkGuide() {
-            console.log('zh:111111111111aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafFFFFFFFFFFFFFFFFFF');
             let guide = DataMgr.getSkillGuide();
             if (guide == 0 && xGame.common.gameMode == GameMode.bigMove && xGame.common.guideStep == 1) {
                 xGame.common.guideStep++;
@@ -21638,11 +21736,13 @@
             if (Laya.Browser.onAndroid) {
                 let boo = JSBridgeUtils.instance.getNetworkAvailable();
                 if (!boo) {
+                    console.log('zh:net error ');
                     JSBridgeUtils.instance.showToast2("Network error, reward unavailable");
                     return;
                 }
             }
             if (Laya.Browser.onAndroid) {
+                console.log('zh:android   ad show ');
                 if (JSBridgeUtils.instance.showRewardAd('qjff_AD_for_uipower')) {
                 }
                 else {
@@ -21655,6 +21755,7 @@
             }
         }
         qjff_AD_for_uipower() {
+            console.log('zh:ADD 体力 start');
             DataMgr.setPower(xGame.common.videoPower, true);
             xGame.eventMgr.event(POWER_TIME);
             this.hide();
@@ -22793,12 +22894,23 @@
             this.ui.aiHead.c1.selectedIndex = 1;
             let myData = this.skillSelectData[index];
             this.ui.selfHead.skillImg.url = xGame.common.getGameIconUrl(myData.skillImg);
-            let guide = DataMgr.getSkillGuide();
-            if (guide == 0) {
-                this.ui.selfHead.skillTxt.text = myData.skillName + " Max Level";
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                let guide = DataMgr.getLianXiGuide();
+                if (guide == 0) {
+                    this.ui.selfHead.skillTxt.text = myData.skillName + " Max Level";
+                }
+                else {
+                    this.ui.selfHead.skillTxt.text = myData.skillName + "Lv." + myData.skillLevel;
+                }
             }
             else {
-                this.ui.selfHead.skillTxt.text = myData.skillName + "Lv." + myData.skillLevel;
+                let guide = DataMgr.getSkillGuide();
+                if (guide == 0) {
+                    this.ui.selfHead.skillTxt.text = myData.skillName + " Max Level";
+                }
+                else {
+                    this.ui.selfHead.skillTxt.text = myData.skillName + "Lv." + myData.skillLevel;
+                }
             }
             let aiData = this.skillSelectData[aiInfo.aiType];
             this.ui.aiHead.skillImg.url = xGame.common.getGameIconUrl(aiData.skillImg);
@@ -22911,13 +23023,23 @@
             xGame.soundMgr.playSound(xGame.common.btnClickStr);
             let needCoin = xGame.common.bigMoveNeedCoin;
             xGame.common.passAwardCoin = 2000;
-            let guide = DataMgr.getSkillGuide();
-            console.log('zh:startGame guide=' + guide);
-            xGame.common.temSelfLevel = 0;
-            if (guide == 0) {
-                needCoin = 0;
-                xGame.common.temSelfLevel = 100;
+            let guide = 1;
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                guide = DataMgr.getLianXiGuide();
+                if (guide == 0) {
+                    needCoin = 0;
+                    xGame.common.temSelfLevel = 100;
+                }
+            }
+            else {
+                guide = DataMgr.getSkillGuide();
+                console.log('zh:startGame guide=' + guide);
+                if (guide == 0) {
+                    needCoin = 0;
+                    xGame.common.temSelfLevel = 100;
+                }
             }
+            xGame.common.temSelfLevel = 0;
             if (DataMgr.coinEnough(needCoin)) {
                 DataMgr.setCoin(-needCoin);
                 xGame.common.curPlayerSkillType = this.index;
@@ -25276,7 +25398,13 @@
             let curUse = DataMgr.getCurSecretary();
             this.changeSecretary(curUse);
             this.ui.talkNode.visible = false;
-            let guide = DataMgr.getSkillGuide();
+            let guide = 1;
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                guide = DataMgr.getLianXiGuide();
+            }
+            else {
+                guide = DataMgr.getSkillGuide();
+            }
             if (xGame.common.isNewDay && guide == 1) {
                 xGame.common.isNewDay = false;
                 xGame.soundMgr.playSound("s_main01");
@@ -25472,7 +25600,6 @@
         }
         showGuideForLianxi() {
             let lianXiGuide = DataMgr.getLianXiGuide();
-            console.log('zh: AAAAA练习模式引导判断:lianXiGuide=' + lianXiGuide);
             if (lianXiGuide == 0) {
                 let x = this.ui.placeBallBtn.x;
                 let y = this.ui.placeBallBtn.y;
@@ -25568,27 +25695,50 @@
                     break;
                 case GameMode.bigMove:
                     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;
+                    let tipStr = 'Complete ' + DataMgr.DIY_challengeMode_overLev_jieSuo_rodMethod + ' levels in Challenge Mode to unlock the Rod Method Mode';
+                    if (DataMgr.getGuideDefaultModel() === 1) {
+                        let lianXiGuide = DataMgr.getLianXiGuide();
+                        if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark && lianXiGuide == 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) {
+                                xGame.uiMgr.Show(UIMsg$1, tipStr);
+                                return;
+                            }
+                            else {
+                                console.log('zh:可以玩');
+                                this.beginGame();
+                                if (DataMgr.getNewUser())
+                                    Moyu.sendDataEvent("gameStart0");
+                            }
                         }
                         else {
-                            console.log('zh:可以玩该模式 bigMove');
                             this.beginGame();
                             if (DataMgr.getNewUser())
                                 Moyu.sendDataEvent("gameStart0");
                         }
                     }
                     else {
-                        this.beginGame();
-                        if (DataMgr.getNewUser())
-                            Moyu.sendDataEvent("gameStart0");
+                        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) {
+                                xGame.uiMgr.Show(UIMsg$1, tipStr);
+                                return;
+                            }
+                            else {
+                                console.log('zh:可以玩');
+                                this.beginGame();
+                                if (DataMgr.getNewUser())
+                                    Moyu.sendDataEvent("gameStart0");
+                            }
+                        }
+                        else {
+                            this.beginGame();
+                            if (DataMgr.getNewUser())
+                                Moyu.sendDataEvent("gameStart0");
+                        }
                     }
                     break;
                 default:
@@ -25598,7 +25748,13 @@
         }
         beginGame(isNice = false) {
             console.log('zh:beginGame ');
-            let guide = DataMgr.getSkillGuide();
+            let guide = 1;
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                guide = DataMgr.getLianXiGuide();
+            }
+            else {
+                guide = DataMgr.getSkillGuide();
+            }
             if (guide == 1) {
                 console.log('zh:非新手引导，showInternAd  ');
                 JSBridgeUtils.instance.showInternAd('beginGame');

client/laya/src/d2Obj/AIPlayer.ts

@@ -94,7 +94,13 @@ export default class AIPlayer {
         }, this)
     }
     public init() {
-        this.isGuide = DataMgr.getSkillGuide() < 1 || DataMgr.gameData.gameCount < 1;
+        let ggg = 1;
+        if (DataMgr.getGuideDefaultModel() === 1) {
+            ggg = DataMgr.getLianXiGuide();
+        } else {
+            ggg = DataMgr.getSkillGuide();
+        }
+        this.isGuide = ggg < 1 || DataMgr.gameData.gameCount < 1;
         this.awayTime = xGame.tools.random(5000, 10000);
         this.awayNum = 0;
         this.hideTime = Laya.timer.currTimer;

client/laya/src/d2Obj/D2BallSrc.ts

@@ -356,8 +356,6 @@ export default class D2BallSrc extends Laya.Script {
         xGame.common.clickedBall = true;
         //
         console.log('zh:点击之后=判断引导')
-
-
         if (DataMgr.getGuideDefaultModel() === 1) {
             this.checkGuideForLianXi();
         } else {

client/laya/src/data/DataMgr.ts

@@ -443,13 +443,13 @@ export default class DataMgr {
      * 第一次启动默认引导的玩法 1 = 练习模式  2 = rodmethod模式 （也是之前默认的引导）
      * @returns 
      */
-    public static getGuideDefaultModel(){
+    public static getGuideDefaultModel() {
         return this.userData.guideDefaultGameMode;
     }
 
 
     /**
-     *  大招模式新手引导
+     *  大招模式新手引导    1: 已经引导完毕，无需引导 0: 需要开启引导
      * @returns 1: 关闭 0: 开启
      */
     public static getSkillGuide() {
@@ -459,7 +459,7 @@ export default class DataMgr {
         return this.userData.skillGuide;
     }
     /**
-     * 
+     *    1: 已经引导完毕，无需引导 0: 需要开启引导
      * @param val 1: 关闭 0: 开启
      */
     public static setSkillGuide(val) {
@@ -469,14 +469,18 @@ export default class DataMgr {
 
 
     /**
-    * 
-    * @param val 1: 关闭 0: 开启
+    *  1: 已经引导完毕，无需引导 0: 需要开启引导
+    * @param val  1: 已经引导完毕，无需引导 0: 需要开启引导
     */
     public static setLianXiGuide(val) {
         this.userData.lianXiGuide = val;
         this.saveUserData();
     }
 
+    /**
+     *  1: 已经引导完毕，无需引导 0: 需要开启引导
+     * @returns  1: 已经引导完毕，无需引导 0: 需要开启引导
+     */
     public static getLianXiGuide() {
         // if (!xGame.common.openGuide) {
         //     return 1;
@@ -718,8 +722,12 @@ export default class DataMgr {
     }
     //体力
     public static setPower(val, addUp = true) {
-        if (addUp) this.userData.power += val;
-        else this.userData.power = val;
+        if (addUp) {
+            this.userData.power += val;
+        }
+        else {
+            this.userData.power = val;
+        }
         //
         if (this.userData.power >= xGame.common.maxPower) {
             this.userData.power = xGame.common.maxPower;
@@ -730,6 +738,7 @@ export default class DataMgr {
         this.saveUserData();
 
         this.updateUserInfo2Server("power");
+        console.log('zh:up tili over = ' + this.userData.power);
     }
     public static getPower() {
         return this.userData.power;

client/laya/src/game/GameMgr.ts

@@ -182,7 +182,16 @@ export default class GameMgr {
             this.selfTurn = true;
         }
         if (xGame.common.gameMode == GameMode.placeBall) this.selfTurn = true;
-        if (xGame.common.gameMode == GameMode.bigMove && !DataMgr.getSkillGuide()) {
+
+
+        let ggg = 1;
+        if (DataMgr.getGuideDefaultModel() === 1) {
+            ggg = DataMgr.getLianXiGuide();
+        } else {
+            ggg = DataMgr.getSkillGuide();
+        }
+
+        if (xGame.common.gameMode == GameMode.bigMove && !ggg) {
             this.selfTurn = true;
         }
         xGame.common.gameUI.setTurnAlpha(this.selfTurn);
@@ -282,8 +291,17 @@ export default class GameMgr {
         //
         this.showLongView = false;
         xGame.common.wordsMgr.comboTimes = 1;
-        let guide = DataMgr.getSkillGuide();
-        if (guide) xGame.eventMgr.event(WAIT_SHOOT);
+
+
+        if (DataMgr.getGuideDefaultModel() === 1) {
+            let guide = DataMgr.getLianXiGuide();
+            //if (guide) xGame.eventMgr.event(WAIT_SHOOT);//TODO:ZZZZZ可能需要处理
+        } else {
+            let guide = DataMgr.getSkillGuide();
+            if (guide) xGame.eventMgr.event(WAIT_SHOOT);
+        }
+
+
         //
         xGame.common.upSkillLevel = false;
         xGame.common.gameStartTime = new Date().getTime();
@@ -324,8 +342,8 @@ export default class GameMgr {
             gameUI.n_lxms_yd1.visible = true;
 
             let oneBall = this.getOneBallForPlaceBall();
-            gameUI.n_lxms_yd1.fingerNode.x = oneBall.gameObj.x + 15;
-            gameUI.n_lxms_yd1.fingerNode.y = oneBall.gameObj.y;
+            gameUI.n_lxms_yd1.fingerNode.x = oneBall.gameObj.x + 30;
+            gameUI.n_lxms_yd1.fingerNode.y = oneBall.gameObj.y + 15;
         }
         else {
             gameUI.n_lxms_yd1.visible = false;

client/laya/src/game/SkillMgr.ts

@@ -44,7 +44,15 @@ export default class SkillMgr {
         this.callback = callback;
         this.judgeSkill();
         this.leveNum = DataMgr.getBigSkillByIndex(this.curSkill);
-        let guide = DataMgr.getSkillGuide();
+
+
+        let guide = 1;
+        if (DataMgr.getGuideDefaultModel() === 1) {
+            guide = DataMgr.getLianXiGuide();
+        } else {
+            guide = DataMgr.getSkillGuide();
+        }
+
         if (!xGame.common.gameMgr.selfTurn) {
             //ai的等级
             this.leveNum = xGame.common.gameMgr.aiSkillLevelNum;
@@ -61,6 +69,7 @@ export default class SkillMgr {
         }
         if (guide == 0) {//已经引导过了，下次不需要引导了
             DataMgr.setSkillGuide(1);
+            DataMgr.setLianXiGuide(1);
             if (DataMgr.getNewUser()) {
                 Moyu.sendDataEvent("gameFirstPlay");
                 DataMgr.setNewUser();

client/laya/src/ui/UIGame.ts

@@ -200,7 +200,7 @@ export class UIGame extends UIBase {
             })
 
         } else {
-            ///////checkGuide
+            ///////checkGuide  这里不调用
         }
 
         this.setGlobalFont(this.ui)
@@ -214,13 +214,6 @@ export class UIGame extends UIBase {
      * 练习模式 引导  ，他给人家起名字是什么挑战模式
      */
     yinDaoForLianxi() {
-        ///DEBUG
-        // let g = DataMgr.getSkillGuide();
-        // if (g === 0) {
-        //     console.log('zh:默认的引导还没有完毕');
-        //     return;
-        // }
-
         let lianXiGuide = DataMgr.getLianXiGuide();
         console.log('zh:lianXiGuide=', lianXiGuide);
         if (lianXiGuide === 0) {
@@ -373,7 +366,15 @@ export class UIGame extends UIBase {
         xGame.common.createHead(this.ui.topNode.selfHeadLoader, user.headIcon, 80);
         //对手的头像
         let aiData = xGame.cfgMgr.getRandomUserInfo();
-        if (DataMgr.getSkillGuide() < 1) {
+
+        let guide = 1;
+        if (DataMgr.getGuideDefaultModel() === 1) {
+            guide = DataMgr.getLianXiGuide();
+        } else {
+            guide = DataMgr.getSkillGuide();
+        }
+
+        if (guide < 1) {
             this.ui.topNode.aiNameTxt.text = 'billiards';//万宁台球
             this.ui.topNode.aiHeadLoader.url = 'res/icon.png';
         }
@@ -668,7 +669,7 @@ export class UIGame extends UIBase {
         this.pressTarget = -1;
     }
     checkGuide() {
-        console.log('zh:111111111111aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafFFFFFFFFFFFFFFFFFF')
+
         let guide = DataMgr.getSkillGuide();
         // this.closeAllGuide();
         if (guide == 0 && xGame.common.gameMode == GameMode.bigMove && xGame.common.guideStep == 1) {

client/laya/src/ui/UIMain.ts

@@ -176,7 +176,14 @@ export default class UIMain extends UIBase {
         //
         //this.ui.rankBtn.visible = false;
         this.ui.talkNode.visible = false;
-        let guide = DataMgr.getSkillGuide();
+
+        let guide = 1;
+        if (DataMgr.getGuideDefaultModel() === 1) {
+            guide = DataMgr.getLianXiGuide();
+        } else {
+            guide = DataMgr.getSkillGuide();
+        }
+
         if (xGame.common.isNewDay && guide == 1) {
             xGame.common.isNewDay = false;
             xGame.soundMgr.playSound("s_main01");
@@ -475,14 +482,7 @@ export default class UIMain extends UIBase {
      * 练习模式 引导  ，他给人家起名字是什么挑战模式
      */
     showGuideForLianxi() {
-        //下面的代码是DEBUG
-        // let g = DataMgr.getSkillGuide();
-        // if (g === 0) {
-        //     console.log('zh:默认的引导还没有完毕');
-        //     return;
-        // }
         let lianXiGuide = DataMgr.getLianXiGuide();
-        console.log('zh: AAAAA练习模式引导判断:lianXiGuide=' + lianXiGuide);
         if (lianXiGuide == 0) {
             let x = this.ui.placeBallBtn.x;
             let y = this.ui.placeBallBtn.y;
@@ -605,25 +605,45 @@ export default class UIMain extends UIBase {
                 break;
             case GameMode.bigMove:
                 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;
+                let tipStr = 'Complete ' + DataMgr.DIY_challengeMode_overLev_jieSuo_rodMethod + ' levels in Challenge Mode to unlock the Rod Method Mode';
+                if (DataMgr.getGuideDefaultModel() === 1) {
+                    let lianXiGuide = DataMgr.getLianXiGuide();
+                    //zhdiy - challenge mode作为教学练习关，完成2关解锁classic，
+                    if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark && lianXiGuide == 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) {
+                            xGame.uiMgr.Show(UIMsg, tipStr);
+                            return;
+                        } else {
+                            console.log('zh:可以玩');
+                            this.beginGame();
+                            if (DataMgr.getNewUser()) Moyu.sendDataEvent("gameStart0");
+                        }
                     } else {
-                        console.log('zh:可以玩该模式 bigMove');
                         this.beginGame();
                         if (DataMgr.getNewUser()) Moyu.sendDataEvent("gameStart0");
                     }
 
                 } else {
-                    this.beginGame();
-                    if (DataMgr.getNewUser()) Moyu.sendDataEvent("gameStart0");
+                    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) {
+                            xGame.uiMgr.Show(UIMsg, tipStr);
+                            return;
+                        } else {
+                            console.log('zh:可以玩');
+                            this.beginGame();
+                            if (DataMgr.getNewUser()) Moyu.sendDataEvent("gameStart0");
+                        }
+
+                    } else {
+                        this.beginGame();
+                        if (DataMgr.getNewUser()) Moyu.sendDataEvent("gameStart0");
+                    }
                 }
                 break;
             default:
@@ -638,7 +658,13 @@ export default class UIMain extends UIBase {
         //let time = xGame.common.randomNum(1000, 2000);
         //Moyu.showInsertAd(time, 60000);
 
-        let guide = DataMgr.getSkillGuide();
+        let guide = 1;
+        if (DataMgr.getGuideDefaultModel() === 1) {
+            guide = DataMgr.getLianXiGuide();
+        } else {
+            guide = DataMgr.getSkillGuide();
+        }
+
         if (guide == 1) {//非新手引导，就显示，否则不显示
             console.log('zh:非新手引导，showInternAd  ');
             JSBridgeUtils.instance.showInternAd('beginGame');

client/laya/src/ui/UIMatching.ts

@@ -79,7 +79,7 @@ export default class UIMatching extends UIBase {
             ))
         }));
 
-         this.setGlobalFont(this.ui)
+        this.setGlobalFont(this.ui)
     }
     initSkillData() {
         this.skillSelectData = [];
@@ -171,13 +171,27 @@ export default class UIMatching extends UIBase {
         //玩家
         let myData = this.skillSelectData[index];
         this.ui.selfHead.skillImg.url = xGame.common.getGameIconUrl(myData.skillImg);
-        let guide = DataMgr.getSkillGuide();
-        if (guide == 0) {
-            this.ui.selfHead.skillTxt.text = myData.skillName + " Max Level";//满级
-        }
-        else {
-            this.ui.selfHead.skillTxt.text = myData.skillName + "Lv." + myData.skillLevel;
+
+        if (DataMgr.getGuideDefaultModel() === 1) {
+            let guide = DataMgr.getLianXiGuide();
+            if (guide == 0) {
+                this.ui.selfHead.skillTxt.text = myData.skillName + " Max Level";//满级
+            }
+            else {
+                this.ui.selfHead.skillTxt.text = myData.skillName + "Lv." + myData.skillLevel;
+            }
+        } else {
+            let guide = DataMgr.getSkillGuide();
+            if (guide == 0) {
+                this.ui.selfHead.skillTxt.text = myData.skillName + " Max Level";//满级
+            }
+            else {
+                this.ui.selfHead.skillTxt.text = myData.skillName + "Lv." + myData.skillLevel;
+            }
         }
+
+
+
         //ai
         let aiData = this.skillSelectData[aiInfo.aiType];
         this.ui.aiHead.skillImg.url = xGame.common.getGameIconUrl(aiData.skillImg);

client/laya/src/ui/UIPower.ts

@@ -34,12 +34,14 @@ export default class UIPower extends UIBase {
         if (Laya.Browser.onAndroid) {
             let boo = JSBridgeUtils.instance.getNetworkAvailable();
             if (!boo) {
+                console.log('zh:net error ')
                 JSBridgeUtils.instance.showToast2("Network error, reward unavailable");
                 return;
             }
         }
 
         if (Laya.Browser.onAndroid) {
+            console.log('zh:android   ad show ')
             if (JSBridgeUtils.instance.showRewardAd('qjff_AD_for_uipower')) {
 
             } else {
@@ -58,6 +60,7 @@ export default class UIPower extends UIBase {
     }
 
     public qjff_AD_for_uipower() {
+        console.log('zh:ADD 体力 start')
         DataMgr.setPower(xGame.common.videoPower, true);
         xGame.eventMgr.event(POWER_TIME);
         this.hide();

client/laya/src/ui/item/SkillDisplay.ts

@@ -128,14 +128,24 @@ export default class SkillDisplay {
         xGame.soundMgr.playSound(xGame.common.btnClickStr);
         let needCoin = xGame.common.bigMoveNeedCoin;
         xGame.common.passAwardCoin = 2000;
-        let guide = DataMgr.getSkillGuide();//新手引导
-        console.log('zh:startGame guide=' + guide)
 
-        xGame.common.temSelfLevel = 0;
-        if (guide == 0) {
-            needCoin = 0;
-            xGame.common.temSelfLevel = 100;
+        let guide = 1;
+        if (DataMgr.getGuideDefaultModel() === 1) {
+            guide = DataMgr.getLianXiGuide();
+            if (guide == 0) {
+                needCoin = 0;
+                xGame.common.temSelfLevel = 100;
+            }
+        } else {
+            guide = DataMgr.getSkillGuide();//新手引导
+            console.log('zh:startGame guide=' + guide)
+            if (guide == 0) {
+                needCoin = 0;
+                xGame.common.temSelfLevel = 100;
+            }
         }
+        xGame.common.temSelfLevel = 0;
+
         if (DataMgr.coinEnough(needCoin)) {
             DataMgr.setCoin(-needCoin);
             xGame.common.curPlayerSkillType = this.index;//所选择的技能类型
@@ -149,11 +159,7 @@ export default class SkillDisplay {
                 xGame.common.gameUI.startGame();
                 xGame.uiMgr.Hide(UISkill);
             });
-
-
             this.logEventForRod_start();
-
-
         } else {
             console.log('zh: skilldisplay 2');
             xGame.uiMgr.Show(UIAddProp, 0);

client/laya/src/utils/JSBridgeUtils.ts

@@ -284,13 +284,13 @@ export default class JSBridgeUtils {
 
     public getNetworkAvailable(): boolean {
         if (!Laya.Browser.onAndroid) {
-            return;
+            return true;
         }
         if (!this.initBridge()) {
-            return;
+            return true;
         }
         let boo = this.bridge.call("getNetworkAvailable");
-        console.log("zh:getNetworkAvailable boo=" + boo);
+       // console.log("zh:getNetworkAvailable boo=" + boo);
         return boo;
     }
     showToast2(msg: string): void {