1

client/laya/bin/js/bundle.js

@@ -3155,8 +3155,12 @@
             xGame.common.d2World.getHelpLine();
             xGame.common.clickedBall = true;
             console.log('zh:点击之后=判断引导');
-            this.checkGuide();
-            this.checkGuideForLianXi();
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                this.checkGuideForLianXi();
+            }
+            else {
+                this.checkGuide();
+            }
         }
         checkGuide() {
             let guide = DataMgr.getSkillGuide();
@@ -5194,11 +5198,11 @@
             let lianXiGuide = DataMgr.getLianXiGuide();
             console.log('zh:lianXiGuide=', lianXiGuide);
             if (lianXiGuide === 0) {
-                this.ui.myNode.n_yd_3.visible = true;
+                this.ui.myNode.n_yd_lxms_3.visible = true;
                 console.log('zh:yinDaoForLianxi 333 set ok');
             }
             else {
-                this.ui.myNode.n_yd_3.visible = false;
+                this.ui.myNode.n_yd_lxms_3.visible = false;
                 console.log('zh:无需引导33');
             }
         }
@@ -5412,11 +5416,11 @@
             let lianXiGuide = DataMgr.getLianXiGuide();
             console.log('zh:lianXiGuide=', lianXiGuide);
             if (lianXiGuide === 0) {
-                this.ui.myNode.n_yd.visible = true;
+                this.ui.myNode.n_yd_lxms_2.visible = true;
                 console.log('zh:yinDaoForLianxi 222 set ok');
             }
             else {
-                this.ui.myNode.n_yd.visible = false;
+                this.ui.myNode.n_yd_lxms_2.visible = false;
                 console.log('zh:无需引导');
             }
         }
@@ -6863,8 +6867,11 @@
             Laya.timer.clearAll(this);
             xGame.soundMgr.playSound("s_start");
             xGame.common.showGirlTalkPop(13, this.ui.talkNode, this.ui.talkNode.womanTxt);
-            let guide = DataMgr.getSkillGuide();
-            this.ui.guideNode.visible = guide == 0;
+            let guide = 0;
+            if (DataMgr.getGuideDefaultModel() === 2) {
+                guide = DataMgr.getSkillGuide();
+                this.ui.guideNode.visible = guide == 0;
+            }
             let item = this.getSkillItemByUIIndex(0);
             if (guide == 0) {
                 item.ui.c1.selectedIndex = 1;
@@ -6872,7 +6879,9 @@
             else {
                 item.ui.c1.selectedIndex = 0;
             }
-            this.ui.guideNode.guideBtn.visible = guide == 0;
+            if (DataMgr.getGuideDefaultModel() === 2) {
+                this.ui.guideNode.guideBtn.visible = guide == 0;
+            }
             for (let index = 0; index < this.displayList.length; index++) {
                 this.displayList[index].checkTry();
             }
@@ -7745,6 +7754,7 @@
             DataMgr.setChallengeMode_overLev(1);
             this.setDefaultSignData();
             DataMgr.setBigSkillFormServer('[1, 1, 1, 1, 1]');
+            DataMgr.setCurBallRod(5);
         }
         setDefaultSignData() {
             DataMgr.setSignData(1);
@@ -7860,17 +7870,31 @@
             }
             this.ui.guideBtn.x = this.ui.liucheng2.myMask.x;
             this.ui.guideBtn.y = this.ui.liucheng2.myMask.y;
-            let guide = DataMgr.getSkillGuide();
-            if (guide == 1) {
-                let randTime = xGame.common.randomNum(300, 800);
-                if (this.firstEnter) {
-                    console.log("zh: firstEnter");
+            let isGuideOver = false;
+            let randTime = xGame.common.randomNum(300, 800);
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                let guide = DataMgr.getLianXiGuide();
+                if (guide == 1) {
+                    isGuideOver = true;
+                    this.ui.n_yd_lxms_1.visible = false;
                     this.firstEnter = false;
-                    randTime += 900;
                 }
-                else {
-                    console.log("zh: no firstEnter");
+            }
+            else {
+                let guide = DataMgr.getSkillGuide();
+                if (guide == 1) {
+                    isGuideOver = true;
+                    if (this.firstEnter) {
+                        console.log("zh: firstEnter");
+                        this.firstEnter = false;
+                        randTime += 900;
+                    }
+                    else {
+                        console.log("zh: no firstEnter");
+                    }
                 }
+            }
+            if (isGuideOver) {
                 Laya.timer.once(randTime, this, () => {
                 });
                 Laya.timer.once(1000, this, () => {
@@ -7883,7 +7907,12 @@
         }
         event_gameConfigReadyMark() {
             console.log('zh:事件触发,配置加载OK');
-            this.showGuideForLianxi();
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                this.showGuideForLianxi();
+            }
+            else {
+                this.showGuide();
+            }
         }
         showGuideForLianxi() {
             let lianXiGuide = DataMgr.getLianXiGuide();
@@ -8991,6 +9020,10 @@
             }
         }
         shareGame() {
+            if (2 > 1) {
+                this.hideSelf();
+                return;
+            }
             Moyu.sendDataEvent("VideoShare");
             if (Moyu.canShare() > 100) {
                 Moyu.shareGame((success) => {
@@ -9139,8 +9172,12 @@
                 this.selfTurn = true;
             }
             xGame.common.gameUI.setTurnAlpha(this.selfTurn);
-            this.checkGuide();
-            this.checkGuideForPlaceBall();
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                this.checkGuideForPlaceBall();
+            }
+            else {
+                this.checkGuide();
+            }
             if (xGame.common.uiRodMethod)
                 xGame.common.uiRodMethod.resetRod();
             xGame.common.d2World.getHelpLine();
@@ -9251,15 +9288,14 @@
             console.log('zh:xGame.common.gameMode=' + xGame.common.gameMode);
             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;
             }
             else {
                 gameUI.n_lxms_yd1.visible = false;
                 return;
             }
-            let oneBall = this.getOneBallForPlaceBall();
-            gameUI.n_lxms_yd1.visible = true;
-            gameUI.n_lxms_yd1.fingerNode.x = oneBall.gameObj.x + 30;
-            gameUI.n_lxms_yd1.fingerNode.y = oneBall.gameObj.y;
         }
         getOneBall() {
             let arr = xGame.common.d2World.ballArr;
@@ -11446,15 +11482,16 @@
             this.updateHead();
             let curUse = DataMgr.getCurBallRod();
             this.getGanZiImg();
-            this.yinDaoForLianxi();
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                Laya.timer.once(3000, this, () => {
+                    this.yinDaoForLianxi();
+                });
+            }
+            else {
+            }
             this.setGlobalFont(this.ui);
         }
         yinDaoForLianxi() {
-            let g = DataMgr.getSkillGuide();
-            if (g === 0) {
-                console.log('zh:默认的引导还没有完毕');
-                return;
-            }
             let lianXiGuide = DataMgr.getLianXiGuide();
             console.log('zh:lianXiGuide=', lianXiGuide);
             if (lianXiGuide === 0) {
@@ -11725,8 +11762,12 @@
                     }
                     xGame.common.d2World.d2Gan.rotateSelf(yy, true);
                     let h = ruler1.height;
-                    this.checkGuide();
-                    this.checkGuideForLxms();
+                    if (DataMgr.getGuideDefaultModel() === 1) {
+                        this.checkGuideForLxms();
+                    }
+                    else {
+                        this.checkGuide();
+                    }
                     this.isMoveRod = true;
                     if (ruler1.y >= h) {
                         ruler1.y = -h;
@@ -11780,8 +11821,12 @@
                         xGame.common.d2World.shoot(this.powerNum);
                         xGame.common.d2World.d2Gan.shoot();
                         xGame.common.d2World.d2HelpLine.shoot();
-                        this.finishGuide();
-                        this.finishGuideForLxms();
+                        if (DataMgr.getGuideDefaultModel() === 1) {
+                            this.finishGuideForLxms();
+                        }
+                        else {
+                            this.finishGuide();
+                        }
                         this.ui.powerEft.visible = false;
                         this.ui.colorNode.visible = false;
                         let ganStr = "";
@@ -11832,6 +11877,7 @@
             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++;
@@ -11842,6 +11888,7 @@
         checkGuideForLxms() {
             let guide = DataMgr.getLianXiGuide();
             if (guide == 0 && xGame.common.gameMode == GameMode.placeBall && xGame.common.guideStepForLianXi == 2) {
+                xGame.common.gameUI.ui.n_lxms_yd1.visible = false;
                 xGame.common.gameUI.ui.n_lxms_yd2.visible = false;
                 xGame.common.gameUI.ui.n_lxms_yd3.visible = true;
                 xGame.common.guideStepForLianXi = 3;
@@ -13370,7 +13417,7 @@
             this.guide2 = (this.getChild("guide2"));
             this.yd = (this.getChild("yd"));
             this.yd_zzq_btn = (this.getChild("yd_zzq_btn"));
-            this.n_yd = (this.getChild("n_yd"));
+            this.n_yd_lxms_2 = (this.getChild("n_yd_lxms_2"));
             this.t0 = this.getTransition("t0");
         }
     }
@@ -16872,7 +16919,7 @@
             this.n32 = (this.getChild("n32"));
             this.n33 = (this.getChild("n33"));
             this.n_yd_zzq_btn3 = (this.getChild("n_yd_zzq_btn3"));
-            this.n_yd_3 = (this.getChild("n_yd_3"));
+            this.n_yd_lxms_3 = (this.getChild("n_yd_lxms_3"));
             this.t0 = this.getTransition("t0");
         }
     }
@@ -18662,10 +18709,11 @@
             this.skillSuccessTimes = 0;
             this.skillGuide = 0;
             this.lianXiGuide = 0;
+            this.guideDefaultGameMode = 1;
             this.skillAccTimes = 0;
             this.placeBallData = [];
             this.shareDiamondTimes = 0;
-            this.dailyVideoShareTimes = 0;
+            this.dailyVideoShareTimes = 3;
             this.secretary = [1, 0];
             this.curSecretary = 0;
             this.ballRod = [1, 0, 0, 0, 0, 1];
@@ -19240,6 +19288,9 @@
             this.userData.skillAccTimes += val;
             this.saveUserData();
         }
+        static getGuideDefaultModel() {
+            return this.userData.guideDefaultGameMode;
+        }
         static getSkillGuide() {
             if (!xGame.common.openGuide) {
                 return 1;
@@ -20913,15 +20964,16 @@
             this.updateHead();
             let curUse = DataMgr.getCurBallRod();
             this.getGanZiImg();
-            this.yinDaoForLianxi();
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                Laya.timer.once(3000, this, () => {
+                    this.yinDaoForLianxi();
+                });
+            }
+            else {
+            }
             this.setGlobalFont(this.ui);
         }
         yinDaoForLianxi() {
-            let g = DataMgr.getSkillGuide();
-            if (g === 0) {
-                console.log('zh:默认的引导还没有完毕');
-                return;
-            }
             let lianXiGuide = DataMgr.getLianXiGuide();
             console.log('zh:lianXiGuide=', lianXiGuide);
             if (lianXiGuide === 0) {
@@ -21192,8 +21244,12 @@
                     }
                     xGame.common.d2World.d2Gan.rotateSelf(yy, true);
                     let h = ruler1.height;
-                    this.checkGuide();
-                    this.checkGuideForLxms();
+                    if (DataMgr.getGuideDefaultModel() === 1) {
+                        this.checkGuideForLxms();
+                    }
+                    else {
+                        this.checkGuide();
+                    }
                     this.isMoveRod = true;
                     if (ruler1.y >= h) {
                         ruler1.y = -h;
@@ -21247,8 +21303,12 @@
                         xGame.common.d2World.shoot(this.powerNum);
                         xGame.common.d2World.d2Gan.shoot();
                         xGame.common.d2World.d2HelpLine.shoot();
-                        this.finishGuide();
-                        this.finishGuideForLxms();
+                        if (DataMgr.getGuideDefaultModel() === 1) {
+                            this.finishGuideForLxms();
+                        }
+                        else {
+                            this.finishGuide();
+                        }
                         this.ui.powerEft.visible = false;
                         this.ui.colorNode.visible = false;
                         let ganStr = "";
@@ -21299,6 +21359,7 @@
             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++;
@@ -21309,6 +21370,7 @@
         checkGuideForLxms() {
             let guide = DataMgr.getLianXiGuide();
             if (guide == 0 && xGame.common.gameMode == GameMode.placeBall && xGame.common.guideStepForLianXi == 2) {
+                xGame.common.gameUI.ui.n_lxms_yd1.visible = false;
                 xGame.common.gameUI.ui.n_lxms_yd2.visible = false;
                 xGame.common.gameUI.ui.n_lxms_yd3.visible = true;
                 xGame.common.guideStepForLianXi = 3;
@@ -22349,11 +22411,11 @@
             let lianXiGuide = DataMgr.getLianXiGuide();
             console.log('zh:lianXiGuide=', lianXiGuide);
             if (lianXiGuide === 0) {
-                this.ui.myNode.n_yd_3.visible = true;
+                this.ui.myNode.n_yd_lxms_3.visible = true;
                 console.log('zh:yinDaoForLianxi 333 set ok');
             }
             else {
-                this.ui.myNode.n_yd_3.visible = false;
+                this.ui.myNode.n_yd_lxms_3.visible = false;
                 console.log('zh:无需引导33');
             }
         }
@@ -22567,11 +22629,11 @@
             let lianXiGuide = DataMgr.getLianXiGuide();
             console.log('zh:lianXiGuide=', lianXiGuide);
             if (lianXiGuide === 0) {
-                this.ui.myNode.n_yd.visible = true;
+                this.ui.myNode.n_yd_lxms_2.visible = true;
                 console.log('zh:yinDaoForLianxi 222 set ok');
             }
             else {
-                this.ui.myNode.n_yd.visible = false;
+                this.ui.myNode.n_yd_lxms_2.visible = false;
                 console.log('zh:无需引导');
             }
         }
@@ -22938,8 +23000,11 @@
             Laya.timer.clearAll(this);
             xGame.soundMgr.playSound("s_start");
             xGame.common.showGirlTalkPop(13, this.ui.talkNode, this.ui.talkNode.womanTxt);
-            let guide = DataMgr.getSkillGuide();
-            this.ui.guideNode.visible = guide == 0;
+            let guide = 0;
+            if (DataMgr.getGuideDefaultModel() === 2) {
+                guide = DataMgr.getSkillGuide();
+                this.ui.guideNode.visible = guide == 0;
+            }
             let item = this.getSkillItemByUIIndex(0);
             if (guide == 0) {
                 item.ui.c1.selectedIndex = 1;
@@ -22947,7 +23012,9 @@
             else {
                 item.ui.c1.selectedIndex = 0;
             }
-            this.ui.guideNode.guideBtn.visible = guide == 0;
+            if (DataMgr.getGuideDefaultModel() === 2) {
+                this.ui.guideNode.guideBtn.visible = guide == 0;
+            }
             for (let index = 0; index < this.displayList.length; index++) {
                 this.displayList[index].checkTry();
             }
@@ -25243,6 +25310,7 @@
             DataMgr.setChallengeMode_overLev(1);
             this.setDefaultSignData();
             DataMgr.setBigSkillFormServer('[1, 1, 1, 1, 1]');
+            DataMgr.setCurBallRod(5);
         }
         setDefaultSignData() {
             DataMgr.setSignData(1);
@@ -25358,17 +25426,31 @@
             }
             this.ui.guideBtn.x = this.ui.liucheng2.myMask.x;
             this.ui.guideBtn.y = this.ui.liucheng2.myMask.y;
-            let guide = DataMgr.getSkillGuide();
-            if (guide == 1) {
-                let randTime = xGame.common.randomNum(300, 800);
-                if (this.firstEnter) {
-                    console.log("zh: firstEnter");
+            let isGuideOver = false;
+            let randTime = xGame.common.randomNum(300, 800);
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                let guide = DataMgr.getLianXiGuide();
+                if (guide == 1) {
+                    isGuideOver = true;
+                    this.ui.n_yd_lxms_1.visible = false;
                     this.firstEnter = false;
-                    randTime += 900;
                 }
-                else {
-                    console.log("zh: no firstEnter");
+            }
+            else {
+                let guide = DataMgr.getSkillGuide();
+                if (guide == 1) {
+                    isGuideOver = true;
+                    if (this.firstEnter) {
+                        console.log("zh: firstEnter");
+                        this.firstEnter = false;
+                        randTime += 900;
+                    }
+                    else {
+                        console.log("zh: no firstEnter");
+                    }
                 }
+            }
+            if (isGuideOver) {
                 Laya.timer.once(randTime, this, () => {
                 });
                 Laya.timer.once(1000, this, () => {
@@ -25381,7 +25463,12 @@
         }
         event_gameConfigReadyMark() {
             console.log('zh:事件触发,配置加载OK');
-            this.showGuideForLianxi();
+            if (DataMgr.getGuideDefaultModel() === 1) {
+                this.showGuideForLianxi();
+            }
+            else {
+                this.showGuide();
+            }
         }
         showGuideForLianxi() {
             let lianXiGuide = DataMgr.getLianXiGuide();

client/laya/src/d2Obj/D2BallSrc.ts

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

client/laya/src/data/Data.ts

@@ -37,12 +37,15 @@ export class UserData {
      * 大招模式新手引导
      */
     public skillGuide: number = 0;
-
-
     /**
      * 练习模式新手引导
      */
     public lianXiGuide: number = 0;
+
+    /**
+     * 第一次启动默认引导的玩法 1 = 练习模式  2 = rodmethod模式 （也是之前默认的引导）
+     */
+    public guideDefaultGameMode: number = 1;
     
     public skillAccTimes = 0;//大招模式累计胜利次数
     //摆球达人关卡通关情况
@@ -50,7 +53,7 @@ export class UserData {
     //每日分享钻石次数
     public shareDiamondTimes: number = 0;
     //每日录屏分享次数
-    public dailyVideoShareTimes: number = 0;
+    public dailyVideoShareTimes: number = 3;
     //小秘书
     public secretary: Array<number> = [1, 0];
     //当前选中的秘书

client/laya/src/data/DataMgr.ts

@@ -439,6 +439,14 @@ export default class DataMgr {
         this.saveUserData();
     }
 
+    /**
+     * 第一次启动默认引导的玩法 1 = 练习模式  2 = rodmethod模式 （也是之前默认的引导）
+     * @returns 
+     */
+    public static getGuideDefaultModel(){
+        return this.userData.guideDefaultGameMode;
+    }
+
 
     /**
      *  大招模式新手引导

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

@@ -11,7 +11,7 @@ export default class ui_Component80 extends fgui.GComponent {
 	public guide2:ui_Component_lc2;
 	public yd:ui_Component_shou2;
 	public yd_zzq_btn:fgui.GLoader;
-	public n_yd:fgui.GGroup;
+	public n_yd_lxms_2:fgui.GGroup;
 	public t0:fgui.Transition;
 	public static URL:string = "ui://isxx5ak7avag47b";
 
@@ -26,7 +26,7 @@ export default class ui_Component80 extends fgui.GComponent {
 		this.guide2 = <ui_Component_lc2>(this.getChild("guide2"));
 		this.yd = <ui_Component_shou2>(this.getChild("yd"));
 		this.yd_zzq_btn = <fgui.GLoader>(this.getChild("yd_zzq_btn"));
-		this.n_yd = <fgui.GGroup>(this.getChild("n_yd"));
+		this.n_yd_lxms_2 = <fgui.GGroup>(this.getChild("n_yd_lxms_2"));
 		this.t0 = this.getTransition("t0");
 	}
 }

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

@@ -32,7 +32,7 @@ export default class ui_Component85 extends fgui.GComponent {
 	public n32:ui_Component_lc3;
 	public n33:ui_Component_shou3;
 	public n_yd_zzq_btn3:fgui.GLoader;
-	public n_yd_3:fgui.GGroup;
+	public n_yd_lxms_3:fgui.GGroup;
 	public t0:fgui.Transition;
 	public static URL:string = "ui://isxx5ak7xs1r482";
 
@@ -62,7 +62,7 @@ export default class ui_Component85 extends fgui.GComponent {
 		this.n32 = <ui_Component_lc3>(this.getChild("n32"));
 		this.n33 = <ui_Component_shou3>(this.getChild("n33"));
 		this.n_yd_zzq_btn3 = <fgui.GLoader>(this.getChild("n_yd_zzq_btn3"));
-		this.n_yd_3 = <fgui.GGroup>(this.getChild("n_yd_3"));
+		this.n_yd_lxms_3 = <fgui.GGroup>(this.getChild("n_yd_lxms_3"));
 		this.t0 = this.getTransition("t0");
 	}
 }

client/laya/src/game/GameMgr.ts

@@ -186,8 +186,13 @@ export default class GameMgr {
             this.selfTurn = true;
         }
         xGame.common.gameUI.setTurnAlpha(this.selfTurn);
-        this.checkGuide();
-        this.checkGuideForPlaceBall();
+        if (DataMgr.getGuideDefaultModel() === 1) {
+            this.checkGuideForPlaceBall();
+        } else {
+            this.checkGuide();
+        }
+
+
         //高低杆重置
         if (xGame.common.uiRodMethod) xGame.common.uiRodMethod.resetRod();
         //辅助线
@@ -315,18 +320,19 @@ export default class GameMgr {
         console.log('zh:checkGuideForPlaceBall =', guide);
         console.log('zh:xGame.common.gameMode=' + xGame.common.gameMode)
         if (guide == 0 && xGame.common.gameMode == GameMode.placeBall) {
-            // this.selfTurn = true;//肯定是该直接戳球了
+            // this.selfTurn = true;//肯定是该zj戳球了
             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;
         }
         else {
             gameUI.n_lxms_yd1.visible = false;
             return;
         }
         //////
-        let oneBall = this.getOneBallForPlaceBall();
-        gameUI.n_lxms_yd1.visible = true;
-        gameUI.n_lxms_yd1.fingerNode.x = oneBall.gameObj.x+30;
-        gameUI.n_lxms_yd1.fingerNode.y = oneBall.gameObj.y;
+
     }
 
 

client/laya/src/ui/UIGame.ts

@@ -193,7 +193,16 @@ export class UIGame extends UIBase {
 
         //console.log("持续播放");
         //xGame.soundMgr.playSound("bjyy1", 0);
-        this.yinDaoForLianxi();
+
+        if (DataMgr.getGuideDefaultModel() === 1) {
+            Laya.timer.once(3000, this, () => {
+                this.yinDaoForLianxi();
+            })
+
+        } else {
+            ///////checkGuide
+        }
+
         this.setGlobalFont(this.ui)
     }
 
@@ -205,11 +214,12 @@ export class UIGame extends UIBase {
      * 练习模式 引导  ，他给人家起名字是什么挑战模式
      */
     yinDaoForLianxi() {
-        let g = DataMgr.getSkillGuide();
-        if (g === 0) {
-            console.log('zh:默认的引导还没有完毕');
-            return;
-        }
+        ///DEBUG
+        // let g = DataMgr.getSkillGuide();
+        // if (g === 0) {
+        //     console.log('zh:默认的引导还没有完毕');
+        //     return;
+        // }
 
         let lianXiGuide = DataMgr.getLianXiGuide();
         console.log('zh:lianXiGuide=', lianXiGuide);
@@ -519,8 +529,15 @@ export class UIGame extends UIBase {
                 //
                 let h = ruler1.height;
                 //
-                this.checkGuide();
-                this.checkGuideForLxms();
+
+                if (DataMgr.getGuideDefaultModel() === 1) {
+                    this.checkGuideForLxms();
+                } else {
+                    this.checkGuide();
+                }
+
+
+
                 //
                 this.isMoveRod = true;
                 //
@@ -579,8 +596,16 @@ export class UIGame extends UIBase {
                     xGame.common.d2World.shoot(this.powerNum);
                     xGame.common.d2World.d2Gan.shoot();
                     xGame.common.d2World.d2HelpLine.shoot();
-                    this.finishGuide();
-                    this.finishGuideForLxms();
+
+                    if (DataMgr.getGuideDefaultModel() === 1) {
+                        this.finishGuideForLxms();
+                    } else {
+                        this.finishGuide();
+                    }
+
+
+
+
                     this.ui.powerEft.visible = false;
                     this.ui.colorNode.visible = false;
                     //播放击打白球时候的杆音效
@@ -643,6 +668,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) {
@@ -657,6 +683,7 @@ export class UIGame extends UIBase {
         let guide = DataMgr.getLianXiGuide();
         // this.closeAllGuide();
         if (guide == 0 && xGame.common.gameMode == GameMode.placeBall && xGame.common.guideStepForLianXi == 2) {
+            xGame.common.gameUI.ui.n_lxms_yd1.visible = false;
             xGame.common.gameUI.ui.n_lxms_yd2.visible = false;
             xGame.common.gameUI.ui.n_lxms_yd3.visible = true;
             xGame.common.guideStepForLianXi = 3

client/laya/src/ui/UILevelDisplay.ts

@@ -67,7 +67,7 @@ export default class UILevelDisplay extends UIBase {
         let lianXiGuide = DataMgr.getLianXiGuide();
         console.log('zh:lianXiGuide=', lianXiGuide);
         if (lianXiGuide === 0) {
-            this.ui.myNode.n_yd.visible = true;
+            this.ui.myNode.n_yd_lxms_2.visible = true;
             console.log('zh:yinDaoForLianxi 222 set ok')
             // let x = this.ui.placeBallBtn.x;
             // let y = this.ui.placeBallBtn.y;
@@ -79,7 +79,7 @@ export default class UILevelDisplay extends UIBase {
             // console.log('zh:yinDaoForLianxi set ok')
             //  DataMgr.setLianXiGuide(1)
         } else {
-            this.ui.myNode.n_yd.visible = false;
+            this.ui.myNode.n_yd_lxms_2.visible = false;
             console.log('zh:无需引导')
         }
 

client/laya/src/ui/UILevelProp.ts

@@ -83,7 +83,7 @@ export default class UILevelProp extends UIBase {
         let lianXiGuide = DataMgr.getLianXiGuide();
         console.log('zh:lianXiGuide=', lianXiGuide);
         if (lianXiGuide === 0) {
-            this.ui.myNode.n_yd_3.visible = true;
+            this.ui.myNode.n_yd_lxms_3.visible = true;
             console.log('zh:yinDaoForLianxi 333 set ok')
             // let x = this.ui.myNode.startBtn.x;
             // let y = this.ui.myNode.startBtn.y;
@@ -94,7 +94,7 @@ export default class UILevelProp extends UIBase {
             // this.ui.n_lc3.x = x1;
             // this.ui.n_lc3.y = y1;
         } else {
-            this.ui.myNode.n_yd_3.visible = false;
+            this.ui.myNode.n_yd_lxms_3.visible = false;
             console.log('zh:无需引导33')
         }
 

client/laya/src/ui/UIMain.ts

@@ -227,6 +227,9 @@ export default class UIMain extends UIBase {
         this.setDefaultSignData();
         DataMgr.setBigSkillFormServer('[1, 1, 1, 1, 1]');//初始值
 
+        ///默认使用的当前使用的球杆
+        DataMgr.setCurBallRod(5);
+
 
     }
     /**
@@ -412,42 +415,62 @@ export default class UIMain extends UIBase {
 
         this.ui.guideBtn.x = this.ui.liucheng2.myMask.x;
         this.ui.guideBtn.y = this.ui.liucheng2.myMask.y;
-        //
-        let guide = DataMgr.getSkillGuide();
-        if (guide == 1) {
-            let randTime = xGame.common.randomNum(300, 800);
-            if (this.firstEnter) {
-                console.log("zh: firstEnter");
+        let isGuideOver = false;
+
+        let randTime = xGame.common.randomNum(300, 800);
+        if (DataMgr.getGuideDefaultModel() === 1) {
+            let guide = DataMgr.getLianXiGuide();
+            if (guide == 1) {//已经引导完毕
+                isGuideOver = true;
+                this.ui.n_yd_lxms_1.visible = false;
                 this.firstEnter = false;
-                randTime += 900;
-            } else {
-                console.log("zh: no firstEnter");
+            }
+        } else {
+            let guide = DataMgr.getSkillGuide();
+            if (guide == 1) {
+                isGuideOver = true;
+                if (this.firstEnter) {
+                    console.log("zh: firstEnter");
+                    this.firstEnter = false;
+                    randTime += 900;
+                } else {
+                    console.log("zh: no firstEnter");
 
+                }
             }
+        }
+        if (isGuideOver) {
+
             Laya.timer.once(randTime, this, () => {
                 // xGame.common.autoPopUIView();
             })
 
-            // Laya.timer.once(1000, this, () => {
-            //     console.log('zh: 1秒后  showFuLiSp1')
-            //     this.showFuLiSp1();
-            // })
-
             Laya.timer.once(1000, this, () => {
                 console.log('zh: 1秒后  showFuLiSp7')
                 this.showFuLiSp7();
             })
+
+
             //引导登录
             this.showTipForGuest();
         }
+
+
         this.setGlobalFont(this.ui)
     }
 
     event_gameConfigReadyMark() {
         console.log('zh:事件触发,配置加载OK');
-        this.showGuideForLianxi();
+        if (DataMgr.getGuideDefaultModel() === 1) {
+            this.showGuideForLianxi();
+        } else {
+            this.showGuide();
+        }
+
     }
 
+
+
     /**
      * 练习模式 引导  ，他给人家起名字是什么挑战模式
      */
@@ -469,7 +492,7 @@ export default class UIMain extends UIBase {
             this.ui.n_yd_challenge_1_btn.x = x;
             this.ui.n_yd_challenge_1_btn.y = y;
             console.log('zh:yinDaoForLianxi set ok')
-        
+
         } else {
             this.ui.n_yd_lxms_1.visible = false;
         }

client/laya/src/ui/UISkill.ts

@@ -26,7 +26,7 @@ export default class UISkill extends UIBase {
         console.log('zh:aaaaaa1111111111')
         this.addUIClick(this.ui.closeNode.closeBtn, this.returnUIMain);
         this.ui.skillNode.skillList.itemRenderer = Laya.Handler.create(this, this.updateSkillItem, null, false);
-          console.log('zh:aaaaaa22222222')
+        console.log('zh:aaaaaa22222222')
         //
         this.displayList = [];
         //this.ui.skillNode.skillList.numItems = 4;  OLD
@@ -46,9 +46,13 @@ export default class UISkill extends UIBase {
         Laya.timer.clearAll(this);
         xGame.soundMgr.playSound("s_start");
         xGame.common.showGirlTalkPop(13, this.ui.talkNode, this.ui.talkNode.womanTxt);
-        //
-        let guide = DataMgr.getSkillGuide();
-        this.ui.guideNode.visible = guide == 0;
+
+        let guide = 0;
+        if (DataMgr.getGuideDefaultModel() === 2) {
+            guide = DataMgr.getSkillGuide();
+            this.ui.guideNode.visible = guide == 0;
+        }
+
         let item = this.getSkillItemByUIIndex(0);
         if (guide == 0) {
             item.ui.c1.selectedIndex = 1;
@@ -56,13 +60,16 @@ export default class UISkill extends UIBase {
         else {
             item.ui.c1.selectedIndex = 0;
         }
-        this.ui.guideNode.guideBtn.visible = guide == 0;
+        if (DataMgr.getGuideDefaultModel() === 2) {
+            this.ui.guideNode.guideBtn.visible = guide == 0;
+        }
+
         //
         for (let index = 0; index < this.displayList.length; index++) {
             this.displayList[index].checkTry();
 
         }
-         this.setGlobalFont(this.ui)
+        this.setGlobalFont(this.ui)
     }
     getSkillItemByUIIndex(cur) {
         for (let index = 0; index < this.displayList.length; index++) {
@@ -138,7 +145,7 @@ export default class UISkill extends UIBase {
         let yy = this.ui.secretary.height;
         let scale = xGame.common.getSecretaryScale();
         let data = { x: xx, y: yy, scaleX: scale, scaleY: scale };
-       // xGame.common.secretary.play(data, 1, true, parent);
+        // xGame.common.secretary.play(data, 1, true, parent);
         xGame.common.secretary.play(data, 0, true, parent);
     }
     returnUIMain() {

client/laya/src/ui/UIVideoShare.ts

@@ -87,6 +87,10 @@ export default class UIVideoShare extends UIBase {
         }
     }
     shareGame() {
+        if(2>1){
+             this.hideSelf();
+             return;
+        }
         Moyu.sendDataEvent("VideoShare");
         if (Moyu.canShare() > 100) {
             Moyu.shareGame((success) => {