1

assets/resources/game/prefab/game.prefab

@@ -4899,7 +4899,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "bdRRjypfVENLcAxEA46lWI",
+    "fileId": "02QEu2Ax9AvKF9huIHDDYV",
     "sync": false
   },
   {
@@ -5132,7 +5132,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "3exfNiHfNJtKhOJL/6+5C1",
+    "fileId": "52FEyxuxJPg6VeXdH0Kefl",
     "sync": false
   },
   {
@@ -5262,7 +5262,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "3eGc2UI0pKZIJW0Ok24SXr",
+    "fileId": "11+qK8jEdNIrpyKR0IfHy6",
     "sync": false
   },
   {
@@ -9102,7 +9102,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 180,
+      "width": 160,
       "height": 41
     },
     "_anchorPoint": {
@@ -9181,7 +9181,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -3,
+        0,
         0,
         0,
         0,
@@ -9307,7 +9307,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -29,
+        -26,
         0,
         0,
         0,

assets/resources/game/texture/main/iocn5_1.png.meta

@@ -28,8 +28,8 @@
       "rawHeight": 41,
       "borderTop": 0,
       "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
+      "borderLeft": 27,
+      "borderRight": 22,
       "subMetas": {}
     }
   }

assets/resources/module/speedUpUI/speedUp.prefab

@@ -218,7 +218,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        212.257,
+        117.089,
         0,
         0,
         0,

assets/script/before/main/FactoryIcon.ts

@@ -143,6 +143,10 @@ export class FactoryIcon extends cc.Component {
         }
     }
 
+    clickSpeedUp() {
+        mk.ui.openPanel('module/speedUpUI/speedUp');
+    }
+
     onRipe() {
         this._state = FactroyState.Ripe;
         this.data.state = FactroyState.Ripe;

assets/script/before/main/FarmIcon.ts

@@ -166,6 +166,9 @@ export class FarmIcon extends cc.Component {
             this.plantIcon.getComponent(cc.Animation).play();
             this.plantIcon.getComponent(cc.Animation).on(cc.Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
         }
+        else {
+            mk.tip.pop('农田已满，无法继续生产');
+        }
     }
 
     /** 成熟 */

assets/script/before/main/FarmSystem.ts

@@ -30,7 +30,7 @@ export class FarmSystem {
     }
     public plant(id: number): void {
         this.currSelectFarm && this.currSelectFarm.plant(id);
-        this._lastSeletFarm = this._currSelectFarm;
+        // this._lastSeletFarm = this._currSelectFarm;
     }
     public selectNextFarm(sel = true): FarmIcon | null {
         let nextFarm = this.getCanPlantFarm();

assets/script/before/main/PastureIcon.ts

@@ -199,6 +199,10 @@ export default class PastureIcon extends cc.Component {
         }
     }
 
+    clickSpeedUp() {
+        mk.ui.openPanel('module/speedUpUI/speedUp');
+    }
+
     onRipe() {
         this._state = PastureState.Ripe;
         this.data.state = PastureState.Ripe;

assets/script/before/view/ui/ADClearSickPanel.ts

@@ -45,12 +45,12 @@ export default class ADClearSickPanel extends cc.Component {
     }
 
     clickWatchVideo() {
+        mk.ui.closePanel(this.node.name);
         mk.ad.watchAd((success: boolean) => {
             mk.console.log("watchAD:" + success);
             if (success) {
                 // gData.adUnlockData.unlockFarm();
                 gData.adClearSickData.clearSick();
-                mk.ui.closePanel(this.node.name);
 
                 let des = '';
                 switch (gData.adClearSickData.tab) {

assets/script/before/view/ui/HarvestPanel.ts

@@ -23,6 +23,7 @@ export default class HarvestPanel extends cc.Component {
             mk.console.log("watchAD:" + success);
             if (success) {
                 await gData.adData.watchVideo(AdFun.harvest);
+                gData.harvestData.setToEmpty();
                 await gData.farmGradeData.addGradeExp(ExpAddType.EAT_harvest);
                 // mk.ad.destroyNativeAd();
             }

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

@@ -100,7 +100,7 @@ export default class PlantItem extends cc.Component {
     clickMake() {
         if (this.data.tab == ProductType.nzw) {
             gData.farmSystem.plant(this.data.picture);
-            gData.farmSystem.selectNextFarm();
+            gData.farmSystem.selectNextFarm(false);
         }
         else {
             gData.factorySystem.make(this.data.picture);

assets/script/game/data/GameData.ts

@@ -851,6 +851,9 @@ export class GameData {
 
     private initProductTimes() {
         this._productMakeTimesData = this.getProp(GameProp.productMakeTimes);
+        if (!this._productMakeTimesData) {
+            this._productMakeTimesData = [];
+        }
         let len = this._productMakeTimesData.length;
         for (var i = 0; i < len; i++) {
             this._productMakeTimesMap.set(this._productMakeTimesData[i].id, this._productMakeTimesData[i].times);

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATInterstitial.ts

@@ -18,14 +18,15 @@ export default class ATInterstitial extends zgSingleton {
     private ifLoadShowArr: Array<boolean> = new Array();
 
     /** 初始化 */
-    init() {
+    async init() {
         this.ATInterstitialJS = cc["ATInterstitialJS"];
         this.ATInterstitialJS.proxy = this;;
         this.ATInterstitialJS.init();
 
-        for (var i = 0; i < 3; i++) {
+        for (var i = 2; i >= 0; i--) {
             this.interAdStateArr[i] = InterAdState.Unload;
             this.loadInter(i);
+            await mk.time.WaitForSeconds(1);
         }
     }
 
@@ -86,6 +87,7 @@ export default class ATInterstitial extends zgSingleton {
      * @param type 0 插屏 1 全屏 2 大插屏
      */
     loadInter(type: number, ifLoadShow: boolean = false) {
+        mk.console.logSingle('ATInterstitialJS  ', 'loadInter ' + type);
         this.ifLoadShowArr[type] = ifLoadShow;
         this.interAdStateArr[type] = InterAdState.Loading;
         let id = this.getPlaceIDByType(type);
@@ -102,7 +104,7 @@ export default class ATInterstitial extends zgSingleton {
             console.log('当前插屏类型正在展示');
         }
         else {
-            mk.console.logSingle('inter  ', 'showInter ' + type);
+            mk.console.logSingle('ATInterstitialJS  ', 'showInter ' + type);
             if (this.hasAdReady(type)) {
                 this.interAdStateArr[type] = InterAdState.Show;
                 this.ATInterstitialJS.showInter(this.getPlaceIDByType(type));
@@ -124,7 +126,7 @@ export default class ATInterstitial extends zgSingleton {
     onInterstitialAdLoaded(placementId) {
         let type = this.checkPlacementIDType(placementId);
         this.interAdStateArr[type] = InterAdState.LoadSuccess;
-        mk.console.logSingle('inter  ', 'onInterstitialAdLoaded ' + type);
+        mk.console.logSingle('ATInterstitialJS  ', 'onInterstitialAdLoaded ' + type);
 
         if (this.ifLoadShowArr[type]) {
             this.showInter(type);
@@ -136,7 +138,7 @@ export default class ATInterstitial extends zgSingleton {
         this.interAdStateArr[type] = InterAdState.LoadFail;
         let id = 11
 
-        mk.console.logSingle('inter  ', 'onInterstitialAdLoadFail ' + type);
+        mk.console.logSingle('ATInterstitialJS  ', 'onInterstitialAdLoadFail ' + type);
         if (type == 0) {
             id = 11
         }
@@ -153,7 +155,7 @@ export default class ATInterstitial extends zgSingleton {
         this.interAdStateArr[type] = InterAdState.Show;
         let data = JSON.parse(callbackInfo)
         let id = 2
-        mk.console.logSingle('inter  ', 'onInterstitialAdShow ' + type);
+        mk.console.logSingle('ATInterstitialJS  ', 'onInterstitialAdShow ' + type);
         if (type == 0) {
             id = 2
         }

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATInterstitialJS.js

@@ -16,11 +16,6 @@ var ATInterstitialJS = cc.Class({
         ATInterstitialJSSDK.setAdListener(this);
     },
 
-    // /** 广告位id */
-    // placementID: function () {
-    //     return this.proxy.placementID();
-    // },
-
     /**
      * 检查插屏是否加载成功
      * @returns 

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/gradle.properties

@@ -12,5 +12,5 @@ MY_APP_NAME=\u5f00\u5fc3\u519c\u4e50\u56ed
 PACKAGE_NAME=com.aries.kxnly.mz
 VERSION_NAME=1.0.0
 VERSION_CODE=1
-TOPON="a6078f65457f6f,66b742dd0e502b64d783d9c66a9d30c4,b6078f6a006916,b6078f6ddebed2,b6078f6fe52b70,b6078f72ec4003,b6078f71eed53e,b6078f711d7007,b613180ff8bfea"; //巨量渠道topon的 AppId,AppSecreate,激励视频，插屏，信息流，开屏,banner,全屏,大插屏
+TOPON="a6078f65457f6f,66b742dd0e502b64d783d9c66a9d30c4,b6078f6a006916,b613180ff8bfea,b6078f6fe52b70,b6078f72ec4003,b6078f71eed53e,b6078f711d7007,b6078f6ddebed2"; //巨量渠道topon的 AppId,AppSecreate,激励视频，插屏，信息流，开屏,banner,全屏,大插屏
 APP_CONFIG_CODE="1.0.0"