1

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

@@ -42,7 +42,8 @@ export default class HarvestData extends Data {
             if (!isTeaching && rand <= rate) {
                 if(gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes >0)
                 {
-                    if (gData.loginData.isMatched == 0 && gData.gameData.prohibiJBAd[gData.loginData.userChannel - 1] == "1") {
+                    let str = gData.gameData.prohibiJBAd[gData.loginData.userChannel - 1].split(",");
+                    if (str[1- gData.loginData.isMatched]  == "1") {
                         this.isTouchBtn = false;
                         this.isCdOver = true;
                         mk.ui.openPanel('game/prefab/uiPanel/HarvestPanel');

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

@@ -123,6 +123,9 @@ export default class PlantItem extends cc.Component {
         }
 
         if (flyRed) {
+            if (gData.gameData.funOpenData[4] == "0") {
+                return;
+            }
             gData.plantData.init_ani = true;
             let pos = this.nameIcon.node.parent.convertToWorldSpaceAR(this.nameIcon.node.getPosition());
             gData.gameData.gameStyle.dpFlyRedAni(pos);

assets/script/game/data/GameData.ts

@@ -178,9 +178,9 @@ export class GameData {
         //从服务器解析配置
         this.setProductMapFromJson();
 
-        gData.loginData.popIdentifySwitch = this.configs.ServerConfig.popIdentifySwitch.split(",");
-        this.prohibiJBAd = this.configs.ServerConfig.ProhibitJBAd.split(",");
-        this.prohibitProductionAd = this.configs.ServerConfig.ProhibitProductionAd.split(",");
+        gData.loginData.popIdentifySwitch = this.configs.ServerConfig.popIdentifySwitch.split(";");
+        this.prohibiJBAd = this.configs.ServerConfig.ProhibitJBAd.split(";");
+        this.prohibitProductionAd = this.configs.ServerConfig.ProhibitProductionAd.split(";");
         this.productionAdMaxTimes = this.configs.ServerConfig.ProductionAdMax;
 
         console.log(`popIdentifySwitch=======${gData.loginData.popIdentifySwitch}`);

assets/script/game/data/LoginData.ts

@@ -360,7 +360,8 @@ export class LoginData {
         mk.data.setTAEventUserStr(0, 'kncdsf_zhubao_juliangwpp', `${this.userChannel}_${this.isMatched}`);
         if (isDoIdentify) {
             if (this.userChannel <= 5) {
-                if (this.isMatched == 0 && this.popIdentifySwitch[this.userChannel - 1] == "1") {
+                let str = this.popIdentifySwitch[this.userChannel - 1].split(",");
+                if (str[1- this.isMatched] == "1") {
                     JsbSystem.ysdkInit();
                     JsbSystem.autologin();
                     mk.data.sendDataEvent(DataEventId.realName, `实名认证验证人数`);

assets/script/game/game/Game.ts

@@ -524,7 +524,8 @@ export default class Game extends cc.Component {
             // {
             //     mk.ui.openPanel('module/speedUpUI/productReward');
             // } 
-            if (gData.loginData.isMatched == 0 && gData.gameData.prohibitProductionAd[gData.loginData.userChannel - 1] == "1") {
+            let str = gData.gameData.prohibitProductionAd[gData.loginData.userChannel - 1].split(",");
+            if (str[1- gData.loginData.isMatched] == "1") {
                 if (gData.gameData.playerProp.curProductionAdTimes >= gData.gameData.productionAdMaxTimes) {
                     mk.tip.pop('今日领取生产次数已达上限!');
                     return;
@@ -546,6 +547,10 @@ export default class Game extends cc.Component {
         if (flyRed) {
             //mk.audio.playEffect('redmoney');
 
+            if( gData.gameData.funOpenData[4] == "0")
+            {
+                return;
+            }
             if (gData.gameData.playerProp.userFarmTaskInfo) {
                 let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
                 let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
@@ -1035,8 +1040,9 @@ export default class Game extends cc.Component {
         if (this.isGray) {
             mk.tip.pop("订单未完成");
         } else {
-            this.getOrderReward();
+            //smk.tip.pop("测试使用==订单领奖");
             mk.data.sendDataEvent(DataEventId.button_click, "订单领奖按钮");
+            this.getOrderReward();      
         }
     }
 
@@ -1063,6 +1069,10 @@ export default class Game extends cc.Component {
     }
 
     async doCropFlyLogic(plantId: number, farmNode: cc.Node, isNzw = false) {
+        if( gData.gameData.funOpenData[11] == "0")
+        {
+            return;
+        }
         for (let i = 0; i != this.orderPicIdArray.length; ++i) {
             if (plantId == this.orderPicIdArray[i].picID) {
                 let data = gData.gameData.playerProp.orderData.orderTaskList[i];

assets/script/game/module/login/Login.ts

@@ -149,7 +149,7 @@ export default class Login extends cc.Component {
                     //     this.node_btnLogin.active = true;
                     // }
 
-                    if (CC_DEBUG) {
+                    if (!CC_DEBUG) {
                         //检查用户来源渠道
                         if (!this.hasCheckChannel) {
                             this.hasCheckChannel = true;

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

@@ -131,7 +131,8 @@ export default class ProductReward extends cc.Component {
         mk.ad.videoAdType = VideoAdType.video_init_16;
         mk.ad.watchAd((success: boolean) => {
             if (success) {
-                if(gData.loginData.isMatched == 0 && gData.gameData.prohibitProductionAd[gData.loginData.userChannel - 1] == "1")
+                let str = gData.gameData.prohibitProductionAd[gData.loginData.userChannel - 1].split(",");
+                if(str[1- gData.loginData.isMatched] == "1")
                 {
                     gData.adData.watchVideo(AdFun.addProductTimes, this.refreshMaxAdTimes);
                 }else{

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

@@ -2369,19 +2369,18 @@ e.prototype.placementID = function() {
 return cc.sys.os === cc.sys.OS_IOS ? a.topon_rewardVideo_placementId : cc.sys.os === cc.sys.OS_ANDROID ? a.topon_rewardVideo_placementId : void 0;
 };
 e.prototype.getAdvertiseChannel = function() {
-var t = l.default.getAdvertisingChannel();
-t || (t = "1,a60cac090a6eb0,66b742dd0e502b64d783d9c66a9d30c4,b60cac0e43c0e1,b60cac0e4892fa,b60cac0e4d08e8,b60cac0e5754fc,b60cac0e524313,b60cac0e524313");
+var t = "";
+t = "" != gData.loginData.toponStr ? gData.loginData.toponStr : (t = l.default.getAdvertisingChannel()).slice(1);
 console.log("getAdvertiseChannel..." + t);
 var e = t.split(",");
-e[0];
-a.topon_android_appId = e[1];
-a.topon_android_appSecret = e[2];
-a.topon_rewardVideo_placementId = e[3];
-a.topon_inter_placementId = e[4];
-a.topon_native_placementId = e[5];
-a.topon_banner_placementId = e[7];
-e[8] && (a.topon_fullinter_placementId = e[8]);
-e[9] && (a.topon_biginter_placementId = e[9]);
+a.topon_android_appId = e[0];
+a.topon_android_appSecret = e[1];
+a.topon_rewardVideo_placementId = e[2];
+a.topon_inter_placementId = e[3];
+a.topon_native_placementId = e[4];
+a.topon_banner_placementId = e[6];
+e[7] && (a.topon_fullinter_placementId = e[7]);
+e[8] && (a.topon_biginter_placementId = e[8]);
 };
 e.prototype.showVideo = function() {
 console.log("===[ShowVideoAd] ", f.ATRewardVideo.getInstance().hasAdReady());
@@ -13089,7 +13088,6 @@ return [ 2 ];
 }
 mk.console.logSingle("getAllConfigInfo", e.data);
 this.initConfigs(e.data);
-mk.ad.init();
 t = {};
 return [ 4, mk.http.sendData("getInfoCrypt", t) ];
 
@@ -13122,9 +13120,9 @@ t.prototype.initConfigs = function(t) {
 this.configs = t;
 this.funOpenData = this.configs.ServerConfig.Functionswitch.split(",");
 this.setProductMapFromJson();
-gData.loginData.popIdentifySwitch = this.configs.ServerConfig.popIdentifySwitch.split(",");
-this.prohibiJBAd = this.configs.ServerConfig.ProhibitJBAd.split(",");
-this.prohibitProductionAd = this.configs.ServerConfig.ProhibitProductionAd.split(",");
+gData.loginData.popIdentifySwitch = this.configs.ServerConfig.popIdentifySwitch.split(";");
+this.prohibiJBAd = this.configs.ServerConfig.ProhibitJBAd.split(";");
+this.prohibitProductionAd = this.configs.ServerConfig.ProhibitProductionAd.split(";");
 this.productionAdMaxTimes = this.configs.ServerConfig.ProductionAdMax;
 console.log("popIdentifySwitch=======" + gData.loginData.popIdentifySwitch);
 console.log("prohibiJBAd=======" + this.prohibiJBAd);
@@ -15021,7 +15019,7 @@ switch (o.label) {
 case 0:
 mk.audio.playEffect("button");
 if (gData.gameData.leftTimes <= 0) {
-if ("1" == gData.gameData.prohibitProductionAd[gData.loginData.userChannel - 1] && gData.gameData.playerProp.curProductionAdTimes >= gData.gameData.productionAdMaxTimes) {
+if ("1" == gData.gameData.prohibitProductionAd[gData.loginData.userChannel - 1].split(",")[1 - gData.loginData.isMatched] && gData.gameData.playerProp.curProductionAdTimes >= gData.gameData.productionAdMaxTimes) {
 mk.tip.pop("今日领取生产次数已达上限!");
 return [ 2 ];
 }
@@ -15036,6 +15034,7 @@ return [ 4, gData.gameData.makeProduct() ];
 
 case 1:
 if (o.sent()) {
+if ("0" == gData.gameData.funOpenData[4]) return [ 2 ];
 if (gData.gameData.playerProp.userFarmTaskInfo) {
 t = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
 e = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
@@ -15464,8 +15463,8 @@ return [ 2 ];
 e.prototype.clickGetOrderRewardBtn = function() {
 mk.audio.playEffect("button");
 if (this.isGray) mk.tip.pop("订单未完成"); else {
-this.getOrderReward();
 mk.data.sendDataEvent(d.DataEventId.button_click, "订单领奖按钮");
+this.getOrderReward();
 }
 };
 e.prototype.getIsCanGetOrderReward = function() {
@@ -15508,6 +15507,7 @@ var o, n, i, r = this;
 return c(this, function(s) {
 switch (s.label) {
 case 0:
+if ("0" == gData.gameData.funOpenData[11]) return [ 2 ];
 o = function(o) {
 var i, s, l, p, u;
 return c(this, function(d) {
@@ -17591,7 +17591,7 @@ console.log("=========isCdOver == false");
 this.getNormalReward();
 } else {
 var r = mk.guide.isGuiding(), c = Math.random(), l = gData.adData.getPerByEcpm(s.RateConfig.RC_superDouble);
-if (!r && c <= l) if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes > 0) if ("1" == gData.gameData.prohibiJBAd[gData.loginData.userChannel - 1]) {
+if (!r && c <= l) if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes > 0) if ("1" == gData.gameData.prohibiJBAd[gData.loginData.userChannel - 1].split(",")[1 - gData.loginData.isMatched]) {
 this.isTouchBtn = !1;
 this.isCdOver = !0;
 mk.ui.openPanel("game/prefab/uiPanel/HarvestPanel");
@@ -19829,6 +19829,8 @@ this.popIdentifySwitch = [];
 this.passAnti = !1;
 this.passPrivacy = !1;
 this.userChannel = 1;
+this.isMatched = 1;
+this.toponStr = "";
 }
 t.prototype.loadLocalRes = function() {
 return o(this, void 0, void 0, function() {
@@ -20087,7 +20089,7 @@ return n(this, function(o) {
 switch (o.label) {
 case 0:
 e = {};
-return [ 4, mk.http.sendData("user/getUserChannel", e) ];
+return [ 4, mk.http.sendData("user/income-strategy", e) ];
 
 case 1:
 a = o.sent();
@@ -20096,10 +20098,14 @@ if (0 != a.errcode) {
 t && (this.passAnti = !0);
 return [ 2 ];
 }
-this.userChannel = a.data.channel;
+this.userChannel = a.data.tfChannel;
+this.isMatched = a.data.isMatched;
+this.toponStr = a.data.strategyContent;
+mk.ad.init();
 console.log("userChannel=========" + this.userChannel);
-mk.data.setTAEventUser(0, "kncdsf_zhubao_juliangwpp", this.userChannel);
-if (t && this.userChannel <= 5) if ("1" == this.popIdentifySwitch[this.userChannel - 1]) {
+console.log("isMatched=========" + this.isMatched);
+mk.data.setTAEventUserStr(0, "kncdsf_zhubao_juliangwpp", this.userChannel + "_" + this.isMatched);
+if (t && this.userChannel <= 5) if ("1" == this.popIdentifySwitch[this.userChannel - 1].split(",")[1 - this.isMatched]) {
 i.default.ysdkInit();
 i.default.autologin();
 mk.data.sendDataEvent(r.DataEventId.realName, "实名认证验证人数");
@@ -24146,6 +24152,7 @@ a.label = 4;
 
 case 4:
 if (t) {
+if ("0" == gData.gameData.funOpenData[4]) return [ 2 ];
 gData.plantData.init_ani = !0;
 e = this.nameIcon.node.parent.convertToWorldSpaceAR(this.nameIcon.node.getPosition());
 gData.gameData.gameStyle.dpFlyRedAni(e);
@@ -24978,7 +24985,7 @@ mk.ui.closePanel(this.node.name);
 mk.ad.videoAdType = c.VideoAdType.video_init_16;
 mk.ad.watchAd(function(e) {
 if (e) {
-"1" == gData.gameData.prohibitProductionAd[gData.loginData.userChannel - 1] ? gData.adData.watchVideo(r.AdFun.addProductTimes, t.refreshMaxAdTimes) : gData.adData.watchVideo(null);
+"1" == gData.gameData.prohibitProductionAd[gData.loginData.userChannel - 1].split(",")[1 - gData.loginData.isMatched] ? gData.adData.watchVideo(r.AdFun.addProductTimes, t.refreshMaxAdTimes) : gData.adData.watchVideo(null);
 var a = [ {
 rewardType: 4,
 rewardNum: parseInt(gData.gameData.configs.ServerConfig.ProductionAd)

packages-hot-update/cfg.json

@@ -12,7 +12,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/"
     ],
-    "buildTime": 1635834684991,
-    "genTime": 1635834684991,
+    "buildTime": 1635910752375,
+    "genTime": 1635910752375,
     "genVersion": null
 }