1

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

@@ -114,7 +114,7 @@ export default class PlantItem extends cc.Component {
         }
 
         if (gData.gameData.isProducting) {
-            mk.tip.pop('点击太快了');
+            //mk.tip.pop('点击太快了');
             return;
         }
         let flyRed;

assets/script/game/data/GameData.ts

@@ -121,8 +121,13 @@ export class GameData {
 
     public welfareOpenLimit = 0;
 
+    //插屏每日限制
     public insertAdLimit = 0;
+    //插屏展示开关
     public insertAdSwitch: string[] = [];
+    //全屏插屏展示开关
+    public fullScreenAdSwitch: string[] = [];
+
     /**
      * 初始化游戏数据：网络配置信息，用户信息
      * @returns 
@@ -157,13 +162,7 @@ export class GameData {
             }
         }
 
-        data = {};
-        response = await mk.http.sendData('user/adShowConfig', data);
-        if (response.errcode != 0) {
-            return;
-        }
-        this.adShowConfig = response.data;
-        mk.console.logSingle("user/adShowConfig", response.data);
+        this.uploadAverageEcpm();
         gData.adData.initEcpmData();
 
         // data = {};
@@ -182,6 +181,18 @@ export class GameData {
         this.dataFinish = true;
     }
 
+    public async uploadAverageEcpm(){
+        let data = {};
+        let response = await mk.http.sendData('user/adShowConfig', data);
+        if (response.errcode != 0) {
+            return;
+        }
+        this.adShowConfig = response.data;
+        mk.data.setTAEventUser(0, "average_ecpm",  this.adShowConfig.average_ecpm);
+
+        mk.console.logSingle("user/adShowConfig", response.data);
+    }
+
     private initConfigs(data) {
         // console.log('config  ', data);
         this.configs = data;
@@ -207,6 +218,7 @@ export class GameData {
 
         gData.gameData.insertAdLimit = parseInt(this.configs.ServerConfig.InsertAdCash);
         gData.gameData.insertAdSwitch = this.configs.ServerConfig.InsertAdScene.split(",");
+        gData.gameData.fullScreenAdSwitch = this.configs.ServerConfig.FullScreenAdScene.split(",");
     }
 
     /**
@@ -2328,7 +2340,26 @@ export enum VideoAdType {
 export enum InterFullAdType {
     interstitial2_init_1 = '点击红包的关闭按钮',
     interstitial2_init_2 = '普通收获',
-    interstitial2_init_3 = '点击鸟和狗'
+    interstitial2_init_3 = '点击鸟和狗',
+    interstitial2_init_4 = '关闭个人资料页',
+    interstitial2_init_5 = '关闭农场等级奖励界面',
+    interstitial2_init_6 = '关闭红包币提现界面',
+    interstitial2_init_7 = '关闭抽奖界面',
+    interstitial2_init_8 = '关闭任务红包界面',
+    interstitial2_init_9 = '关闭更多游戏界面',
+    interstitial2_init_10 = '关闭图鉴界面',
+    interstitial2_init_11 = '关闭生虫、生病、停电弹窗',
+    interstitial2_init_12 = '关闭全体加速界面',
+    interstitial2_init_13 = '关闭收获弹窗',
+    interstitial2_init_14 = '关闭富翁银行',
+    interstitial2_init_15 = '关闭福利界面',
+    interstitial2_init_16 = '一键生产-关闭领取生产次数弹窗',
+    interstitial2_init_17 = '红包币提现界面，点击提现按钮',
+    interstitial2_init_18 = '福利-点击提现按钮',
+    interstitial2_init_19 = '订单-点击订单提现按钮',
+    interstitial2_init_20 = '任务红包-点击领取按钮',
+    interstitial2_init_21 = '富翁银行-点击开始任务按钮',
+    interstitial2_init_22 = '富翁银行-点击提现按钮',
 }
 
 export enum InterAdType {

assets/script/game/game/Game.ts

@@ -564,7 +564,7 @@ export default class Game extends cc.Component {
         }
 
         if (gData.gameData.isProducting) {
-            mk.tip.pop('点击太快了');
+            //mk.tip.pop('点击太快了');
             return;
         }
 

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

@@ -226,6 +226,9 @@ export default class ATInterstitial extends zgSingleton {
             gData.adData.updateADLog(8, placementId, data);
             mk.data.sendDataEvent(DataEventId.interstitial2_end, mk.ad.interFullAdType);
             // this.loadInter(1);
+
+            console.log("onInterstitialAdClose======");
+            ATSDKMgr.getInstance().onInterstitialAdCloseCallBack();
         }
         else if (type == 2) {
             // this.loadInter(2);

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

@@ -123,6 +123,13 @@ export default class ATSDKMgr extends zgSingleton implements IADSDKMgr {
         }
     }
 
+    /** 
+     * 关闭全屏插屏回调
+     */
+     onInterstitialAdCloseCallBack(){
+        mk.ad.closeInterFullAdCallBack();
+    }
+
     //插屏广告------------------------------------------------------------------------------
     /**
      * 显示插屏广告

assets/script/mk/system/AdSystem.ts

@@ -30,6 +30,9 @@ export default class AdSystem {
     /** 全屏插屏广告类型 */
     public interFullAdType: InterFullAdType = InterFullAdType.interstitial2_init_1;
 
+    /** 全屏插屏广告类型关闭回调 */
+    public interFullAdCallBack: Function = null;
+
     /** 插屏广告类型 */
     public interAdType: InterAdType = InterAdType.interstitial1_click_1;
 
@@ -118,9 +121,23 @@ export default class AdSystem {
                 this.videoAdcallBack(true);
             }
             this.initLastTimeStamp();
+            gData.gameData.uploadAverageEcpm();
         }, 0)
     }
 
+    /**
+     * 全屏插屏关闭回调
+     */
+     public closeInterFullAdCallBack(){
+        setTimeout(()=>{
+            if(this.interFullAdCallBack){
+                this.interFullAdCallBack();
+                this.interFullAdCallBack = null;
+                console.log("closeInterFullAdCallBack===");
+            }
+        }, 1000);
+    }
+
     /** 显示原生广告 */
     public showNative(type = 4) {
 
@@ -255,7 +272,7 @@ export default class AdSystem {
      * @param type 0 插屏 1 全屏 2 大插屏
      * @param des 广告类型
      */
-    public showInterAd(type: number, des = null) {
+    public showInterAd(type: number, des = null, callBack = null) {
         if (CC_DEBUG) {
             return;
         }
@@ -272,6 +289,8 @@ export default class AdSystem {
             if (des as InterFullAdType) {
                 this.interFullAdType = des;
             }
+
+            this.interFullAdCallBack = callBack;
         }
         else {
             if (des as InterAdType) {