wuwangdong 4 gadi atpakaļ
vecāks
revīzija
30a8d2606d

+ 6 - 4
assets/script/before/view/uiItem/PlantItem.ts

@@ -69,11 +69,13 @@ export default class PlantItem extends cc.Component {
         let times = 0;
         //根据上个商品种植次数
         if (list_data.unlock == 1) {
-            // times = gData.gameData.getProductMakeTimesById(list_data.picture - 1);
-            // if (times >= list_data.value) {
-            //     unlock = true;
-            // }
             unlock = gData.gameData.getProductUnlockById(this.data.tab, this.data.picture);
+            if (!unlock) {
+                times = gData.gameData.getProductMakeTimesById(list_data.picture - 1);
+                if (times >= list_data.value) {
+                    unlock = true;
+                }
+            }
         }
         //根据农场等级
         else if (list_data.unlock == 2) {

+ 35 - 18
assets/script/game/data/GameData.ts

@@ -1107,22 +1107,34 @@ export class GameData {
     }
 
     //设置解锁的最大id
-    addProductUnlockMaxId(tab, id) {
+    addProductUnlockMaxId(tab, id, isUpdateSever = true) {
         if (this._productMakeTimesData.productUnlockMaxId) {
             let productId = this._productMakeTimesData.productUnlockMaxId.get(tab);
             if (productId && id > productId) {
                 this._productMakeTimesData.productUnlockMaxId.set(tab, id);
 
-                let sss: any = {};
-                sss.makeTimes = this._productMakeTimesData.makeTimes;
-                let json = this.mapToObj(this._productMakeTimesData.productUnlockMaxId);
-                sss.productUnlockMaxId = JSON.stringify(json);
-
-                this.setProp(GameProp.productMakeTimes, sss);
+                if(isUpdateSever)
+                {
+                    let sss: any = {};
+                    sss.makeTimes = this._productMakeTimesData.makeTimes;
+                    let json = this.mapToObj(this._productMakeTimesData.productUnlockMaxId);
+                    sss.productUnlockMaxId = JSON.stringify(json);
+    
+                    this.setProp(GameProp.productMakeTimes, sss);
+                }         
             }
         }
     }
 
+    updateDataToSever() {
+        let sss: any = {};
+        sss.makeTimes = this._productMakeTimesData.makeTimes;
+        let json = this.mapToObj(this._productMakeTimesData.productUnlockMaxId);
+        sss.productUnlockMaxId = JSON.stringify(json);
+
+        this.setProp(GameProp.productMakeTimes, sss);
+    }
+
     getProductMakeTimesById(id: number) {
         let times = this._productMakeTimesMap.get(id);
         if (!times) {
@@ -1131,19 +1143,16 @@ export class GameData {
         return times;
     }
 
-    getProductUnlockById(tab, id:number){
-        if(this._productMakeTimesData.productUnlockMaxId)
-        {
+    getProductUnlockById(tab, id: number) {
+        if (this._productMakeTimesData.productUnlockMaxId) {
             let productId = this._productMakeTimesData.productUnlockMaxId.get(tab);
-            if(productId) 
-            {
-                if(productId >= id)
-                {
+            if (productId) {
+                if (productId >= id) {
                     return true;
-                }else{
+                } else {
                     return false;
                 }
-            }else{
+            } else {
                 return false;
             }
         }
@@ -1479,6 +1488,7 @@ export class GameData {
 
     /** 农场升级时解锁工厂,检查最大可种植/生产商品 */
     public checkTaskFinishUnLock() {
+        let isUpdateToSever = false;
         for (var key in ProductType) {
             let tab = ProductType[key];
             let configArr = this.getProductArrByType(tab);
@@ -1509,8 +1519,9 @@ export class GameData {
 
                     if (maxId != 0) {
                         //更新最大可购买商品
+                        isUpdateToSever = true;
                         this.setMaxProduct(maxId, true);
-                        this.addProductUnlockMaxId(tab, maxId);
+                        this.addProductUnlockMaxId(tab, maxId, false);
                     }
 
                     //更新到服务器
@@ -1531,8 +1542,9 @@ export class GameData {
                             needUpdate = true;
                         }
                         //更新最大可购买商品
+                        isUpdateToSever = true;
                         this.setMaxProduct(configArr[0].picture, true);
-                        this.addProductUnlockMaxId(tab, configArr[0].picture);
+                        this.addProductUnlockMaxId(tab, configArr[0].picture, false);
                     }
 
                     if (needUpdate) {
@@ -1542,6 +1554,11 @@ export class GameData {
                     break;
             }
         }
+
+        if(isUpdateToSever)
+        {
+            this.updateDataToSever();
+        }
     }
 
     checkCanSpeedUp(pop = false) {

+ 1 - 1
assets/script/mk/system/JsbSystem.ts

@@ -150,7 +150,7 @@ export default class JsbSystem {
             //gData.appData.appId = "wx3c0cc2f730c5ad5a";
             //gData.appData.version = "1.0.0";
             gData.appData.appId = "wxd98fe9d52af10e59";
-            gData.appData.version = "1.1.5";
+            gData.appData.version = "1.1.4";
         }
         // console.log('gData.appData  ', unicodeStr)
         // console.log('gData.appData.appId  ', gData.appData.appId)

BIN
build/jsb-link/assets/main/index.jsc


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
build/jsb-link/assets/resources/config.json


BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser


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

@@ -8588,24 +8588,21 @@ if (1 != t.state) return this.doSameCheckLogic(t);
 for (var o = e.orderTaskList, n = gData.gameData.configs.Product, i = 0; i != o.length; ++i) {
 var c = o[i];
 if (c.Id <= n.length) {
-if (a[i] < c.taskCount) for (var s = n[c.Id - 1], l = this.factoryIcons.length, p = 0; p < l; p++) {
-var u = gData.gameData.getTabByConfigID(this.factoryIcons[p].configID), d = gData.gameData.getMaxProduct(u);
-if (u == s.tab && this.factoryIcons[p].data.state == r.FactroyState.Empty && s.picture <= d) {
+if (a[i] < c.taskCount) for (var s = n[c.Id - 1], l = this.factoryIcons.length, p = 0; p < l; p++) if (gData.gameData.getTabByConfigID(this.factoryIcons[p].configID) == s.tab && this.factoryIcons[p].data.state == r.FactroyState.Empty) {
 gData.gameData.nextCanProduct = gData.gameData.getProductMap(s.picture);
 gData.gameData.nextMake = this.factoryIcons[p];
 gData.gameData.nextType = 3;
 console.log("nextFactory ===== successs");
 return this.factoryIcons[p];
 }
-}
 } else {
 l = this.factoryIcons.length;
-for (var h = 0; h < l; h++) if (this.factoryIcons[h].data.state == r.FactroyState.Empty) {
-gData.gameData.nextCanProduct = gData.gameData.getRandomFactoryConfig(this.factoryIcons[h].configID);
-gData.gameData.nextMake = this.factoryIcons[h];
+for (var u = 0; u < l; u++) if (this.factoryIcons[u].data.state == r.FactroyState.Empty) {
+gData.gameData.nextCanProduct = gData.gameData.getRandomFactoryConfig(this.factoryIcons[u].configID);
+gData.gameData.nextMake = this.factoryIcons[u];
 gData.gameData.nextType = 3;
 console.log("nextFactory ===== successs===");
-return this.factoryIcons[h];
+return this.factoryIcons[u];
 }
 }
 }
@@ -10121,7 +10118,7 @@ this.init_award = !0;
 };
 e.prototype.setChooseType = function(t) {
 this.chooseType = t;
-this.maxUnluckValue = gData.gameData.getMaxProduct(t);
+this.maxUnluckValue = gData.gameData.getMaxProductExtra(t);
 };
 return e;
 }(i.Data);
@@ -10194,7 +10191,7 @@ this.refreshBtnState();
 e.prototype.refreshBtnState = function() {
 var t = 0;
 for (var e in c.ProductType) {
-var a = gData.gameData.getMaxProduct(c.ProductType[e]);
+var a = gData.gameData.getMaxProductExtra(c.ProductType[e]);
 if (a) {
 this.itemName[t].toggle.interactable = !0;
 for (var o = gData.gameData.getProductArrByType(c.ProductType[e]), n = !1, i = 0; i != o.length; ++i) if (o[i].picture <= a && 0 == gData.gameData.getFarmMapRewardState(this.getIndex(o[i]))) {
@@ -11254,7 +11251,6 @@ var r = mk.math.random(.3, 1, !1);
 cc.tween(e).to(r, {
 scale: .8
 }).start();
-console.log("---");
 var c = null, l = null;
 if ("string" == typeof a) {
 if ("" == a) {
@@ -12393,7 +12389,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"), F = t("../../before/view/data/ADClearSickData"), M = t("../../before/main/PastureSystem"), x = 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();
 }
@@ -12406,8 +12402,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();
@@ -12425,9 +12421,9 @@ this.newCashUiData = new O.NewCashUIData();
 this.adUnlockData = new I.default();
 this.plantData = new T.default();
 this.harvestData = new C.default();
-this.adClearSickData = new F.default();
-this.pastureSystem = new M.default();
-this.factorySystem = new x.default();
+this.adClearSickData = new M.default();
+this.pastureSystem = new x.default();
+this.factorySystem = new F.default();
 this.farmSystem = new R.FarmSystem();
 this.farmMapData = new N.FarmMapData();
 this.farmGradeData = new j.GradeRewardData();
@@ -12794,8 +12790,9 @@ this.needFreshArr = [];
 this.hasFirstCheck = !1;
 this._productMap = new Map();
 this._productTypeMap = new Map();
-this._productMakeTimesData = [];
+this._productMakeTimesData = {};
 this._productMakeTimesMap = new Map();
+this._productUnlockMaxId = new Map();
 this._pastureData = [];
 this._pastureDataMap = new Map();
 this._factoryData = [];
@@ -13092,7 +13089,7 @@ break;
 o = !0;
 var m = f[g.Id - 1];
 if (m.tab == u.nzw) {
-var _ = this.getMaxProduct(u.nzw);
+var _ = this.getMaxProductExtra(u.nzw);
 if (_ && m.picture <= _) {
 e = m.picture;
 a = !1;
@@ -13106,7 +13103,7 @@ break;
 }
 if (!i) {
 if (v = this.doFarmMapDataCheck(0)) e = v; else {
-e = r.default.rnd(10001, this.getMaxProduct(u.nzw));
+e = r.default.rnd(10001, this.getMaxProductExtra(u.nzw));
 this.nextType = 1;
 }
 console.log("订单数据没有匹配成功====1");
@@ -13115,7 +13112,7 @@ console.log("订单数据没有匹配成功====1");
 n = !0;
 var v;
 if (v = this.doFarmMapDataCheck(0)) e = v; else {
-e = r.default.rnd(10001, this.getMaxProduct(u.nzw));
+e = r.default.rnd(10001, this.getMaxProductExtra(u.nzw));
 this.nextType = 1;
 }
 console.log("订单数据为null");
@@ -13130,8 +13127,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;
@@ -13178,7 +13175,7 @@ return;
 }
 };
 t.prototype.getRandomFactoryConfig = function(t) {
-for (var e = gData.gameData.getTabByConfigID(t), a = this.getProductArrByType(e), o = this.getMaxProduct(e), n = [], i = a.length, c = 0; c < i; c++) if (a[c].picture <= o) {
+for (var e = gData.gameData.getTabByConfigID(t), a = this.getProductArrByType(e), o = this.getMaxProductExtra(e), n = [], i = a.length, c = 0; c < i; c++) if (a[c].picture <= o) {
 n.push(a[c].picture);
 if (a[c].picture == o) break;
 }
@@ -13189,7 +13186,7 @@ t.prototype.doFarmMapDataCheck = function(t, e) {
 var a = 0;
 for (var o in u) {
 if (t <= a) {
-var n = this.getMaxProduct(u[o]);
+var n = this.getMaxProductExtra(u[o]);
 if (n) for (var i = this.getProductArrByType(u[o]), r = 0; r != i.length; ++r) {
 var c = i[r].picture - 1;
 if (1 == i[r].unlock && c == n && 0 == this.getFarmMapRewardState(this.getIndex(i[r]))) switch (u[o]) {
@@ -13411,11 +13408,26 @@ t.prototype.getProductArrByType = function(t) {
 return this._productTypeMap.get(t);
 };
 t.prototype.initProductTimes = function() {
-this._productMakeTimesData = this.getProp(i.productMakeTimes);
-this._productMakeTimesData || (this._productMakeTimesData = []);
-for (var t = this._productMakeTimesData.length, e = 0; e < t; e++) {
-this._productMakeTimesMap.set(this._productMakeTimesData[e].id, this._productMakeTimesData[e].times);
-this.setMaxProduct(this._productMakeTimesData[e].id);
+var t = this.getProp(i.productMakeTimes);
+if (t) if (t instanceof Array) {
+this._productMakeTimesData.makeTimes = t;
+this._productMakeTimesData.productUnlockMaxId = new Map();
+this._productMakeTimesData.productUnlockMaxId.set(u.nzw, 10003);
+for (var e = t.length, a = 0; a != e; ++a) {
+var o = t[a], n = this.getProductMap(o.id), r = this._productMakeTimesData.productUnlockMaxId.get(n.tab);
+r ? r < o.id && this._productMakeTimesData.productUnlockMaxId.set(n.tab, o.id) : this._productMakeTimesData.productUnlockMaxId.set(n.tab, o.id);
+}
+} else {
+this._productMakeTimesData.makeTimes = t.makeTimes;
+this._productMakeTimesData.productUnlockMaxId = this.objToMap(JSON.parse(t.productUnlockMaxId));
+} else {
+this._productMakeTimesData.makeTimes = [];
+this._productMakeTimesData.productUnlockMaxId = new Map();
+this._productMakeTimesData.productUnlockMaxId.set(u.nzw, 10003);
+}
+for (var c = this._productMakeTimesData.makeTimes.length, s = 0; s < c; s++) {
+this._productMakeTimesMap.set(this._productMakeTimesData.makeTimes[s].id, this._productMakeTimesData.makeTimes[s].times);
+this.setMaxProduct(this._productMakeTimesData.makeTimes[s].id);
 }
 };
 t.prototype.addProductMakeTimesById = function(t) {
@@ -13423,8 +13435,8 @@ var e = !1, a = this._productMakeTimesMap.get(t);
 a || (a = 0);
 a++;
 this._productMakeTimesMap.set(t, a);
-for (var o = !1, n = this._productMakeTimesData.length, r = 0; r < n; r++) if (this._productMakeTimesData[r].id == t) {
-this._productMakeTimesData[r].times = a;
+for (var o = !1, n = this._productMakeTimesData.makeTimes.length, r = 0; r < n; r++) if (this._productMakeTimesData.makeTimes[r].id == t) {
+this._productMakeTimesData.makeTimes[r].times = a;
 o = !0;
 break;
 }
@@ -13433,29 +13445,66 @@ var c = {
 id: t,
 times: a
 };
-this._productMakeTimesData.push(c);
+this._productMakeTimesData.makeTimes.push(c);
 }
 var s = t + 1, l = this.getProductMap(t), p = this.getProductMap(s);
-t == this.getMaxProduct(l.tab) && p && (gData.plantData.init_itemIndex = s);
-if (p && p.tab == l.tab && s > this.getMaxProduct(l.tab) && 1 == p.unlock && p.value <= a) {
+t == this.getMaxProductExtra(l.tab) && p && (gData.plantData.init_itemIndex = s);
+if (p && p.tab == l.tab && s > this.getMaxProductExtra(l.tab) && 1 == p.unlock && p.value <= a) {
 e = !0;
 this._productMakeTimesMap.set(s, 0);
 c = {
 id: s,
 times: 0
 };
-this._productMakeTimesData.push(c);
+this._productMakeTimesData.makeTimes.push(c);
+this._productMakeTimesData.productUnlockMaxId.set(p.tab, s);
 this.setMaxProduct(s);
 this.getProductMap(s + 1) && (gData.plantData.init_lock = s + 1);
 }
 e || mk.event.emit("refreshFarmMapUI");
-this.setProp(i.productMakeTimes, this._productMakeTimesData);
+var u = {};
+u.makeTimes = this._productMakeTimesData.makeTimes;
+var d = this.mapToObj(this._productMakeTimesData.productUnlockMaxId);
+u.productUnlockMaxId = JSON.stringify(d);
+this.setProp(i.productMakeTimes, u);
+};
+t.prototype.mapToObj = function(t) {
+var e = {};
+t.forEach(function(t, a) {
+e[a] = t;
+});
+return e;
+};
+t.prototype.objToMap = function(t) {
+var e = new Map();
+for (var a in t) e.set(a, t[a]);
+return e;
+};
+t.prototype.addProductUnlockMaxId = function(t, e) {
+if (this._productMakeTimesData.productUnlockMaxId) {
+var a = this._productMakeTimesData.productUnlockMaxId.get(t);
+if (a && e > a) {
+this._productMakeTimesData.productUnlockMaxId.set(t, e);
+var o = {};
+o.makeTimes = this._productMakeTimesData.makeTimes;
+var n = this.mapToObj(this._productMakeTimesData.productUnlockMaxId);
+o.productUnlockMaxId = JSON.stringify(n);
+this.setProp(i.productMakeTimes, o);
+}
+}
 };
 t.prototype.getProductMakeTimesById = function(t) {
 var e = this._productMakeTimesMap.get(t);
 e || (e = 0);
 return e;
 };
+t.prototype.getProductUnlockById = function(t, e) {
+if (this._productMakeTimesData.productUnlockMaxId) {
+var a = this._productMakeTimesData.productUnlockMaxId.get(t);
+return !!a && a >= e;
+}
+return !1;
+};
 t.prototype.setPastureDataMap = function(t, e, a) {
 void 0 === a && (a = !0);
 this._pastureDataMap.set(t, e);
@@ -13538,6 +13587,7 @@ productID: 0,
 growSpan: 0
 };
 this.setMaxProduct(r[0].picture, !0);
+this.addProductUnlockMaxId(o, r[0].picture);
 }
 this._factoryData.push(a);
 this._factoryDataMap.set(e, a);
@@ -13551,7 +13601,10 @@ o = this.getTabByConfigID(e);
 r = this.getProductArrByType(o);
 this._factoryDataMap.set(this._factoryData[n].id, this._factoryData[n]);
 this._factoryData[n].state == d.Sick && c++;
-this.playerProp.completeFarmTaskTimes >= r[0].value && this.setMaxProduct(r[0].picture, !0);
+if (this.playerProp.completeFarmTaskTimes >= r[0].value) {
+this.setMaxProduct(r[0].picture, !0);
+this.addProductUnlockMaxId(o, r[0].picture);
+}
 e++;
 }
 this.RawInsectCurArr[2] = c;
@@ -13678,6 +13731,9 @@ t.prototype.getMaxProduct = function(t) {
 if (this._maxProduct) for (var e = this._maxProduct.length, a = null, o = 0; o < e; o++) if ((a = this._maxProduct[o]).tab == t) return a.productID;
 return null;
 };
+t.prototype.getMaxProductExtra = function(t) {
+return this._productMakeTimesData.productUnlockMaxId ? this._productMakeTimesData.productUnlockMaxId.get(t) : null;
+};
 t.prototype.setMaxProduct = function(t, e) {
 void 0 === e && (e = !1);
 var a = this.getProductMap(t);
@@ -13728,7 +13784,10 @@ s = a[l].picture;
 }
 c++;
 }
-0 != s && this.setMaxProduct(s, !0);
+if (0 != s) {
+this.setMaxProduct(s, !0);
+this.addProductUnlockMaxId(e, s);
+}
 if (r) {
 this.setProp(i.pastureData, this._pastureData);
 this.setNextProduct();
@@ -13751,6 +13810,7 @@ this.setFactoryDataMap(h, n, !1);
 r = !0;
 }
 this.setMaxProduct(a[0].picture, !0);
+this.addProductUnlockMaxId(e, a[0].picture);
 }
 if (r) {
 this.setProp(i.factoryData, this._factoryData);
@@ -14885,7 +14945,7 @@ this.node_farmMapUI.active = !1;
 return [ 2 ];
 }
 this.uiShowType = 3;
-for (t in d.ProductType) if (e = gData.gameData.getMaxProduct(d.ProductType[t])) {
+for (t in d.ProductType) if (e = gData.gameData.getMaxProductExtra(d.ProductType[t])) {
 a = gData.gameData.getProductArrByType(d.ProductType[t]);
 for (o = 0; o != a.length; ++o) {
 n = a[o];
@@ -17975,7 +18035,7 @@ value: !0
 a.ServerUrl = a.HttpData = void 0;
 var o, n = function() {
 function t() {
-this.serverType = 1;
+this.serverType = 0;
 }
 t.prototype.getServerUrl = function() {
 switch (this.serverType) {
@@ -20315,7 +20375,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 = 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 = function() {
 function t() {}
 Object.defineProperty(t.prototype, "time", {
 get: function() {
@@ -20459,7 +20519,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
@@ -20523,7 +20583,7 @@ configurable: !0
 });
 Object.defineProperty(t.prototype, "numberAnim", {
 get: function() {
-return A.default;
+return k.default;
 },
 enumerable: !1,
 configurable: !0
@@ -23678,7 +23738,7 @@ gData.plantData.init_lock = -1;
 };
 e.prototype.initItem = function(t) {
 return r(this, void 0, void 0, function() {
-var e, a, o, n, i, r, s, p;
+var e, a, o, n, i, r, s;
 return c(this, function(c) {
 switch (c.label) {
 case 0:
@@ -23709,16 +23769,15 @@ n.spriteFrame = c.sent();
 this.awardLabel.string = (t.menuRedBagCoin / 100).toString();
 this.timeLabel.string = t.time;
 i = !1;
-r = 0;
-1 == t.unlock ? (r = gData.gameData.getProductMakeTimesById(t.picture - 1)) >= t.value && (i = !0) : 2 == t.unlock && gData.gameData.playerProp.completeFarmTaskTimes >= t.value && (i = !0);
+1 == t.unlock ? i = gData.gameData.getProductUnlockById(this.data.tab, this.data.picture) : 2 == t.unlock && gData.gameData.playerProp.completeFarmTaskTimes >= t.value && (i = !0);
 this.mainNode.active = i;
 this.lockNode.active = !i;
 if (!i) {
-s = this.getDesByType();
-p = gData.gameData.getProductMap(this.data.picture - 1).name;
-if (t.picture - 1 == gData.gameData.getMaxProduct(this.data.tab)) {
-this.labUnlock.string = "" + s + this.data.value + "次\n" + p;
-this.lbl_progress.string = r + "/" + this.data.value;
+r = this.getDesByType();
+s = gData.gameData.getProductMap(this.data.picture - 1).name;
+if (t.picture - 1 == gData.gameData.getMaxProductExtra(this.data.tab)) {
+this.labUnlock.string = "" + r + this.data.value + "次\n" + s;
+this.lbl_progress.string = "0/" + this.data.value;
 this.labUnlock.node.active = !0;
 } else this.labUnlock.node.active = !1;
 }
@@ -26031,7 +26090,7 @@ gData.farmMapData.isStateChange = !1;
 };
 e.prototype.changeStatus = function() {
 for (var t in r.ProductType) {
-var e = gData.gameData.getMaxProduct(r.ProductType[t]);
+var e = gData.gameData.getMaxProductExtra(r.ProductType[t]);
 if (e) for (var a = gData.gameData.getProductArrByType(r.ProductType[t]), o = 0; o != a.length; ++o) if (a[o].picture <= e && 0 == gData.gameData.getFarmMapRewardState(this.getIndex(a[o]))) {
 this.node_redPoint.active = !0;
 return;
@@ -32792,30 +32851,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;

+ 2 - 2
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": 1635417853674,
-    "genTime": 1635417853674,
+    "buildTime": 1635751713835,
+    "genTime": 1635751713835,
     "genVersion": null
 }

+ 1 - 1
settings/project.json

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

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels