写法优化

assets/script/before/GamePlay.ts

@@ -718,7 +718,7 @@ export default class GamePlay extends cc.Component {
     /**微信授权返回 */
     onWxAuthBack() {
         if (this.node.active) {
-            this.restart(false);
+            this.restart();
             //
             let node_redPacketUI = mk.ui.getCurOnPanel("RedPacketUI")
             if (node_redPacketUI) {

assets/script/before/view/GameOverUI.ts

@@ -36,7 +36,7 @@ export default class GameOverUI extends cc.Component {
 
     /** 点击返回按钮 */
     onClickBackBtn() {
-        GamePlay.Inst.restart(false);//退出不扣体力
+        GamePlay.Inst.restart();//退出不扣体力
         GamePlay.Inst.node.active = false;
         mk.ad.destroyNativeAd();
         mk.ui.closePanel(this.node.name);

assets/script/game/data/AdData.ts

@@ -1,3 +1,5 @@
+import { Data } from "../../mk/data/Data";
+
 /**
  * @description 广告数据
  * @author 邹勇
@@ -33,11 +35,15 @@ export class AdData {
         return this._watchNumToday;
     }
 
-    private datas: any[];
-
+    private adMap: Map<number, Data>;
 
     public init() {
-        this.datas = [, gData.reward, gData.reward, gData.reward, gData.turnable, gData.sign, gData.blessingBag];
+        this.adMap.set(AdFun.bubble, gData.reward)
+        this.adMap.set(AdFun.checkpoint, gData.reward)
+        this.adMap.set(AdFun.settlement, gData.reward)
+        this.adMap.set(AdFun.turntable, gData.turnable)
+        this.adMap.set(AdFun.sign, gData.sign)
+        this.adMap.set(AdFun.bigCash, gData.blessingBag)
     }
 
     /**
@@ -47,12 +53,12 @@ export class AdData {
     public checkAdMax() {
         this.watchNumToday++;
         let max = parseInt(gData.gameData.configs.ServerConfig.VideoTimesMax);
-        if(this.watchNumToday > max){
-            mk.tip.pop("今日看广告获得奖励的次数已用完",1);
+        if (this.watchNumToday > max) {
+            mk.tip.pop("今日看广告获得奖励的次数已用完", 1);
             mk.ui.closeAllUI();
             return true;
         }
-        else{
+        else {
             return false;
         }
     }
@@ -108,11 +114,11 @@ export class AdData {
             return;
         }
 
-        if (this.datas[this.ad_subType]) {
-            this.datas[this.ad_subType].setAdData(response.data);
+        let curData = this.adMap.get(this.ad_subType)
+        if (curData) {
+            curData.setAdData(response.data);
         }
     }
-
 }
 
 /**

assets/script/game/module/login/Login.ts

@@ -88,8 +88,8 @@ export default class Login extends cc.Component {
         console.log('appversion   ', gData.appData.appVersion);
         //获取登录需要的sessionkey
         gData.loginData.init();
-        this.checkRemoveLocalHot();
         await this.checkForceUpate();
+        this.checkRemoveLocalHot();
         mk.audio.init();
     }
 

assets/script/game/module/reward/Reward.ts

@@ -266,7 +266,7 @@ export default class Reward extends cc.Component {
 
     /** 点击返回 */
     public clickBack() {
-        GamePlay.Inst.restart(false);//退出不扣体力
+        GamePlay.Inst.restart();//退出不扣体力
         GamePlay.Inst.node.active = false;
     }