1

assets/script/game/data/GameData.ts

@@ -206,6 +206,8 @@ export class GameData {
         this.playerProp.userFarmTaskInfo = res_data.userFarmTaskInfo;
         this.playerProp.speedUpLeftTimes = res_data.speedUpLeftTimes;
         this.playerProp.completeFarmTaskTimes = res_data.completeFarmTaskTimes;
+        mk.console.logSingle('initPlayerProp=>', res_data.userFarmTaskInfo);
+        
 
         mk.data.setTAUserID(gData.loginData.uin);
         mk.data.setTAEventUser(0, 'logindays_total', this.playerProp.loginDays);

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

@@ -285,7 +285,7 @@ export default class RedBagTask extends cc.Component {
         mk.console.logSingle('redBagTask=>', response);
         if (response.errcode != 0) {
             // gData.cashPro.init_fail = true;
-            return null;
+            return;
         }
         mk.console.logSingle('redBagTaskhttpCashOut=>', response.data.userFarmTaskInfo);
         gData.gameData.playerProp.userFarmTaskInfo = response.data.userFarmTaskInfo;

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

@@ -3596,12 +3596,12 @@ this.machineInfo.imei = e[2];
 this.machineInfo.mac = this.mac = e[3];
 this.machineInfo.oaid = e[4];
 this.machineInfo.umid = e[5];
-this.machineInfo.UA = e[11];
 this.tfChannel = e[6];
 this.appVersion = e[7];
 this.umengChannel = e[8];
 this.deviceType = e[9];
 this.androidVersion = e[10];
+this.machineInfo.UA = e[11];
 this.IP = e[12];
 this.getDeviceInfoCompelete = !0;
 console.log("===[this.tfChannel", this.tfChannel);
@@ -7137,23 +7137,25 @@ mk.http.sendData("cp", o);
 }
 };
 t.prototype.sendXYTrack = function(t, e, o) {
-var n = {
+var n = {};
+n[e] = o;
+var a = {
 app_id: "30WAK1lNDc0b99LzSOJqv3TXa",
 app_type: 1,
-app_ver: gData.appData.androidVersion,
+app_ver: gData.appData.appVersion,
 app_channel: gData.appData.tfChannel,
 report_time: Date.now(),
 user_id: gData.loginData.uin,
-device_id: gData.appData.deviceType,
+device_id: "",
 os_type: 1,
 user_agent: gData.appData.UA,
 imei: gData.appData.machineInfo.imei,
 ifda: gData.appData.machineInfo.idfa,
 oaid: gData.appData.machineInfo.oaid,
 event_id: t,
-event_value: '{"' + e + '":' + o + "}"
-}, a = this.xyTrackUrl + "track";
-mk.http.sendRequestNormal(a, "POST", JSON.stringify(n));
+event_value: JSON.stringify(n)
+}, i = this.xyTrackUrl + "track";
+mk.http.sendRequestNormal(i, "POST", JSON.stringify(a));
 };
 return t;
 }();
@@ -12726,6 +12728,7 @@ mk.console.logSingle("userNoviceWeFareInfo==>", t.userNoviceWeFareInfo);
 this.playerProp.userFarmTaskInfo = t.userFarmTaskInfo;
 this.playerProp.speedUpLeftTimes = t.speedUpLeftTimes;
 this.playerProp.completeFarmTaskTimes = t.completeFarmTaskTimes;
+mk.console.logSingle("initPlayerProp=>", t.userFarmTaskInfo);
 mk.data.setTAUserID(gData.loginData.uin);
 mk.data.setTAEventUser(0, "logindays_total", this.playerProp.loginDays);
 0 == this.playerProp.completeFarmTaskTimes && mk.data.setTAEventUser(0, "Cumulative_task", gData.gameData.playerProp.completeFarmTaskTimes);
@@ -16896,7 +16899,7 @@ o = mk.encrypt.decrypt(t.encrypt, gData.loginData.sessionKey, gData.appData.appI
 o = JSON.parse(o);
 } else t.data && (o = t.data);
 t.data = o;
-0 != t.errcode && (-10003 != t.errcode && -20003 != t.errcode && 403 != t.errcode || gData.warnTipData.setSolution(4));
+0 != t.errcode && 403 == t.errcode && gData.warnTipData.setSolution(4);
 return t;
 };
 t.prototype.sendRequestNormal = function(t, e, o) {
@@ -18317,7 +18320,7 @@ return [ 4, mk.http.sendRequest("checklogin", "POST", JSON.stringify(e)) ];
 
 case 1:
 if (0 != (o = a.sent()).errcode) {
-403 != o.errcode && -10003 != o.errcode && -20003 != o.errcode || gData.warnTipData.setSolution(4);
+403 == o.errcode && gData.warnTipData.setSolution(4);
 return [ 2 ];
 }
 n = null != gData.wechatData.code ? mk.encrypt.decrypt(o.encrypt, this.sessionKey, gData.appData.appId) : mk.encrypt.decrypt(o.encrypt, t, gData.appData.appId);
@@ -24313,7 +24316,7 @@ return [ 4, mk.http.sendData("farmTask/farmTaskCash", t) ];
 case 1:
 e = o.sent();
 mk.console.logSingle("redBagTask=>", e);
-if (0 != e.errcode) return [ 2, null ];
+if (0 != e.errcode) return [ 2 ];
 mk.console.logSingle("redBagTaskhttpCashOut=>", e.data.userFarmTaskInfo);
 gData.gameData.playerProp.userFarmTaskInfo = e.data.userFarmTaskInfo;
 gData.gameData.playerProp.completeFarmTaskTimes = e.data.completeFarmTaskTimes;

packages-hot-update/cfg.json

@@ -1,7 +1,7 @@
 {
     "version": "1.0.1",
     "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/",
-    "resourceRootDir": "D:\\mokaszProjects\\team1_nc\\build\\jsb-link",
+    "resourceRootDir": "D:\\projects\\team1_nc\\build\\jsb-link",
     "genManifestDir": "",
     "hotAddressArray": [
         "http://",
@@ -11,7 +11,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyJsb/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/"
     ],
-    "buildTime": 1634635844234,
-    "genTime": 1634635844234,
+    "buildTime": 1634637476058,
+    "genTime": 1634637476058,
     "genVersion": null
 }