1

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

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

assets/script/game/data/LoginData.ts

@@ -348,26 +348,42 @@ export class LoginData {
             return;
         }
 
-        this.userChannel = response.data.tfChannel;
+        let index = response.data.tfChannel;
         this.isMatched = response.data.isMatched;
         this.toponStr = response.data.strategyContent;
 
         //初始化topon
         mk.ad.init();
 
-        console.log(`userChannel=========${this.userChannel}`);
+        console.log(`userChannel=========${index}`);
         console.log(`isMatched=========${this.isMatched}`);
         mk.data.setTAEventUserStr(0, 'kncdsf_zhubao_qudaopipei', `${this.userChannel}_${this.isMatched}`);
         if (isDoIdentify) {
-            if (this.userChannel <= 5) {
-                let str = this.popIdentifySwitch[this.userChannel - 1].split(",");
-                if (str[1- this.isMatched] == "1") {
-                    JsbSystem.ysdkInit();
-                    JsbSystem.autologin();
-                    mk.data.sendDataEvent(DataEventId.realName, `实名认证验证人数`);
-                } else {
-                    this.passAnti = true;
-                }
+            
+            switch (index) {
+                case 1:
+                    this.userChannel = 0;
+                    break;
+                case 24:
+                    this.userChannel = 1;
+                    break;
+                case 4:
+                    this.userChannel = 2;
+                    break;
+                case 5:
+                    this.userChannel = 3;
+                    break;
+                default:
+                    this.userChannel = 2;
+                    break;
+            }
+            let str = this.popIdentifySwitch[this.userChannel].split(",");
+            if (str[1 - this.isMatched] == "1") {
+                JsbSystem.ysdkInit();
+                JsbSystem.autologin();
+                mk.data.sendDataEvent(DataEventId.realName, `实名认证验证人数`);
+            } else {
+                this.passAnti = true;
             }
         }
     }

assets/script/game/game/Game.ts

@@ -524,7 +524,7 @@ export default class Game extends cc.Component {
             // {
             //     mk.ui.openPanel('module/speedUpUI/productReward');
             // } 
-            let str = gData.gameData.prohibitProductionAd[gData.loginData.userChannel - 1].split(",");
+            let str = gData.gameData.prohibitProductionAd[gData.loginData.userChannel].split(",");
             if (str[1- gData.loginData.isMatched] == "1") {
                 if (gData.gameData.playerProp.curProductionAdTimes >= gData.gameData.productionAdMaxTimes) {
                     mk.tip.pop('今日领取生产次数已达上限!');

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

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

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/js backups (useful for debugging)/main.index.js

@@ -12658,7 +12658,7 @@ Object.defineProperty(a, "__esModule", {
 value: !0
 });
 a.Fun = void 0;
-var o, n = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/TurnableData"), d = t("./module/SignData"), h = t("./module/FissionData"), f = t("./AdData"), y = t("./module/RewardData"), g = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), _ = t("./module/BlessingBagData"), v = t("./module/CashProData"), b = t("./module/RedBagCashData"), D = t("./module/RedCodeData"), w = t("./module/MoreGameData"), S = t("./module/SettingData"), A = t("./module/GuideData"), k = t("./module/GuideWeakData"), P = t("./ConfigData"), O = t("./module/NewCashUIData"), I = t("../../before/view/data/ADUnlockData"), T = t("../../before/view/data/PlantData"), R = t("../../before/main/FarmSystem"), C = t("../../before/view/data/HarvestData"), M = t("../../before/view/data/ADClearSickData"), x = t("../../before/main/PastureSystem"), F = t("../../before/main/FactorySystem"), N = t("./module/FarmMapData"), j = t("./module/GradeRewardData"), E = t("./module/WalletCashOutData"), L = t("./module/LineUpUIData"), B = t("./module/WarnTipData"), U = function() {
+var o, n = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/TurnableData"), d = t("./module/SignData"), h = t("./module/FissionData"), f = t("./AdData"), y = t("./module/RewardData"), g = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), _ = t("./module/BlessingBagData"), v = t("./module/CashProData"), b = t("./module/RedBagCashData"), D = t("./module/RedCodeData"), w = t("./module/MoreGameData"), S = t("./module/SettingData"), k = t("./module/GuideData"), A = t("./module/GuideWeakData"), P = t("./ConfigData"), O = t("./module/NewCashUIData"), I = t("../../before/view/data/ADUnlockData"), T = t("../../before/view/data/PlantData"), R = t("../../before/main/FarmSystem"), C = t("../../before/view/data/HarvestData"), M = t("../../before/view/data/ADClearSickData"), x = t("../../before/main/PastureSystem"), F = t("../../before/main/FactorySystem"), N = t("./module/FarmMapData"), j = t("./module/GradeRewardData"), E = t("./module/WalletCashOutData"), L = t("./module/LineUpUIData"), B = t("./module/WarnTipData"), U = function() {
 function t() {
 this.init();
 }
@@ -12671,8 +12671,8 @@ this.wechatData = new l.WechatData();
 this.httpData = new r.HttpData();
 this.adData = new f.AdData();
 this.storageData = new s.StorageData();
-this.guideData = new A.GuideData();
-this.guideWeakData = new k.default();
+this.guideData = new k.GuideData();
+this.guideWeakData = new A.default();
 this.reward = new y.RewardData();
 this.help = new p.HelpData();
 this.turnable = new u.TurnableData();
@@ -13407,8 +13407,8 @@ t.state = 1;
 break;
 }
 if (!b) for (y = 0; y != s.length; ++y) {
-var A = gData.pastureSystem.pastureIcons;
-for (w = A.length, S = 0; S < w; S++) if (A[S].data.productID == s[y] && A[S].data.state == p.Empty) {
+var k = gData.pastureSystem.pastureIcons;
+for (w = k.length, S = 0; S < w; S++) if (k[S].data.productID == s[y] && k[S].data.state == p.Empty) {
 b = !0;
 t.state = 2;
 break;
@@ -15019,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].split(",")[1 - gData.loginData.isMatched] && gData.gameData.playerProp.curProductionAdTimes >= gData.gameData.productionAdMaxTimes) {
+if ("1" == gData.gameData.prohibitProductionAd[gData.loginData.userChannel].split(",")[1 - gData.loginData.isMatched] && gData.gameData.playerProp.curProductionAdTimes >= gData.gameData.productionAdMaxTimes) {
 mk.tip.pop("今日领取生产次数已达上限!");
 return [ 2 ];
 }
@@ -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].split(",")[1 - gData.loginData.isMatched]) {
+if (!r && c <= l) if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes > 0) if ("1" == gData.gameData.prohibiJBAd[gData.loginData.userChannel].split(",")[1 - gData.loginData.isMatched]) {
 this.isTouchBtn = !1;
 this.isCdOver = !0;
 mk.ui.openPanel("game/prefab/uiPanel/HarvestPanel");
@@ -19613,7 +19613,7 @@ value: !0
 a.LogTagColor = void 0;
 var n, i = function() {
 function t() {
-this.ifShowLog = !0;
+this.ifShowLog = !1;
 this._tagChar = "...";
 this._frontChar = "    ";
 this._keyValueChar = " = ";
@@ -20084,32 +20084,54 @@ return [ 2 ];
 t.prototype.getUserChannel = function(t) {
 void 0 === t && (t = !0);
 return o(this, void 0, void 0, function() {
-var e, a;
-return n(this, function(o) {
-switch (o.label) {
+var e, a, o;
+return n(this, function(n) {
+switch (n.label) {
 case 0:
 e = {};
 return [ 4, mk.http.sendData("user/income-strategy", e) ];
 
 case 1:
-a = o.sent();
+a = n.sent();
 mk.console.logSingle("getUserChannel=>", a);
 if (0 != a.errcode) {
 t && (this.passAnti = !0);
 return [ 2 ];
 }
-this.userChannel = a.data.tfChannel;
+o = a.data.tfChannel;
 this.isMatched = a.data.isMatched;
 this.toponStr = a.data.strategyContent;
 mk.ad.init();
-console.log("userChannel=========" + this.userChannel);
+console.log("userChannel=========" + o);
 console.log("isMatched=========" + this.isMatched);
 mk.data.setTAEventUserStr(0, "kncdsf_zhubao_qudaopipei", this.userChannel + "_" + this.isMatched);
-if (t && this.userChannel <= 5) if ("1" == this.popIdentifySwitch[this.userChannel - 1].split(",")[1 - this.isMatched]) {
+if (t) {
+switch (o) {
+case 1:
+this.userChannel = 0;
+break;
+
+case 24:
+this.userChannel = 1;
+break;
+
+case 4:
+this.userChannel = 2;
+break;
+
+case 5:
+this.userChannel = 3;
+break;
+
+default:
+this.userChannel = 2;
+}
+if ("1" == this.popIdentifySwitch[this.userChannel].split(",")[1 - this.isMatched]) {
 i.default.ysdkInit();
 i.default.autologin();
 mk.data.sendDataEvent(r.DataEventId.realName, "实名认证验证人数");
 } else this.passAnti = !0;
+}
 return [ 2 ];
 }
 });
@@ -20694,7 +20716,7 @@ cc._RF.push(e, "f0038hKHC9Nf5+ipaUV9rc5", "MKSystem");
 Object.defineProperty(a, "__esModule", {
 value: !0
 });
-var o = t("../sdk/BuglySDK"), n = t("../utils/FileUtil"), i = t("../utils/TimeUtil"), r = t("./DataSystem"), c = t("./HttpSystem"), s = t("../utils/LoadResUtil"), l = t("../utils/LogUtil"), p = t("../utils/EncryptUtil"), u = t("../utils/GameUtil"), d = t("../utils/StorageUtil"), h = t("./TimerSystem"), f = t("./EventSystem"), y = t("../utils/MathUtil"), g = t("./AdSystem"), m = t("./JsbSystem"), _ = t("./AudioSystem"), v = t("./PoolSystem"), b = t("../utils/TweenUtil"), D = t("./GuideSystem"), w = t("../utils/StringUtil"), S = t("../../game/component/SetGray"), A = t("../../game/component/NumberAnim"), k = t("../sdk/aliRisk/AliRiskManager"), P = t("../sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr"), O = t("../sdk/shuzilm/ShuzilmM"), I = t("../sdk/tongdun/TongdunM"), T = function() {
+var o = t("../sdk/BuglySDK"), n = t("../utils/FileUtil"), i = t("../utils/TimeUtil"), r = t("./DataSystem"), c = t("./HttpSystem"), s = t("../utils/LoadResUtil"), l = t("../utils/LogUtil"), p = t("../utils/EncryptUtil"), u = t("../utils/GameUtil"), d = t("../utils/StorageUtil"), h = t("./TimerSystem"), f = t("./EventSystem"), y = t("../utils/MathUtil"), g = t("./AdSystem"), m = t("./JsbSystem"), _ = t("./AudioSystem"), v = t("./PoolSystem"), b = t("../utils/TweenUtil"), D = t("./GuideSystem"), w = t("../utils/StringUtil"), S = t("../../game/component/SetGray"), k = t("../../game/component/NumberAnim"), A = t("../sdk/aliRisk/AliRiskManager"), P = t("../sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr"), O = t("../sdk/shuzilm/ShuzilmM"), I = t("../sdk/tongdun/TongdunM"), T = function() {
 function t() {}
 Object.defineProperty(t.prototype, "time", {
 get: function() {
@@ -20838,7 +20860,7 @@ configurable: !0
 });
 Object.defineProperty(t.prototype, "aliRiskManager", {
 get: function() {
-return this._aliRiskManager || (this._aliRiskManager = new k.default());
+return this._aliRiskManager || (this._aliRiskManager = new A.default());
 },
 enumerable: !1,
 configurable: !0
@@ -20916,7 +20938,7 @@ configurable: !0
 });
 Object.defineProperty(t.prototype, "numberAnim", {
 get: function() {
-return A.default;
+return k.default;
 },
 enumerable: !1,
 configurable: !0
@@ -24985,7 +25007,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].split(",")[1 - gData.loginData.isMatched] ? gData.adData.watchVideo(r.AdFun.addProductTimes, t.refreshMaxAdTimes) : gData.adData.watchVideo(null);
+"1" == gData.gameData.prohibitProductionAd[gData.loginData.userChannel].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)
@@ -33413,30 +33435,30 @@ var c = t[s = n + r];
 t[s] = 16711935 & (c << 8 | c >>> 24) | 4278255360 & (c << 24 | c >>> 8);
 }
 r = this._hash.words;
-var s = t[n + 0], l = (c = t[n + 1], t[n + 2]), u = t[n + 3], d = t[n + 4], h = t[n + 5], f = t[n + 6], y = t[n + 7], g = t[n + 8], m = t[n + 9], _ = t[n + 10], v = t[n + 11], b = t[n + 12], D = t[n + 13], w = t[n + 14], S = t[n + 15], A = e(A = r[0], O = r[1], P = r[2], k = r[3], s, 7, p[0]), k = e(k, A, O, P, c, 12, p[1]), P = e(P, k, A, O, l, 17, p[2]), O = e(O, P, k, A, u, 22, p[3]);
-A = e(A, O, P, k, d, 7, p[4]), k = e(k, A, O, P, h, 12, p[5]), P = e(P, k, A, O, f, 17, p[6]), 
-O = e(O, P, k, A, y, 22, p[7]), A = e(A, O, P, k, g, 7, p[8]), k = e(k, A, O, P, m, 12, p[9]), 
-P = e(P, k, A, O, _, 17, p[10]), O = e(O, P, k, A, v, 22, p[11]), A = e(A, O, P, k, b, 7, p[12]), 
-k = e(k, A, O, P, D, 12, p[13]), P = e(P, k, A, O, w, 17, p[14]), A = a(A, O = e(O, P, k, A, S, 22, p[15]), P, k, c, 5, p[16]), 
-k = a(k, A, O, P, f, 9, p[17]), P = a(P, k, A, O, v, 14, p[18]), O = a(O, P, k, A, s, 20, p[19]), 
-A = a(A, O, P, k, h, 5, p[20]), k = a(k, A, O, P, _, 9, p[21]), P = a(P, k, A, O, S, 14, p[22]), 
-O = a(O, P, k, A, d, 20, p[23]), A = a(A, O, P, k, m, 5, p[24]), k = a(k, A, O, P, w, 9, p[25]), 
-P = a(P, k, A, O, u, 14, p[26]), O = a(O, P, k, A, g, 20, p[27]), A = a(A, O, P, k, D, 5, p[28]), 
-k = a(k, A, O, P, l, 9, p[29]), P = a(P, k, A, O, y, 14, p[30]), A = o(A, O = a(O, P, k, A, b, 20, p[31]), P, k, h, 4, p[32]), 
-k = o(k, A, O, P, g, 11, p[33]), P = o(P, k, A, O, v, 16, p[34]), O = o(O, P, k, A, w, 23, p[35]), 
-A = o(A, O, P, k, c, 4, p[36]), k = o(k, A, O, P, d, 11, p[37]), P = o(P, k, A, O, y, 16, p[38]), 
-O = o(O, P, k, A, _, 23, p[39]), A = o(A, O, P, k, D, 4, p[40]), k = o(k, A, O, P, s, 11, p[41]), 
-P = o(P, k, A, O, u, 16, p[42]), O = o(O, P, k, A, f, 23, p[43]), A = o(A, O, P, k, m, 4, p[44]), 
-k = o(k, A, O, P, b, 11, p[45]), P = o(P, k, A, O, S, 16, p[46]), A = i(A, O = o(O, P, k, A, l, 23, p[47]), P, k, s, 6, p[48]), 
-k = i(k, A, O, P, y, 10, p[49]), P = i(P, k, A, O, w, 15, p[50]), O = i(O, P, k, A, h, 21, p[51]), 
-A = i(A, O, P, k, b, 6, p[52]), k = i(k, A, O, P, u, 10, p[53]), P = i(P, k, A, O, _, 15, p[54]), 
-O = i(O, P, k, A, c, 21, p[55]), A = i(A, O, P, k, g, 6, p[56]), k = i(k, A, O, P, S, 10, p[57]), 
-P = i(P, k, A, O, f, 15, p[58]), O = i(O, P, k, A, D, 21, p[59]), A = i(A, O, P, k, d, 6, p[60]), 
-k = i(k, A, O, P, v, 10, p[61]), P = i(P, k, A, O, l, 15, p[62]), O = i(O, P, k, A, m, 21, p[63]);
-r[0] = r[0] + A | 0;
+var s = t[n + 0], l = (c = t[n + 1], t[n + 2]), u = t[n + 3], d = t[n + 4], h = t[n + 5], f = t[n + 6], y = t[n + 7], g = t[n + 8], m = t[n + 9], _ = t[n + 10], v = t[n + 11], b = t[n + 12], D = t[n + 13], w = t[n + 14], S = t[n + 15], k = e(k = r[0], O = r[1], P = r[2], A = r[3], s, 7, p[0]), A = e(A, k, O, P, c, 12, p[1]), P = e(P, A, k, O, l, 17, p[2]), O = e(O, P, A, k, u, 22, p[3]);
+k = e(k, O, P, A, d, 7, p[4]), A = e(A, k, O, P, h, 12, p[5]), P = e(P, A, k, O, f, 17, p[6]), 
+O = e(O, P, A, k, y, 22, p[7]), k = e(k, O, P, A, g, 7, p[8]), A = e(A, k, O, P, m, 12, p[9]), 
+P = e(P, A, k, O, _, 17, p[10]), O = e(O, P, A, k, v, 22, p[11]), k = e(k, O, P, A, b, 7, p[12]), 
+A = e(A, k, O, P, D, 12, p[13]), P = e(P, A, k, O, w, 17, p[14]), k = a(k, O = e(O, P, A, k, S, 22, p[15]), P, A, c, 5, p[16]), 
+A = a(A, k, O, P, f, 9, p[17]), P = a(P, A, k, O, v, 14, p[18]), O = a(O, P, A, k, s, 20, p[19]), 
+k = a(k, O, P, A, h, 5, p[20]), A = a(A, k, O, P, _, 9, p[21]), P = a(P, A, k, O, S, 14, p[22]), 
+O = a(O, P, A, k, d, 20, p[23]), k = a(k, O, P, A, m, 5, p[24]), A = a(A, k, O, P, w, 9, p[25]), 
+P = a(P, A, k, O, u, 14, p[26]), O = a(O, P, A, k, g, 20, p[27]), k = a(k, O, P, A, D, 5, p[28]), 
+A = a(A, k, O, P, l, 9, p[29]), P = a(P, A, k, O, y, 14, p[30]), k = o(k, O = a(O, P, A, k, b, 20, p[31]), P, A, h, 4, p[32]), 
+A = o(A, k, O, P, g, 11, p[33]), P = o(P, A, k, O, v, 16, p[34]), O = o(O, P, A, k, w, 23, p[35]), 
+k = o(k, O, P, A, c, 4, p[36]), A = o(A, k, O, P, d, 11, p[37]), P = o(P, A, k, O, y, 16, p[38]), 
+O = o(O, P, A, k, _, 23, p[39]), k = o(k, O, P, A, D, 4, p[40]), A = o(A, k, O, P, s, 11, p[41]), 
+P = o(P, A, k, O, u, 16, p[42]), O = o(O, P, A, k, f, 23, p[43]), k = o(k, O, P, A, m, 4, p[44]), 
+A = o(A, k, O, P, b, 11, p[45]), P = o(P, A, k, O, S, 16, p[46]), k = i(k, O = o(O, P, A, k, l, 23, p[47]), P, A, s, 6, p[48]), 
+A = i(A, k, O, P, y, 10, p[49]), P = i(P, A, k, O, w, 15, p[50]), O = i(O, P, A, k, h, 21, p[51]), 
+k = i(k, O, P, A, b, 6, p[52]), A = i(A, k, O, P, u, 10, p[53]), P = i(P, A, k, O, _, 15, p[54]), 
+O = i(O, P, A, k, c, 21, p[55]), k = i(k, O, P, A, g, 6, p[56]), A = i(A, k, O, P, S, 10, p[57]), 
+P = i(P, A, k, O, f, 15, p[58]), O = i(O, P, A, k, D, 21, p[59]), k = i(k, O, P, A, d, 6, p[60]), 
+A = i(A, k, O, P, v, 10, p[61]), P = i(P, A, k, O, l, 15, p[62]), O = i(O, P, A, k, m, 21, p[63]);
+r[0] = r[0] + k | 0;
 r[1] = r[1] + O | 0;
 r[2] = r[2] + P | 0;
-r[3] = r[3] + k | 0;
+r[3] = r[3] + A | 0;
 },
 _doFinalize: function() {
 var e = this._data, a = e.words, o = 8 * this._nDataBytes, n = 8 * e.sigBytes;

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": 1635927013210,
-    "genTime": 1635927013210,
+    "buildTime": 1635930909751,
+    "genTime": 1635930909751,
     "genVersion": null
 }