1

assets/resources/data/guide_data.json

@@ -78,7 +78,7 @@
 		"id": "2_0",
 		"trigger": "1",
 		"trNum": "0",
-		"btnEnable": "1",
+		"btnEnable": "0",
 		"trForm": "3",
 		"dialogPos": "::::-600:",
 		"dialogPos1": "",

assets/script/before/main/FactorySystem.ts

@@ -1,6 +1,6 @@
 /** 工厂数据类 */
 
-import { FactroyState, GameProp } from "../../game/data/GameData";
+import { FactroyState, GameProp, ProductType } from "../../game/data/GameData";
 import { FactoryIcon } from "./FactoryIcon";
 
 const { ccclass } = cc._decorator;
@@ -36,59 +36,80 @@ export default class FactorySystem {
         let data = gData.gameData.playerProp.orderData;
         let copyData = gData.gameData.playerProp.copyOrderData
         if (data && data.orderTaskList) {
-            if(out.state == 1)
-            {
+            if (out.state == 1) {
                 let orderData = data.orderTaskList;
                 let productJson = gData.gameData.configs.Product;
                 for (let index = 0; index != orderData.length; ++index) {
                     let dataE = orderData[index];
                     if (copyData[index] < dataE.taskCount && dataE.Id <= productJson.length) {
                         let productData = productJson[dataE.Id - 1];
-    
+
                         let len = this.factoryIcons.length;
                         for (var j = 0; j < len; j++) {
                             let tab = gData.gameData.getTabByConfigID(this.factoryIcons[j].configID);
                             let max = gData.gameData.getMaxProduct(tab);
-                            if (tab == productData.tab && this.factoryIcons[j].data.state == FactroyState.Empty && productData.picture <= max) {    
+                            if (tab == productData.tab && this.factoryIcons[j].data.state == FactroyState.Empty && productData.picture <= max) {
                                 gData.gameData.nextCanProduct = gData.gameData.getProductMap(productData.picture);
                                 gData.gameData.nextMake = this.factoryIcons[i];
+                                gData.gameData.nextType = 3;
                                 return this.factoryIcons[i];
                             }
                         }
                     } else {
-    
                         let len = this.factoryIcons.length;
                         for (var i = 0; i < len; i++) {
                             if (this.factoryIcons[i].data.state == FactroyState.Empty) {
                                 gData.gameData.nextCanProduct = gData.gameData.getRandomFactoryConfig(this.factoryIcons[i].configID);
                                 gData.gameData.nextMake = this.factoryIcons[i];
+                                gData.gameData.nextType = 3;
                                 return this.factoryIcons[i];
                             }
                         }
                     }
                 }
-            }else{
-                let len = this.factoryIcons.length;
-                for (var i = 0; i < len; i++) {
-                    if (this.factoryIcons[i].data.state == FactroyState.Empty) {
-                        gData.gameData.nextCanProduct = gData.gameData.getRandomFactoryConfig(this.factoryIcons[i].configID);
-                        gData.gameData.nextMake = this.factoryIcons[i];
-                        return this.factoryIcons[i];
-                    }
-                }
             }
-            
+            else {
+                return this.doSameCheckLogic(out);
+            }
+
         } else {
+            return this.doSameCheckLogic(out);
+        }
+
+        return null;
+    }
+
+    doSameCheckLogic(out: any) {
+        if (out.state == 0) {
             let len = this.factoryIcons.length;
             for (var i = 0; i < len; i++) {
                 if (this.factoryIcons[i].data.state == FactroyState.Empty) {
                     gData.gameData.nextCanProduct = gData.gameData.getRandomFactoryConfig(this.factoryIcons[i].configID);
                     gData.gameData.nextMake = this.factoryIcons[i];
+                    gData.gameData.nextType = 3;
                     return this.factoryIcons[i];
                 }
             }
+        } 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;
+                    for (var i = 0; i < len; i++) {
+                        if (this.factoryIcons[i].data.state == FactroyState.Empty) {
+                            gData.gameData.nextCanProduct = gData.gameData.getRandomFactoryConfig(this.factoryIcons[i].configID);
+                            gData.gameData.nextMake = this.factoryIcons[i];
+                            gData.gameData.nextType = 3;
+                            return this.factoryIcons[i];
+                        }
+                    }
+                }           
+            }
         }
-
         return null;
     }
 

assets/script/before/main/FarmSystem.ts

@@ -61,6 +61,7 @@ export class FarmSystem {
         let len = this.farms.length;
         for (let i = 0; i < len; i++) {
             if (this.farms[i] != this.currSelectFarm && this.farms[i].data.state == FarmState.Empty) {
+                out.state = 0;
                 let nextProduct = gData.gameData.getRandomPlantConfig(out);
                 if(nextProduct)
                 {

assets/script/before/main/PastureSystem.ts

@@ -1,4 +1,4 @@
-import { PastureState } from "../../game/data/GameData";
+import { PastureState, ProductType } from "../../game/data/GameData";
 import PastureData from "./PastureData";
 import PastureIcon from "./PastureIcon";
 
@@ -44,45 +44,63 @@ export default class PastureSystem {
                         if (productData.picture == this.pastureIcons[i].data.productID && this.pastureIcons[i].data.state == PastureState.Empty) {
                             gData.gameData.nextCanProduct = gData.gameData.getProductMap(this.pastureIcons[i].data.productID);
                             gData.gameData.nextMake = this.pastureIcons[i];
+                            gData.gameData.nextType = 2;
                             return this.pastureIcons[i];
                         }
                     }
                 } else {
-                    let len = this.pastureIcons.length;
-                    for (var i = 0; i < len; i++) {
-                        if (this.pastureIcons[i].data.state == PastureState.Empty) {
-                            gData.gameData.nextCanProduct = gData.gameData.getProductMap(this.pastureIcons[i].data.productID);
-                            gData.gameData.nextMake = this.pastureIcons[i];
-                            return this.pastureIcons[i];
-                        }
-                    }
+                    break;
                 }
             }
 
             //工厂有匹配的
-            if(out.state == 1)
-            {
+            if (out.state == 1) {
                 return null;
-            }else{
-                let len = this.pastureIcons.length;
-                for (var i = 0; i < len; i++) {
-                    if (this.pastureIcons[i].data.state == PastureState.Empty) {
-                        gData.gameData.nextCanProduct = gData.gameData.getProductMap(this.pastureIcons[i].data.productID);
-                        gData.gameData.nextMake = this.pastureIcons[i];
-                        return this.pastureIcons[i];
-                    }
-                }
-            }
+            } else
+            {
+                return this.doSameCheckLogic(out);
+            }    
         } else {
+            return this.doSameCheckLogic(out);
+        }
+        return null;
+    }
+
+    doSameCheckLogic(out:any)
+    {
+        if (out.state == 0) {
             let len = this.pastureIcons.length;
             for (var i = 0; i < len; i++) {
                 if (this.pastureIcons[i].data.state == PastureState.Empty) {
                     gData.gameData.nextCanProduct = gData.gameData.getProductMap(this.pastureIcons[i].data.productID);
                     gData.gameData.nextMake = this.pastureIcons[i];
+                    gData.gameData.nextType = 2;
                     return this.pastureIcons[i];
                 }
             }
         }
+        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;
+                    for (var i = 0; i < len; i++) {
+                        if (this.pastureIcons[i].data.state == PastureState.Empty) {
+                            gData.gameData.nextCanProduct = gData.gameData.getProductMap(this.pastureIcons[i].data.productID);
+                            gData.gameData.nextMake = this.pastureIcons[i];
+                            gData.gameData.nextType = 2;
+                            return this.pastureIcons[i];
+                        }
+                    }
+                }    
+            }
+        }
+
         return null;
     }
 

assets/script/game/data/GameData.ts

@@ -69,7 +69,7 @@ export class GameData {
     /** 按钮生产选中的农田、牧场或工厂 */
     public nextMake = null;
     /** 类型标识 */
-    private nextType = 0;
+    public nextType = 0;
     /** 刷新生产按钮信息 */
     public init_makeInfo = false;
 
@@ -211,7 +211,7 @@ export class GameData {
         //mk.console.logSingle('redMoneyCashPayRecordList==>', res_data.redMoneyCashPayRecordList);
         this.playerProp.userFarmTaskInfo = res_data.userFarmTaskInfo;
         this.playerProp.speedUpLeftTimes = res_data.speedUpLeftTimes;
-        this.playerProp.completeFarmTaskTimes = res_data.completeFarmTaskTimes;
+        this.playerProp.completeFarmTaskTimes = 3;//res_data.completeFarmTaskTimes;
         this.playerProp.orderData = res_data.userOrderTaskInfo;
         console.log("==============initPlayerProp");
         console.log(res_data.userOrderTaskInfo);
@@ -254,22 +254,20 @@ export class GameData {
         if (value && !isRefresh) {
             this.playerProp.copyOrderData = [];
             let v = value.split(",");
-            for(let i = 0; i != v.length; ++i)
-            {
+            for (let i = 0; i != v.length; ++i) {
                 this.playerProp.copyOrderData.push(parseInt(v[i]));
             }
         } else {
             let orderData = this.playerProp.orderData;
             if (orderData) {
                 this.playerProp.copyOrderData = [];
-                if(orderData && orderData.orderTaskList)
-                {
+                if (orderData && orderData.orderTaskList) {
                     let len = orderData.orderTaskList.length;
                     for (let i = 0; i != len; ++i) {
                         this.playerProp.copyOrderData.push(this.playerProp.orderData.orderTaskList[i].completeCount);
                     }
                     mk.storage.setStorage(StorageKey.copyOrderData, this.playerProp.copyOrderData);
-                }       
+                }
             }
         }
 
@@ -292,7 +290,7 @@ export class GameData {
                     }
                 }
             }
-        }else{
+        } else {
             this.playerProp.copyOrderData = [];
             cc.sys.localStorage.removeItem(StorageKey.copyOrderData);
         }
@@ -522,10 +520,11 @@ export class GameData {
                         let productData = productJson[dataE.Id - 1];
                         if (productData.tab == ProductType.nzw) {
                             let max = this.getMaxProduct(ProductType.nzw);
-                            if (productData.picture <= max) {
+                            if (max && productData.picture <= max) {
                                 id = productData.picture;
                                 isNoHaveCurTab = false;
                                 isMatchSuccess = true;
+                                this.nextType = 1;
                                 mk.console.logSingle("getRandomPlantConfig=>", id);
                                 break;
                             }
@@ -543,15 +542,29 @@ export class GameData {
             }
 
             if (!isMatchSuccess) {
-                id = Util.rnd(10001, this.getMaxProduct(ProductType.nzw));
+
+                let picId = this.doFarmMapDataCheck(0);
+                if (picId) {
+                    id = picId;
+                } else {
+                    id = Util.rnd(10001, this.getMaxProduct(ProductType.nzw));
+                    this.nextType = 1
+                }
                 console.log("订单数据没有匹配成功");
             }
         } else {
             isOrderDataInvalid = true;
-            id = Util.rnd(10001, this.getMaxProduct(ProductType.nzw));
+            let picId = this.doFarmMapDataCheck(0);
+            if (picId) {
+                id = picId;
+            } else {
+                id = Util.rnd(10001, this.getMaxProduct(ProductType.nzw));
+                this.nextType = 1
+            }
             console.log("订单数据为null");
         }
 
+        //选择逻辑处理
         if (isOrderDataInvalid) {
             return this.getProductMap(id);
         } else {
@@ -624,12 +637,82 @@ export class GameData {
         return this.getProductMap(id);
     }
 
+    public doFarmMapDataCheck(startIndex: number, isHaveEmpty?: any) {
+        let value = 0;
+        for (let key in ProductType) {
+            if (startIndex <= value) {
+                let max = this.getMaxProduct(ProductType[key]);
+                if (max) {
+                    let list_data = this.getProductArrByType(ProductType[key]);
+                    for (let i = 0; i != list_data.length; ++i) {
+                        let picId = list_data[i].picture - 1;
+                        if (list_data[i].unlock == 1 && picId == max) {
+                            let state = this.getFarmMapRewardState(this.getIndex(list_data[i]));
+                            if (state == 0) {
+                                switch (ProductType[key]) {
+                                    case ProductType.nzw:
+                                        console.log("图鉴数据匹配成功");
+                                        this.nextType = 1
+                                        return picId;
+                                    case ProductType.dw:
+                                        {
+                                            let pastureIconsData = gData.pastureSystem.pastureIcons;
+                                            let len = pastureIconsData.length;
+                                            for (let index = 0; index < len; index++) {
+                                                if (pastureIconsData[index].data.state == PastureState.Empty) {
+                                                    if (isHaveEmpty && startIndex == value) {
+                                                        isHaveEmpty.state = true;
+                                                    }
+                                                    if (picId == pastureIconsData[index].data.productID) {
+                                                        console.log("图鉴数据匹配成功");
+                                                        this.nextCanProduct = this.getProductMap(pastureIconsData[index].data.productID);
+                                                        this.nextMake = pastureIconsData[index];
+                                                        this.nextType = 2;
+                                                        return picId;
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                    default:
+                                        {
+                                            let factoryIconsData = gData.factorySystem.factoryIcons;
+                                            let len = factoryIconsData.length;
+                                            for (let index = 0; index < len; index++) {
+                                                if (factoryIconsData[index].data.state == FactroyState.Empty) {
+                                                    if (isHaveEmpty) {
+                                                        isHaveEmpty.state = true;
+                                                    }
+                                                    let tab = this.getTabByConfigID(factoryIconsData[index].configID);
+                                                    if (tab == ProductType[key]) {
+                                                        console.log("图鉴数据匹配成功");
+                                                        this.nextCanProduct = this.getProductMap(picId);
+                                                        this.nextMake = factoryIconsData[index];
+                                                        this.nextType = 3;
+                                                        return picId;
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            ++value;
+        }
+        console.log("图鉴数据匹配不成功");
+        return null;
+    }
+
     /** 自动生产选中下一个 */
     setNextProduct(sel = true) {
         if (this.nextMake) {
             return;
         }
-        //-1无效，1:工厂有空位，2:饲养厂有空位
+        //-1无效，0:有空地，1:工厂有空位，2:饲养厂有空位
         let haveEmpty = { state: -1 };
         let next = gData.farmSystem.selectNextFarm(haveEmpty, sel);
         if (!next) {
@@ -640,15 +723,15 @@ export class GameData {
                     this.nextType = 0;
                 }
                 else {
-                    this.nextType = 3;
+                    //this.nextType = 3;
                 }
             }
             else {
-                this.nextType = 2;
+                //this.nextType = 2;
             }
         }
         else {
-            this.nextType = 1;
+            //this.nextType = 1;
         }
 
         this.init_makeInfo = true;
@@ -705,7 +788,9 @@ export class GameData {
             let count = this.playerProp.userFarmTaskInfo.taskCount;
 
             if (com >= count) {
-                mk.tip.pop('任务红包进度已满，快去提现');
+                if (!this.gameStyle.getIsCanGetOrderReward()) {
+                    mk.tip.pop('任务红包进度已满，快去提现');
+                }
                 return false;
             }
 
@@ -1126,6 +1211,48 @@ export class GameData {
         return configID;
     }
 
+    getIndex(data) {
+        let index: any = {};
+        index.i = 0;
+        index.j = 0;
+        switch (data.tab) {
+            case '农作物':
+                index.i = 0;
+                index.j = data.picture - 10001;
+                break;
+            case '动物':
+                index.i = 1;
+                index.j = data.picture - 20001;
+                break;
+            case '爆米花厂':
+                index.i = 2;
+                index.j = data.picture - 20004;
+                break;
+            case '糕点铺':
+                index.i = 3;
+                index.j = data.picture - 20013;
+                break;
+            case '制糖厂':
+                index.i = 4;
+                index.j = data.picture - 20010;
+                break;
+            case '炼乳厂':
+                index.i = 5;
+                index.j = data.picture - 20007;
+                break;
+            case '功夫面馆':
+                index.i = 6;
+                index.j = data.picture - 20025;
+                break;
+            case '快餐店':
+                index.i = 7;
+                index.j = data.picture - 20019;
+                break;
+        }
+
+        return index;
+    }
+
     /** 发送数据到服务器 */
     freshSendToServer(type) {
         switch (type) {

assets/script/game/game/Game.ts

@@ -679,7 +679,7 @@ export default class Game extends cc.Component {
                             //this.sp_farmMapIcon.spriteFrame = await mk.loader.load(plantPath + data.picture, cc.SpriteFrame);
                             return;
                         }
-                    } else if (data.picture - 1 == max) {
+                    } else if (data.picture - 1 == max && data.unlock == 1) {
                         this.uiShowType = 2
                         this.productType = ProductType[key];
                         this.productIndex = i;
@@ -952,6 +952,11 @@ export default class Game extends cc.Component {
         }
     }
 
+    public getIsCanGetOrderReward()
+    {
+        return !this.isGray;
+    }
+
     public async getOrderReward() {
         let data = {};
         let response = await mk.http.sendData('orderTask/receiveReward', data);

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","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}
+{"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}

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

@@ -7469,9 +7469,9 @@ break;
 
 case r.bottomIn:
 var s = -cc.winSize.height;
-cc.tween(this.effect_par).to(.3, {
+cc.tween(this.effect_par).to(.4, {
 y: s
-}, cc.easeOut(3)).call(function() {
+}, cc.easeSineOut()).call(function() {
 t && t();
 }).start();
 }
@@ -8611,14 +8611,16 @@ this.factoryIcons.push(t);
 };
 t.prototype.nextFactory = function(t) {
 var e = gData.gameData.playerProp.orderData, a = gData.gameData.playerProp.copyOrderData;
-if (e && e.orderTaskList) {
-if (1 == t.state) for (var o = e.orderTaskList, n = gData.gameData.configs.Product, i = 0; i != o.length; ++i) {
+if (!e || !e.orderTaskList) return this.doSameCheckLogic(t);
+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 (a[i] < c.taskCount && c.Id <= n.length) 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) {
 gData.gameData.nextCanProduct = gData.gameData.getProductMap(s.picture);
 gData.gameData.nextMake = this.factoryIcons[h];
+gData.gameData.nextType = 3;
 return this.factoryIcons[h];
 }
 } else {
@@ -8626,18 +8628,32 @@ 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];
+gData.gameData.nextType = 3;
 return this.factoryIcons[h];
 }
 }
-} else for (l = this.factoryIcons.length, 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];
-return this.factoryIcons[h];
 }
-} else for (l = this.factoryIcons.length, 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];
-return this.factoryIcons[h];
+return null;
+};
+t.prototype.doSameCheckLogic = function(t) {
+if (0 == t.state) {
+for (var 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];
+}
+} 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) {
+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;
 };
@@ -10507,6 +10523,7 @@ return a;
 };
 t.prototype.getCanPlantFarm = function(t) {
 for (var e = this.farms.length, a = 0; a < e; a++) if (this.farms[a] != this.currSelectFarm && this.farms[a].data.state == r.FarmState.Empty) {
+t.state = 0;
 var o = gData.gameData.getRandomPlantConfig(t);
 if (o) {
 gData.gameData.nextCanProduct = o;
@@ -11586,16 +11603,21 @@ n && n();
 s.destroy();
 }).start();
 };
-e.prototype.playFlyAniExtra = function(t, e, a, o, n) {
-void 0 === n && (n = null);
-var i = t.parent.convertToWorldSpaceAR(t.getPosition()), r = this.node.convertToNodeSpaceAR(i), c = e.parent.convertToWorldSpaceAR(e.getPosition()), s = this.node.convertToNodeSpaceAR(c);
+e.prototype.playFlyAniExtra = function(t, e, a, o, n, i) {
+void 0 === n && (n = 0);
+void 0 === i && (i = null);
+var r = t.parent.convertToWorldSpaceAR(t.getPosition()), c = this.node.convertToNodeSpaceAR(r), s = e.parent.convertToWorldSpaceAR(e.getPosition()), l = this.node.convertToNodeSpaceAR(s);
 if (a) {
+var p = cc.v2(mk.math.random(-1, 1, !1), mk.math.random(-1, 1, !1));
+p = p.normalize();
+cc.v2(mk.math.random(10, 160, !1) * p.x, mk.math.random(10, 160, !1) * p.y);
+c.add(p);
 a.setParent(this.node);
-a.setPosition(r);
-cc.tween(a).to(o, {
-position: cc.v3(s)
+a.setPosition(c);
+cc.tween(a).delay(n).to(o, {
+position: cc.v3(l)
 }, cc.easeSineOut()).call(function() {
-n && n();
+i && i();
 a.destroy();
 }).start();
 }
@@ -12373,7 +12395,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"), x = t("../../before/main/PastureSystem"), N = t("../../before/main/FactorySystem"), M = 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"), 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"), x = t("../../before/main/PastureSystem"), M = 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();
 }
@@ -12407,9 +12429,9 @@ this.plantData = new T.default();
 this.harvestData = new C.default();
 this.adClearSickData = new F.default();
 this.pastureSystem = new x.default();
-this.factorySystem = new N.default();
+this.factorySystem = new M.default();
 this.farmSystem = new R.FarmSystem();
-this.farmMapData = new M.FarmMapData();
+this.farmMapData = new N.FarmMapData();
 this.farmGradeData = new j.GradeRewardData();
 this.walletCashOutData = new E.WalletCashOutData();
 this.lineUpUIData = new L.LineUpUIData();
@@ -12866,7 +12888,7 @@ this.playerProp.redMoneyCashPayRecordList = t.redMoneyCashPayRecordList;
 mk.console.logSingle("userNoviceWeFareInfo==>", t.userNoviceWeFareInfo);
 this.playerProp.userFarmTaskInfo = t.userFarmTaskInfo;
 this.playerProp.speedUpLeftTimes = t.speedUpLeftTimes;
-this.playerProp.completeFarmTaskTimes = t.completeFarmTaskTimes;
+this.playerProp.completeFarmTaskTimes = 3;
 this.playerProp.orderData = t.userOrderTaskInfo;
 console.log("==============initPlayerProp");
 console.log(t.userOrderTaskInfo);
@@ -13070,10 +13092,11 @@ o = !0;
 var m = f[g.Id - 1];
 if (m.tab == u.nzw) {
 var _ = this.getMaxProduct(u.nzw);
-if (m.picture <= _) {
+if (_ && m.picture <= _) {
 e = m.picture;
 a = !1;
 i = !0;
+this.nextType = 1;
 mk.console.logSingle("getRandomPlantConfig=>", e);
 break;
 }
@@ -13081,32 +13104,39 @@ 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("订单数据没有匹配成功");
 }
 } 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 v = !1;
-for (y = 0; y != c.length; ++y) for (var b = gData.factorySystem.factoryIcons, D = b.length, w = 0; w < D; w++) if (this.getTabByConfigID(b[w].configID) == c[w] && b[w].data.state == d.Empty) {
-v = !0;
+var b = !1;
+for (y = 0; y != c.length; ++y) for (var D = gData.factorySystem.factoryIcons, w = D.length, S = 0; S < w; S++) if (this.getTabByConfigID(D[S].configID) == c[S] && D[S].data.state == d.Empty) {
+b = !0;
 t.state = 1;
 break;
 }
-if (!v) for (y = 0; y != s.length; ++y) {
-var S = gData.pastureSystem.pastureIcons;
-for (D = S.length, w = 0; w < D; w++) if (S[w].data.productID == s[y] && S[w].data.state == p.Empty) {
-v = !0;
+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) {
+b = !0;
 t.state = 2;
 break;
 }
 }
-return v ? null : this.getProductMap(e);
+return b ? null : this.getProductMap(e);
 }
 return this.getProductMap(e);
 }
@@ -13120,16 +13150,59 @@ if (a[c].picture == o) break;
 var s = n[r.default.rnd(0, n.length - 1)];
 return this.getProductMap(s);
 };
+t.prototype.doFarmMapDataCheck = function(t, e) {
+var a = 0;
+for (var o in u) {
+if (t <= a) {
+var n = this.getMaxProduct(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]) {
+case u.nzw:
+console.log("图鉴数据匹配成功");
+this.nextType = 1;
+return c;
+
+case u.dw:
+for (var s = gData.pastureSystem.pastureIcons, l = s.length, h = 0; h < l; h++) if (s[h].data.state == p.Empty) {
+e && t == a && (e.state = !0);
+if (c == s[h].data.productID) {
+console.log("图鉴数据匹配成功");
+this.nextCanProduct = this.getProductMap(s[h].data.productID);
+this.nextMake = s[h];
+this.nextType = 2;
+return c;
+}
+}
+break;
+
+default:
+var f = gData.factorySystem.factoryIcons;
+for (l = f.length, h = 0; h < l; h++) if (f[h].data.state == d.Empty) {
+e && (e.state = !0);
+if (this.getTabByConfigID(f[h].configID) == u[o]) {
+console.log("图鉴数据匹配成功");
+this.nextCanProduct = this.getProductMap(c);
+this.nextMake = f[h];
+this.nextType = 3;
+return c;
+}
+}
+}
+}
+}
+++a;
+}
+console.log("图鉴数据匹配不成功");
+return null;
+};
 t.prototype.setNextProduct = function(t) {
 void 0 === t && (t = !0);
 if (!this.nextMake) {
 var e = {
 state: -1
 };
-if (gData.farmSystem.selectNextFarm(e, t)) this.nextType = 1; else if (gData.pastureSystem.nextPasture(e)) this.nextType = 2; else {
-var a = gData.factorySystem.nextFactory(e);
-this.nextType = a ? 3 : 0;
-}
+gData.farmSystem.selectNextFarm(e, t) || gData.pastureSystem.nextPasture(e) || gData.factorySystem.nextFactory(e) || (this.nextType = 0);
 this.init_makeInfo = !0;
 }
 };
@@ -13210,7 +13283,7 @@ if (this.playerProp.userFarmTaskInfo) {
 t = this.playerProp.userFarmTaskInfo.completeCount;
 e = this.playerProp.userFarmTaskInfo.taskCount;
 if (t >= e) {
-mk.tip.pop("任务红包进度已满，快去提现");
+this.gameStyle.getIsCanGetOrderReward() || mk.tip.pop("任务红包进度已满，快去提现");
 return [ 2, !1 ];
 }
 }
@@ -13502,6 +13575,53 @@ e = 30009;
 }
 return e;
 };
+t.prototype.getIndex = function(t) {
+var e = {
+i: 0,
+j: 0
+};
+switch (t.tab) {
+case "农作物":
+e.i = 0;
+e.j = t.picture - 10001;
+break;
+
+case "动物":
+e.i = 1;
+e.j = t.picture - 20001;
+break;
+
+case "爆米花厂":
+e.i = 2;
+e.j = t.picture - 20004;
+break;
+
+case "糕点铺":
+e.i = 3;
+e.j = t.picture - 20013;
+break;
+
+case "制糖厂":
+e.i = 4;
+e.j = t.picture - 20010;
+break;
+
+case "炼乳厂":
+e.i = 5;
+e.j = t.picture - 20007;
+break;
+
+case "功夫面馆":
+e.i = 6;
+e.j = t.picture - 20025;
+break;
+
+case "快餐店":
+e.i = 7;
+e.j = t.picture - 20019;
+}
+return e;
+};
 t.prototype.freshSendToServer = function(t) {
 switch (t) {
 case 1:
@@ -14276,6 +14396,7 @@ e.lbl_progress = [];
 e.sp_mark = [];
 e.lbl_redMoneyValue = [];
 e.node_getOrderReward = null;
+e.node_orderHand = null;
 e.posY = 0;
 e.lastTimeSpan = 0;
 e.span = 0;
@@ -14671,9 +14792,21 @@ a.ani_add2.y = a.posY;
 e.prototype.initRefreshEvent = function() {
 mk.event.register("initFarmMapUi", this.initFarmMapUi.bind(this), this);
 mk.event.register("refreshFarmMapUI", this.refreshFarmMapUI.bind(this), this);
+mk.event.register("moveUpAndDownFarmMapUI", this.moveUpAndDownFarmMapUI.bind(this), this);
 this.initFarmMapUi();
 this.showChangePart();
 };
+e.prototype.moveUpAndDownFarmMapUI = function(t) {
+cc.Tween.stopAllByTarget(this.node_farmMapUI);
+t ? cc.tween(this.node_farmMapUI).to(.2, {
+y: 540
+}).start() : cc.tween(this.node_farmMapUI).to(.2, {
+y: 240
+}).start();
+};
+e.prototype.clickFarmMapUIBtn = function() {
+gData.plantData.openPanel(this.productType, 1, this.productIndex - 1);
+};
 e.prototype.initFarmMapUi = function() {
 return r(this, void 0, void 0, function() {
 var t, e, a, o, n, i, r, s;
@@ -14691,7 +14824,7 @@ this.node_farmMapProduct.active = !1;
 this.node_farmMapUI.active = !0;
 return [ 2 ];
 }
-} else if (n.picture - 1 == e) {
+} else if (n.picture - 1 == e && 1 == n.unlock) {
 this.uiShowType = 2;
 this.productType = d.ProductType[t];
 this.productIndex = o;
@@ -14701,7 +14834,7 @@ this.node_farmMapUI.active = !0;
 i = gData.gameData.getProductMakeTimesById(n.picture - 1);
 r = gData.gameData.getProductMap(n.picture - 1).name;
 s = this.getDesByType(n);
-this.lbl_farmMapDes.string = "" + s + n.value + "次" + r + "(" + i + "/" + n.value + ")";
+this.lbl_farmMapDes.string = "<color=#7E411F>" + s + "<color=#FF0000>" + n.value + "</c>次" + r + " <color=#FF0000>" + i + "</c>/" + n.value + "</color>";
 return [ 2 ];
 }
 }
@@ -14713,7 +14846,7 @@ return [ 2 ];
 e.prototype.refreshFarmMapUI = function() {
 if (2 == this.uiShowType) {
 var t = gData.gameData.getProductArrByType(this.productType)[this.productIndex], e = gData.gameData.getProductMakeTimesById(t.picture - 1), a = gData.gameData.getProductMap(t.picture - 1).name, o = this.getDesByType(t);
-this.lbl_farmMapDes.string = "" + o + t.value + "次" + a + "(" + e + "/" + t.value + ")";
+this.lbl_farmMapDes.string = "<color=#7E411F>" + o + "<color=#FF0000>" + t.value + "</c>次" + a + " <color=#FF0000>" + e + "</c>/" + t.value + "</color>";
 }
 };
 e.prototype.clickGetFarmMapRewardBtn = function() {
@@ -14935,9 +15068,13 @@ case 5:
 if (o >= 3) {
 this.isGray = !1;
 this.node_getOrderReward.setGray(!1, !0);
+this.node_getOrderReward.getComponent(cc.Animation).play();
+this.node_orderHand.active = !0;
 } else {
 this.isGray = !0;
 this.node_getOrderReward.setGray(!0, !0);
+this.node_getOrderReward.getComponent(cc.Animation).stop();
+this.node_orderHand.active = !1;
 }
 return [ 3, 7 ];
 
@@ -14961,6 +15098,9 @@ return [ 2 ];
 e.prototype.clickGetOrderRewardBtn = function() {
 this.isGray ? mk.tip.pop("订单未完成") : this.getOrderReward();
 };
+e.prototype.getIsCanGetOrderReward = function() {
+return !this.isGray;
+};
 e.prototype.getOrderReward = function() {
 return r(this, void 0, void 0, function() {
 var t, e;
@@ -14999,35 +15139,56 @@ switch (s.label) {
 case 0:
 o = function(o) {
 var i, s, l, p;
-return c(this, function(c) {
-switch (c.label) {
+return c(this, function(u) {
+switch (u.label) {
 case 0:
-if (t != n.orderPicIdArray[o].picID) return [ 3, 5 ];
-if (!((i = gData.gameData.playerProp.orderData.orderTaskList[o]).completeCount < i.taskCount)) return [ 3, 4 ];
+if (t != n.orderPicIdArray[o].picID) return [ 3, 6 ];
+if (!((i = gData.gameData.playerProp.orderData.orderTaskList[o]).completeCount < i.taskCount)) return [ 3, 5 ];
 s = "";
 s = a ? "game/coregame/texture/plant_icons/plantIcon_" : "game/coregame/texture/factory_icons/factory_";
+return [ 4, n.updataOrderProgress(n.orderPicIdArray[o].ID) ];
+
+case 1:
+u.sent();
+l = function(a) {
+var i, l;
+return c(this, function(c) {
+switch (c.label) {
+case 0:
 return [ 4, mk.pool.getPrefab("game/prefab/crop") ];
 
 case 1:
-l = c.sent();
+i = c.sent();
 return [ 4, mk.loader.load(s + t, cc.SpriteFrame) ];
 
 case 2:
-p = c.sent();
-l.getComponent(cc.Sprite).spriteFrame = p;
-return [ 4, n.updataOrderProgress(n.orderPicIdArray[o].ID) ];
+l = c.sent();
+i.getComponent(cc.Sprite).spriteFrame = l;
+mk.fly.playFlyAniExtra(e, n.sp_cropIcon[o].node, i, .6, .2 * a, function() {
+1 == a && r.doFlyOrderAni(o);
+});
+return [ 2 ];
+}
+});
+};
+p = 0;
+u.label = 2;
+
+case 2:
+return 3 == p ? [ 3, 5 ] : [ 5, l(p) ];
 
 case 3:
-c.sent();
-mk.fly.playFlyAniExtra(e, n.sp_cropIcon[o].node, l, .6, function() {
-r.doFlyOrderAni(o);
-});
-c.label = 4;
+u.sent();
+u.label = 4;
 
 case 4:
-return [ 2, "break" ];
+++p;
+return [ 3, 2 ];
 
 case 5:
+return [ 2, "break" ];
+
+case 6:
 return [ 2 ];
 }
 });
@@ -15066,8 +15227,10 @@ break;
 if (a) {
 this.isGray = !1;
 this.node_getOrderReward.setGray(!1, !0);
+this.node_getOrderReward.getComponent(cc.Animation).play();
+this.node_orderHand.active = !0;
 mk.ui.closeAllUI();
-mk.guide.open(3);
+mk.guide.open(3) || mk.tip.pop("订单已完成，快领奖吧!");
 }
 if (i = e.orderTaskList[t]) if (i.completeCount == i.taskCount) {
 this.lbl_progress[t].node.active = !1;
@@ -15222,7 +15385,7 @@ type: cc.Node,
 displayName: "图鉴种植节点"
 }) ], e.prototype, "node_farmMapProduct", void 0);
 i([ y({
-type: cc.Label,
+type: cc.RichText,
 displayName: "描述"
 }) ], e.prototype, "lbl_farmMapDes", void 0);
 i([ y({
@@ -15253,6 +15416,10 @@ i([ y({
 displayName: "领奖按钮",
 type: p.default
 }) ], e.prototype, "node_getOrderReward", void 0);
+i([ y({
+displayName: "手指",
+type: cc.Node
+}) ], e.prototype, "node_orderHand", void 0);
 return i([ f ], e);
 }(cc.Component);
 a.default = m;
@@ -16235,17 +16402,23 @@ this.curDes = "";
 }
 t.prototype.open = function(t, e) {
 void 0 === e && (e = "");
-if ("0" != gData.gameData.configs.ServerConfig.NewUserGuide) {
+if ("0" == gData.gameData.configs.ServerConfig.NewUserGuide) return !1;
 this.curDes = e;
 this.crtGuideID = gData.gameData.getProp(o.GameProp.guideID);
 null == this.crtGuideID && (this.crtGuideID = 0);
-if (this.crtGuideID >= 9999) mk.console.log("新手引导已做完"); else if (t <= this.crtGuideID && this.crtGuideID > 0) mk.console.log("当前引导已做过：" + t); else {
+if (this.crtGuideID >= 9999) {
+mk.console.log("新手引导已做完");
+return !1;
+}
+if (t <= this.crtGuideID && this.crtGuideID > 0) {
+mk.console.log("当前引导已做过：" + t);
+return !1;
+}
 gData.guideData.crtID = t;
 this.crtGuideID = t;
 mk.ui.openPanel("module/guide/guide", n.OpenActionType.normal, this.ui);
 this.setGuideID(this.crtGuideID++);
-}
-}
+return !0;
 };
 t.prototype.setGuideID = function(t) {
 if (4 == t) {
@@ -16983,6 +17156,7 @@ e.call = null;
 e.getType = 0;
 e.init_reward = !1;
 e.node_fly = null;
+e.isMatchOrder = !1;
 return e;
 }
 e.prototype.openPanel = function(t, e, a, o) {
@@ -16991,6 +17165,7 @@ this.plantID = e;
 this.call = a;
 this.node_fly = o;
 this.config = gData.gameData.getProductMap(this.plantID);
+this.judgeIsMatchOrder();
 var n = mk.guide.isGuiding(), i = Math.random(), r = gData.adData.getPerByEcpm(s.RateConfig.RC_superDouble);
 !n && i <= r ? mk.ui.openPanel("game/prefab/uiPanel/HarvestPanel") : this.getNormalReward();
 };
@@ -17000,7 +17175,7 @@ t.prototype.setAdData.call(this, e);
 gData.reward.data = gData.harvestData.adData.videoRedMoney.videoRewardList;
 gData.reward.callback = gData.harvestData.call;
 var a = this.node_fly.parent.convertToWorldSpaceAR(this.node_fly.getPosition());
-gData.reward.getReward(a);
+gData.reward.getReward(a, this.isMatchOrder);
 gData.harvestData.call = null;
 };
 e.prototype.getNormalReward = function() {
@@ -17009,12 +17184,16 @@ var t, e, a, o;
 return c(this, function(n) {
 switch (n.label) {
 case 0:
+return [ 4, mk.time.WaitForSeconds(.5) ];
+
+case 1:
+n.sent();
 t = {
 id: this.config.id
 };
 return [ 4, mk.http.sendData("redMoney/addRedMoneyByFarm", t) ];
 
-case 1:
+case 2:
 if ((e = n.sent()) && 0 != e.errcode) return [ 2 ];
 if (e.data.redMoneyAddition <= 0) console.log("返回奖励为0"); else {
 this.getType = 0;
@@ -17025,13 +17204,24 @@ rewardNum: e.data.redMoneyAddition
 gData.reward.data = a;
 gData.reward.callback = this.call;
 o = this.node_fly.parent.convertToWorldSpaceAR(this.node_fly.getPosition());
-gData.reward.getReward(o);
+gData.reward.getReward(o, this.isMatchOrder);
 }
 return [ 2 ];
 }
 });
 });
 };
+e.prototype.judgeIsMatchOrder = function() {
+var t = gData.gameData.playerProp.orderData;
+if (t && t.orderTaskList) for (var e = gData.gameData.configs.Product, a = t.orderTaskList, o = a.length, n = 0; n != o; ++n) {
+var i = a[n];
+if (i.Id <= e.length && e[i.Id - 1].picture == this.plantID) {
+this.isMatchOrder = !0;
+return;
+}
+}
+this.isMatchOrder = !1;
+};
 return i([ p ], e);
 }(l.Data);
 a.default = u;
@@ -22965,28 +23155,37 @@ var e = gData.gameData.playerProp.orderData, a = gData.gameData.playerProp.copyO
 if (e && e.orderTaskList) {
 for (var o = e.orderTaskList, n = gData.gameData.configs.Product, i = 0; i != o.length; ++i) {
 var c = o[i];
-if (a[i] < c.taskCount && c.Id <= n.length) {
+if (!(a[i] < c.taskCount && c.Id <= n.length)) break;
 for (var s = n[c.Id - 1], l = this.pastureIcons.length, p = 0; p < l; p++) if (s.picture == this.pastureIcons[p].data.productID && this.pastureIcons[p].data.state == r.PastureState.Empty) {
 gData.gameData.nextCanProduct = gData.gameData.getProductMap(this.pastureIcons[p].data.productID);
 gData.gameData.nextMake = this.pastureIcons[p];
+gData.gameData.nextType = 2;
 return this.pastureIcons[p];
 }
-} else for (l = this.pastureIcons.length, p = 0; p < l; p++) if (this.pastureIcons[p].data.state == r.PastureState.Empty) {
-gData.gameData.nextCanProduct = gData.gameData.getProductMap(this.pastureIcons[p].data.productID);
-gData.gameData.nextMake = this.pastureIcons[p];
-return this.pastureIcons[p];
 }
+return 1 == t.state ? null : this.doSameCheckLogic(t);
 }
-if (1 == t.state) return null;
-for (l = this.pastureIcons.length, p = 0; p < l; p++) if (this.pastureIcons[p].data.state == r.PastureState.Empty) {
-gData.gameData.nextCanProduct = gData.gameData.getProductMap(this.pastureIcons[p].data.productID);
-gData.gameData.nextMake = this.pastureIcons[p];
-return this.pastureIcons[p];
+return this.doSameCheckLogic(t);
+};
+t.prototype.doSameCheckLogic = function(t) {
+if (0 == t.state) {
+for (var 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];
+}
+} 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) {
+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];
 }
-} else for (l = this.pastureIcons.length, p = 0; p < l; p++) if (this.pastureIcons[p].data.state == r.PastureState.Empty) {
-gData.gameData.nextCanProduct = gData.gameData.getProductMap(this.pastureIcons[p].data.productID);
-gData.gameData.nextMake = this.pastureIcons[p];
-return this.pastureIcons[p];
 }
 return null;
 };
@@ -23060,10 +23259,13 @@ this.productArr = [];
 this.init_itemIndex = -1;
 this.init_lock = -1;
 this.init_ani = !1;
+this.productIndex = -1;
 }
-t.prototype.openPanel = function(t, e) {
+t.prototype.openPanel = function(t, e, a) {
+void 0 === a && (a = -1);
 this.tab = t;
 this.configID = e;
+this.productIndex = a;
 this.productArr = gData.gameData.getProductArrByType(t);
 mk.ui.openPanel("game/prefab/uiPanel/PlantPanel");
 };
@@ -23445,6 +23647,7 @@ e.prototype.start = function() {
 gData.plantData.init_itemIndex = -1;
 gData.plantData.init_lock = -1;
 this.initScollView();
+mk.event.emit("moveUpAndDownFarmMapUI", !0);
 };
 e.prototype.getItemDataByID = function(t) {
 for (var e = this.list_data.length, a = 0; a < e; a++) if (this.list_data[a].picture == t) return a;
@@ -23470,10 +23673,17 @@ a.destroy();
 }
 };
 e.prototype.initScollView = function() {
+var t = this;
 this.list_data = gData.plantData.productArr;
 this.tableView.node.emit("srollview-init", this.list_data);
+gData.plantData.productIndex > 1 && cc.tween(this).delay(.2).call(function() {
+t.tableView.contentMoveByIndex(gData.plantData.productIndex - 1, .1);
+}).start();
 };
 e.prototype.onDestroy = function() {};
+e.prototype.closeUI = function() {
+mk.event.emit("moveUpAndDownFarmMapUI", !1);
+};
 i([ l({
 type: r.default,
 displayName: "滚动视图"
@@ -25771,24 +25981,28 @@ gData.gameData.playerProp.redMoney += gData.reward.data[e].rewardNum;
 } else gData.reward.data[e].rewardType == r.RewardType.rmb || gData.reward.data[e].rewardType == r.RewardType.pigRmb && gData.reward.data[e].rewardNum && (gData.gameData.playerProp.piggyBank += gData.reward.data[e].rewardNum);
 gData.reward.data = [];
 };
-e.prototype.flyCoinAnim = function(t) {
-var e = this;
+e.prototype.flyCoinAnim = function(t, e) {
+var a = this;
 void 0 === t && (t = null);
-if (gData.reward.data && gData.reward.data.length) for (var a = gData.reward.data.length, o = 0; o < a; o++) if (gData.reward.data[o].rewardType !== r.RewardType.rmb && 0 != gData.reward.data[o].rewardNum) {
+void 0 === e && (e = !1);
+if (gData.reward.data && gData.reward.data.length) for (var o = gData.reward.data.length, n = 0; n < o; n++) if (gData.reward.data[n].rewardType !== r.RewardType.rmb && 0 != gData.reward.data[n].rewardNum) {
 mk.audio.playEffect("redmoney");
-var n = "", i = 10, c = -1;
-if (gData.reward.data[o].rewardType === r.RewardType.productTimes) {
-n = "Canvas/主界面层/game/功能按钮/底部按钮/中间按钮";
-i = 5;
-c = .5;
+var i = "", c = 10;
+e && (c = 4);
+var s = -1;
+if (gData.reward.data[n].rewardType === r.RewardType.productTimes) {
+i = "Canvas/主界面层/game/功能按钮/底部按钮/中间按钮";
+c = 5;
+s = .5;
 }
-mk.fly.PlayCoinAnim(gData.reward.data[o].rewardType, i, t, n, function() {
-e.addReward();
-}, c);
+mk.fly.PlayCoinAnim(gData.reward.data[n].rewardType, c, t, i, function() {
+a.addReward();
+}, s);
 }
 };
-e.prototype.getReward = function(t) {
-this.flyCoinAnim(t);
+e.prototype.getReward = function(t, e) {
+void 0 === e && (e = !1);
+this.flyCoinAnim(t, e);
 if (this.callback) {
 this.callback();
 this.callback = null;
@@ -28898,6 +29112,9 @@ var o = function() {
 function t() {
 this.offTime = 0;
 }
+t.WaitForSeconds = function() {
+throw new Error("Method not implemented.");
+};
 t.prototype.setServerTime = function(t) {
 this.offTime = t - Math.ceil(new Date().getTime() / 1e3);
 };

packages-hot-update/cfg.json

@@ -10,7 +10,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyJsb/baseRemote/"
     ],
-    "buildTime": 1634800139059,
-    "genTime": 1634800139059,
+    "buildTime": 1635125034974,
+    "genTime": 1635125034974,
     "genVersion": null
 }

settings/project.json

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