合并代码

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

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

assets/resources/module/speedUpUI/productReward.prefab

@@ -1064,7 +1064,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 236.49,
+      "width": 288.49,
       "height": 50
     },
     "_anchorPoint": {
@@ -1128,7 +1128,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 78,
+      "width": 130,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1180,8 +1180,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "再生产",
-    "_N$string": "再生产",
+    "_string": "订单再生产",
+    "_N$string": "订单再生产",
     "_fontSize": 26,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -1248,7 +1248,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -13.000000000000004,
+        12.999999999999996,
         -5,
         0,
         0,
@@ -1360,7 +1360,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        66.245,
+        92.245,
         0,
         0,
         0,
@@ -1547,7 +1547,7 @@
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 236.49,
+      "width": 288.49,
       "height": 50
     },
     "_resize": 1,

assets/script/before/main/FactoryIcon.ts

@@ -190,7 +190,7 @@ export class FactoryIcon extends cc.Component {
         this.data.growSpan = 0;
         gData.gameData.setFactoryDataMap(this.configID, this.data);
         //await gData.gameData.gameStyle.doCropFlyLogic(productID, this.node);
-        gData.gameData.nextMake = null;
+        //gData.gameData.nextMake = null;
         gData.gameData.setNextProduct(false);
 
         if (gData.harvestData.getType == 0) {

assets/script/before/main/FactorySystem.ts

@@ -95,11 +95,13 @@ export default class FactorySystem {
                 }
             }
         } else {
-            let isHaveEmpty = {state: false};
-            let picId = gData.gameData.doFarmMapDataCheck(2, isHaveEmpty);
-            if (picId) {
-                return picId;
-            } else {
+            // let isHaveEmpty = {state: false};
+            // let picId = gData.gameData.doFarmMapDataCheck(2, isHaveEmpty);
+            // if (picId) {
+            //     return picId;
+            // } 
+            // else 
+            {
                 //if(isHaveEmpty.state)
                 {
                     let len = this.factoryIcons.length;

assets/script/before/main/FarmIcon.ts

@@ -155,7 +155,7 @@ export class FarmIcon extends cc.Component {
         this.node.removeChild(child);
         gData.gameData.setFarmDataMap(this.configID, this.data);
         //await gData.gameData.gameStyle.doCropFlyLogic(this.plantID, this.node, true);
-        gData.gameData.nextMake = null;
+        //gData.gameData.nextMake = null;
         gData.gameData.setNextProduct(false);
 
         if (gData.harvestData.getType == 0) {

assets/script/before/main/PastureIcon.ts

@@ -283,7 +283,7 @@ export default class PastureIcon extends cc.Component {
         this.data.growSpan = 0;
         gData.gameData.setPastureDataMap(this.configID, this.data);
         //await gData.gameData.gameStyle.doCropFlyLogic(this.data.productID, this.node);
-        gData.gameData.nextMake = null;
+        //gData.gameData.nextMake = null;
         gData.gameData.setNextProduct(false);
 
         if (gData.harvestData.getType == 0) {

assets/script/before/main/PastureSystem.ts

@@ -82,11 +82,12 @@ export default class PastureSystem {
         }
         else {
 
-            let isHaveEmpty = {state: false};
-            let picId = gData.gameData.doFarmMapDataCheck(1, isHaveEmpty);
-            if (picId) {
-                return picId;
-            } else {
+            // let isHaveEmpty = {state: false};
+            // let picId = gData.gameData.doFarmMapDataCheck(1, isHaveEmpty);
+            // if (picId) {
+            //     return picId;
+            // } else 
+            {
                 //if(isHaveEmpty.state)
                 {
                     let len = this.pastureIcons.length;

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

@@ -121,6 +121,8 @@ export default class HarvestData extends Data {
             }
             
         }
+
+        gData.adData.checkShowFullInter(4);
     }
 
     public judgeIsMatchOrder()

assets/script/before/view/ui/HarvestPanel.ts

@@ -46,7 +46,7 @@ export default class HarvestPanel extends cc.Component {
             gData.reward.callback = gData.harvestData.call;
 
             let world_Pos = gData.harvestData.node_fly.parent.convertToWorldSpaceAR(gData.harvestData.node_fly.getPosition());
-            gData.reward.getReward(world_Pos, gData.harvestData.isMatchOrder);
+            gData.reward.getReward(world_Pos);
             //mk.ui.openPanel('module/reward/reward');
         }
         mk.ui.closePanel('HarvestPanel');
@@ -69,6 +69,8 @@ export default class HarvestPanel extends cc.Component {
     onEnable() {
         //mk.ad.showBanner(BannerAdType.banner_click_6);
         mk.ad.showNative();
+
+        gData.adData.checkShowFullInter(4);
     }
 
     onDisable() {

assets/script/game/data/GameData.ts

@@ -567,10 +567,11 @@ export class GameData {
 
             if (!isMatchSuccess) {
 
-                let picId = this.doFarmMapDataCheck(0);
-                if (picId) {
-                    id = picId;
-                } else {
+                // let picId = this.doFarmMapDataCheck(0);
+                // if (picId) {
+                //     id = picId;
+                // } else 
+                {
                     id = Util.rnd(10001, this.getMaxProduct(ProductType.nzw));
                     this.nextType = 1
                 }
@@ -578,10 +579,11 @@ export class GameData {
             }
         } else {
             isOrderDataInvalid = true;
-            let picId = this.doFarmMapDataCheck(0);
-            if (picId) {
-                id = picId;
-            } else {
+            // let picId = this.doFarmMapDataCheck(0);
+            // if (picId) {
+            //     id = picId;
+            // } else 
+            {
                 id = Util.rnd(10001, this.getMaxProduct(ProductType.nzw));
                 this.nextType = 1
             }

assets/script/game/data/HttpData.ts

@@ -5,7 +5,7 @@
 export class HttpData {
 
     /** 服务器类型 0测试服 1正式服 2李扬服 3悍国服 */
-    public serverType: number = 1;
+    public serverType: number = 0;
 
     public getServerUrl(): string {
         switch (this.serverType) {

assets/script/game/game/Game.ts

@@ -968,7 +968,7 @@ export default class Game extends cc.Component {
         let productJson = gData.gameData.configs.Product;
         let data = gData.gameData.playerProp.orderData;
         if (data) {
-            this.lbl_addRedMoney.string = (data.redMoneyAddition / 100).toFixed(2);
+            this.lbl_addRedMoney.string = (data.cashMoney / 100).toFixed(2);
             let len = data.orderTaskList.length;
             if (len == 3) {
                 let completeCount = 0;
@@ -1056,12 +1056,12 @@ export default class Game extends cc.Component {
         }
 
         let data = {};
-        let response = await mk.http.sendData('orderTask/receiveReward', data);
+        let response = await mk.http.sendData('orderTask/receiveRewardCash', data);
         console.log(`getOrderReward=========${response}`);
         if (response.errcode != 0) {
             return null;
         }
-        let addMoney = gData.gameData.playerProp.orderData.redMoneyAddition;
+        let addMoney = gData.gameData.playerProp.orderData.cashMoney;
         gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
         //gData.gameData.cloneOrderData(true);
 
@@ -1076,6 +1076,7 @@ export default class Game extends cc.Component {
         mk.ui.openPanel('module/newNotice/newNotice');
         this.initOrderUI();
         gData.gameData.init_order = true;
+        gData.gameData.checkTaskFinishUnLock();
     }
 
     showTips()
@@ -1161,15 +1162,15 @@ export default class Game extends cc.Component {
             {
                 let pos = this.node_orderHb.parent.convertToWorldSpaceAR(this.node_orderHb.getPosition());
                 mk.fly.PlayCoinAnim(1, 5, parentNode, pos, () => {
-                    this.refreshOrderUI(index);
+                    //this.refreshOrderUI(index);
                 }, 0.8);
             }else{
                 let pos = this.node_orderHb.parent.convertToWorldSpaceAR(this.node_orderHb.getPosition());
                 mk.fly.PlayCoinAnim(1, 5, this.btn_product, pos, () => {
-                    this.refreshOrderUI(index);
+                    //this.refreshOrderUI(index);
                 }, 0.8);
             }
-            
+            this.refreshOrderUI(index);
 
             // if (!isComplet && this.node_orderHb && this.btn_product) {
             //     let pos = this.node_orderHb.parent.convertToWorldSpaceAR(this.node_orderHb.getPosition());

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

@@ -150,7 +150,7 @@ export default class ProductReward extends cc.Component {
                     }
 
                 } else {
-                    let v = gData.gameData.playerProp.orderData.redMoneyAddition;
+                    let v = gData.gameData.playerProp.orderData.cashMoney;
                     this.lbl_orderValue.string = "订单已完成，可提现" + (v/100).toFixed(2) + "元";
                     this.sp_taskProgress.fillRange = 1;
                     this.lbl_progress.string = `${allCount}/${allCount}`;

build/jsb-link/assets/resources/native/9e/9ed98385-f23f-41b7-a2bc-27a1d4ad9fd6.manifest

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

build/jsb-link/frameworks/runtime-src/proj.android-studio/gradle.properties

@@ -36,7 +36,7 @@ PROP_BUILD_TOOLS_VERSION=28.0.3
 PROP_APP_ABI=armeabi-v7a
 
 # fill in sign information for release mode
-#RELEASE_STORE_FILE=D:/mokaszProjects/team1_nc/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/keystore/kncdsf.keystore
+#RELEASE_STORE_FILE=D:/projects/team1_nc/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/keystore/kncdsf.keystore
 RELEASE_STORE_PASSWORD=szmoka
 RELEASE_KEY_ALIAS=kncdsf.keystore
 RELEASE_KEY_PASSWORD=szmoka

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

@@ -36487,16 +36487,16 @@ return e.join("");
 253: [ (function(t, e, i) {
 "use strict";
 i.__esModule = !0;
-i.default = L;
+i.default = z;
 i.unpackJSONs = function(t, e) {
-if (t[0] < 1) throw new Error(cc.debug.getError(5304, t[0]));
-D(t, !0, e);
-P(t);
-for (var i = new O(t[0]), n = t[1], r = t[2], s = t[3], o = t[4], a = t[v], c = 0; c < a.length; ++c) a[c].unshift(i, n, r, s, o);
+if (t[0] < f) throw new Error(cc.debug.getError(5304, t[0]));
+V(t, !0, e);
+N(t);
+for (var i = new k(t[0]), n = t[1], r = t[2], s = t[3], o = t[4], a = t[A], c = 0; c < a.length; ++c) a[c].unshift(i, n, r, s, o);
 return a;
 };
 i.packCustomObjData = function(t, e, i) {
-return [ 1, f, f, [ t ], f, i ? [ e, -1 ] : [ e ], [ 0 ], f, [], [], [] ];
+return [ f, d, d, [ t ], d, i ? [ e, -1 ] : [ e ], [ 0 ], d, [], [], [] ];
 };
 i.hasNativeDep = function(t) {
 var e = t[5], i = e[e.length - 1];
@@ -36514,21 +36514,21 @@ return t && t.__esModule ? t : {
 default: t
 };
 }
-var f = 0, d = [ r.default, s.default, o.default, u.default, a.default, c.default, l.default, h.default ];
-function p(t, e) {
+var f = 1, d = 0, p = [ r.default, s.default, o.default, u.default, a.default, c.default, l.default, h.default ];
+function m(t, e) {
 t.x = e[1];
 t.y = e[2];
 t.z = e[3];
 t.w = e[4];
 }
-var m = [ function(t, e) {
+var y = [ function(t, e) {
 t.x = e[1];
 t.y = e[2];
 }, function(t, e) {
 t.x = e[1];
 t.y = e[2];
 t.z = e[3];
-}, p, p, function(t, e) {
+}, m, m, function(t, e) {
 t._val = e[1];
 }, function(t, e) {
 t.width = e[1];
@@ -36540,7 +36540,7 @@ t.width = e[3];
 t.height = e[4];
 }, function(t, e) {
 h.default.fromArray(t, e, 1);
-} ], y = 0, v = 5, g = (function() {
+} ], v = 0, g = 1, b = 2, C = 0, x = 0, A = 5, S = (function() {
 function t() {
 this.uuidObjList = null;
 this.uuidPropList = null;
@@ -36564,13 +36564,13 @@ this.uuidList.push(i);
 };
 return t;
 })();
-g.pool = new n.default.Pool(function(t) {
+S.pool = new n.default.Pool(function(t) {
 t.reset();
 }, 5);
-g.pool.get = function() {
-return this._get() || new g();
+S.pool.get = function() {
+return this._get() || new S();
 };
-function b(t, e, i) {
+function T(t, e, i) {
 for (var n = t.length - 1, r = 0, s = 3 * t[n]; r < s; r += 3) {
 var o = t[r], a = e[t[r + 2]], c = t[r + 1];
 c >= 0 ? o[i[c]] = a : o[~c] = a;
@@ -36580,127 +36580,127 @@ var l = e[t[r]], u = e[t[r + 2]], h = t[r + 1];
 h >= 0 ? l[i[h]] = u : l[~h] = u;
 }
 }
-function C(t, e) {
-for (var i = t[4][e[0]], n = i[0], r = new (0, n[0])(), s = n[1], o = n[2], a = i[i.length - 1], c = 1; c < a; ++c) r[s[i[c]]] = e[c];
+function w(t, e) {
+for (var i = t[4][e[x]], n = i[C], r = new (0, n[v])(), s = n[g], o = n[b], a = i[i.length - 1], c = C + 1; c < a; ++c) r[s[i[c]]] = e[c];
 for (;c < e.length; ++c) {
 var l = s[i[c]], u = n[i[c] + o];
-(0, E[u])(t, r, l, e[c]);
+(0, P[u])(t, r, l, e[c]);
 }
 return r;
 }
-function x(t, e, i) {
+function E(t, e, i) {
 var r = new e();
 r._deserialize ? r._deserialize(i, t[0]) : cc.errorID(5303, n.default.getClassName(e));
 return r;
 }
-function A(t, e, i, n) {
+function M(t, e, i, n) {
 n >= 0 ? e[i] = t[5][n] : t[7][3 * ~n] = e;
 }
-function S(t) {
+function B(t) {
 return function(e, i, n, r) {
 i[n] = r;
 for (var s = 0; s < r.length; ++s) t(e, r, s, r[s]);
 };
 }
-function T(t, e, i, n) {
+function I(t, e, i, n) {
 e[i] = null;
 t[8][n] = e;
 }
-function w(t, e, i, n) {
-e[i] = C(t, n);
+function D(t, e, i, n) {
+e[i] = w(t, n);
 }
-var E = new Array(13);
-E[0] = function(t, e, i, n) {
+var P = new Array(13);
+P[0] = function(t, e, i, n) {
 e[i] = n;
 };
-E[1] = A;
-E[2] = S(A);
-E[3] = S(T);
-E[4] = w;
-E[5] = function(t, e, i, n) {
-m[n[0]](e[i], n);
+P[1] = M;
+P[2] = B(M);
+P[3] = B(I);
+P[4] = D;
+P[5] = function(t, e, i, n) {
+y[n[0]](e[i], n);
 };
-E[6] = T;
-E[7] = function(t, e, i, n) {
+P[6] = I;
+P[7] = function(t, e, i, n) {
 e[i].set(n);
 };
-E[8] = function(t, e, i, n) {
-var r = new d[n[0]]();
-m[n[0]](r, n);
+P[8] = function(t, e, i, n) {
+var r = new p[n[0]]();
+y[n[0]](r, n);
 e[i] = r;
 };
-E[9] = S(w);
-E[10] = function(t, e, i, n) {
+P[9] = B(D);
+P[10] = function(t, e, i, n) {
 var r = t[3][n[0]];
-e[i] = x(t, r, n[1]);
+e[i] = E(t, r, n[1]);
 };
-E[11] = function(t, e, i, n) {
+P[11] = function(t, e, i, n) {
 var r = n[0];
 e[i] = r;
 for (var s = 1; s < n.length; s += 3) {
 var o = n[s], a = n[s + 1], c = n[s + 2];
-(0, E[a])(t, r, o, c);
+(0, P[a])(t, r, o, c);
 }
 };
-E[12] = function(t, e, i, n) {
+P[12] = function(t, e, i, n) {
 var r = n[0];
 e[i] = r;
 for (var s = 0; s < r.length; ++s) {
 var o = r[s], a = n[s + 1];
-0 !== a && (0, E[a])(t, r, s, o);
+0 !== a && (0, P[a])(t, r, s, o);
 }
 };
-function M(t) {
-var e = t[5], i = t[6], n = 0 === i ? 0 : i.length, r = e[e.length - 1], s = e.length - n;
+function R(t) {
+var e = t[5], i = t[6], n = i === d ? 0 : i.length, r = e[e.length - 1], s = e.length - n;
 if ("number" != typeof r) r = 0; else {
 r < 0 && (r = ~r);
 --s;
 }
-for (var o = 0; o < s; ++o) e[o] = C(t, e[o]);
+for (var o = 0; o < s; ++o) e[o] = w(t, e[o]);
 for (var a = t[3], c = 0; c < n; ++c, ++o) {
 var l = i[c], u = e[o];
 if (l >= 0) {
 var h = a[l];
-e[o] = x(t, h, u);
-} else (0, E[l = ~l])(t, e, o, u);
+e[o] = E(t, h, u);
+} else (0, P[l = ~l])(t, e, o, u);
 }
 return r;
 }
-function B(t, e) {
-t || L.reportMissingClass(e);
+function L(t, e) {
+t || z.reportMissingClass(e);
 return Object;
 }
-function I(t, e, i, n, r, s) {
+function O(t, e, i, n, r, s) {
 var o = t(e);
 if (!o) {
 if (r) {
 i[n] = (function(e, i, n) {
 return function() {
-var r = t(n) || B(s, n);
+var r = t(n) || L(s, n);
 e[i] = r;
 return new r();
 };
 })(i, n, e);
 return;
 }
-o = B(s, e);
+o = L(s, e);
 }
 i[n] = o;
 }
-function D(t, e, i) {
+function V(t, e, i) {
 for (var r = i || n.default._getClassById, s = t[3], o = 0; o < s.length; ++o) {
 var a = s[o];
-"string" != typeof a ? I(r, a[0], a, y, e, i) : I(r, a, s, o, e, i);
+"string" != typeof a ? O(r, a[v], a, v, e, i) : O(r, a, s, o, e, i);
 }
 }
-function P(t) {
+function N(t) {
 var e = t[4];
 if (e) for (var i = t[3], n = 0; n < e.length; ++n) {
 var r = e[n];
-r[0] = i[r[0]];
+r[C] = i[r[C]];
 }
 }
-function R(t) {
+function F(t) {
 for (var e = t[5], i = t[2], n = t[1], r = t[8], s = t[9], o = t[10], a = 0; a < r.length; ++a) {
 var c = r[a];
 "number" == typeof c && (r[a] = e[c]);
@@ -36713,34 +36713,34 @@ var u = o[a];
 "number" == typeof u && (o[a] = n[u]);
 }
 }
-function L(t, e, i) {
+function z(t, e, i) {
 "string" == typeof t && (t = JSON.parse(t));
 var n = !e;
-(e = e || g.pool.get()).init(t);
+(e = e || S.pool.get()).init(t);
 i = i || {};
 var r = t[0], s = !1;
 if ("object" == typeof r) {
 s = r.preprocessed;
 r = r.version;
 }
-if (r < 1) throw new Error(cc.debug.getError(5304, r));
+if (r < f) throw new Error(cc.debug.getError(5304, r));
 i._version = r;
 i.result = e;
 t[0] = i;
 if (!s) {
-D(t, !1, i.classFinder);
-P(t);
+V(t, !1, i.classFinder);
+N(t);
 }
 cc.game._isCloning = !0;
-var o = t[5], a = M(t);
+var o = t[5], a = R(t);
 cc.game._isCloning = !1;
-t[7] && b(t[7], o, t[2]);
-R(t);
-n && g.pool.put(e);
+t[7] && T(t[7], o, t[2]);
+F(t);
+n && S.pool.put(e);
 return o[a];
 }
-L.Details = g;
-var O = function(t) {
+z.Details = S;
+var k = function(t) {
 this.preprocessed = !0;
 this.version = t;
 };

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

@@ -8889,7 +8889,6 @@ this.data.state = s.FactroyState.Empty;
 this.data.productID = 0;
 this.data.growSpan = 0;
 gData.gameData.setFactoryDataMap(this.configID, this.data);
-gData.gameData.nextMake = null;
 gData.gameData.setNextProduct(!1);
 0 == gData.harvestData.getType ? gData.farmGradeData.addGradeExp(s.ExpAddType.EAT_harvest, this.node) : gData.farmGradeData.addGradeExp(s.ExpAddType.EAT_others, this.node);
 return [ 2 ];
@@ -9125,18 +9124,12 @@ gData.gameData.nextMake = this.factoryIcons[a];
 gData.gameData.nextType = 3;
 return this.factoryIcons[a];
 }
-} else {
-var o = gData.gameData.doFarmMapDataCheck(2, {
-state: !1
-});
-if (o) return o;
-for (e = this.factoryIcons.length, a = 0; a < e; a++) if (this.factoryIcons[a].data.state == r.FactroyState.Empty) {
+} else for (e = this.factoryIcons.length, a = 0; a < e; a++) if (this.factoryIcons[a].data.state == r.FactroyState.Empty) {
 gData.gameData.nextCanProduct = gData.gameData.getRandomFactoryConfig(this.factoryIcons[a].configID);
 gData.gameData.nextMake = this.factoryIcons[a];
 gData.gameData.nextType = 3;
 return this.factoryIcons[a];
 }
-}
 return null;
 };
 t.prototype.btnMake = function() {
@@ -10067,7 +10060,6 @@ this.data.growSpan = 0;
 t = this.node.getChildByName("hb");
 this.node.removeChild(t);
 gData.gameData.setFarmDataMap(this.configID, this.data);
-gData.gameData.nextMake = null;
 gData.gameData.setNextProduct(!1);
 0 == gData.harvestData.getType ? gData.farmGradeData.addGradeExp(s.ExpAddType.EAT_harvest, this.node) : gData.farmGradeData.addGradeExp(s.ExpAddType.EAT_others, this.node);
 return [ 2 ];
@@ -13624,39 +13616,34 @@ break;
 }
 }
 if (!i) {
-if (v = this.doFarmMapDataCheck(0)) e = v; else {
 e = r.default.rnd(10001, this.getMaxProduct(u.nzw));
 this.nextType = 1;
-}
 console.log("订单数据没有匹配成功====1");
 }
 } else {
 n = !0;
-var v;
-if (v = this.doFarmMapDataCheck(0)) e = v; else {
 e = r.default.rnd(10001, this.getMaxProduct(u.nzw));
 this.nextType = 1;
-}
 console.log("订单数据为null");
 }
 if (n) return this.getProductMap(e);
 if (a) {
 if (o) {
-var D = !1;
-for (y = 0; y != c.length; ++y) for (var b = gData.factorySystem.factoryIcons, w = b.length, S = 0; S < w; S++) if (this.getTabByConfigID(b[S].configID) == c[y] && b[S].data.state == d.Empty) {
-D = !0;
+var v = !1;
+for (y = 0; y != c.length; ++y) for (var D = gData.factorySystem.factoryIcons, b = D.length, w = 0; w < b; w++) if (this.getTabByConfigID(D[w].configID) == c[y] && D[w].data.state == d.Empty) {
+v = !0;
 t.state = 1;
 break;
 }
-if (!D) for (y = 0; y != s.length; ++y) {
-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) {
-D = !0;
+if (!v) for (y = 0; y != s.length; ++y) {
+var S = gData.pastureSystem.pastureIcons;
+for (b = S.length, w = 0; w < b; w++) if (S[w].data.productID == s[y] && S[w].data.state == p.Empty) {
+v = !0;
 t.state = 2;
 break;
 }
 }
-if (D) {
+if (v) {
 console.log("getRandomPlantConfig====0");
 return null;
 }
@@ -15611,7 +15598,7 @@ this.orderPicIdArray = [];
 this.isGray = !0;
 t = gData.gameData.configs.Product;
 if (!(e = gData.gameData.playerProp.orderData)) return [ 3, 8 ];
-this.lbl_addRedMoney.string = (e.redMoneyAddition / 100).toFixed(2);
+this.lbl_addRedMoney.string = (e.cashMoney / 100).toFixed(2);
 if (3 != (a = e.orderTaskList.length)) return [ 3, 6 ];
 o = 0;
 n = 0;
@@ -15706,19 +15693,20 @@ mk.ui.openPanel("module/authUI/authUI");
 return [ 2 ];
 }
 t = {};
-return [ 4, mk.http.sendData("orderTask/receiveReward", t) ];
+return [ 4, mk.http.sendData("orderTask/receiveRewardCash", t) ];
 
 case 1:
 e = o.sent();
 console.log("getOrderReward=========" + e);
 if (0 != e.errcode) return [ 2, null ];
-a = gData.gameData.playerProp.orderData.redMoneyAddition;
+a = gData.gameData.playerProp.orderData.cashMoney;
 gData.gameData.playerProp.orderData = e.data.userOrderTaskInfo;
 gData.cashPro.callBack = this.showTips;
 gData.receiptNotice.receip_rmb = a;
 mk.ui.openPanel("module/newNotice/newNotice");
 this.initOrderUI();
 gData.gameData.init_order = !0;
+gData.gameData.checkTaskFinishUnLock();
 return [ 2 ];
 }
 });
@@ -15790,18 +15778,17 @@ return [ 2 ];
 });
 };
 e.prototype.doFlyOrderAni = function(t, e) {
-var a = this;
 void 0 === e && (e = null);
-var o = gData.gameData.playerProp.orderData;
-if (o) {
-for (var n = !0, i = o.orderTaskList.length, r = 0; r != i; ++r) {
-var c = o.orderTaskList;
-if (c[r].completeCount < c[r].taskCount) {
-n = !1;
+var a = gData.gameData.playerProp.orderData;
+if (a) {
+for (var o = !0, n = a.orderTaskList.length, i = 0; i != n; ++i) {
+var r = a.orderTaskList;
+if (r[i].completeCount < r[i].taskCount) {
+o = !1;
 break;
 }
 }
-if (n) {
+if (o) {
 this.isGray = !1;
 this.node_getOrderReward.setGray(!1, !0);
 this.node_getOrderReward.getComponent(cc.Animation).play();
@@ -15810,16 +15797,13 @@ mk.ui.closeAllUI();
 "1" == gData.gameData.funOpenData[11] && mk.guide.open(12) || mk.tip.pop("订单已完成，快提现吧!");
 }
 if (e) {
-var s = this.node_orderHb.parent.convertToWorldSpaceAR(this.node_orderHb.getPosition());
-mk.fly.PlayCoinAnim(1, 5, e, s, function() {
-a.refreshOrderUI(t);
-}, .8);
+var c = this.node_orderHb.parent.convertToWorldSpaceAR(this.node_orderHb.getPosition());
+mk.fly.PlayCoinAnim(1, 5, e, c, function() {}, .8);
 } else {
-s = this.node_orderHb.parent.convertToWorldSpaceAR(this.node_orderHb.getPosition());
-mk.fly.PlayCoinAnim(1, 5, this.btn_product, s, function() {
-a.refreshOrderUI(t);
-}, .8);
+c = this.node_orderHb.parent.convertToWorldSpaceAR(this.node_orderHb.getPosition());
+mk.fly.PlayCoinAnim(1, 5, this.btn_product, c, function() {}, .8);
 }
+this.refreshOrderUI(t);
 }
 };
 e.prototype.refreshOrderUI = function(t) {
@@ -18060,7 +18044,7 @@ rewardNum: e.data.redMoneyAddition
 gData.reward.data = a;
 gData.reward.callback = gData.harvestData.call;
 o = gData.harvestData.node_fly.parent.convertToWorldSpaceAR(gData.harvestData.node_fly.getPosition());
-gData.reward.getReward(o, gData.harvestData.isMatchOrder);
+gData.reward.getReward(o);
 }
 mk.ui.closePanel("HarvestPanel");
 return [ 2 ];
@@ -23910,7 +23894,6 @@ this.clean();
 this.data.state = s.PastureState.Empty;
 this.data.growSpan = 0;
 gData.gameData.setPastureDataMap(this.configID, this.data);
-gData.gameData.nextMake = null;
 gData.gameData.setNextProduct(!1);
 0 == gData.harvestData.getType ? gData.farmGradeData.addGradeExp(s.ExpAddType.EAT_harvest, this.node) : gData.farmGradeData.addGradeExp(s.ExpAddType.EAT_others, this.node);
 return [ 2 ];
@@ -24132,18 +24115,12 @@ gData.gameData.nextMake = this.pastureIcons[a];
 gData.gameData.nextType = 2;
 return this.pastureIcons[a];
 }
-} else {
-var o = gData.gameData.doFarmMapDataCheck(1, {
-state: !1
-});
-if (o) return o;
-for (e = this.pastureIcons.length, a = 0; a < e; a++) if (this.pastureIcons[a].data.state == r.PastureState.Empty) {
+} else for (e = this.pastureIcons.length, a = 0; a < e; a++) if (this.pastureIcons[a].data.state == r.PastureState.Empty) {
 gData.gameData.nextCanProduct = gData.gameData.getProductMap(this.pastureIcons[a].data.productID);
 gData.gameData.nextMake = this.pastureIcons[a];
 gData.gameData.nextType = 2;
 return this.pastureIcons[a];
 }
-}
 return null;
 };
 t.prototype.btnMake = function() {
@@ -25328,7 +25305,7 @@ mk.guide.open(11, t);
 }, .2);
 }
 } else {
-var p = gData.gameData.playerProp.orderData.redMoneyAddition;
+var p = gData.gameData.playerProp.orderData.cashMoney;
 this.lbl_orderValue.string = "订单已完成，可提现" + (p / 100).toFixed(2) + "元";
 this.sp_taskProgress.fillRange = 1;
 this.lbl_progress.string = i + "/" + i;

packages-hot-update/cfg.json

@@ -1,7 +1,7 @@
 {
-    "version": "1.0.4",
+    "version": "1.0.5",
     "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://",
@@ -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": 1636508759722,
-    "genTime": 1636508759722,
+    "buildTime": 1636515232657,
+    "genTime": 1636515232657,
     "genVersion": null
 }

packages-hot-update/manifest/version.manifest

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