dzduole 1 月之前
父節點
當前提交
dc8ed22059

文件差異過大導致無法顯示
+ 649 - 354
client/laya/bin/js/bundle.js


文件差異過大導致無法顯示
+ 0 - 0
client/laya/bin/js/bundle.js.map


+ 4 - 0
client/laya/src/GameInit.ts

@@ -62,6 +62,7 @@ export function getGameResList() {
 }
 function initCallback() {
     window["DataMgr"] = DataMgr;
+    
     DataMgr.Init();
     Moyu.init(getPlat(), this, () => {
         DataMgr.isNewDay();
@@ -74,10 +75,13 @@ function initCallback() {
     console.log('zh:开始sm init1 end');
     //初始化fgui
     xGame.uiMgr.init();
+    xGame.uiMgr.clearTempData();
     xGame.uiMgr.bindFUI(fguiRes.loading);
     //加载loading界面
     xGame.uiMgr.Show(UILoading)
 }
+
+
 export function loadSubRes(callback) {
     var tab = ["asset", "res", "spine"];
     let subDone = 0;

+ 7 - 0
client/laya/src/fgui/core/UIMgr.ts

@@ -40,6 +40,13 @@ export default class UIMgr {
 		this._stage = s;
 	}
 
+	public clearTempData(): void {
+		console.log('zh:clearTempData start');
+		Laya.LocalStorage.removeItem('temp_qjff_AD_for_uiGameEnd_level');
+		console.log('zh:clearTempData end');
+
+	}
+
 	public init(): void {
 		this.setStage(Laya.stage);
 		fairygui.UIConfig.defaultFont = "微软雅黑";

+ 3 - 9
client/laya/src/ui/UIDraw.ts

@@ -119,12 +119,12 @@ export default class UIDraw extends UIBase {
             this.checkFree();
         }
         else {
-            GlobalManager.instance.registerMethod('qjff_chouJiang', this.qjff_chouJiang);
+            //GlobalManager.instance.registerMethod('qjff_chouJiang', this.qjff_chouJiang);
             if (JSBridgeUtils.instance.showRewardAd('qjff_chouJiang')) {
 
             } else {
                 console.log('zh:AD 失败,直接发放奖励')
-                this.qjff_chouJiang
+                this.qjff_chouJiang();
             }
             // Moyu.sendDataEvent("turntable");
             // Moyu.showVideoAd(() => {
@@ -133,16 +133,10 @@ export default class UIDraw extends UIBase {
         }
     }
 
-    qjff_chouJiang() {
-
+     public qjff_chouJiang() {
         this.beginDraw();
     }
 
-
-
-
-
-
     beginDraw() {
         this.ui.myNode.flashNode.c1.selectedIndex = 0;
         this.ui.drawBtn.touchable = false;

+ 50 - 20
client/laya/src/ui/UIGameEnd.ts

@@ -13,6 +13,9 @@ import UIInvitation from "./UIInvitation";
 import UIMain from "./UIMain";
 import UIPower from "./UIPower";
 import UIMsg from "./UIMsg";
+import GlobalManager from "../utils/GlobalManager";
+import JSBridgeUtils from "../utils/JSBridgeUtils";
+
 export default class UIGameEnd extends UIBase {
     public ui: ui_UIGameEnd;
     public success: boolean = false;
@@ -338,7 +341,7 @@ export default class UIGameEnd extends UIBase {
         if (this.success) {
             //let rand = Math.random() <= 0.5 ? 2 : 3;
             let rand = 0;//只有一个动画
-             xGame.common.secretary.play(data, 0, true, parent);
+            xGame.common.secretary.play(data, 0, true, parent);
         }
         else {
             //失败特效
@@ -410,11 +413,11 @@ export default class UIGameEnd extends UIBase {
             case GameMode.classic:
                 console.log('zh:clickRightBtn 111');
             case GameMode.bigMove:
-                 console.log('zh:clickRightBtn 222');
+                console.log('zh:clickRightBtn 222');
                 this.restartGame();
                 break;
             case GameMode.placeBall:
-                 console.log('zh:clickRightBtn 333');
+                console.log('zh:clickRightBtn 333');
                 //直接进入下一关,若当前关卡没有通关则当前关卡按照1星通关
                 let level = xGame.common.placeBallCurLevel;
                 let data = DataMgr.getPlaceBallLevel(level);
@@ -422,36 +425,60 @@ export default class UIGameEnd extends UIBase {
                 let curPss = data.play && !data.isCur;
                 if (curPss) {
                     console.log('zh:clickRightBtn 333-111');
-                    console.log('zh:当前LV='+level)
+                    console.log('zh:当前LV=' + level)
                     if (level == 60) {
-                       xGame.uiMgr.Show(UIMsg, "Congratulations on passing all levels.")
-                      // this.ui.rightBtn.visible = false;
-                      Laya.timer.once(3000, this, () => {
-                           this.returnHome();
-                      });
-                     
-                    }else{
+                        xGame.uiMgr.Show(UIMsg, "Congratulations on passing all levels.")
+                        // this.ui.rightBtn.visible = false;
+                        Laya.timer.once(3000, this, () => {
+                            this.returnHome();
+                        });
+
+                    } else {
                         this.powerStartPlaceBallLevel(level + 1, this.ui.rightBtn);
-                    }   
+                    }
                 }
                 else {
                     console.log('zh:clickRightBtn 333-000');
+
                     //当前关卡未通关
                     Moyu.sendDataEvent("placeBallNextLevel");
-                    Moyu.showVideoAd(() => {
-                        //一星通关当前关卡,不领取当前关卡奖励
-                        DataMgr.setPlaceBallLevel(level, 1);
-                        //进入下一关
-                        this.startPlaceBallLevel(level + 1);
-                        //
-                    }, xGame.define.EAdType.placeBallNextLevel);
+
+                    console.log('zh:qjff_AD_for_uiGameEnd')
+                    // GlobalManager.instance.registerMethod('xxxxx',this.xxxxx);
+                    // JSBridgeUtils.instance.showRewardAd('xxxxx');
+
+                    //需要传递参数
+                    Laya.LocalStorage.setItem('temp_qjff_AD_for_uiGameEnd_level', level+'');
+                    if (JSBridgeUtils.instance.showRewardAd('qjff_AD_for_uiGameEnd')) {
+
+
+                    } else {
+                        console.log('zh:AD 失败,直接发放奖励')
+                        this.qjff_AD_for_uiGameEnd(level);
+                    }
+                    // Moyu.showVideoAd(() => {
+                    //     //一星通关当前关卡,不领取当前关卡奖励
+                    //     DataMgr.setPlaceBallLevel(level, 1);
+                    //     //进入下一关
+                    //     this.startPlaceBallLevel(level + 1);
+                    //     //
+                    // }, xGame.define.EAdType.placeBallNextLevel);
                 }
                 break;
             default:
-                 console.log('zh:clickRightBtn 444');
+                console.log('zh:clickRightBtn 444');
                 break;
         }
     }
+
+
+    public qjff_AD_for_uiGameEnd(level) {
+        //一星通关当前关卡,不领取当前关卡奖励
+        DataMgr.setPlaceBallLevel(level, 1);
+        //进入下一关
+        this.startPlaceBallLevel(level + 1);
+    }
+
     startPlaceBallLevel(level) {
         xGame.common.gameMode = GameMode.placeBall;
         xGame.common.placeBallCurLevel = level;
@@ -459,5 +486,8 @@ export default class UIGameEnd extends UIBase {
         this.hide();
     }
 
+
+
+
 }
 UIGameEnd.uiName = "UIGameEnd";

+ 31 - 4
client/laya/src/ui/UIGetAward.ts

@@ -4,6 +4,11 @@ import ui_AwardItem from "../fgui/res/game/ui_AwardItem";
 import ui_UIGetAward from "../fgui/res/game/ui_UIGetAward";
 import PlatMgr from "../game/PlatMgr";
 import { xGame } from "../xGame";
+
+import GlobalManager from "../utils/GlobalManager";
+import JSBridgeUtils from "../utils/JSBridgeUtils";
+
+
 export default class UIGetAward extends UIBase {
     public ui: ui_UIGetAward;
     //
@@ -42,7 +47,7 @@ export default class UIGetAward extends UIBase {
     updateSelf(index, obj: ui_AwardItem) {
         let temp: AwardType = this.awardArr[index];
         let icon = this.getIcon(temp.type);
-        let str =icon;
+        let str = icon;
         if (temp.type > 2) {
             str = "s" + icon;
         }
@@ -56,10 +61,32 @@ export default class UIGetAward extends UIBase {
         this.updateSelf(index, obj);
     }
     public tripleGetAward() {
-        Moyu.showVideoAd(() => {
-            this.getAward(3);
-        }, EAdType.triple)
+
+        console.log('zh:qjff_AD_for_uigetAward')
+        // GlobalManager.instance.registerMethod('xxxxx',this.xxxxx);
+        // JSBridgeUtils.instance.showRewardAd('xxxxx');
+        if (JSBridgeUtils.instance.showRewardAd('qjff_AD_for_uigetAward')) {
+
+        } else {
+            console.log('zh:AD 失败,直接发放奖励')
+            this.qjff_AD_for_uigetAward();
+        }
+
+        // Moyu.showVideoAd(() => {
+        //     this.getAward(3);
+        // }, EAdType.triple)
+    }
+
+
+    public qjff_AD_for_uigetAward() {
+        this.getAward(3);
+
     }
+
+
+
+
+
     public normalGetAward() {
         if (PlatMgr.isMisVideo())
             this.tripleGetAward()

+ 85 - 21
client/laya/src/ui/UIMain.ts

@@ -23,6 +23,10 @@ import UIMsg from "./UIMsg";
 import UIModeSelection from "./UIModeSelection";
 import GlobalManager from "../utils/GlobalManager";
 import JSBridgeUtils from "../utils/JSBridgeUtils"; // 根据你的目录结构调整路径
+import SkillDisplay from "./item/SkillDisplay";
+import UITry from "./UITry";
+import UIPower from "./UIPower";
+import UIGetAward from "./UIGetAward";
 
 
 export default class UIMain extends UIBase {
@@ -33,20 +37,79 @@ export default class UIMain extends UIBase {
     public firstEnter = true;
 
     nativeCallJs(msg: string) {
-         let t  =msg;
-         console.log("zh:ts 奖励开始发放-", t);
-         GlobalManager.instance.callMethod(msg)
-        // if (msg === 'Ad1') {
-        //     GlobalManager.instance.callMethod(msg)
-        //     console.log("lichao: Ad1 奖励发送成功");
-        // } else if (msg === 'Ad2') {
-        //     console.log("lichao: Ad2 奖励发送成功");
-        // } else if (msg === 'Ad3') {
-        //     console.log("lichao: Ad3 奖励发送成功");
-        // } else if (msg === 'Ad4') {
-        //     console.log("lichao: Ad4 奖励发送成功");
-        // } else if (msg === 'Ad5') {
-        // } 
+        let t = msg;
+        console.log("zh: nativeCallJs 奖励开始发放:", t);
+        //GlobalManager.instance.callMethod(msg)
+
+        switch (t) {
+            case 'qjff_chouJiang':
+                let dui = <UIDraw>xGame.uiMgr.getUI(UIDraw);
+                dui.qjff_chouJiang();
+                break;
+            case 'qjff_AD_for_uisign':
+                let dui2 = <UISign>xGame.uiMgr.getUI(UISign);
+                dui2.qjff_AD_for_uisign();
+                break;
+            case 'qjff_AD_for_uitry':
+                let dui3 = <UITry>xGame.uiMgr.getUI(UITry);
+                dui3.qjff_AD_for_uitry();
+                break;
+            case 'qjff_AD_for_uipower':
+                let dui4 = <UIPower>xGame.uiMgr.getUI(UIPower);
+                dui4.qjff_AD_for_uipower();
+                break;
+            case 'qjff_AD_for_uigetAward':
+                let dui5 = <UIGetAward>xGame.uiMgr.getUI(UIGetAward);
+                dui5.qjff_AD_for_uigetAward();
+                break;
+            case 'qjff_AD_for_uiGameEnd':
+                let temp_level =  Laya.LocalStorage.getItem('temp_qjff_AD_for_uiGameEnd_level');
+                let dui6 = <UIGameEnd>xGame.uiMgr.getUI(UIGameEnd);
+                dui6.qjff_AD_for_uiGameEnd(parseInt(temp_level))
+                break;
+            case '5':
+                let dui7 = <UISign>xGame.uiMgr.getUI(UISign);
+                dui7.qjff_AD_for_uisign();
+                break;
+
+            case '6':
+                let dui8 = <UISign>xGame.uiMgr.getUI(UISign);
+                dui8.qjff_AD_for_uisign();
+                break;
+            case '7':
+                let dui9 = <UISign>xGame.uiMgr.getUI(UISign);
+                dui9.qjff_AD_for_uisign();
+                break;
+
+            case '5':
+                let dui10 = <UISign>xGame.uiMgr.getUI(UISign);
+                dui10.qjff_AD_for_uisign();
+                break;
+
+            case '5':
+                let dui11 = <UISign>xGame.uiMgr.getUI(UISign);
+                dui11.qjff_AD_for_uisign();
+                break;
+
+            case '5':
+                let dui12 = <UISign>xGame.uiMgr.getUI(UISign);
+                dui12.qjff_AD_for_uisign();
+                break;
+
+            default:
+                console.log('zh:未知的方法名字' + t)
+                break;
+
+        }
+
+
+        // if(t === 'qjff_shengJi_for_SkillDisplay'){
+        //     const dui = new 
+        //     dui.qjff_shengJi();
+        // }
+
+
+
     }
 
 
@@ -54,6 +117,7 @@ export default class UIMain extends UIBase {
         super();
     }
     protected onConstructor(): void {
+        console.log('zh: UIMain onConstructor');
         this.ui = ui_UIMain.createInstance();
         this.contentPane = this.ui;
         this.isEject = false;
@@ -83,7 +147,7 @@ export default class UIMain extends UIBase {
         //万宁台球
         Moyu.setShareInfo("8Ball Fury", ["台球", "万宁", "桌球"], '2300002254');
 
-         window['nativeCallJs'] = this.nativeCallJs.bind(this);
+        window['nativeCallJs'] = this.nativeCallJs.bind(this);
     }
     changeSecretary(curUse) {
         let name = cfgTable.secretaryshopData[curUse + 1].spine;
@@ -268,25 +332,25 @@ export default class UIMain extends UIBase {
     startGlobal() {
         xGame.uiMgr.Show(UIMsg, "Coming Soon")
         //xGame.uiMgr.Show(UITry);
-       JSBridgeUtils.instance.showInternAd('全球');
+        JSBridgeUtils.instance.showInternAd('全球');
     }
     startWeekly() {
         //xGame.uiMgr.Show(UIBox);
         xGame.uiMgr.Show(UIMsg, "Coming Soon")
 
-         //测试AD
-         GlobalManager.instance.registerMethod('zhouSaiMonth',this.zhouSaiMonth);
-         JSBridgeUtils.instance.showRewardAd('zhouSaiMonth');
+        //测试AD
+        GlobalManager.instance.registerMethod('zhouSaiMonth', this.zhouSaiMonth);
+        JSBridgeUtils.instance.showRewardAd('zhouSaiMonth');
     }
 
-    zhouSaiMonth(){
+    zhouSaiMonth() {
         console.log('zh:  zhouSaiMonth 被调用')
     }
     startPlaceBall() {
         xGame.uiMgr.Show(UILevelDisplay);
         //xGame.uiMgr.Show(UIMsg, "敬请期待~")
 
-        
+
     }
     public hide(): void {
         super.hide();

+ 28 - 5
client/laya/src/ui/UIPower.ts

@@ -3,6 +3,11 @@ import { EAdType, POWER_TIME } from "../data/Define";
 import UIBase from "../fgui/core/UIBase";
 import ui_UIPower from "../fgui/res/game/ui_UIpower";
 import { xGame } from "../xGame";
+
+import GlobalManager from "../utils/GlobalManager";
+import JSBridgeUtils from "../utils/JSBridgeUtils";
+
+
 export default class UIPower extends UIBase {
     protected ui: ui_UIPower;
     public constructor() {
@@ -20,11 +25,29 @@ export default class UIPower extends UIBase {
         this.ui.t0.play();
     }
     public videoGetPower() {
-        Moyu.showVideoAd(() => {
-            DataMgr.setPower(xGame.common.videoPower, true);
-            xGame.eventMgr.event(POWER_TIME);
-            this.hide();
-        }, EAdType.getPower)
+        console.log('zh:qjff_AD_for_uipower')
+        // GlobalManager.instance.registerMethod('xxxxx',this.xxxxx);
+        // JSBridgeUtils.instance.showRewardAd('xxxxx');
+        if (JSBridgeUtils.instance.showRewardAd('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);
+        //     this.hide();
+        // }, EAdType.getPower)
     }
+
+    public qjff_AD_for_uipower() {
+        DataMgr.setPower(xGame.common.videoPower, true);
+        xGame.eventMgr.event(POWER_TIME);
+        this.hide();
+    }
+
 }
 UIPower.uiName = "UIPower";

+ 62 - 22
client/laya/src/ui/UISign.ts

@@ -9,6 +9,11 @@ import { xGame } from "../xGame";
 import MoneyNode from "./item/MoneyNode";
 import SignMax from "./item/SignMax";
 import SignNormal from "./item/SignNormal";
+
+import GlobalManager from "../utils/GlobalManager";
+import JSBridgeUtils from "../utils/JSBridgeUtils";
+
+
 export default class UISign extends UIBase {
     public ui: ui_UISign;
     public signArr: Array<SignNormal>;
@@ -91,8 +96,8 @@ export default class UISign 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, 0, true, parent);
+        // xGame.common.secretary.play(data, 1, true, parent);
+        xGame.common.secretary.play(data, 0, true, parent);
     }
     closeSelf() {
         this.hide();
@@ -131,26 +136,61 @@ export default class UISign extends UIBase {
     }
     againGetAward() {
         Moyu.sendDataEvent("signIn2");
-        Moyu.showVideoAd(() => {
-            //
-            //已经领取了奖励的情况
-            let index = this.curDayIndex;
-            if (index == 0) index = 7;
-            let award = cfgTable.signData[index].award;
-            let temp;
-            let type;
-            let num;
-            for (let index = 0; index < award.length; index++) {
-                temp = award[index].split("-");
-                type = parseInt(temp[0]);
-                num = parseInt(temp[1]) * 3;//三倍再次领取所有奖励
-                xGame.common.playObjFlyAnim(num, type);
-            }
-            //
-            DataMgr.setExtraSign(1);
-            this.updateSign();
-            //
-        }, EAdType.againSign)
+
+       // GlobalManager.instance.registerMethod('xxxxx',this.xxxxx);
+       // JSBridgeUtils.instance.showRewardAd('xxxxx');
+        console.log('zh:qjff_AD_for_uisign')
+        if (JSBridgeUtils.instance.showRewardAd('qjff_AD_for_uisign')) {
+        
+        } else {
+            console.log('zh:AD 失败,直接发放奖励')
+            this.qjff_AD_for_uisign();
+        }
+         
+
+        //Moyu.showVideoAd(() => {
+            // //
+            // //已经领取了奖励的情况
+            // let index = this.curDayIndex;
+            // if (index == 0) index = 7;
+            // let award = cfgTable.signData[index].award;
+            // let temp;
+            // let type;
+            // let num;
+            // for (let index = 0; index < award.length; index++) {
+            //     temp = award[index].split("-");
+            //     type = parseInt(temp[0]);
+            //     num = parseInt(temp[1]) * 3;//三倍再次领取所有奖励
+            //     xGame.common.playObjFlyAnim(num, type);
+            // }
+            // //
+            // DataMgr.setExtraSign(1);
+            // this.updateSign();
+            // //
+        //}, EAdType.againSign)
     }
+
+    public qjff_AD_for_uisign() {
+      
+
+        //已经领取了奖励的情况
+        let index = this.curDayIndex;
+        if (index == 0) index = 7;
+        let award = cfgTable.signData[index].award;
+        let temp;
+        let type;
+        let num;
+        for (let index = 0; index < award.length; index++) {
+            temp = award[index].split("-");
+            type = parseInt(temp[0]);
+            num = parseInt(temp[1]) * 3;//三倍再次领取所有奖励
+            xGame.common.playObjFlyAnim(num, type);
+        }
+        //
+        DataMgr.setExtraSign(1);
+        this.updateSign();
+    }
+
+
 }
 UISign.uiName = "UISign";

+ 35 - 10
client/laya/src/ui/UITry.ts

@@ -4,6 +4,8 @@ import UIBase from "../fgui/core/UIBase";
 import ui_UITry from "../fgui/res/game/ui_UITry";
 import PlatMgr from "../game/PlatMgr";
 import { xGame } from "../xGame";
+import GlobalManager from "../utils/GlobalManager";
+import JSBridgeUtils from "../utils/JSBridgeUtils"; 
 
 export default class UITry extends UIBase {
     protected ui: ui_UITry;
@@ -50,17 +52,40 @@ export default class UITry extends UIBase {
         xGame.common.gameMgr.gamePause = false;
     }
     onTry() {
-        //试用
-        Moyu.showVideoAd(() => {
-            let select = xGame.common.curPlayerSkillType
-            DataMgr.gameData.trySkill = select;  //当前试用技能ID
-            DataMgr.gameData.tryTime = Laya.timer.currTimer + 300000;
-            DataMgr.saveGameData();
-            DataMgr.setBigSkill(select, 1);
-            xGame.showTip("Trial Successful");//试用成功
-            this.hide();
-        }, EAdType.try);
+
+          console.log('zh:qjff_AD_for_uitry')
+       // GlobalManager.instance.registerMethod('xxxxx',this.xxxxx);
+       // JSBridgeUtils.instance.showRewardAd('xxxxx');
+        if (JSBridgeUtils.instance.showRewardAd('qjff_AD_for_uitry')) {
+        
+        } else {
+            console.log('zh:AD 失败,直接发放奖励')
+            this.qjff_AD_for_uitry();
+        }
+
+        // //试用
+        // Moyu.showVideoAd(() => {
+        //     let select = xGame.common.curPlayerSkillType
+        //     DataMgr.gameData.trySkill = select;  //当前试用技能ID
+        //     DataMgr.gameData.tryTime = Laya.timer.currTimer + 300000;
+        //     DataMgr.saveGameData();
+        //     DataMgr.setBigSkill(select, 1);
+        //     xGame.showTip("Trial Successful");//试用成功
+        //     this.hide();
+        // }, EAdType.try);
     }
+
+    public qjff_AD_for_uitry() {
+        let select = xGame.common.curPlayerSkillType
+        DataMgr.gameData.trySkill = select;  //当前试用技能ID
+        DataMgr.gameData.tryTime = Laya.timer.currTimer + 300000;
+        DataMgr.saveGameData();
+        DataMgr.setBigSkill(select, 1);
+        xGame.showTip("Trial Successful");//试用成功
+        this.hide();
+    }
+
+
     onCancel() {
         if (this.closeNum > 0) {
             this.closeNum--;

部分文件因文件數量過多而無法顯示