1

assets/script/before/main/FarmIcon.ts

@@ -1,4 +1,4 @@
-import { DataEventId, ExpAddType, FarmState, GameProp, ProductType } from '../../game/data/GameData';
+import { DataEventId, ExpAddType, FarmState, GameProp, InterAdType, ProductType } from '../../game/data/GameData';
 import { MoveToCenter } from '../map/MoveToCenter';
 import ProductShow from '../view/ProductShow';
 import { FarmCountDown } from './FarmCountDown';
@@ -165,6 +165,8 @@ export class FarmIcon extends cc.Component {
         else {
             gData.farmGradeData.addGradeExp(ExpAddType.EAT_others, this.node);
         }
+        //gData.adData.checkPopInter(InterAdType.interstitial1_click_8);
+        gData.gameData.popTableScreenADLogic(7);
     }
 
     public async plant(id: number, parentNode = null) {

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

@@ -35,7 +35,7 @@ export default class ADClearSickPanel extends cc.Component {
     }
 
     onEnable() {
-        gData.adData.checkPopInter(InterAdType.interstitial1_click_3);
+        gData.gameData.popTableScreenADLogic(2);
 
         //mk.ad.showBanner(BannerAdType.banner_click_8);
         mk.ad.showNative();

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

@@ -14,6 +14,8 @@ export default class ADUnlockPanel extends cc.Component {
                 mk.ui.closePanel(this.node.name);
                 gData.adData.watchVideo(null);
                 gData.adUnlockData.unlockFarm();
+
+                gData.gameData.popTableScreenADLogic(16);
             }
         });
     }

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

@@ -62,6 +62,8 @@ export default class HarvestPanel extends cc.Component {
             mk.console.log("watchAD:" + success);
             if (success) {
                 await gData.adData.watchVideo(AdFun.harvest);
+
+                gData.gameData.popTableScreenADLogic(17);
             }
         });
     }

assets/script/game/data/AdData.ts

@@ -1,6 +1,6 @@
 import Util from "../../before/util/Util";
 import { Data } from "../../mk/data/Data";
-import { GameProp, VideoAdType } from "./GameData";
+import { GameProp, InterAdType, VideoAdType } from "./GameData";
 
 /**
  * @description 广告数据
@@ -104,7 +104,7 @@ export class AdData {
         this.precision = data.precision;
         this.ecpm_level = data.ecpm_level;
         this.request_id = '';
-        if(data.ext_info && data.ext_info.request_id){
+        if (data.ext_info && data.ext_info.request_id) {
             this.request_id = data.ext_info.request_id;
         }
     }
@@ -157,11 +157,10 @@ export class AdData {
             curData.setAdData(response.data);
         }
 
-        if(callBack)
-        {
+        if (callBack) {
             callBack(response.data);
         }
-        
+
         //达到任务之后计算视频
         if (gData.safeDepositBoxData.isStartBankTask > 0) {
             gData.safeDepositBoxData.richBankDailyVideoTimes++
@@ -229,7 +228,7 @@ export class AdData {
                 "platformRisk": 1,
                 "request_id": '',
             }
-            if(data.ext_info && data.ext_info.request_id){
+            if (data.ext_info && data.ext_info.request_id) {
                 sData.request_id = data.ext_info.request_id;
             }
         }
@@ -288,14 +287,18 @@ export class AdData {
     }
 
     /** 检查是否显示插屏、互推（概率弹出）
-     * @type  1:弹出全屏插屏广告  2:延时弹出大插屏  3:先弹出插屏，再弹出大插屏  4:互推红包
+     * @type  1:弹出全屏插屏广告  2:延时弹出大插屏  3:先弹出插屏，再弹出大插屏  4:互推红包  5.激励视频之后弹插屏
      */
-    checkShowFullInter(type, des = null) {
+    checkShowFullInter(type, des = null, rateType = null) {
         let per = 0;
         let pop = true;
         switch (type) {
             case 1:
-                per = this.getPerByEcpm(RateConfig.RC_fullScreen);
+                if(rateType != null){
+                    per = this.getPerByEcpm(rateType);
+                }else{
+                    per = this.getPerByEcpm(RateConfig.RC_fullScreen);
+                }
                 pop = Math.random() < per;
                 if (!pop) {
                     return pop;
@@ -306,7 +309,11 @@ export class AdData {
                 mk.ad.showInterAd(1, des);
                 break;
             case 2:
-                per = this.getPerByEcpm(RateConfig.RC_tableScreen);
+                if(rateType != null){
+                    per = this.getPerByEcpm(rateType);
+                }else{
+                    per = this.getPerByEcpm(RateConfig.RC_tableScreen);
+                }
                 pop = Math.random() < per;
                 if (!pop) {
                     return pop;
@@ -320,8 +327,11 @@ export class AdData {
                 }, delay);
                 break;
             case 3:
-
-                per = this.getPerByEcpm(RateConfig.RC_tableScreen);
+                if(rateType != null){
+                    per = this.getPerByEcpm(rateType);
+                }else{
+                    per = this.getPerByEcpm(RateConfig.RC_tableScreen);
+                }
                 pop = Math.random() < per;
                 if (!pop) {
                     return pop;
@@ -339,20 +349,24 @@ export class AdData {
                 }, delay1);
                 break;
             case 4:
-                per = this.getPerByEcpm(RateConfig.RC_moreGameRedBag);
+                if(rateType != null){
+                    per = this.getPerByEcpm(rateType);
+                }else{
+                    per = this.getPerByEcpm(RateConfig.RC_moreGameRedBag);
+                }
                 pop = Math.random() < per;
                 if (!pop) {
                     return pop;
                 }
 
                 gData.moreGame.popNewOpenRedBag();
-                break;
+                break;    
         }
         return pop;
     }
 
     /** 弹出插屏 */
-    checkPopInter(des) {
+    checkPopInter(des, rateType = null) {
         if (this.ABCInsertAdArr.indexOf(this.ecpmLevel.toString()) == -1) {
             return;
         }
@@ -367,7 +381,7 @@ export class AdData {
             }
         }
 
-        this.checkShowFullInter(index, des);
+        this.checkShowFullInter(index, des, rateType);
     }
 
     /** 点击提现弹出全屏插屏 */
@@ -409,9 +423,11 @@ export class AdData {
         let span = this.AutoRedMoneyMap.get(this.ecpmLevel);
         if (this.timeAd >= span) {
             this.timeAd = 0;
-            mk.ad.videoAdType = VideoAdType.video_init_19;
-            gData.gameData.init_hideRedBag = true;
-            mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
+            //mk.ad.videoAdType = VideoAdType.video_init_19;
+            // gData.gameData.init_hideRedBag = true;
+            // mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
+
+            this.checkPopInter(InterAdType.interstitial1_click_19);
         }
     }
 
@@ -490,10 +506,15 @@ export class AdData {
                         return per;
                     }
                 case RateConfig.RC_popSpeedUp:
-                    if (gData.gameData.adShowConfig.average_ecpm <= parseInt(forceAd[i].ecpmMax)){
+                    if (gData.gameData.adShowConfig.average_ecpm <= parseInt(forceAd[i].ecpmMax)) {
                         per = parseFloat(forceAd[i].jsPercent);
                         return per;
                     }
+                case RateConfig.RC_afterVideo:
+                    if (gData.gameData.adShowConfig.average_ecpm <= parseInt(forceAd[i].ecpmMax)) {
+                        per = parseFloat(forceAd[i].cpjlPercent);
+                        return per;
+                    }
             }
         }
 
@@ -506,8 +527,7 @@ export class AdData {
         if (!times) {
             console.log('savePreLoadEcpm  data ', data.adsource_price)
             let response = await mk.http.sendData('user/savePreLoadEcpm', data);
-            if(response.errcode != 0)
-            {
+            if (response.errcode != 0) {
                 return;
             }
 
@@ -515,17 +535,15 @@ export class AdData {
         }
     }
 
-    async getOrderTaskInfo(isDefault)
-    {
-        if(!gData.gameData.playerProp.orderData)
-        {
+    async getOrderTaskInfo(isDefault) {
+        if (!gData.gameData.playerProp.orderData) {
             let data = {};
             data["isDefault"] = isDefault;
             let response = await mk.http.sendData('orderTask/getUserOrderTaskInfo', data);
-            if(response.errcode != 0){
+            if (response.errcode != 0) {
                 return;
             }
-            gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;  
+            gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
 
             mk.event.emit("initOrderUi");
         }
@@ -557,5 +575,6 @@ export enum RateConfig {
     RC_splash,
     RC_superDouble,
     RC_moreGameRedBag,
-    RC_popSpeedUp
+    RC_popSpeedUp,
+    RC_afterVideo
 }

assets/script/game/data/GameData.ts

@@ -120,6 +120,9 @@ export class GameData {
     public orderAinFinishNum = 0;
 
     public welfareOpenLimit = 0;
+
+    public insertAdLimit = 0;
+    public insertAdSwitch: string[] = [];
     /**
      * 初始化游戏数据：网络配置信息，用户信息
      * @returns 
@@ -183,7 +186,7 @@ export class GameData {
         // console.log('config  ', data);
         this.configs = data;
         this.funOpenData = this.configs.ServerConfig.Functionswitch.split(",");
-        
+
         //从服务器解析配置
         this.setProductMapFromJson();
 
@@ -201,6 +204,9 @@ export class GameData {
         gData.safeDepositBoxData.richBankConfig = this.configs.BankTask;
 
         gData.gameData.welfareOpenLimit = parseInt(this.configs.ServerConfig.welfareOpen);
+
+        gData.gameData.insertAdLimit = parseInt(this.configs.ServerConfig.InsertAdCash);
+        gData.gameData.insertAdSwitch = this.configs.ServerConfig.InsertAdScene.split(",");
     }
 
     /**
@@ -234,7 +240,7 @@ export class GameData {
         this.playerProp.userFarmTaskInfo = res_data.userFarmTaskInfo;
         this.playerProp.speedUpLeftTimes = res_data.speedUpLeftTimes;
         this.playerProp.completeFarmTaskTimes = res_data.completeFarmTaskTimes;
-        if(res_data.userOrderTaskInfo){
+        if (res_data.userOrderTaskInfo) {
             this.playerProp.orderData = res_data.userOrderTaskInfo;
             console.log("============userOrderTaskInfo123");
         }
@@ -243,7 +249,7 @@ export class GameData {
         //this.playerProp.orderData.overTimes = 3;
         //this.cloneOrderData();
         this.playerProp.curProductionAdTimes = res_data.dailyProductionTimes;
-     
+
         mk.data.setTAUserID(gData.loginData.uin);
         mk.data.setTAEventUser(0, 'logindays_total', this.playerProp.loginDays);
         if (this.playerProp.completeFarmTaskTimes == 0) {
@@ -336,14 +342,13 @@ export class GameData {
         }
     }
 
-    public setOrderAniFinishNum()
-    {
+    public setOrderAniFinishNum() {
         ++this.orderAinFinishNum;
-        if(this.orderAinFinishNum >= 3){
+        if (this.orderAinFinishNum >= 3) {
             this.orderAinFinishNum = 0;
             setTimeout(() => {
                 mk.event.emit("flyOrderAni");
-            }, 500)      
+            }, 500)
         }
     }
 
@@ -701,43 +706,41 @@ export class GameData {
             }
             if (factoryArray.length > 0) {
                 matchSuccessFactorys = gData.factorySystem.isHaveEmptyFactory(factoryArray);
-                if(matchSuccessFactorys.length > 0){
+                if (matchSuccessFactorys.length > 0) {
                     typeArr.push(1);
                 }
             }
             if (animalArray.length > 0) {
                 matchSuccessPastures = gData.pastureSystem.isHaveEmptyPasture(animalArray);
-                if(matchSuccessPastures.length > 0){
+                if (matchSuccessPastures.length > 0) {
                     typeArr.push(2);
                 }
             }
 
-            if(typeArr.length > 0)
-            {
-                let rand = mk.math.random(0, typeArr.length-1);
+            if (typeArr.length > 0) {
+                let rand = mk.math.random(0, typeArr.length - 1);
                 let type = typeArr[rand];
                 if (type == 0) {
-                    let randCrop = mk.math.random(0, cropArray.length-1);
+                    let randCrop = mk.math.random(0, cropArray.length - 1);
                     id = cropArray[randCrop];
                     this.nextType = 1
                     return this.getProductMap(id);
                 } else if (type == 1) {
-                    let randFactory = mk.math.random(0, matchSuccessFactorys.length-1);
+                    let randFactory = mk.math.random(0, matchSuccessFactorys.length - 1);
                     let factory = matchSuccessFactorys[randFactory];
                     this.nextCanProduct = this.getProductMap(factory.picture);
                     this.nextMake = factory.key;
                     this.nextType = 3;
                     return this.nextMake;
                 } else if (type == 2) {
-                    let randPasture = mk.math.random(0, matchSuccessPastures.length-1);
+                    let randPasture = mk.math.random(0, matchSuccessPastures.length - 1);
                     let pasture = matchSuccessPastures[randPasture];
                     this.nextCanProduct = this.getProductMap(pasture.data.productID);
                     this.nextMake = pasture
                     this.nextType = 2;
                     return pasture;
                 }
-            }else
-            {
+            } else {
                 id = Util.rnd(10001, this.getMaxProductExtra(ProductType.nzw));
                 this.nextType = 1
                 return this.getProductMap(id);
@@ -748,7 +751,7 @@ export class GameData {
             return this.getProductMap(id);
         }
     }
-    
+
     public doJudgeOrderLogic(out?: any) {
         let data = this.playerProp.orderData;
         if (data) {
@@ -834,7 +837,7 @@ export class GameData {
                                                     if (isHaveEmpty && startIndex == value) {
                                                         isHaveEmpty.state = true;
                                                     }
-                                                    if (picId == pastureIconsData[index].data.productID) {            
+                                                    if (picId == pastureIconsData[index].data.productID) {
                                                         this.nextCanProduct = this.getProductMap(pastureIconsData[index].data.productID);
                                                         this.nextMake = pastureIconsData[index];
                                                         this.nextType = 2;
@@ -854,7 +857,7 @@ export class GameData {
                                                         isHaveEmpty.state = true;
                                                     }
                                                     let tab = this.getTabByConfigID(factoryIconsData[index].configID);
-                                                    if (tab == ProductType[key]) {                             
+                                                    if (tab == ProductType[key]) {
                                                         this.nextCanProduct = this.getProductMap(picId);
                                                         this.nextMake = factoryIconsData[index];
                                                         this.nextType = 3;
@@ -937,25 +940,25 @@ export class GameData {
                 flyRed = false;
                 break;
             case 1:
-                if(this.popSpeedUpByRate()){
+                if (this.popSpeedUpByRate()) {
                     flyRed = false;
-                }else{
+                } else {
                     flyRed = await gData.farmSystem.btnMake();
                     gData.adData.checkPopRed();
                 }
                 break;
             case 2:
-                if(this.popSpeedUpByRate()){
+                if (this.popSpeedUpByRate()) {
                     flyRed = false;
-                }else{
+                } else {
                     flyRed = await gData.pastureSystem.btnMake();
                     gData.adData.checkPopRed();
                 }
                 break;
             case 3:
-                if(this.popSpeedUpByRate()){
+                if (this.popSpeedUpByRate()) {
                     flyRed = false;
-                }else{
+                } else {
                     flyRed = await gData.factorySystem.btnMake();
                     gData.adData.checkPopRed();
                 }
@@ -1263,12 +1266,12 @@ export class GameData {
         if (this._productMakeTimesData.productUnlockMaxId) {
             let productId = this._productMakeTimesData.productUnlockMaxId.get(tab);
             if (productId) {
-                if(id > productId){
+                if (id > productId) {
                     this._productMakeTimesData.productUnlockMaxId.set(tab, id);
                     console.log(`addProductUnlockMaxId====${tab}====${id}`);
                     return true;
                 }
-            }else{
+            } else {
                 console.log(`addProductUnlockMaxId22====${tab}====${id}`);
                 this._productMakeTimesData.productUnlockMaxId.set(tab, id);
                 return true;
@@ -1376,18 +1379,17 @@ export class GameData {
             let id = 30001;
             let data = null;
             for (var i = 0; i < len1; i++) {
-                if(this.playerProp.orderData)
-                {
+                if (this.playerProp.orderData) {
                     if (this.playerProp.orderData.overTimes < arr[i].value) {
                         data = { id: id, state: PastureState.Lock, productID: arr[i].picture, growSpan: 0 };
                     }
                     else {
                         data = { id: id, state: PastureState.Empty, productID: arr[i].picture, growSpan: 0 };
                     }
-                }else{
+                } else {
                     data = { id: id, state: PastureState.Lock, productID: arr[i].picture, growSpan: 0 };
                 }
-                
+
                 this._pastureData.push(data);
                 this._pastureDataMap.set(id, data);
                 id++;
@@ -1453,7 +1455,7 @@ export class GameData {
             for (var i = 0; i < 6; i++) {
                 tab = this.getTabByConfigID(id);
                 let arr = this.getProductArrByType(tab);
-                if(this.playerProp.orderData){
+                if (this.playerProp.orderData) {
                     if (this.playerProp.orderData.overTimes < arr[0].value) {
                         data = { id: id, state: FactroyState.Lock, productID: 0, growSpan: 0 };
                     }
@@ -1467,10 +1469,10 @@ export class GameData {
                         //     isUpdate = is;
                         // }
                     }
-                }else{
+                } else {
                     data = { id: id, state: FactroyState.Lock, productID: 0, growSpan: 0 };
                 }
-                
+
                 this._factoryData.push(data);
                 this._factoryDataMap.set(id, data);
                 id++;
@@ -1690,17 +1692,17 @@ export class GameData {
                     let maxId = 0;
                     for (var i = 0; i < len; i++) {
                         data = this.getPastureDataMap(id);
-                        if(this.playerProp.orderData){
+                        if (this.playerProp.orderData) {
                             if (this.playerProp.orderData.overTimes >= configArr[i].value) {
                                 if (data.state == PastureState.Lock) {
                                     data = { id: id, state: PastureState.Empty, productID: configArr[i].picture, growSpan: 0 };
                                     this.setPastureDataMap(id, data, false);
                                     needUpdate = true;
                                 }
-    
+
                                 maxId = configArr[i].picture;
                             }
-                        }        
+                        }
                         id++;
                     }
                     console.log(`checkTaskFinishUnLock11=====${maxId}`);
@@ -1724,7 +1726,7 @@ export class GameData {
                     needUpdate = false;
                     let configID = this.getConfigIDByTab(tab);
                     data = this.getFactoryDataMap(configID);
-                    if(this.playerProp.orderData){
+                    if (this.playerProp.orderData) {
                         if (this.playerProp.orderData.overTimes >= configArr[0].value) {
                             if (data.state == FactroyState.Lock) {
                                 data = { id: id, state: FactroyState.Empty, productID: 0, growSpan: 0 };
@@ -1775,19 +1777,17 @@ export class GameData {
         return can;
     }
 
-    popSpeedUpByRate()
-    {
+    popSpeedUpByRate() {
         let isPop = false;
         let rate = gData.adData.getPerByEcpm(RateConfig.RC_popSpeedUp);
-        if(rate >= Math.random())
-        {
+        if (rate >= Math.random()) {
             isPop = gData.pastureSystem.canSpeedUp();
             if (!isPop) {
                 isPop = gData.factorySystem.canSpeedUp();
             }
         }
 
-        if(isPop){
+        if (isPop) {
             mk.ui.openPanel('module/speedUpUI/speedUp');
         }
         return isPop;
@@ -1858,6 +1858,81 @@ export class GameData {
             console.log("------");
         }
     }
+
+    popTableScreenADLogic(type: number) {
+        let str = null;
+        switch (type) {
+            case 0:
+                str = InterAdType.interstitial1_click_1;
+                break;
+            case 1:
+                str = InterAdType.interstitial1_click_2;
+                break;
+            case 2:
+                str = InterAdType.interstitial1_click_3;
+                break;
+            case 3:
+                str = InterAdType.interstitial1_click_4;
+                break;
+            case 4:
+                str = InterAdType.interstitial1_click_5;
+                break;
+            case 5:
+                str = InterAdType.interstitial1_click_6;
+                break;
+            case 6:
+                str = InterAdType.interstitial1_click_7;
+                break;
+            case 7:
+                str = InterAdType.interstitial1_click_8;
+                break;
+            case 8:
+                str = InterAdType.interstitial1_click_9;
+                break;
+            case 9:
+                str = InterAdType.interstitial1_click_10;
+                break;
+            case 10:
+                str = InterAdType.interstitial1_click_11;
+                break;
+            case 11:
+                str = InterAdType.interstitial1_click_12;
+                break;
+            case 12:
+                str = InterAdType.interstitial1_click_13;
+                break;
+            case 13:
+                str = InterAdType.interstitial1_click_14;
+                break;
+            case 14:
+                str = InterAdType.interstitial1_click_15;
+                break;
+            case 15:
+                str = InterAdType.interstitial1_click_16;
+                break;
+            case 16:
+                str = InterAdType.interstitial1_click_17;
+                break;
+            case 17:
+                str = InterAdType.interstitial1_click_18;
+                break;
+        }
+        let index = 0;
+        let rateType = null;
+        if(type <= 11){
+            index = type;
+        }else{
+            index = 12;
+            rateType = RateConfig.RC_afterVideo;
+        }
+        if(str != null){
+            let cashTimes = gData.gameData.getProp(GameProp.cashOutTimes);
+            let str = gData.gameData.insertAdSwitch[index];
+            if(str == "1" && cashTimes >= gData.gameData.insertAdLimit){
+                gData.adData.checkPopInter(str, rateType);
+            }
+        }
+    }
 }
 
 /**
@@ -2219,7 +2294,9 @@ export enum DataEventId {
     /**互推红包弹出位置 */
     htRedBag_scene = "htRedBag_scene",
     /**互推红包领取次数*/
-    htRedBag_eject = "htRedBag_eject"
+    htRedBag_eject = "htRedBag_eject",
+    /**插屏广告弹出*/
+    interstita11_eject = "interstita11_eject"
 }
 
 
@@ -2257,9 +2334,26 @@ export enum InterFullAdType {
 export enum InterAdType {
     interstitial1_click_1 = '恭喜发财红包弹出后',
     interstitial1_click_2 = '恭喜获得弹窗弹出后',
-    interstitial1_click_3 = '生虫/生病/停电弹出后'
+    interstitial1_click_3 = '生虫/生病/停电弹出后',
+    interstitial1_click_4 = '关闭抽奖界面后',
+    interstitial1_click_5 = '关闭任务红包后',
+    interstitial1_click_6 = '关闭富翁银行后',
+    interstitial1_click_7 = '打开领取生产次数界面',
+    interstitial1_click_8 = '农作物点击可收获',
+    interstitial1_click_9 = '关闭全体加速后',
+    interstitial1_click_10 = '关闭福利后',
+    interstitial1_click_11 = '打开个人资料页',
+    interstitial1_click_12 = '打开更多游戏页',
+    interstitial1_click_13 = '全体加速激励视频播完后',
+    interstitial1_click_14 = '离线奖励激励视频播完后',
+    interstitial1_click_15 = '抽奖激励视频播完后',
+    interstitial1_click_16 = '图鉴领奖激励视频播完后',
+    interstitial1_click_17 = '拓建激励视频播完后',
+    interstitial1_click_18 = '收获超级加倍激励视频播完后',
+    interstitial1_click_19 = '定时弹出插屏',
 }
 
+
 export enum BannerAdType {
     banner_click_1 = '恭喜获得弹窗弹出后',
     banner_click_2 = '任务红包',
@@ -2322,7 +2416,7 @@ export enum FactroyState {
 }
 
 //功能开关含义
-export enum FunctionSwitch{
+export enum FunctionSwitch {
     FS_farmGrade = 0,                   //农场等级奖励
     FS_cashOutBtn = 1,                  //主界面提现按钮
     FS_sign = 2,                        //签到

assets/script/game/game/Game.ts

@@ -3,7 +3,7 @@ import JsbSystem from "../../mk/system/JsbSystem";
 import TimeUtil from "../../mk/utils/TimeUtil";
 import SetGray from "../component/SetGray";
 import { AdFun, RateConfig } from "../data/AdData";
-import { DataEventId, FarmState, GameProp, ProductType, VideoAdType } from "../data/GameData";
+import { DataEventId, FarmState, GameProp, InterAdType, ProductType, VideoAdType } from "../data/GameData";
 import FunBtns from "./FunBtns";
 
 const { ccclass, property } = cc._decorator;
@@ -568,7 +568,6 @@ export default class Game extends cc.Component {
             return;
         }
 
-
         let flyRed = await gData.gameData.makeProduct();
 
         //任务红包刷新逻辑

assets/script/game/module/blessingBag/BlessingBag.ts

@@ -6,7 +6,7 @@
 import JsbSystem from "../../../mk/system/JsbSystem";
 import SetGray from "../../component/SetGray";
 import TableView from "../../component/TableView";
-import { DataEventId, VideoAdType } from "../../data/GameData";
+import { DataEventId, InterAdType, VideoAdType } from "../../data/GameData";
 
 
 const { ccclass, property } = cc._decorator;
@@ -297,4 +297,9 @@ export default class BlessingBag extends cc.Component {
             mk.data.sendDataEvent(DataEventId.htRedBag_scene, "关闭福利界面");
         }
     }
+
+    onDestroy(){
+        //gData.adData.checkPopInter(InterAdType.interstitial1_click_10);
+        gData.gameData.popTableScreenADLogic(9);
+    }
 }

assets/script/game/module/farmMap/FarmItem.ts

@@ -182,7 +182,9 @@ export default class FarmItem extends cc.Component {
                     this.node_unluckBtn.active = false;
                     this.node_redPoint.active = false;
                     gData.gameData.setFarmMapRewardState(this.getIndex(), 1);
-                }        
+                }
+                
+                gData.gameData.popTableScreenADLogic(15);
             }
         })
     }

assets/script/game/module/moreGame/MoreGame.ts

@@ -3,6 +3,8 @@
  * @author kaka
  */
 
+import { InterAdType } from "../../data/GameData";
+
 const { ccclass, property } = cc._decorator;
 
 @ccclass
@@ -20,6 +22,9 @@ export default class MoreGame extends cc.Component {
     start() {
         this.node.setContentSize(cc.winSize)
         gData.moreGame.init();
+
+        //gData.adData.checkPopInter(InterAdType.interstitial1_click_12);
+        gData.gameData.popTableScreenADLogic(11);
     }
 
     update() {

assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -75,7 +75,7 @@ export default class NewOpenRedBag extends cc.Component {
     }
 
     onEnable() {
-        gData.adData.checkPopInter(InterAdType.interstitial1_click_1);
+        gData.gameData.popTableScreenADLogic(0);
 
         if (this.showNativeAd) {
             mk.ad.showNative();

assets/script/game/module/redBagTask/RedBagTask.ts

@@ -1,7 +1,7 @@
 import Util from "../../../before/util/Util";
 import JsbSystem from "../../../mk/system/JsbSystem";
 import SetGray from "../../component/SetGray";
-import { BannerAdType, DataEventId, GameProp } from "../../data/GameData";
+import { BannerAdType, DataEventId, GameProp, InterAdType } from "../../data/GameData";
 
 const { ccclass, property } = cc._decorator;
 @ccclass
@@ -343,4 +343,9 @@ export default class RedBagTask extends cc.Component {
 
         mk.audio.playEffect("button");
     }
+
+    onDestroy(){
+        //gData.adData.checkPopInter(InterAdType.interstitial1_click_5);
+        gData.gameData.popTableScreenADLogic(4);
+    }
 }

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

@@ -45,7 +45,7 @@ export default class Reward extends cc.Component {
     }
 
     onEnable() {
-        gData.adData.checkPopInter(InterAdType.interstitial1_click_2);
+        gData.gameData.popTableScreenADLogic(1);
 
         mk.ad.showBanner(BannerAdType.banner_click_1);
     }

assets/script/game/module/safeDepositBox/SafeDepositBox.ts

@@ -1,4 +1,4 @@
-import { DataEventId } from "../../data/GameData";
+import { DataEventId, InterAdType } from "../../data/GameData";
 import MoneySaveItem from "./MoneySaveItem";
 
 const { ccclass, property } = cc._decorator;
@@ -764,4 +764,9 @@ export default class SafeDepositBox extends cc.Component {
         let y = moveNode.y
         moveNode.runAction(cc.repeatForever(cc.sequence(cc.moveTo(1.5, cc.v2(x, y - 5)), cc.moveTo(1.5, cc.v2(x - 5, y - 5)), cc.moveTo(1.2, cc.v2(x, y + 5)))))
     }
+
+    onDestroy(){
+        //gData.adData.checkPopInter(InterAdType.interstitial1_click_6);
+        gData.gameData.popTableScreenADLogic(5);
+    }
 }

assets/script/game/module/setting/Setting.ts

@@ -1,6 +1,6 @@
 import Util from "../../../before/util/Util";
 import JsbSystem from "../../../mk/system/JsbSystem";
-import { DataEventId } from "../../data/GameData";
+import { DataEventId, InterAdType } from "../../data/GameData";
 import Rule from "./Rule";
 
 
@@ -42,6 +42,8 @@ export default class Setting extends cc.Component {
     start() {
         //mk.ad.showNative(4);    
         this.initData();
+        //gData.adData.checkPopInter(InterAdType.interstitial1_click_11);
+        gData.gameData.popTableScreenADLogic(10);
     }
 
     private async initData() {

assets/script/game/module/speedUpUI/ProductReward.ts

@@ -1,5 +1,5 @@
 import { AdFun } from "../../data/AdData";
-import { GameProp, VideoAdType } from "../../data/GameData";
+import { GameProp, InterAdType, VideoAdType } from "../../data/GameData";
 
 
 const { ccclass, property } = cc._decorator;
@@ -33,6 +33,11 @@ export default class ProductReward extends cc.Component {
 
     private btnCanClick = true;
 
+    start(){
+        //gData.adData.checkPopInter(InterAdType.interstitial1_click_7);
+        gData.gameData.popTableScreenADLogic(6);
+    }
+
     onEnable() {
 
         this.lbl_times.string = `生产次数+${gData.gameData.configs.ServerConfig.ProductionAd}`;

assets/script/game/module/speedUpUI/RestoreProductTimes.ts

@@ -37,6 +37,8 @@ export default class RestoreProductTimes extends cc.Component {
                 gData.reward.data = rewardData;
                 gData.reward.callback = this.addDoubleTimes;
                 mk.ui.openPanel('module/reward/reward');
+
+                gData.gameData.popTableScreenADLogic(13);
             }
         })
     }

assets/script/game/module/speedUpUI/SpeedUpUI.ts

@@ -1,4 +1,4 @@
-import { BannerAdType, VideoAdType } from "../../data/GameData";
+import { BannerAdType, InterAdType, VideoAdType } from "../../data/GameData";
 
 
 const { ccclass, property } = cc._decorator;
@@ -100,6 +100,7 @@ export default class SpeedUpUI extends cc.Component {
                     }
                     gData.gameData.setHarvest();
                     mk.tip.pop('加速成功！');
+                    gData.gameData.popTableScreenADLogic(12);
                 }
             })
         }
@@ -111,4 +112,9 @@ export default class SpeedUpUI extends cc.Component {
     private clickCloseBtn() {
         mk.audio.playEffect("button");
     }
+
+    onDestroy(){
+        //gData.adData.checkPopInter(InterAdType.interstitial1_click_9);
+        gData.gameData.popTableScreenADLogic(8);
+    }
 }

assets/script/game/module/turntable/Turnable.ts

@@ -1,7 +1,7 @@
 import BtnClosePanel from "../../component/BtnClosePanel";
 import SetGray from "../../component/SetGray";
 import { AdFun } from "../../data/AdData";
-import { VideoAdType } from "../../data/GameData";
+import { InterAdType, VideoAdType } from "../../data/GameData";
 import TurnableItem from "./TurnableItem";
 
 const { ccclass, property } = cc._decorator;
@@ -80,6 +80,7 @@ export default class Turnable extends cc.Component {
                 mk.console.log("watchAD:" + success);
                 if (success) {
                     gData.adData.watchVideo(AdFun.turntable);
+                    gData.gameData.popTableScreenADLogic(14);
                 }
             });
         }
@@ -194,7 +195,8 @@ export default class Turnable extends cc.Component {
     }
 
     onDestroy() {
-
+        //gData.adData.checkPopInter(InterAdType.interstitial1_click_4);
+        gData.gameData.popTableScreenADLogic(3);
     }
 
     onClickClose() {

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

@@ -166,6 +166,9 @@ export default class ATInterstitial extends zgSingleton {
         if (type == 0 || type == 2) {
             id = 2
             this.singleClick = true;
+            if(type == 2){
+                mk.data.sendDataEvent(DataEventId.interstita11_eject, mk.ad.interAdType);
+            }
         }
         else if (type == 1) {
             id = 9

assets/script/mk/utils/LogUtil.ts

@@ -9,7 +9,7 @@ export default class LogUtil {
      * 是否显示Log
      * @description
      */
-    public ifShowLog: boolean = false;
+    public ifShowLog: boolean = true;
 
     /**
      * 标签符号

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","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}
+{"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}

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

@@ -7,10 +7,10 @@ KS_CHANNEL="kuaishou";    //快手渠道
 UM_AID="6165593d14e22b6a4f1e16a2"; //友盟appid
 UM_CHANNEL="oppo"; //友盟渠道
 UM_SECRET="";       //友盟秘钥
-WX_APP_ID="wxd98fe9d52af10e59"; //微信appidUM_CHANNEL
+WX_APP_ID="wxd413dcac1e6a74c9"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u5f00\u519c\u573a\u5f53\u9996\u5bcc
-PACKAGE_NAME=com.aries.kncdsf.mz
-VERSION_NAME=1.1.8
+PACKAGE_NAME=com.aries.kncdsf.jsb
+VERSION_NAME=13.1.8
 VERSION_CODE=1000
 TOPON="a60af425829e4e,66b742dd0e502b64d783d9c66a9d30c4,b60af42bb7253c,b60af42bbb9a8a,b60af42bc3ee53,b60af42bba453f,b60af42bc9e854,b60af42bc0de73,b6167ea26616bf"; //巨量渠道topon的 AppId,AppSecreate,激励视频，插屏，信息流，开屏,banner,全屏,大插屏
-APP_CONFIG_CODE="1.1.8"
+APP_CONFIG_CODE="13.1.8"

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

@@ -20382,7 +20382,7 @@ value: !0
 a.LogTagColor = void 0;
 var n, i = function() {
 function t() {
-this.ifShowLog = !1;
+this.ifShowLog = !0;
 this._tagChar = "...";
 this._frontChar = "    ";
 this._keyValueChar = " = ";

packages-hot-update/cfg.json

@@ -14,7 +14,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJsb/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/"
     ],
-    "buildTime": 1638342334046,
-    "genTime": 1638342334046,
+    "buildTime": 1638871464049,
+    "genTime": 1638871464049,
     "genVersion": null
 }