1

client/laya/bin/js/bundle.js

@@ -5119,10 +5119,15 @@
                     return;
                 }
             }
-            if (JSBridgeUtils.instance.showRewardAd('qjff_AD_for_uipower')) {
+            if (Laya.Browser.onAndroid) {
+                if (JSBridgeUtils.instance.showRewardAd('qjff_AD_for_uipower')) {
+                }
+                else {
+                    console.log('zh:AD 失败，直接发放奖励');
+                    this.qjff_AD_for_uipower();
+                }
             }
             else {
-                console.log('zh:AD 失败，直接发放奖励');
                 this.qjff_AD_for_uipower();
             }
         }
@@ -5326,6 +5331,7 @@
             }
         }
         clickSelf() {
+            console.log("zh:lev clickSelf");
             if (!this.data.play)
                 return;
             xGame.soundMgr.playSound(xGame.common.btnClickStr);
@@ -5343,6 +5349,7 @@
             this.isEject = false;
             this.myList = this.ui.myNode.myList;
             this.addUIClick(this.ui.closeNode.closeBtn, this.hide);
+            this.addUIClick(this.ui.myNode.yd_zzq_btn, this.showLevelTipWindows);
             this.levelItemArr = [];
             let levelNum = xGame.cfgMgr.getMaxPlaceBall();
             this.myList.itemRenderer = Laya.Handler.create(this, this.levelItemRender, null, false);
@@ -5356,8 +5363,25 @@
             super.show();
             this.updateLevel();
             this.scrollToPlace();
+            this.yinDaoForLianxi();
             this.setGlobalFont(this.ui);
         }
+        yinDaoForLianxi() {
+            let lianXiGuide = DataMgr.getLianXiGuide();
+            console.log('zh:lianXiGuide=', lianXiGuide);
+            if (lianXiGuide === 0) {
+                this.ui.myNode.n_yd.visible = true;
+                console.log('zh:yinDaoForLianxi 222 set ok');
+            }
+            else {
+                console.log('zh:无需引导');
+            }
+            DataMgr.setLianXiGuide(1);
+        }
+        showLevelTipWindows() {
+            xGame.soundMgr.playSound(xGame.common.btnClickStr);
+            xGame.uiMgr.Show(UILevelProp, 1);
+        }
         updateLevel() {
             let temp;
             for (let index = 0; index < this.levelItemArr.length; index++) {
@@ -7814,16 +7838,28 @@
                 this.showTipForGuest();
             }
             this.setGlobalFont(this.ui);
+            this.yinDaoForLianxi();
         }
         yinDaoForLianxi() {
-            let x = this.ui.placeBallBtn.x;
-            let y = this.ui.placeBallBtn.y;
-            this.ui.n_yd_challenge_1.visible = true;
-            this.ui.n_yd_challenge_1_hand.x = x + 150;
-            this.ui.n_yd_challenge_1_hand.y = y;
-            this.ui.n_yd_challenge_1_btn.x = x;
-            this.ui.n_yd_challenge_1_btn.y = y;
-            console.log('zh:yinDaoForLianxi set ok');
+            let g = DataMgr.getSkillGuide();
+            if (g === 0) {
+                console.log('zh:默认的引导还没有完毕');
+                return;
+            }
+            let lianXiGuide = DataMgr.getLianXiGuide();
+            if (lianXiGuide == 0) {
+                let x = this.ui.placeBallBtn.x;
+                let y = this.ui.placeBallBtn.y;
+                this.ui.n_yd_challenge_1.visible = true;
+                this.ui.n_yd_challenge_1_hand.x = x + 150;
+                this.ui.n_yd_challenge_1_hand.y = y;
+                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_challenge_1.visible = false;
+            }
         }
         showTipForGuest() {
             let userInfo = LocalStorageManager.getItem(keyForLoginInfo);
@@ -13221,6 +13257,10 @@
             this.n0 = (this.getChild("n0"));
             this.n1 = (this.getChild("n1"));
             this.myList = (this.getChild("myList"));
+            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.t0 = this.getTransition("t0");
         }
     }
@@ -14016,6 +14056,31 @@
     }
     ui_Component59.URL = "ui://isxx5ak7gg0z446";
 
+    class ui_Component_lc2 extends fgui.GComponent {
+        static createInstance() {
+            return (fgui.UIPackage.createObject("game", "Component_lc2"));
+        }
+        onConstruct() {
+            this.n0 = (this.getChild("n0"));
+            this.n1_bai = (this.getChild("n1_bai"));
+        }
+    }
+    ui_Component_lc2.URL = "ui://isxx5ak7ggd1v5ay";
+
+    class ui_Component_shou2 extends fgui.GComponent {
+        static createInstance() {
+            return (fgui.UIPackage.createObject("game", "Component_shou2"));
+        }
+        onConstruct() {
+            this.n57 = (this.getChild("n57"));
+            this.n54 = (this.getChild("n54"));
+            this.n55 = (this.getChild("n55"));
+            this.n56 = (this.getChild("n56"));
+            this.t1 = this.getTransition("t1");
+        }
+    }
+    ui_Component_shou2.URL = "ui://isxx5ak7ggd1v5b0";
+
     class ui_RulerNode extends fgui.GComponent {
         static createInstance() {
             return (fgui.UIPackage.createObject("game", "RulerNode"));
@@ -16775,6 +16840,8 @@
             fgui.UIObjectFactory.setExtension(ui_Component53.URL, ui_Component53);
             fgui.UIObjectFactory.setExtension(ui_Component58.URL, ui_Component58);
             fgui.UIObjectFactory.setExtension(ui_Component59.URL, ui_Component59);
+            fgui.UIObjectFactory.setExtension(ui_Component_lc2.URL, ui_Component_lc2);
+            fgui.UIObjectFactory.setExtension(ui_Component_shou2.URL, ui_Component_shou2);
             fgui.UIObjectFactory.setExtension(ui_RulerNode.URL, ui_RulerNode);
             fgui.UIObjectFactory.setExtension(ui_Component108.URL, ui_Component108);
             fgui.UIObjectFactory.setExtension(ui_Component63.URL, ui_Component63);
@@ -18403,6 +18470,7 @@
             this.diamond = 0;
             this.skillSuccessTimes = 0;
             this.skillGuide = 0;
+            this.lianXiGuide = 0;
             this.skillAccTimes = 0;
             this.placeBallData = [];
             this.shareDiamondTimes = 0;
@@ -18991,6 +19059,13 @@
             this.userData.skillGuide = val;
             this.saveUserData();
         }
+        static setLianXiGuide(val) {
+            this.userData.lianXiGuide = val;
+            this.saveUserData();
+        }
+        static getLianXiGuide() {
+            return this.userData.lianXiGuide;
+        }
         static getPlaceBallLevelList() {
             return this.userData.placeBallData;
         }
@@ -21270,10 +21345,15 @@
                     return;
                 }
             }
-            if (JSBridgeUtils.instance.showRewardAd('qjff_AD_for_uipower')) {
+            if (Laya.Browser.onAndroid) {
+                if (JSBridgeUtils.instance.showRewardAd('qjff_AD_for_uipower')) {
+                }
+                else {
+                    console.log('zh:AD 失败，直接发放奖励');
+                    this.qjff_AD_for_uipower();
+                }
             }
             else {
-                console.log('zh:AD 失败，直接发放奖励');
                 this.qjff_AD_for_uipower();
             }
         }
@@ -22192,6 +22272,7 @@
             }
         }
         clickSelf() {
+            console.log("zh:lev clickSelf");
             if (!this.data.play)
                 return;
             xGame.soundMgr.playSound(xGame.common.btnClickStr);
@@ -22209,6 +22290,7 @@
             this.isEject = false;
             this.myList = this.ui.myNode.myList;
             this.addUIClick(this.ui.closeNode.closeBtn, this.hide);
+            this.addUIClick(this.ui.myNode.yd_zzq_btn, this.showLevelTipWindows);
             this.levelItemArr = [];
             let levelNum = xGame.cfgMgr.getMaxPlaceBall();
             this.myList.itemRenderer = Laya.Handler.create(this, this.levelItemRender, null, false);
@@ -22222,8 +22304,25 @@
             super.show();
             this.updateLevel();
             this.scrollToPlace();
+            this.yinDaoForLianxi();
             this.setGlobalFont(this.ui);
         }
+        yinDaoForLianxi() {
+            let lianXiGuide = DataMgr.getLianXiGuide();
+            console.log('zh:lianXiGuide=', lianXiGuide);
+            if (lianXiGuide === 0) {
+                this.ui.myNode.n_yd.visible = true;
+                console.log('zh:yinDaoForLianxi 222 set ok');
+            }
+            else {
+                console.log('zh:无需引导');
+            }
+            DataMgr.setLianXiGuide(1);
+        }
+        showLevelTipWindows() {
+            xGame.soundMgr.playSound(xGame.common.btnClickStr);
+            xGame.uiMgr.Show(UILevelProp$1, 1);
+        }
         updateLevel() {
             let temp;
             for (let index = 0; index < this.levelItemArr.length; index++) {
@@ -25023,16 +25122,28 @@
                 this.showTipForGuest();
             }
             this.setGlobalFont(this.ui);
+            this.yinDaoForLianxi();
         }
         yinDaoForLianxi() {
-            let x = this.ui.placeBallBtn.x;
-            let y = this.ui.placeBallBtn.y;
-            this.ui.n_yd_challenge_1.visible = true;
-            this.ui.n_yd_challenge_1_hand.x = x + 150;
-            this.ui.n_yd_challenge_1_hand.y = y;
-            this.ui.n_yd_challenge_1_btn.x = x;
-            this.ui.n_yd_challenge_1_btn.y = y;
-            console.log('zh:yinDaoForLianxi set ok');
+            let g = DataMgr.getSkillGuide();
+            if (g === 0) {
+                console.log('zh:默认的引导还没有完毕');
+                return;
+            }
+            let lianXiGuide = DataMgr.getLianXiGuide();
+            if (lianXiGuide == 0) {
+                let x = this.ui.placeBallBtn.x;
+                let y = this.ui.placeBallBtn.y;
+                this.ui.n_yd_challenge_1.visible = true;
+                this.ui.n_yd_challenge_1_hand.x = x + 150;
+                this.ui.n_yd_challenge_1_hand.y = y;
+                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_challenge_1.visible = false;
+            }
         }
         showTipForGuest() {
             let userInfo = LocalStorageManager.getItem(keyForLoginInfo);

client/laya/src/data/Data.ts

@@ -37,6 +37,13 @@ export class UserData {
      * 大招模式新手引导
      */
     public skillGuide: number = 0;
+
+
+    /**
+     * 练习模式新手引导
+     */
+    public lianXiGuide: number = 0;
+    
     public skillAccTimes = 0;//大招模式累计胜利次数
     //摆球达人关卡通关情况
     public placeBallData: Array<any> = [];

client/laya/src/data/DataMgr.ts

@@ -318,8 +318,8 @@ export default class DataMgr {
     }
 
     public static setBigSkillFormServer(jsonStr: string) {
-        console.log("zh:大技能 setBigSkillFormServer  ="+jsonStr);
-        this.userData.bigSkills =JSON.parse(jsonStr);
+        console.log("zh:大技能 setBigSkillFormServer  =" + jsonStr);
+        this.userData.bigSkills = JSON.parse(jsonStr);
         this.saveUserData();
 
     }
@@ -438,7 +438,7 @@ export default class DataMgr {
         this.userData.skillAccTimes += val;
         this.saveUserData();
     }
-    
+
 
     /**
      *  大招模式新手引导
@@ -458,6 +458,27 @@ export default class DataMgr {
         this.userData.skillGuide = val;
         this.saveUserData();
     }
+
+
+    /**
+    * 
+    * @param val 1: 关闭 0: 开启
+    */
+    public static setLianXiGuide(val) {
+        this.userData.lianXiGuide = val;
+        this.saveUserData();
+    }
+
+    public static getLianXiGuide() {
+        // if (!xGame.common.openGuide) {
+        //     return 1;
+        // }
+        return this.userData.lianXiGuide;
+    }
+
+
+
+
     //
     public static getPlaceBallLevelList() {
         return this.userData.placeBallData;

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

@@ -65,6 +65,8 @@ import ui_Component101 from "./ui_Component101";
 import ui_Component53 from "./ui_Component53";
 import ui_Component58 from "./ui_Component58";
 import ui_Component59 from "./ui_Component59";
+import ui_Component_lc2 from "./ui_Component_lc2";
+import ui_Component_shou2 from "./ui_Component_shou2";
 import ui_RulerNode from "./ui_RulerNode";
 import ui_Component108 from "./ui_Component108";
 import ui_Component63 from "./ui_Component63";
@@ -345,6 +347,8 @@ export default class gameBinder {
 		fgui.UIObjectFactory.setExtension(ui_Component53.URL, ui_Component53);
 		fgui.UIObjectFactory.setExtension(ui_Component58.URL, ui_Component58);
 		fgui.UIObjectFactory.setExtension(ui_Component59.URL, ui_Component59);
+		fgui.UIObjectFactory.setExtension(ui_Component_lc2.URL, ui_Component_lc2);
+		fgui.UIObjectFactory.setExtension(ui_Component_shou2.URL, ui_Component_shou2);
 		fgui.UIObjectFactory.setExtension(ui_RulerNode.URL, ui_RulerNode);
 		fgui.UIObjectFactory.setExtension(ui_Component108.URL, ui_Component108);
 		fgui.UIObjectFactory.setExtension(ui_Component63.URL, ui_Component63);

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

@@ -1,10 +1,17 @@
 /** This is an automatically generated class by FairyGUI. Please do not modify it. **/
 
+import ui_Component_lc2 from "./ui_Component_lc2";
+import ui_Component_shou2 from "./ui_Component_shou2";
+
 export default class ui_Component80 extends fgui.GComponent {
 
 	public n0:fgui.GImage;
 	public n1:fgui.GTextField;
 	public myList:fgui.GList;
+	public guide2:ui_Component_lc2;
+	public yd:ui_Component_shou2;
+	public yd_zzq_btn:fgui.GLoader;
+	public n_yd:fgui.GGroup;
 	public t0:fgui.Transition;
 	public static URL:string = "ui://isxx5ak7avag47b";
 
@@ -16,6 +23,10 @@ export default class ui_Component80 extends fgui.GComponent {
 		this.n0 = <fgui.GImage>(this.getChild("n0"));
 		this.n1 = <fgui.GTextField>(this.getChild("n1"));
 		this.myList = <fgui.GList>(this.getChild("myList"));
+		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.t0 = this.getTransition("t0");
 	}
 }

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

@@ -0,0 +1,17 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+export default class ui_Component_lc2 extends fgui.GComponent {
+
+	public n0:fgui.GGraph;
+	public n1_bai:fgui.GImage;
+	public static URL:string = "ui://isxx5ak7ggd1v5ay";
+
+	public static createInstance():ui_Component_lc2 {
+		return <ui_Component_lc2>(fgui.UIPackage.createObject("game", "Component_lc2"));
+	}
+
+	protected onConstruct():void {
+		this.n0 = <fgui.GGraph>(this.getChild("n0"));
+		this.n1_bai = <fgui.GImage>(this.getChild("n1_bai"));
+	}
+}

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

@@ -0,0 +1,23 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+export default class ui_Component_shou2 extends fgui.GComponent {
+
+	public n57:fgui.GImage;
+	public n54:fgui.GImage;
+	public n55:fgui.GImage;
+	public n56:fgui.GImage;
+	public t1:fgui.Transition;
+	public static URL:string = "ui://isxx5ak7ggd1v5b0";
+
+	public static createInstance():ui_Component_shou2 {
+		return <ui_Component_shou2>(fgui.UIPackage.createObject("game", "Component_shou2"));
+	}
+
+	protected onConstruct():void {
+		this.n57 = <fgui.GImage>(this.getChild("n57"));
+		this.n54 = <fgui.GImage>(this.getChild("n54"));
+		this.n55 = <fgui.GImage>(this.getChild("n55"));
+		this.n56 = <fgui.GImage>(this.getChild("n56"));
+		this.t1 = this.getTransition("t1");
+	}
+}

client/laya/src/ui/UILevelDisplay.ts

@@ -4,6 +4,9 @@ import ui_PutBallLevelDisplay from "../fgui/res/game/ui_PutBallLevelDisplay";
 import ui_UILevelDisplay from "../fgui/res/game/ui_UILevelDisplay";
 import { xGame } from "../xGame";
 import PutBallLevelDisplay from "./item/PutBallLevelDisplay";
+
+import UILevelProp from "./UILevelProp";
+
 /**
  * 摆球达人界面，选择关卡界面
  */
@@ -23,6 +26,7 @@ export default class UILevelDisplay extends UIBase {
         this.myList = this.ui.myNode.myList;
         //
         this.addUIClick(this.ui.closeNode.closeBtn, this.hide);
+        this.addUIClick(this.ui.myNode.yd_zzq_btn, this.showLevelTipWindows);
         //
         this.levelItemArr = [];
         let levelNum = xGame.cfgMgr.getMaxPlaceBall();
@@ -49,8 +53,45 @@ export default class UILevelDisplay extends UIBase {
         super.show();
         this.updateLevel();
         this.scrollToPlace();
+
+        this.yinDaoForLianxi();
         this.setGlobalFont(this.ui)
     }
+
+
+
+    /**
+     * 练习模式 引导  ，他给人家起名字是什么挑战模式
+     */
+    yinDaoForLianxi() {
+        let lianXiGuide = DataMgr.getLianXiGuide();
+        console.log('zh:lianXiGuide=', lianXiGuide);
+        if (lianXiGuide === 0) {
+            this.ui.myNode.n_yd.visible = true;
+            console.log('zh:yinDaoForLianxi 222 set ok')
+            // let x = this.ui.placeBallBtn.x;
+            // let y = this.ui.placeBallBtn.y;
+            // this.ui.n_yd_challenge_1.visible = true;
+            // this.ui.n_yd_challenge_1_hand.x = x + 150;
+            // this.ui.n_yd_challenge_1_hand.y = y;
+            // this.ui.n_yd_challenge_1_btn.x = x;
+            // this.ui.n_yd_challenge_1_btn.y = y;
+            // console.log('zh:yinDaoForLianxi set ok')
+            //  DataMgr.setLianXiGuide(1)
+        } else {
+            console.log('zh:无需引导')
+        }
+        DataMgr.setLianXiGuide(1);
+    }
+
+    showLevelTipWindows() {
+        xGame.soundMgr.playSound(xGame.common.btnClickStr);
+        xGame.uiMgr.Show(UILevelProp, 1);
+    }
+
+
+
+
     updateLevel() {
         let temp: PutBallLevelDisplay;
         for (let index = 0; index < this.levelItemArr.length; index++) {

client/laya/src/ui/UIMain.ts

@@ -407,7 +407,7 @@ export default class UIMain extends UIBase {
         // }, 2000);
 
 
-    
+
         this.showGuide();
         this.ui.guideBtn.x = this.ui.liucheng2.myMask.x;
         this.ui.guideBtn.y = this.ui.liucheng2.myMask.y;
@@ -445,7 +445,10 @@ export default class UIMain extends UIBase {
         this.setGlobalFont(this.ui)
 
 
-       // this.yinDaoForLianxi();
+
+
+        this.yinDaoForLianxi();
+
     }
 
 
@@ -453,16 +456,28 @@ export default class UIMain extends UIBase {
      * 练习模式 引导  ，他给人家起名字是什么挑战模式
      */
     yinDaoForLianxi() {
-        let x = this.ui.placeBallBtn.x;
-        let y = this.ui.placeBallBtn.y;
-
-        this.ui.n_yd_challenge_1.visible = true;
+        let g = DataMgr.getSkillGuide();
+        if (g === 0) {
+            console.log('zh:默认的引导还没有完毕');
+            return;
+        }
+        let lianXiGuide = DataMgr.getLianXiGuide();
+        if (lianXiGuide == 0) {
+            let x = this.ui.placeBallBtn.x;
+            let y = this.ui.placeBallBtn.y;
+            this.ui.n_yd_challenge_1.visible = true;
+            this.ui.n_yd_challenge_1_hand.x = x + 150;
+            this.ui.n_yd_challenge_1_hand.y = y;
+            this.ui.n_yd_challenge_1_btn.x = x;
+            this.ui.n_yd_challenge_1_btn.y = y;
+            console.log('zh:yinDaoForLianxi set ok')
+            //  DataMgr.setLianXiGuide(1)
+        } else {
+            //debug后期删除
+            // DataMgr.setLianXiGuide(0)
+            this.ui.n_yd_challenge_1.visible = false;
+        }
 
-        this.ui.n_yd_challenge_1_hand.x = x + 150;
-        this.ui.n_yd_challenge_1_hand.y = y;
-        this.ui.n_yd_challenge_1_btn.x = x;
-        this.ui.n_yd_challenge_1_btn.y = y;
-        console.log('zh:yinDaoForLianxi set ok')
 
     }
 

client/laya/src/ui/UIPower.ts

@@ -23,7 +23,7 @@ export default class UIPower extends UIBase {
     public show(): void {
         super.show();
         this.ui.t0.play();
-        
+
         this.setGlobalFont(this.ui)
     }
     public videoGetPower() {
@@ -39,14 +39,17 @@ export default class UIPower extends UIBase {
             }
         }
 
-        if (JSBridgeUtils.instance.showRewardAd('qjff_AD_for_uipower')) {
+        if (Laya.Browser.onAndroid) {
+            if (JSBridgeUtils.instance.showRewardAd('qjff_AD_for_uipower')) {
 
+            } else {
+                console.log('zh:AD 失败，直接发放奖励')
+                this.qjff_AD_for_uipower();
+            }
         } else {
-            console.log('zh:AD 失败，直接发放奖励')
             this.qjff_AD_for_uipower();
         }
 
-
         // Moyu.showVideoAd(() => {
         //     DataMgr.setPower(xGame.common.videoPower, true);
         //     xGame.eventMgr.event(POWER_TIME);

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

@@ -54,6 +54,7 @@ export default class PutBallLevelDisplay {
         }
     }
     clickSelf() {
+        console.log("zh:lev clickSelf");
         if (!this.data.play) return;
         xGame.soundMgr.playSound(xGame.common.btnClickStr);
         xGame.uiMgr.Show(UILevelProp, this.index + 1);

client/laya/src/utils/Common.ts

@@ -56,6 +56,11 @@ export default class Common {
      * 打开指导
      */
     openGuide: boolean = true;
+
+
+
+
+
     //
     screenImg: Laya.Texture;
     //高低杆偏移值