1

assets/resources/animation/Main.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "f7bacbfe-36b6-4d58-a67c-2bd784f014d1",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/script/before/view/data/HarvestData.ts

@@ -21,6 +21,7 @@ export default class HarvestData extends Data {
     }
 
     setAdData(data) {
+        mk.console.logSingle('HarvestData  addata ', this.adData);
         super.setAdData(data);
         this.init_reward = true;
     }

assets/script/before/view/uiItem/PlantItem.ts

@@ -103,6 +103,11 @@ export default class PlantItem extends cc.Component {
             return;
         }
 
+        if (gData.gameData.isProducting) {
+            mk.tip.pop('点击太快了');
+            return;
+        }
+
         if (this.data.tab == ProductType.nzw) {
             gData.farmSystem.plant(this.data.picture);
             gData.gameData.nextMake = null;

assets/script/game/data/AdData.ts

@@ -62,6 +62,8 @@ export class AdData {
         this.adMap.set(AdFun.sign, gData.sign)
         this.adMap.set(AdFun.bigCash, gData.blessingBag)
         this.adMap.set(AdFun.cashOutAddCash, gData.walletCashOutData);
+        this.adMap.set(AdFun.harvest, gData.harvestData);
+        this.adMap.set(AdFun.farmMap, gData.farmMapData);
     }
 
     /**
@@ -71,8 +73,11 @@ export class AdData {
     public checkAdMax() {
         this.watchNumToday++;
         let max = parseInt(gData.gameData.configs.ServerConfig.VideoTimesMax);
+
+        mk.console.logSingle('checkAdMax  watchNumToday ', this.watchNumToday);
+        mk.console.logSingle('checkAdMax  max ', max);
         if (this.watchNumToday > max) {
-            mk.tip.pop("今日看广告获得奖励的次数已用完", 1);
+            mk.tip.pop("今日看广告获得奖励的次数已用完");
             mk.ui.closeAllUI();
             return true;
         }
@@ -312,8 +317,7 @@ export class AdData {
         mk.ad.showInterAd(1);
     }
 
-    checkShowVideoIcon()
-    {
+    checkShowVideoIcon() {
         if (this.FullCsahAdArr.indexOf(this.ecpmLevel.toString()) == -1) {
             return false;
         }
@@ -405,7 +409,6 @@ export enum AdFun {
     turntable = 4,      //转盘视频
     sign = 5,           //签到视频
     bigCash = 6,        //福袋视频
-    cashOutNoviceWelfare = 7, //钱包提现新手福利视频
     cashOutAddCash = 8, //钱包提现加现金视频
     harvest = 9,        //收获超级加倍视频
     farmMap = 10,       //图鉴领取视频

assets/script/game/data/module/MoreGameData.ts

@@ -223,7 +223,7 @@ export class MoreGameData extends Data {
 
         mk.console.logSingle('popNodeGetRedBag  ', response);
         if (response.data.redMoneyAddition != 0) {
-            let rewardData = [{ rewardType: 1, rewardNum: response.data.redMoneyAddition }]
+            let rewardData = [{ rewardType: 1, rewardNum: response.data.redMoneyAddition }];
             gData.reward.data = rewardData;
             mk.ui.openPanel('module/reward/reward');
         }

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

@@ -46,6 +46,7 @@ export default class Login extends cc.Component {
             mk.aliRiskManager.init();
         }
 
+        mk.loader.preload('game/coregame/coregame', cc.Prefab);
         this.init();
     }
 
@@ -224,7 +225,6 @@ export default class Login extends cc.Component {
         gData.appData.init();
         //本地读取配置
         await gData.configData.loadConfig();
-        mk.loader.preload('game/coregame/coregame', cc.Prefab);
 
         gData.adData.init();
         mk.console.log("[FC] gData.appData.appId", gData.appData.appId);