Merge branch 'dev_1.1.4_jsb' of http://git.mokasz.com/zouyong/team1_nc into dev_1.1.4_jsb

assets/resources/module/login/hot/version.manifest

@@ -1 +1 @@
-{"version":"1.0.6","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/version.manifest"}
+{"version":"1.0.7","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/version.manifest"}

assets/script/game/data/AdData.ts

@@ -294,9 +294,9 @@ export class AdData {
         let pop = true;
         switch (type) {
             case 1:
-                if(rateType != null){
+                if (rateType != null) {
                     per = this.getPerByEcpm(rateType);
-                }else{
+                } else {
                     per = this.getPerByEcpm(RateConfig.RC_fullScreen);
                 }
                 pop = Math.random() < per;
@@ -309,9 +309,9 @@ export class AdData {
                 mk.ad.showInterAd(1, des);
                 break;
             case 2:
-                if(rateType != null){
+                if (rateType != null) {
                     per = this.getPerByEcpm(rateType);
-                }else{
+                } else {
                     per = this.getPerByEcpm(RateConfig.RC_tableScreen);
                 }
                 pop = Math.random() < per;
@@ -327,9 +327,9 @@ export class AdData {
                 }, delay);
                 break;
             case 3:
-                if(rateType != null){
+                if (rateType != null) {
                     per = this.getPerByEcpm(rateType);
-                }else{
+                } else {
                     per = this.getPerByEcpm(RateConfig.RC_tableScreen);
                 }
                 pop = Math.random() < per;
@@ -349,9 +349,9 @@ export class AdData {
                 }, delay1);
                 break;
             case 4:
-                if(rateType != null){
+                if (rateType != null) {
                     per = this.getPerByEcpm(rateType);
-                }else{
+                } else {
                     per = this.getPerByEcpm(RateConfig.RC_moreGameRedBag);
                 }
                 pop = Math.random() < per;
@@ -360,7 +360,7 @@ export class AdData {
                 }
 
                 gData.moreGame.popNewOpenRedBag();
-                break;    
+                break;
         }
         return pop;
     }
@@ -427,7 +427,16 @@ export class AdData {
             // gData.gameData.init_hideRedBag = true;
             // mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
 
-            this.checkPopInter(InterAdType.interstitial1_click_19);
+            //this.checkPopInter(InterAdType.interstitial1_click_19);
+            if (gData.gameData.insertAdSwitch[13] == "1") {
+                mk.ad.videoAdType = VideoAdType.video_init_22;
+                mk.ad.watchAd((success: boolean) => {
+                    mk.console.log("watchAD:" + success);
+                    if (success) {
+                        gData.adData.watchVideo(null);
+                    }
+                });
+            }
         }
     }
 

assets/script/game/data/GameData.ts

@@ -433,7 +433,7 @@ export class GameData {
         this.initProductTimes();
         this.initLeftTimes();
         this.initFarmMapGetRewardData();
-        this.initCashOutTimes();
+        //this.initCashOutTimes();
         // let isNewTask = this.getProp(GameProp.redBagTaskRefresh);
         // if (isNewTask != undefined) {
         //     this.init_redBagTask = isNewTask;
@@ -547,6 +547,7 @@ export class GameData {
 
     public addCashOutTimes() {
         this._cashOutTimes += 1;
+        console.log(`===========${this._cashOutTimes}`);
         this.setProp(GameProp.cashOutTimes, this._cashOutTimes);
     }
 
@@ -1938,9 +1939,10 @@ export class GameData {
             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){
+            let cashTimes = gData.gameData.getProp(GameProp.cashTimes);
+            console.log(`===========${cashTimes}`);
+            let is = gData.gameData.insertAdSwitch[index];
+            if(is == "1"){
                 gData.adData.checkPopInter(str, rateType);
             }
         }
@@ -2335,6 +2337,7 @@ export enum VideoAdType {
     video_init_19 = '定时弹出红包',
     video_init_20 = '插队',
     video_init_21 = '恢复生产次数',
+    video_init_22 = '长时间未操作弹出视频',
 }
 
 export enum InterFullAdType {
@@ -2381,7 +2384,7 @@ export enum InterAdType {
     interstitial1_click_16 = '图鉴领奖激励视频播完后',
     interstitial1_click_17 = '拓建激励视频播完后',
     interstitial1_click_18 = '收获超级加倍激励视频播完后',
-    interstitial1_click_19 = '定时弹出插屏',
+    //interstitial1_click_19 = '定时弹出插屏',
 }
 
 

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

@@ -124,7 +124,7 @@ export class BlessingBagData extends Data {
         mk.data.sendDataEvent(DataEventId.fudaiFunction, `视频红包第${this.taskRbId}档提现成功`);
         mk.data.sendDataEvent(DataEventId.Sundry, '福利提现成功');
         gData.gameData.doPointToXYLogic();
-        gData.gameData.addCashOutTimes();
+        //gData.gameData.addCashOutTimes();
 
         gData.receiptNotice.receip_rmb = gData.blessingBag.rbNum;
         mk.ui.openPanel('module/newNotice/newNotice');

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

@@ -36,7 +36,7 @@ export class GradeRewardData extends Data {
         mk.data.sendDataEvent(DataEventId.Sundry, '农场等级奖励提现成功');
         gData.gameData.doPointToXYLogic();
 
-        gData.gameData.addCashOutTimes();
+        //gData.gameData.addCashOutTimes();
 
         this.changeExp = true;
         gData.gameData.playerProp.farmGradeData = response.data.userFarmGrageRewardInfo

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

@@ -151,7 +151,7 @@ export class SignData extends Data {
                 return;
             }
 
-            gData.gameData.addCashOutTimes();
+            //gData.gameData.addCashOutTimes();
             const rewardNum = Math.round(adData.videoRedMoney.videoRewardList[0].rewardNum * 100);
             gData.receiptNotice.receip_rmb = rewardNum;
             mk.ui.openPanel('module/newNotice/newNotice', OpenActionType.closeLast);

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

@@ -39,7 +39,7 @@ export class WalletCashOutData extends Data {
 
         gData.safeDepositBoxData.updateQipao();
         gData.gameData.doPointToXYLogic();
-        gData.gameData.addCashOutTimes();
+        //gData.gameData.addCashOutTimes();
     }
 
     async addProgress() {
@@ -101,7 +101,7 @@ export class WalletCashOutData extends Data {
         gData.safeDepositBoxData.updateQipao();
         mk.data.sendDataEvent(DataEventId.Sundry, '红包币提现成功');
         gData.gameData.doPointToXYLogic();
-        gData.gameData.addCashOutTimes();
+        //gData.gameData.addCashOutTimes();
     }
 
 }

assets/script/game/module/newCashUI/WalletCashOut.ts

@@ -113,7 +113,11 @@ export default class WalletCashOut extends cc.Component {
         let data = gData.gameData.funOpenData;
         if(data[10] == '1')
         {
-            this.node_addCash.active = gData.gameData._cashOutTimes >= parseInt(gData.gameData.configs.ServerConfig.CashIncrease);
+            let cashTimes = gData.gameData.getProp(GameProp.cashTimes);
+            if(!cashTimes){
+                cashTimes = 0;
+            }
+            this.node_addCash.active = cashTimes >= parseInt(gData.gameData.configs.ServerConfig.CashIncrease);
         }else{
             this.node_addCash.active = false;
         }

assets/script/game/module/newNotice/NewNotice.ts

@@ -1,3 +1,5 @@
+import { GameProp } from "../../data/GameData";
+
 const { ccclass, property } = cc._decorator;
 @ccclass
 export default class NewNotice extends cc.Component {
@@ -14,6 +16,12 @@ export default class NewNotice extends cc.Component {
 
     start() {
         //mk.audio.playEffect("receiptNotice");
+
+        let times = gData.gameData.getProp(GameProp.cashTimes);
+        if (!times) {
+            times = 0;
+        }
+        gData.gameData.setProp(GameProp.cashTimes, ++times);
     }
 
     onEnable()

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

@@ -323,7 +323,7 @@ export default class RedBagTask extends cc.Component {
             mk.data.sendXYEvent('guide_harvest', '首次领取任务红包');
         }
         gData.gameData.doPointToXYLogic();
-        gData.gameData.addCashOutTimes();
+        //gData.gameData.addCashOutTimes();
         gData.adData.checkPopCashFull();
         gData.safeDepositBoxData.updateQipao();
     }

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

@@ -100,7 +100,7 @@ export default class SpeedUpUI extends cc.Component {
                     }
                     gData.gameData.setHarvest();
                     mk.tip.pop('加速成功！');
-                    gData.gameData.popTableScreenADLogic(12);
+                    //gData.gameData.popTableScreenADLogic(12);
                 }
             })
         }

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

@@ -80,7 +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);
+                    //gData.gameData.popTableScreenADLogic(14);
                 }
             });
         }

assets/script/mk/utils/LogUtil.ts

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

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/assets/resources/native/9e/9ed98385-f23f-41b7-a2bc-27a1d4ad9fd6.manifest

@@ -1 +1 @@
-{"version":"1.0.6","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/version.manifest"}
+{"version":"1.0.7","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/version.manifest"}

packages-hot-update/cfg.json

@@ -1,5 +1,5 @@
 {
-    "version": "1.0.6",
+    "version": "1.0.7",
     "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/",
     "resourceRootDir": "D:\\projects\\team1_nc\\build\\jsb-link",
     "genManifestDir": "",
@@ -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": 1638871464049,
-    "genTime": 1638871464049,
+    "buildTime": 1639020018880,
+    "genTime": 1639020018880,
     "genVersion": null
 }

packages-hot-update/manifest/version.manifest

@@ -1 +1 @@
-{"version":"1.0.6","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/version.manifest"}
+{"version":"1.0.7","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/version.manifest"}

settings/project.json

@@ -36,6 +36,6 @@
       "enable": false
     }
   },
-  "last-module-event-record-time": 1638271205538,
+  "last-module-event-record-time": 1638963598974,
   "start-scene": "6f522a54-3e0e-404d-a06c-bec8b4307c95"
 }