广告配置字段修改

assets/script/before/main/FarmIcon.ts

@@ -159,6 +159,8 @@ export class FarmIcon extends cc.Component {
             gData.farmSystem.currSelectFarm = this;
 
             gData.adData.checkPopRed();
+            
+            gData.gameData.addProductMakeTimesById(this.plantID);
 
             this.plantIcon.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + this.plantID, cc.SpriteFrame);
             this.plantIcon.getComponent(cc.Animation).play();
@@ -171,7 +173,6 @@ export class FarmIcon extends cc.Component {
         this._state = FarmState.Ripe;
         this.data.state = FarmState.Ripe;
         gData.gameData.setFarmDataMap(this.configID, this.data);
-        gData.gameData.addProductMakeTimesById(this.plantID);
     }
 
     /** 生虫 */

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

@@ -9,6 +9,8 @@ export default class PlantData {
     tab = null;
     configID = -1;
     productArr = [];
+    /** 刷新下一个要解锁数据 */
+    init_itemIndex = -1;
     /**
      * 打开生产产品界面
      * @param tab 产品类型

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

@@ -8,23 +8,38 @@ const { ccclass, property } = cc._decorator;
 export default class PlantPanel extends cc.Component {
 
     @property({ type: TableView, displayName: '滚动视图' })
-    private tableView: TableView = null!;
+    private tableView: TableView = null;
+    private list_data = null;
 
     start() {
+        gData.plantData.init_itemIndex = -1;
         this.initScollView();
     }
 
+    update() {
+        if (gData.plantData.init_itemIndex != -1) {
+            let index = this.getItemDataByID();
+            this.tableView.contentMoveByIndex(index, 0.1);
+            gData.plantData.init_itemIndex = -1;
+        }
+    }
+
+    getItemDataByID() {
+        let len = this.list_data.length;
+        for (var i = 0; i < len; i++) {
+            if (this.list_data[i].picture == gData.plantData.init_itemIndex) {
+                return i;
+            }
+        }
+        return 0;
+    }
+
     /**
      * 初始化滚动视图
      */
     private initScollView() {
-        let list_data = gData.plantData.productArr;
-        this.tableView.node.emit('srollview-init', list_data)
-
-        // let index = gData.sign.getItemIndexByCanSign();
-        // if (index > 0)
-        //     index -= 1;
-        // this.tableView.contentMoveByIndex(index, 0.1);
+        this.list_data = gData.plantData.productArr;
+        this.tableView.node.emit('srollview-init', this.list_data)
     }
 
     onDestroy() {

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

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

assets/script/game/data/AdData.ts

@@ -204,13 +204,13 @@ export class AdData {
         this.TimingRedMoneyArr = gData.gameData.configs.ServerConfig.TimingRedMoney.split(',');
         this.ProductionButtonArr = gData.gameData.configs.ServerConfig.ProductionButton.split(',');
         this.FullScreenAdArr = gData.gameData.configs.ServerConfig.FullScreenAd.split(',');
-        let arr = gData.gameData.configs.ServerConfig.ABCInsertAdPercent.split(',');
+        let arr = gData.gameData.configs.ServerConfig.ABInsertAdPercent.split(',');
         let per = 0;
         for (var i = 0; i < arr.length; i++) {
             per += parseFloat(arr[i]);
             this.ABCInsertAdPercentArr[i] = per;
         }
-        this.ABCInsertAdArr = gData.gameData.configs.ServerConfig.ABCInsertAd.split(',');
+        this.ABCInsertAdArr = gData.gameData.configs.ServerConfig.ABInsertAd.split(',');
     }
 
     /** 设置用户ecpm分级, 自动弹窗字典等 */

assets/script/game/data/GameData.ts

@@ -154,7 +154,7 @@ export class GameData {
         this.gameData.versioncfg = res_data.versioncfg;
         this.gameData.isFirstRedMoney = res_data.isFirstRedMoney;
         gData.adData.watchNumToday = res_data.dayVideoTimesForRedMoney == null ? 0 : res_data.dayVideoTimesForRedMoney;
-        
+
         this.gameData.userTuCaoInfo = res_data.userWelFareTaskInfo;
         this.gameData.farmExpValue = res_data.userExp;
         this.gameData.farmGradeData = res_data.userFarmGrageRewardInfo;
@@ -570,6 +570,11 @@ export class GameData {
         let nextID = id + 1;
         let curConfig = this.getProductMap(id);
         let nextConfig = this.getProductMap(nextID);
+
+        if (id == this.getMaxProduct(this.configs.tab)) {
+            gData.plantData.init_itemIndex = id;
+        }
+
         if (nextConfig) {
             if (nextConfig.tab == curConfig.tab && nextID > this.getMaxProduct(curConfig.tab)) {
                 if (nextConfig.unlock == 1 && nextConfig.value <= times) {
@@ -1040,7 +1045,7 @@ class PlayerProp {
     gradeLevel = 6;
 
     //农场等级奖励数据
-    farmGradeData:any = {};
+    farmGradeData: any = {};
 
     //农场经验
     private farmExp = 0;
@@ -1242,7 +1247,7 @@ export enum VideoAdType {
     farmGradeCashOut = "农场等级提现视频",
 }
 
-export enum ExpAddType{
+export enum ExpAddType {
     EAT_video = 1,
     EAT_harvest = 2,
 }

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

@@ -81,7 +81,7 @@ export default class ATBanner extends zgSingleton {
     /** 销毁banner */
     destroyBanner() {
         this.bannerAdState = BannerAdState.Close;
-
+        this.ifLoadShow = false;
         this.ATBannerJS.destroyBanner()
         this.loadBanner();
     }
@@ -94,6 +94,10 @@ export default class ATBanner extends zgSingleton {
      */
     onBannerAdLoaded(placementId) {
         this.bannerAdState = BannerAdState.LoadSuccess;
+        mk.console.logSingle('banner  ', 'onBannerAdLoaded');
+        if (this.ifLoadShow) {
+            this.showBanner();
+        }
     }
 
     /**
@@ -106,6 +110,8 @@ export default class ATBanner extends zgSingleton {
         this.bannerAdState = BannerAdState.LoadFail;
         // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdLoadFail(" + placementId + ", " + errorInfo + ")");
         gData.adData.updateADLog(14, placementId);
+
+        mk.console.logSingle('banner  ', 'onBannerAdLoadFail');
     }
 
     /**
@@ -117,6 +123,7 @@ export default class ATBanner extends zgSingleton {
     onBannerAdShow(placementId, callbackInfo) {
         this.bannerAdState = BannerAdState.Show;
         // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdShow(" + placementId + ", " + callbackInfo + ")");
+        mk.console.logSingle('banner  ', 'onBannerAdShow');
         let data = JSON.parse(callbackInfo);
         gData.adData.updateADLog(7, placementId, data);
     }

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

@@ -99,6 +99,9 @@ export default class ATInterstitial extends zgSingleton {
             else if (placementId == ATSDKMgr.topon_fullinter_placementId) {
                 return 1;
             }
+            else if (placementId == ATSDKMgr.topon_biginter_placementId) {
+                return 2;
+            }
         }
     }
 
@@ -130,6 +133,7 @@ export default class ATInterstitial extends zgSingleton {
             console.log('当前插屏类型正在展示');
         }
         else {
+            mk.console.logSingle('inter  ', 'showInter ' + type);
             this.interAdType = type;
             if (this.hasAdReady(type)) {
                 this.interAdState = InterAdState.Show;
@@ -152,8 +156,10 @@ export default class ATInterstitial extends zgSingleton {
     onInterstitialAdLoaded(placementId) {
         this.interAdState = InterAdState.LoadSuccess;
 
+        let type = this.checkPlacementIDType(placementId);
+        mk.console.logSingle('inter  ', 'onInterstitialAdLoaded ' + type);
+
         if (this.ifLoadShow) {
-            let type = this.checkPlacementIDType(placementId);
             this.showInter(type);
         }
     }
@@ -163,6 +169,8 @@ export default class ATInterstitial extends zgSingleton {
 
         let id = 11
         let type = this.checkPlacementIDType(placementId);
+
+        mk.console.logSingle('inter  ', 'onInterstitialAdLoadFail ' + type);
         if (type == 0) {
             id = 11
         }
@@ -181,6 +189,7 @@ export default class ATInterstitial extends zgSingleton {
         let data = JSON.parse(callbackInfo)
         let id = 2
         let type = this.checkPlacementIDType(placementId);
+        mk.console.logSingle('inter  ', 'onInterstitialAdShow ' + type);
         if (type == 0) {
             id = 2
         }

assets/script/mk/system/AdSystem.ts

@@ -175,6 +175,7 @@ export default class AdSystem {
             return;
         }
 
+        mk.console.logSingle('banner', 'showBanner');
         // console.log("===[AdSystem gameData.adShowConfig", gData.gameData.adShowConfig.is_show_banner);
         // if (gData.gameData.adShowConfig && gData.gameData.adShowConfig.is_show_banner == 1) {
         this.adSdk.showBanner();

build/jsb-link/assets/internal/config.json

@@ -1 +1 @@
-{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","02delMVqdBD70a/HSD99FK","60AwGqM1dKELCGhPAR+jK6"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[19,3,1,4,18,6,0,11,15,16,20,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}
+{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","60AwGqM1dKELCGhPAR+jK6","02delMVqdBD70a/HSD99FK"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[20,3,1,4,18,6,0,11,15,16,19,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}

build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -258,7 +258,7 @@ return [ 2 ];
 });
 };
 e.prototype.onEnable = function() {
-Math.random() < .5 ? gData.adData.checkShowFullInter(3) : gData.adData.checkShowFullInter(4);
+gData.adData.checkPopInter();
 mk.ad.showBanner();
 };
 e.prototype.onDisable = function() {
@@ -833,18 +833,23 @@ this.ATBannerJS.showBanner();
 };
 e.prototype.destroyBanner = function() {
 this.bannerAdState = i.Close;
+this.ifLoadShow = !1;
 this.ATBannerJS.destroyBanner();
 this.loadBanner();
 };
 e.prototype.onBannerAdLoaded = function() {
 this.bannerAdState = i.LoadSuccess;
+mk.console.logSingle("banner  ", "onBannerAdLoaded");
+this.ifLoadShow && this.showBanner();
 };
 e.prototype.onBannerAdLoadFail = function(t) {
 this.bannerAdState = i.LoadFail;
 gData.adData.updateADLog(14, t);
+mk.console.logSingle("banner  ", "onBannerAdLoadFail");
 };
 e.prototype.onBannerAdShow = function(t, e) {
 this.bannerAdState = i.Show;
+mk.console.logSingle("banner  ", "onBannerAdShow");
 var o = JSON.parse(e);
 gData.adData.updateADLog(7, t, o);
 };
@@ -954,19 +959,16 @@ ctor: function() {},
 init: function() {
 ATInterstitialJSSDK.setAdListener(this);
 },
-placementID: function() {
-return this.proxy.placementID();
-},
-hasAdReady: function() {
-if (null != this.proxy) return !!ATInterstitialJSSDK.hasAdReady(this.placementID());
+hasAdReady: function(t) {
+if (null != this.proxy) return !!ATInterstitialJSSDK.hasAdReady(t);
 },
-loadInter: function() {
-var t = {};
-t[ATInterstitialJSSDK.UseRewardedVideoAsInterstitial] = !1;
-ATInterstitialJSSDK.loadInterstitial(this.placementID(), t);
+loadInter: function(t) {
+var e = {};
+e[ATInterstitialJSSDK.UseRewardedVideoAsInterstitial] = !1;
+ATInterstitialJSSDK.loadInterstitial(t, e);
 },
-showInter: function() {
-ATInterstitialJSSDK.showAd(this.placementID());
+showInter: function(t) {
+ATInterstitialJSSDK.showAd(t);
 },
 onInterstitialAdLoaded: function(t) {
 null != this.proxy && this.proxy.onInterstitialAdLoaded(t);
@@ -1036,60 +1038,73 @@ this.ATInterstitialJS.init();
 if (this.interAdState == i.Unload) {
 this.loadInter(0);
 this.loadInter(1);
+this.loadInter(2);
 }
 };
-e.prototype.placementID = function() {
-if (0 == this.interAdType) {
-if (cc.sys.os === cc.sys.OS_IOS) return c.default.topon_inter_placementId;
-if (cc.sys.os === cc.sys.OS_ANDROID) return c.default.topon_inter_placementId;
-} else {
-if (cc.sys.os === cc.sys.OS_IOS) return c.default.topon_fullinter_placementId;
-if (cc.sys.os === cc.sys.OS_ANDROID) return c.default.topon_fullinter_placementId;
+e.prototype.getPlaceIDByType = function(t) {
+var e = "";
+switch (t) {
+case 0:
+e = c.default.topon_inter_placementId;
+break;
+
+case 1:
+e = c.default.topon_fullinter_placementId;
+break;
+
+case 2:
+e = c.default.topon_biginter_placementId;
 }
+return e;
 };
 e.prototype.checkPlacementIDType = function(t) {
 if (cc.sys.os === cc.sys.OS_IOS) {
 if (t == c.default.topon_inter_placementId) return 0;
 if (t == c.default.topon_fullinter_placementId) return 1;
+if (t == c.default.topon_biginter_placementId) return 2;
 } else if (cc.sys.os === cc.sys.OS_ANDROID) {
 if (t == c.default.topon_inter_placementId) return 0;
 if (t == c.default.topon_fullinter_placementId) return 1;
+if (t == c.default.topon_biginter_placementId) return 2;
 }
 };
-e.prototype.hasAdReady = function() {
-return this.ATInterstitialJS.hasAdReady();
+e.prototype.hasAdReady = function(t) {
+return this.ATInterstitialJS.hasAdReady(this.getPlaceIDByType(t));
 };
 e.prototype.loadInter = function(t, e) {
 void 0 === e && (e = !1);
 this.ifLoadShow = e;
 this.interAdState = i.Loading;
-this.ATInterstitialJS.loadInter(t);
+var o = this.getPlaceIDByType(t);
+this.ATInterstitialJS.loadInter(o);
 };
 e.prototype.showInter = function(t) {
 if (this.interAdState == i.Show && t == this.interAdType) console.log("当前插屏类型正在展示"); else {
+mk.console.logSingle("inter  ", "showInter " + t);
 this.interAdType = t;
-if (this.hasAdReady()) {
+if (this.hasAdReady(t)) {
 this.interAdState = i.Show;
-this.ATInterstitialJS.showInter(t);
+this.ATInterstitialJS.showInter(this.getPlaceIDByType(t));
 } else this.interAdState == i.Loading ? this.ifLoadShow = !0 : this.loadInter(t, !0);
 }
 };
 e.prototype.onInterstitialAdLoaded = function(t) {
 this.interAdState = i.LoadSuccess;
-if (this.ifLoadShow) {
 var e = this.checkPlacementIDType(t);
-this.showInter(e);
-}
+mk.console.logSingle("inter  ", "onInterstitialAdLoaded " + e);
+this.ifLoadShow && this.showInter(e);
 };
 e.prototype.onInterstitialAdLoadFail = function(t) {
 this.interAdState = i.LoadFail;
 var e = 11, o = this.checkPlacementIDType(t);
+mk.console.logSingle("inter  ", "onInterstitialAdLoadFail " + o);
 0 == o ? e = 11 : 1 == o && (e = 10);
 gData.adData.updateADLog(e, t);
 };
 e.prototype.onInterstitialAdShow = function(t, e) {
 this.interAdState = i.Show;
 var o = JSON.parse(e), n = 2, a = this.checkPlacementIDType(t);
+mk.console.logSingle("inter  ", "onInterstitialAdShow " + a);
 0 == a ? n = 2 : 1 == a && (n = 9);
 gData.adData.updateADLog(n, t, o);
 };
@@ -1607,10 +1622,7 @@ this.ATRewardVideoJS.loadAd(gData.loginData.uin, "userDataKey");
 }
 };
 e.prototype.showAd = function() {
-if (this.reawardAdState == i.LoadSuccess) {
-console.log("anythink === 播放广告 showAd ");
-this.ATRewardVideoJS.showAd();
-} else {
+if (this.reawardAdState == i.LoadSuccess) this.ATRewardVideoJS.showAd(); else {
 this.loadAd();
 this.ifLoadShow = !0;
 }
@@ -1633,6 +1645,10 @@ gData.adData.updateADLog(4, t, o);
 gData.adData.updateData(t, o);
 mk.data.sendDataEvent(r.DataEventId.video_init, mk.ad.videoAdType);
 this.reawardAdState = i.Unload;
+var n = mk.storage.getStorage("ad_videoEcpm");
+n ? n++ : n = 1;
+mk.storage.setStorage("ad_videoEcpm", n);
+n <= 300 && (n <= 50 ? mk.data.sendDataEventValue(r.DataEventId.ad_videoEcpm, "ad_video_ecpm" + n, o.adsource_price) : n % 10 == 0 && mk.data.sendDataEventValue(r.DataEventId.ad_videoEcpm, "ad_video_ecpm" + n, o.adsource_price));
 };
 e.prototype.onRewardedVideoAdPlayEnd = function() {};
 e.prototype.onRewardedVideoAdPlayFailed = function(t, e, o) {
@@ -1653,6 +1669,7 @@ this.loadAd();
 };
 e.prototype.onRewardedVideoAdPlayClicked = function() {};
 e.prototype.onReward = function() {
+console.log("onReward  ");
 this.canGet = !0;
 };
 return e;
@@ -1848,6 +1865,7 @@ o.topon_inter_placementId = e[4];
 o.topon_native_placementId = e[5];
 o.topon_banner_placementId = e[7];
 e[8] && (o.topon_fullinter_placementId = e[8]);
+e[9] && (o.topon_biginter_placementId = e[9]);
 };
 e.prototype.showVideo = function() {
 console.log("===[ShowVideoAd] ", d.ATRewardVideo.getInstance().hasAdReady());
@@ -1896,6 +1914,7 @@ e.topon_inter_placementId = "b5f8fa77aa5262";
 e.topon_native_placementId = "b5f8fa77aa5262";
 e.topon_fullinter_placementId = "b6113813b876a1";
 e.topon_banner_placementId = "b5f8fa77aa5262";
+e.topon_biginter_placementId = "b5f8fa77aa5262";
 return o = i([ f ], e);
 }(s.zgSingleton));
 o.default = y;
@@ -2261,7 +2280,13 @@ this.publisher_revenue = "";
 this.precision = "";
 this.ecpm_level = "";
 this._watchNumToday = 0;
-this.fullInterShowStr = "";
+this.ecpmLevel = 0;
+this.AutoRedMoneyMap = new Map();
+this.TimingRedMoneyArr = [];
+this.ProductionButtonArr = [];
+this.FullScreenAdArr = [];
+this.ABCInsertAdPercentArr = [];
+this.ABCInsertAdArr = [];
 this.timeAd = 0;
 this.popClickTimes = 0;
 this.clickTimesAdd = 0;
@@ -2401,53 +2426,68 @@ ecpm_level: ""
 };
 mk.http.sendData("updateADLog", n);
 };
+t.prototype.initEcpmData = function() {
+gData.adData.setEcpmLevel();
+gData.adData.setPopClickTimes();
+this.TimingRedMoneyArr = gData.gameData.configs.ServerConfig.TimingRedMoney.split(",");
+this.ProductionButtonArr = gData.gameData.configs.ServerConfig.ProductionButton.split(",");
+this.FullScreenAdArr = gData.gameData.configs.ServerConfig.FullScreenAd.split(",");
+for (var t = gData.gameData.configs.ServerConfig.ABInsertAdPercent.split(","), e = 0, o = 0; o < t.length; o++) {
+e += parseFloat(t[o]);
+this.ABCInsertAdPercentArr[o] = e;
+}
+this.ABCInsertAdArr = gData.gameData.configs.ServerConfig.ABInsertAd.split(",");
+};
+t.prototype.setEcpmLevel = function() {
+this.ecpmLevel = 1;
+this.AutoRedMoneyMap.set(1, 20);
+};
 t.prototype.checkShowFullInter = function(t) {
 var e = this.getPerByEcpm();
 if (Math.random() < e) switch (t) {
 case 1:
-1 == gData.gameData.ecpmLevel && mk.ad.showInterAd(1);
-break;
-
-case 2:
+if (-1 == this.FullScreenAdArr.indexOf(this.ecpmLevel.toString())) return;
 mk.ad.showInterAd(1);
 break;
 
-case 3:
+case 2:
 var o = gData.gameData.configs.ServerConfig.AdDelay.split(","), n = parseFloat(o[0]), a = 1e3 * (n + (parseFloat(o[1]) - n) * Math.random());
 setTimeout(function() {
-mk.ad.showInterAd(1);
+mk.ad.showInterAd(2);
 }, a);
 break;
 
-case 4:
+case 3:
 var i = gData.gameData.configs.ServerConfig.AdDelay.split(","), r = parseFloat(i[0]), c = parseFloat(i[1]), s = 1e3 * (r + (c - r) * Math.random()), l = 1e3 * (r + (c - r) * Math.random());
 setTimeout(function() {
 mk.ad.showInterAd(0);
 setTimeout(function() {
-mk.ad.showInterAd(1);
+mk.ad.showInterAd(2);
 }, l);
 }, s);
+break;
+
+case 4:
+gData.moreGame.popMoreGamePopNode();
+}
+};
+t.prototype.checkPopInter = function() {
+if (-1 != this.ABCInsertAdArr.indexOf(this.ecpmLevel.toString())) {
+for (var t = Math.random(), e = this.ABCInsertAdPercentArr.length, o = 0, n = 0; n < e; n++) if (t <= this.ABCInsertAdPercentArr[n]) {
+o = n + 2;
+break;
+}
+this.checkShowFullInter(o);
 }
 };
 t.prototype.startPopRed = function(t) {
+if (-1 != this.TimingRedMoneyArr.indexOf(this.ecpmLevel.toString())) {
 this.timeAd += t;
-switch (gData.gameData.ecpmLevel) {
-case 1:
-if (this.timeAd >= 3e4) {
-this.timeAd = 0;
-mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
-}
-break;
-
-case 2:
-if (this.timeAd >= 6e4) {
+var e = this.AutoRedMoneyMap.get(this.ecpmLevel);
+if (this.timeAd >= 1e3 * e) {
 this.timeAd = 0;
 mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
 }
-break;
-
-case 3:
-this.timeAd = 0;
 }
 };
 t.prototype.setPopClickTimes = function() {
@@ -2455,15 +2495,17 @@ var t = gData.gameData.configs.ServerConfig.ClickProduction.split(",");
 this.popClickTimes = r.default.rnd(parseInt(t[0]), parseInt(t[1]));
 };
 t.prototype.checkPopRed = function() {
+if (-1 != this.ProductionButtonArr.indexOf(this.ecpmLevel.toString())) {
 this.clickTimesAdd++;
 if (this.clickTimesAdd >= this.popClickTimes) {
 this.clickTimesAdd = 0;
 this.setPopClickTimes();
 Math.random() <= this.getPerByEcpm() && mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
 }
+}
 };
 t.prototype.getPerByEcpm = function() {
-return 1;
+return .3;
 };
 return t;
 }();
@@ -2550,7 +2592,10 @@ return !0;
 return !1;
 };
 t.prototype.showBanner = function() {
-this.ifShowAd && this.adSdk.showBanner();
+if (this.ifShowAd) {
+mk.console.logSingle("banner", "showBanner");
+this.adSdk.showBanner();
+}
 };
 t.prototype.destoryBanner = function() {
 this.ifShowAd && this.adSdk.destoryBanner();
@@ -2558,18 +2603,6 @@ this.ifShowAd && this.adSdk.destoryBanner();
 t.prototype.showInterAd = function(t) {
 this.ifShowAd && this.adSdk.showInter(t);
 };
-t.prototype.checkShowInterByChance = function() {
-var t = this;
-if (this.ifShowAd && gData.gameData.adShowConfig) {
-var e = gData.gameData.configs.ServerConfig.interOpenChance;
-if (Math.random() <= e) {
-var o = Number(gData.gameData.configs.ServerConfig.interOpenDelayMin) + Math.random() * (Number(gData.gameData.configs.ServerConfig.interOpenDelayMax) - Number(gData.gameData.configs.ServerConfig.interOpenDelayMin));
-setTimeout(function() {
-t.showInterAd(0);
-}, 1e3 * o);
-} else gData.moreGame.popMoreGamePopNode();
-}
-};
 return t;
 }();
 o.default = a;
@@ -2771,6 +2804,7 @@ mk.fly.PlayCoinAnim(1, 5, this.flyBird_2.node, "", null, 2);
 this.moveDogFinished();
 mk.fly.PlayCoinAnim(1, 5, this.dogMove.node, "", null, 2);
 } else "sheep" == e && mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
+gData.adData.checkShowFullInter(1);
 };
 i([ s({
 displayName: "bird_1",
@@ -4518,8 +4552,9 @@ e.prototype.EditBox_End = function() {
 console.log("--\x3eInput：", this.inputBox.string);
 gData.blessingBag.adsource_id_value = this.inputBox.string;
 };
-e.prototype.onClickClose = function() {
-mk.ad.checkShowInterByChance();
+e.prototype.onClickClose = function() {};
+e.prototype.onDisable = function() {
+gData.adData.checkShowFullInter(4);
 };
 i([ y(cc.Label) ], e.prototype, "txtBigNum", void 0);
 i([ y(cc.Label) ], e.prototype, "txtAddEft", void 0);
@@ -6517,12 +6552,19 @@ t.prototype.sendDataEvent = function(t, e) {
 console.log("===[DataSystem", t, e);
 t && e && n.default.sendEvent(t, e);
 };
+t.prototype.sendDataEventValue = function(t, e, o) {
+console.log("===[DataSystem", t, e, o);
+t && e && n.default.sendEventValue(t, e, o);
+};
 t.prototype.setTAEventUser = function(t, e, o) {
 n.default.setTAEventUser(t, e, o);
 };
 t.prototype.setTAEventUserStr = function(t, e, o) {
 n.default.setTAEventUserStr(t, e, o);
 };
+t.prototype.setTAUserID = function(t) {
+n.default.setTAUserID(t);
+};
 t.prototype.sendXYEvent = function(t, e) {
 if (t && e) {
 var o = {
@@ -7532,7 +7574,7 @@ Object.defineProperty(o, "__esModule", {
 value: !0
 });
 o.FactoryIcon = void 0;
-var s = t("../../game/data/GameData"), l = t("../view/ProductShow"), p = t("./FarmCountDown"), u = t("./IDHelper"), d = cc._decorator, h = d.ccclass, f = d.property, y = function(t) {
+var s = t("../../game/data/GameData"), l = t("../map/MoveToCenter"), p = t("../view/ProductShow"), u = t("./FarmCountDown"), d = t("./IDHelper"), h = cc._decorator, f = h.ccclass, y = h.property, g = function(t) {
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -7554,7 +7596,7 @@ enumerable: !1,
 configurable: !0
 });
 e.prototype.onLoad = function() {
-var t = this.getComponent(u.IDHelper);
+var t = this.getComponent(d.IDHelper);
 this.configID = t.buildID;
 this.sortID = t.sortID;
 this.tab = gData.gameData.getTabByConfigID(this.configID);
@@ -7615,7 +7657,7 @@ case 1:
 t = n.sent();
 e = cc.instantiate(t);
 o = this.data.productID;
-e.getComponent(l.default).id = o;
+e.getComponent(p.default).id = o;
 e.parent = this.showGroup;
 n.label = 2;
 
@@ -7664,6 +7706,7 @@ this.data.state = s.FactroyState.Producting;
 this.data.productID = e.picture;
 this.data.growSpan = o;
 gData.gameData.setFactoryDataMap(this.configID, this.data);
+this.getComponent(l.MoveToCenter).move();
 gData.gameData.leftTimes--;
 gData.gameData.setProp(s.GameProp.leftTimes, gData.gameData.leftTimes);
 gData.gameData.init_leftTimes = !0;
@@ -7690,26 +7733,27 @@ this.data.state = s.FactroyState.Empty;
 this.data.productID = 0;
 this.data.growSpan = 0;
 gData.gameData.setFactoryDataMap(this.configID, this.data);
-gData.gameData.setNextProduct();
+gData.gameData.setNextProduct(!1);
 };
-i([ f({
-type: p.FarmCountDown,
+i([ y({
+type: u.FarmCountDown,
 tooltip: "倒计时组件"
 }) ], e.prototype, "countDown", void 0);
-i([ f({
+i([ y({
 type: cc.Node,
 tooltip: "完成品展示节点"
 }) ], e.prototype, "showGroup", void 0);
-i([ f({
+i([ y({
 type: cc.Node,
 tooltip: "闲置动画"
 }) ], e.prototype, "idleAni", void 0);
-return i([ h ], e);
+return i([ f ], e);
 }(cc.Component);
-o.FactoryIcon = y;
+o.FactoryIcon = g;
 cc._RF.pop();
 }, {
 "../../game/data/GameData": "GameData",
+"../map/MoveToCenter": "MoveToCenter",
 "../view/ProductShow": "ProductShow",
 "./FarmCountDown": "FarmCountDown",
 "./IDHelper": "IDHelper"
@@ -8573,7 +8617,7 @@ this.data.state = s.FarmState.Empty;
 this.data.productID = 0;
 this.data.growSpan = 0;
 gData.gameData.setFarmDataMap(this.configID, this.data);
-gData.gameData.setNextProduct();
+gData.gameData.setNextProduct(!1);
 };
 e.prototype.plant = function(t) {
 return r(this, void 0, void 0, function() {
@@ -8581,10 +8625,15 @@ var e;
 return c(this, function(o) {
 switch (o.label) {
 case 0:
-if (this.state != s.FarmState.Empty || gData.farmSystem.plantIsRequesting) return [ 3, 2 ];
+if (this.state != s.FarmState.Empty) return [ 3, 2 ];
 this.plantID = t;
 gData.gameData.isProducting = !0;
 this.plantIcon.node.active = !0;
+gData.gameData.leftTimes--;
+gData.gameData.setProp(s.GameProp.leftTimes, gData.gameData.leftTimes);
+gData.gameData.init_leftTimes = !0;
+gData.farmSystem.currSelectFarm = this;
+gData.adData.checkPopRed();
 e = this.plantIcon;
 return [ 4, mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + this.plantID, cc.SpriteFrame) ];
 
@@ -8592,11 +8641,6 @@ case 1:
 e.spriteFrame = o.sent();
 this.plantIcon.getComponent(cc.Animation).play();
 this.plantIcon.getComponent(cc.Animation).on(cc.Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
-gData.gameData.leftTimes--;
-gData.gameData.setProp(s.GameProp.leftTimes, gData.gameData.leftTimes);
-gData.gameData.init_leftTimes = !0;
-gData.adData.checkPopRed();
-gData.gameData.isProducting = !1;
 o.label = 2;
 
 case 2:
@@ -8628,6 +8672,7 @@ this.data.state = s.FarmState.Growing;
 this.data.productID = this.plantID;
 this.data.growSpan = e;
 gData.gameData.setFarmDataMap(this.configID, this.data);
+gData.gameData.isProducting = !1;
 return [ 2 ];
 });
 });
@@ -9284,7 +9329,7 @@ function t() {
 this.farms = [];
 this._currSelectFarm = null;
 this.plantWindowIsOpening = !1;
-this.plantIsRequesting = !1;
+this._lastSeletFarm = null;
 }
 Object.defineProperty(t.prototype, "currSelectFarm", {
 get: function() {
@@ -9303,16 +9348,23 @@ this.farms[t.sortID] = t;
 };
 t.prototype.plant = function(t) {
 this.currSelectFarm && this.currSelectFarm.plant(t);
+this._lastSeletFarm = this._currSelectFarm;
 };
-t.prototype.selectNextFarm = function() {
-var t = this.getCanPlantFarm();
-t && (this.currSelectFarm = t);
-return t;
+t.prototype.selectNextFarm = function(t) {
+void 0 === t && (t = !0);
+var e = this.getCanPlantFarm();
+this._lastSeletFarm && this._lastSeletFarm.selectFarm(!1);
+if (e) if (t) this.currSelectFarm = e; else {
+this._lastSeletFarm = this._currSelectFarm;
+this._currSelectFarm = e;
+}
+return e;
 };
 t.prototype.getCanPlantFarm = function() {
 for (var t = 0; t < this.farms.length; t++) if (this.farms[t] != this.currSelectFarm && this.farms[t].data.state == a.FarmState.Empty) {
 gData.gameData.nextCanProduct = gData.gameData.getRandomPlantConfig();
 gData.gameData.nextMake = this.farms[t];
+mk.console.logSingle("getCanPlantFarm  ", this.farms[t].data);
 return this.farms[t];
 }
 return null;
@@ -10844,7 +10896,6 @@ this.nextMake = null;
 this.nextType = 0;
 this.init_makeInfo = !1;
 this.isProducting = !1;
-this.ecpmLevel = 0;
 this.init_task = !1;
 this._farmMapRewardData = [];
 this._farmData = [];
@@ -10895,8 +10946,7 @@ case 3:
 if (0 != (e = o.sent()).errcode) return [ 2 ];
 this.adShowConfig = e.data;
 mk.console.logSingle("user/adShowConfig", e.data);
-this.setEcpmLevel();
-gData.adData.setPopClickTimes();
+gData.adData.initEcpmData();
 gData.guideData.init();
 gData.guideWeakData.init();
 gData.moduleData.forEach(function(t) {
@@ -10933,6 +10983,15 @@ gData.adData.watchNumToday = null == t.dayVideoTimesForRedMoney ? 0 : t.dayVideo
 this.gameData.userTuCaoInfo = t.userWelFareTaskInfo;
 this.gameData.farmExpValue = t.userExp;
 this.gameData.farmGradeData = t.userFarmGrageRewardInfo;
+mk.data.setTAUserID(gData.loginData.uin);
+if (gData.loginData.isFirstIn) {
+gData.loginData.isFirstIn = !1;
+mk.data.setTAEventRegister();
+mk.data.sendDataEvent("ABTest", "触发" + this.gameData.groupCode + "方案");
+mk.data.setTAEventUserStr(0, "regtime_app_id", gData.appData.appVersion);
+}
+mk.data.setTAEventUserStr(0, "now_app_id", gData.appData.appVersion);
+mk.data.setTAEventUserStr(0, "channel_id", gData.appData.umengChannel);
 };
 t.prototype.setProp = function(t, e) {
 return n(this, void 0, void 0, function() {
@@ -11083,18 +11142,20 @@ if (o[c].picture == n) break;
 var s = a[r.default.rnd(0, a.length - 1)];
 return this.getProductMap(s);
 };
-t.prototype.setNextProduct = function() {
-this.nextMake = null;
-if (gData.farmSystem.selectNextFarm()) this.nextType = 1; else if (gData.pastureSystem.nextPasture()) this.nextType = 2; else {
-var t = gData.factorySystem.nextFactory();
-this.nextType = t ? 3 : 0;
+t.prototype.setNextProduct = function(t) {
+void 0 === t && (t = !0);
+if (!this.nextMake) {
+if (gData.farmSystem.selectNextFarm(t)) this.nextType = 1; else if (gData.pastureSystem.nextPasture()) this.nextType = 2; else {
+var e = gData.factorySystem.nextFactory();
+this.nextType = e ? 3 : 0;
 }
 this.init_makeInfo = !0;
+}
 };
 t.prototype.firstCheckNext = function() {
 if (!this.hasFirstCheck && gData.pastureSystem.pastureIcons.length >= 3 && gData.factorySystem.factoryIcons.length >= 6) {
 this.hasFirstCheck = !0;
-gData.gameData.setNextProduct();
+gData.gameData.setNextProduct(!1);
 }
 };
 t.prototype.makeProduct = function() {
@@ -11105,17 +11166,23 @@ break;
 
 case 1:
 gData.farmSystem.btnMake();
-this.setNextProduct();
+gData.gameData.nextMake = null;
+this.nextMake = null;
+this.setNextProduct(!1);
 break;
 
 case 2:
 gData.pastureSystem.btnMake();
+gData.gameData.nextMake = null;
+this.nextMake = null;
 this.setNextProduct();
 gData.adData.checkPopRed();
 break;
 
 case 3:
 gData.factorySystem.btnMake();
+gData.gameData.nextMake = null;
+this.nextMake = null;
 this.setNextProduct();
 }
 };
@@ -11422,11 +11489,6 @@ this.setNextProduct();
 }
 }
 };
-t.prototype.setEcpmLevel = function() {
-var t = parseInt(gData.gameData.configs.ServerConfig.LowValueEcpm.split(",")[1]), e = parseInt(gData.gameData.configs.ServerConfig.MediumValueEcpm.split(",")[1]);
-parseInt(gData.gameData.configs.ServerConfig.HighValueEcpm.split(",")[1]);
-this.adShowConfig.average_ecpm <= t ? this.ecpmLevel = 1 : this.adShowConfig.average_ecpm <= e ? this.ecpmLevel = 2 : this.ecpmLevel = 3;
-};
 return t;
 }();
 o.GameData = c;
@@ -11470,6 +11532,7 @@ this.isFirstRedMoney = 0;
 this.gradeLevel = 6;
 this.farmGradeData = {};
 this.farmExp = 0;
+this.groupCode = 0;
 }
 Object.defineProperty(t.prototype, "isSignInToday", {
 get: function() {
@@ -11606,6 +11669,8 @@ t.level = "level";
 t.commonWithDrawal = "commonWithDrawl";
 t.jarWithDrawal = "jarWithDrawal";
 t.signWithDrawal = "signWithDrawal";
+t.ad_videoEcpm = "ad_video";
+t.ad_openEcpm = "ad_open";
 })(o.DataEventId || (o.DataEventId = {}));
 (function(t) {
 t.Null = "";
@@ -11986,7 +12051,6 @@ e.lbl_leftTimes = null;
 e.lbl_task = null;
 e.node_taskHb = null;
 e.btn_product = null;
-e.leftTimesScheduleOn = !1;
 e.lastTimeSpan = 0;
 e.span = 0;
 return e;
@@ -12946,6 +13010,9 @@ t && gData.farmGradeData.addGradeExp();
 e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("closeButton");
 };
+e.prototype.onDisable = function() {
+gData.adData.checkShowFullInter(4);
+};
 i([ u({
 displayName: "进度条",
 type: cc.Sprite
@@ -13218,7 +13285,6 @@ var n = t("../../game/data/GameData"), a = (t("./UISystem"), function() {
 function t() {}
 t.prototype.open = function() {};
 t.prototype.setGuideID = function(t) {
-gData.guideData.getGuidesByID(t);
 if (2 == t) {
 t = 9999;
 mk.data.sendXYEvent("guide_end", "新手引导结束");
@@ -13662,13 +13728,7 @@ r = this.crtGuide.finger.split(":");
 this.node_finger.x = o + parseInt(r[0]);
 this.node_finger.y = n + parseInt(r[1]);
 }
-if (1 == this.crtGuide.tr_form) {
-this.node_head.node.active = !0;
-this.node_person.node.active = !1;
-} else {
-this.node_head.node.active = !1;
-this.node_person.node.active = !0;
-}
+1 == this.crtGuide.tr_form ? this.node_head.node.active = !0 : this.node_head.node.active = !1;
 this.rich_dialog.string = this.crtGuide.dialog;
 }
 };
@@ -14938,7 +14998,7 @@ return n;
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var a = function() {
+var a = t("../../game/data/GameData"), i = function() {
 function t() {}
 t.isFileExist = function(t) {
 if (cc.sys.os == cc.sys.OS_WINDOWS) return !0;
@@ -15046,6 +15106,10 @@ t.sendEvent = function(t, e) {
 cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "sendEvent", "(Ljava/lang/String;Ljava/lang/String;)V", t, e) : (cc.sys.os, 
 cc.sys.OS_IOS);
 };
+t.sendEventValue = function(t, e, o) {
+cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "sendEventValue", "(Ljava/lang/String;Ljava/lang/String;F)V", t, e, o) : (cc.sys.os, 
+cc.sys.OS_IOS);
+};
 t.setTAEventUser = function(t, e, o) {
 cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "setTAEventUser", "(ILjava/lang/String;F)V", t, e, o) : (cc.sys.os, 
 cc.sys.OS_IOS);
@@ -15054,6 +15118,10 @@ t.setTAEventUserStr = function(t, e, o) {
 cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "setTAEventUserStr", "(ILjava/lang/String;Ljava/lang/String;)V", t, e, o) : (cc.sys.os, 
 cc.sys.OS_IOS);
 };
+t.setTAUserID = function(t) {
+cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "setTAUserID", "(Ljava/lang/String;)V", t) : (cc.sys.os, 
+cc.sys.OS_IOS);
+};
 t.WxAuth = function() {
 cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "WxAuth", "()V") : cc.sys.os == cc.sys.OS_IOS && this.callStaticMethod("AppController", "WxAuth", "");
 };
@@ -15101,6 +15169,10 @@ return r;
 t.updateSplashAdLog = function(t) {
 var e = t.split("#"), o = JSON.parse(e[1]);
 gData.adData.updateADLog(6, e[0], o);
+var n = mk.storage.getStorage("ad_openEcpm");
+n ? n++ : n = 1;
+mk.storage.setStorage("ad_openEcpm", n);
+n <= 300 && (n <= 50 ? mk.data.sendDataEventValue(a.DataEventId.ad_openEcpm, "ad_video_ecpm" + n, o.adsource_price) : n % 10 == 0 && mk.data.sendDataEventValue(a.DataEventId.ad_openEcpm, "ad_video_ecpm" + n, o.adsource_price));
 };
 t.getAliRiskDeviceToken = function() {
 var t = "";
@@ -15111,10 +15183,12 @@ t._JSB_ANDROID_PATH = "org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr";
 t._JSB_IOS_PATH = "ThirdSdkMgr";
 return t;
 }();
-o.default = a;
-window.JsbMgr = a;
+o.default = i;
+window.JsbMgr = i;
 cc._RF.pop();
-}, {} ],
+}, {
+"../../game/data/GameData": "GameData"
+} ],
 LoadResUtil: [ function(t, e, o) {
 "use strict";
 cc._RF.push(e, "027abfHullEcrlQpxOvHVc5", "LoadResUtil");
@@ -15587,7 +15661,6 @@ mk.storage.setStorage(i.StorageKey.loginTicket, this.loginTicket);
 if (null == mk.storage.getStorage(i.StorageKey.isFirstIn)) {
 this.isFirstIn = !0;
 mk.storage.setStorage(i.StorageKey.isFirstIn, 1);
-mk.data.setTAEventRegister();
 }
 if (this.uin != o.uin) {
 this.uin = o.uin;
@@ -17826,9 +17899,7 @@ t.push(i);
 }
 this.node_sv.emit("srollview-init", t);
 };
-e.prototype.onClickClose = function() {
-mk.ad.checkShowInterByChance();
-};
+e.prototype.onClickClose = function() {};
 i([ s(cc.Node) ], e.prototype, "node_sv", void 0);
 i([ s(cc.Prefab) ], e.prototype, "moreGameNormalNode", void 0);
 return i([ c ], e);
@@ -18107,7 +18178,7 @@ this.lbl_reward_value.string = "￥" + (gData.receiptNotice.receip_rmb / 100).to
 this.lbl_time.string = mk.time.getNowDayStringExtend();
 };
 e.prototype.clickCloseBtn = function() {
-gData.adData.checkShowFullInter(2);
+gData.adData.checkShowFullInter(1);
 };
 i([ s({
 displayName: "提现金额",
@@ -18168,7 +18239,7 @@ gData.turnable.adData = null;
 }
 };
 e.prototype.onEnable = function() {
-Math.random() < .5 ? gData.adData.checkShowFullInter(3) : gData.adData.checkShowFullInter(4);
+gData.adData.checkPopInter();
 mk.ad.showBanner();
 };
 e.prototype.onDisable = function() {
@@ -18587,7 +18658,7 @@ done: !0
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var s = t("../../game/data/GameData"), l = t("../view/Animals"), p = t("../view/ProductShow"), u = t("./FarmCountDown"), d = t("./IDHelper"), h = cc._decorator, f = h.ccclass, y = h.property, g = function(t) {
+var s = t("../../game/data/GameData"), l = t("../map/MoveToCenter"), p = t("../view/Animals"), u = t("../view/ProductShow"), d = t("./FarmCountDown"), h = t("./IDHelper"), f = cc._decorator, y = f.ccclass, g = f.property, m = function(t) {
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -18618,7 +18689,7 @@ var t, e, o, n, a, i, r, s = this;
 return c(this, function(c) {
 switch (c.label) {
 case 0:
-t = this.getComponent(d.IDHelper);
+t = this.getComponent(h.IDHelper);
 this.configID = t.buildID;
 this.sortID = t.sortID;
 this.data = gData.gameData.getPastureDataMap(this.configID);
@@ -18641,7 +18712,7 @@ return n < 5 ? [ 4, mk.loader.load("game/prefab/paster_" + this.configID, cc.Pre
 case 2:
 a = c.sent();
 i = cc.instantiate(a);
-r = i.getComponent(l.default);
+r = i.getComponent(p.default);
 this.animalsArr.push(r);
 r.pointIndex = this.pastureData.getCanMoveIndex();
 i.setPosition(this.pastureData.getCanMoveIndexPoint(r.pointIndex));
@@ -18722,7 +18793,7 @@ case 1:
 t = n.sent();
 e = cc.instantiate(t);
 o = this.data.productID;
-e.getComponent(p.default).id = o;
+e.getComponent(u.default).id = o;
 e.parent = this.showGroup;
 n.label = 2;
 
@@ -18777,6 +18848,7 @@ this.data.productID = this.data.productID;
 this.data.growSpan = e;
 gData.gameData.setPastureDataMap(this.configID, this.data);
 this.eatNode.active = !1;
+this.getComponent(l.MoveToCenter).move();
 gData.gameData.leftTimes--;
 gData.gameData.setProp(s.GameProp.leftTimes, gData.gameData.leftTimes);
 gData.gameData.init_leftTimes = !0;
@@ -18800,34 +18872,35 @@ this.clean();
 this.data.state = s.PastureState.Empty;
 this.data.growSpan = 0;
 gData.gameData.setPastureDataMap(this.configID, this.data);
-gData.gameData.setNextProduct();
+gData.gameData.setNextProduct(!1);
 };
-i([ y({
+i([ g({
 type: cc.Node,
 tooltip: "动物显示节点"
 }) ], e.prototype, "points", void 0);
-i([ y({
+i([ g({
 type: cc.Node,
 tooltip: "动物喂食节点"
 }) ], e.prototype, "eatNode", void 0);
-i([ y({
-type: u.FarmCountDown,
+i([ g({
+type: d.FarmCountDown,
 tooltip: "倒计时组件"
 }) ], e.prototype, "countDown", void 0);
-i([ y({
+i([ g({
 type: cc.Node,
 tooltip: "完成品展示节点"
 }) ], e.prototype, "showGroup", void 0);
-i([ y({
+i([ g({
 type: cc.Node,
 tooltip: "闲置动画"
 }) ], e.prototype, "idleAni", void 0);
-return i([ f ], e);
+return i([ y ], e);
 }(cc.Component);
-o.default = g;
+o.default = m;
 cc._RF.pop();
 }, {
 "../../game/data/GameData": "GameData",
+"../map/MoveToCenter": "MoveToCenter",
 "../view/Animals": "Animals",
 "../view/ProductShow": "ProductShow",
 "./FarmCountDown": "FarmCountDown",
@@ -19255,9 +19328,7 @@ return [ 2 ];
 });
 });
 };
-e.prototype.onClickClose = function() {
-mk.ad.checkShowInterByChance();
-};
+e.prototype.onClickClose = function() {};
 e.prototype.onDestroy = function() {
 if (1 === gData.gameData.getProp(l.GameProp.isAutoOpenPanel)) {
 !gData.gameData.gameData.isSignInToday && gData.sign.haveSignDay() && mk.ui.openPanel("module/sign/sign");
@@ -19536,10 +19607,7 @@ return [ 2 ];
 });
 };
 e.prototype.clickMake = function() {
-var t = this;
-Math.random() < .5 ? mk.ad.watchAd(function(e) {
-e && (t.data.tab == l.ProductType.nzw ? gData.farmSystem.plant(t.data.picture) : gData.factorySystem.make(t.data.picture));
-}) : this.data.tab == l.ProductType.nzw ? gData.farmSystem.plant(this.data.picture) : gData.factorySystem.make(this.data.picture);
+this.data.tab == l.ProductType.nzw ? gData.farmSystem.plant(this.data.picture) : gData.factorySystem.make(this.data.picture);
 };
 e.prototype.getDesByType = function() {
 var t = "";
@@ -22438,12 +22506,11 @@ this.lbl_reward_num.string = "x0";
 };
 e.prototype.start = function() {
 mk.ad.showBanner();
-mk.ad.checkShowInterByChance();
 this.initLid();
 this.initCashOutStyle(gData.gameData.gameData.redMoney);
 };
 e.prototype.onEnable = function() {
-Math.random() < .5 ? gData.adData.checkShowFullInter(3) : gData.adData.checkShowFullInter(4);
+gData.adData.checkPopInter();
 mk.ad.showBanner();
 };
 e.prototype.onDisable = function() {
@@ -22592,7 +22659,6 @@ this.cur_stage === s.none && mk.audio.playEffect("rewardClose");
 };
 e.prototype.onClickClose = function() {
 mk.ad.destoryBanner();
-mk.ad.checkShowInterByChance();
 };
 i([ h({
 displayName: "红包类型",
@@ -23359,7 +23425,6 @@ e.prototype.onDestroy = function() {};
 e.prototype.onClickClose = function() {
 mk.audio.playEffect("closeButton");
 mk.ad.destroyNativeAd();
-mk.ad.checkShowInterByChance();
 };
 i([ d({
 type: cc.Sprite,
@@ -26698,9 +26763,7 @@ this.playOver();
 }
 };
 e.prototype.onDestroy = function() {};
-e.prototype.onClickClose = function() {
-mk.ad.checkShowInterByChance();
-};
+e.prototype.onClickClose = function() {};
 i([ f(cc.Node) ], e.prototype, "node_turn", void 0);
 i([ f(cc.Node) ], e.prototype, "node_items", void 0);
 i([ f(cc.Node) ], e.prototype, "btn_draw", void 0);
@@ -27764,7 +27827,6 @@ e.curChooseIndex = 0;
 return e;
 }
 e.prototype.start = function() {
-mk.ad.showNative(4);
 for (var t = [ {}, {}, {}, {}, {}, {} ], e = 0; e != this.check_button.length; ++e) e < t.length ? this.check_button[e].setShowUI(t[e]) : this.check_button[e].setShowUI(null);
 };
 e.prototype.clickChooseBtn = function(t, e) {
@@ -27783,10 +27845,7 @@ mk.audio.playEffect("button");
 mk.ad.videoAdType = c.VideoAdType.CashOutNoviceWelfare;
 mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
-if (t) {
-gData.adData.watchVideo(r.AdFun.cashOutNoviceWelfare);
-mk.ad.destroyNativeAd();
-}
+t && gData.adData.watchVideo(r.AdFun.cashOutNoviceWelfare);
 });
 };
 e.prototype.clickAddCashBtn = function() {
@@ -27794,10 +27853,7 @@ mk.audio.playEffect("button");
 mk.ad.videoAdType = c.VideoAdType.CashOutNoviceWelfare;
 mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
-if (t) {
-gData.adData.watchVideo(r.AdFun.cashOutAddCash);
-mk.ad.destroyNativeAd();
-}
+t && gData.adData.watchVideo(r.AdFun.cashOutAddCash);
 });
 };
 e.prototype.clickEnoughCashOutBtn = function() {
@@ -27806,6 +27862,9 @@ mk.audio.playEffect("button");
 e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("closeButton");
 };
+e.prototype.onDisable = function() {
+gData.adData.checkShowFullInter(4);
+};
 i([ u({
 displayName: "进度条",
 type: cc.Sprite

packages-hot-update/cfg.json

@@ -9,7 +9,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/"
     ],
-    "buildTime": 1630659065945,
-    "genTime": 1630659065945,
+    "buildTime": 1630664164183,
+    "genTime": 1630664164183,
     "genVersion": null
 }