1

assets/resources/data/guide_data.json

@@ -38,7 +38,7 @@
 		"dialogPos": ":200::::",
 		"dialogPos1": "",
 		"dialogAlignment": "0",
-		"dialog": "<color=8A4312><color=ff0000>倒计时</color>结束后收获农作物\n获得<color=ff0000>红包币</color>！</color>",
+		"dialog": "<color=8A4312>点击<color=ff0000>收获</color>农作物</color>",
 		"displayRect": "0:0:250:180",
 		"clickRect": "all",
 		"finger": "",
@@ -46,36 +46,21 @@
 	},
 	{
 		"id": "1_3",
-		"trigger": "1",
+		"trigger": "0",
 		"trNum": "0",
 		"btnEnable": "1",
 		"trForm": "1",
-		"dialogPos": ":200::::",
+		"dialogPos": ":700::::",
 		"dialogPos1": "",
 		"dialogAlignment": "0",
-		"dialog": "<color=8A4312>继续生产，完成<color=ff0000>任务</color>即可\n领取百元<color=ff0000>红包</color></color>",
+		"dialog": "<color=8A4312>这里是订单，收获<color=ff0000>足额</color>\n农作物<color=ff0000>就可以领奖啦！</color></color>",
 		"displayRect": "",
-		"clickRect": "主界面层/game/功能按钮/底部按钮/中间按钮",
-		"finger": "100:20",
-		"lagNext": "0"
-	},
-	{
-		"id": "1_4",
-		"trigger": "1",
-		"trNum": "0",
-		"btnEnable": "0",
-		"trForm": "1",
-		"dialogPos": "300:::::",
-		"dialogPos1": "",
-		"dialogAlignment": "0",
-		"dialog": "<color=8A4312>生产次数<color=ff0000>达到要求</color>，就可以<color=ff0000>提现</color>啦，加油！</color>",
-		"displayRect": "",
-		"clickRect": "主界面层/game/node_ui/顶部个人信息/任务",
+		"clickRect": "主界面层/game/node_ui/顶部个人信息/订单",
 		"finger": "",
 		"lagNext": "0"
 	},
 	{
-		"id": "1_5",
+		"id": "1_4",
 		"trigger": "1",
 		"trNum": "0",
 		"btnEnable": "1",
@@ -83,7 +68,7 @@
 		"dialogPos": ":200::::",
 		"dialogPos1": "",
 		"dialogAlignment": "0",
-		"dialog": "<color=8A4312>把农田全部种满，<color=ff0000>红包币</color>\n能提现，<color=ff0000>任务</color>也能<color=ff0000>提现</color>！</color>",
+		"dialog": "<color=8A4312>继续生产1次，很快就\n可以提现了！</color>",
 		"displayRect": "",
 		"clickRect": "主界面层/game/功能按钮/底部按钮/中间按钮",
 		"finger": "100:20",
@@ -98,7 +83,7 @@
 		"dialogPos": "::::-600:",
 		"dialogPos1": "",
 		"dialogAlignment": "0",
-		"dialog": "<color=8A4312>再生产1次，即可获得任\n务红包，快领取次数吧！</color>",
+		"dialog": "<color=8A4312>再收获1次，就可以完成\n订单，提现仅一步之遥！</color>",
 		"displayRect": "",
 		"clickRect": "all",
 		"finger": "100:-280",
@@ -106,32 +91,17 @@
 	},
 	{
 		"id": "3_0",
-		"trigger": "1",
+		"trigger": "0",
 		"trNum": "0",
-		"btnEnable": "1",
-		"trForm": "1",
-		"dialogPos": ":200::::",
-		"dialogPos1": "",
-		"dialogAlignment": "0",
-		"dialog": "<color=8A4312>继续生产，还有<color=ff0000>1次</color>即可\n提现<color=ff0000>！</color></color>",
-		"displayRect": "",
-		"clickRect": "主界面层/game/功能按钮/底部按钮/中间按钮",
-		"finger": "100:20",
-		"lagNext": "0"
-	},
-	{
-		"id": "4_0",
-		"trigger": "1",
-		"trNum": "0",
-		"btnEnable": "1",
+		"btnEnable": "0",
 		"trForm": "1",
-		"dialogPos": "300:::::",
+		"dialogPos": "700:::::",
 		"dialogPos1": "",
 		"dialogAlignment": "0",
-		"dialog": "<color=8A4312>太棒啦！你完成了任务！\n快点击提现吧~</color>",
+		"dialog": "<color=8A4312>太棒啦！你完成了订单！\n快点击领奖吧~</color>",
 		"displayRect": "",
-		"clickRect": "主界面层/game/node_ui/顶部个人信息/任务",
-		"finger": "100:20",
+		"clickRect": "主界面层/game/node_ui/顶部个人信息/订单",
+		"finger": "",
 		"lagNext": "0"
 	}
 ]

assets/resources/game/prefab/uiPanel/HarvestPanel.prefab

@@ -197,7 +197,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        89.802,
+        109.802,
         0,
         0,
         0,
@@ -2553,7 +2553,7 @@
     "asset": {
       "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
     },
-    "fileId": "53XjU167tFdonAJIUfz8yJ",
+    "fileId": "017uQvDQNLDZJxkg+Yat/R",
     "sync": false
   },
   {
@@ -2664,7 +2664,7 @@
     "asset": {
       "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
     },
-    "fileId": "4d9TjEuqhEXYs7tTS5+AwJ",
+    "fileId": "77ZZvxLahJ+aDf4sIOh2Ib",
     "sync": false
   },
   {
@@ -2775,7 +2775,7 @@
     "asset": {
       "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
     },
-    "fileId": "b4b4F0whdG96kvFzNzS5Ny",
+    "fileId": "a5CatQDXRPKKPJZnjvyAXH",
     "sync": false
   },
   {
@@ -3022,7 +3022,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -424,
+        -413,
         0,
         0,
         0,

assets/resources/game/prefab/uiPanel/PlantPanel.prefab

@@ -33,11 +33,11 @@
         "__id__": 27
       },
       {
-        "__id__": 28
+        "__id__": 29
       }
     ],
     "_prefab": {
-      "__id__": 29
+      "__id__": 30
     },
     "_opacity": 255,
     "_color": {
@@ -948,10 +948,24 @@
       "__id__": 2
     },
     "bClickClose": true,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 28
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "afc7c9y+IlK2pswzhp7XL30",
+    "handler": "closeUI",
+    "customEventData": ""
+  },
+  {
     "__type__": "afc7c9y+IlK2pswzhp7XL30",
     "_name": "",
     "_objFlags": 0,

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

@@ -16,12 +16,14 @@ export default class HarvestData extends Data {
     getType = 0;
     init_reward = false;
     node_fly: cc.Node = null;
+    isMatchOrder = false;
     openPanel(configID, plantID, call, node) {
         this.configID = configID;
         this.plantID = plantID;
         this.call = call;
         this.node_fly = node;
         this.config = gData.gameData.getProductMap(this.plantID);
+        this.judgeIsMatchOrder();
 
         let isTeaching = mk.guide.isGuiding();
         let rand = Math.random();
@@ -44,12 +46,13 @@ export default class HarvestData extends Data {
         gData.reward.callback = gData.harvestData.call;
 
         let world_Pos = this.node_fly.parent.convertToWorldSpaceAR(this.node_fly.getPosition());
-        gData.reward.getReward(world_Pos);
+        gData.reward.getReward(world_Pos, this.isMatchOrder);
         //mk.ui.openPanel('module/reward/reward');
         gData.harvestData.call = null;
     }
 
     async getNormalReward() {
+        await mk.time.WaitForSeconds(0.5);
         let data = { id: this.config.id };
         let response = await mk.http.sendData('redMoney/addRedMoneyByFarm', data);
 
@@ -69,8 +72,30 @@ export default class HarvestData extends Data {
 
 
             let world_Pos = this.node_fly.parent.convertToWorldSpaceAR(this.node_fly.getPosition());
-            gData.reward.getReward(world_Pos);
+            gData.reward.getReward(world_Pos, this.isMatchOrder);
             //mk.ui.openPanel('module/reward/reward');
         }
     }
+
+    private judgeIsMatchOrder()
+    {
+        let data = gData.gameData.playerProp.orderData;
+        if (data && data.orderTaskList) {
+            let productJson = gData.gameData.configs.Product;
+            let orderData = data.orderTaskList;
+            let len = orderData.length;
+            for (let i = 0; i != len; ++i) {
+                let dataE = orderData[i];
+                if (dataE.Id <= productJson.length) {
+                    let productData = productJson[dataE.Id - 1];
+                    if (productData.picture == this.plantID) {                    
+                        this.isMatchOrder = true;
+                        return;
+                    }
+                }
+            }
+        }
+        
+        this.isMatchOrder = false;
+    }
 }

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

@@ -17,14 +17,18 @@ export default class PlantData {
 
     //文字动画
     init_ani = false;
+
+    //当前索引
+    productIndex = -1;
     /**
      * 打开生产产品界面
      * @param tab 产品类型
      * @param configID 生产设备ID
      */
-    openPanel(tab: ProductType, configID) {
+    openPanel(tab: ProductType, configID, index = -1) {
         this.tab = tab;
         this.configID = configID;
+        this.productIndex = index;
         this.productArr = gData.gameData.getProductArrByType(tab);
         mk.ui.openPanel('game/prefab/uiPanel/PlantPanel');
     }

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

@@ -17,6 +17,7 @@ export default class PlantPanel extends cc.Component {
         gData.plantData.init_itemIndex = -1;
         gData.plantData.init_lock = -1;
         this.initScollView();
+        mk.event.emit("moveUpAndDownFarmMapUI", true);
     }
 
     getItemDataByID(id) {
@@ -57,9 +58,24 @@ export default class PlantPanel extends cc.Component {
     private initScollView() {
         this.list_data = gData.plantData.productArr;
         this.tableView.node.emit('srollview-init', this.list_data)
+
+        if(gData.plantData.productIndex > 1)
+        {
+            cc.tween(this).delay(0.2).call(()=>{
+
+                this.tableView.contentMoveByIndex(gData.plantData.productIndex-1, 0.1);
+                
+            }).start();
+        }
     }
 
     onDestroy() {
         // this.tableView.clearItem();
+       
+    }
+
+    public closeUI()
+    {
+        mk.event.emit("moveUpAndDownFarmMapUI", false);
     }
 }

assets/script/game/component/tween/EffectOpenAndClose.ts

@@ -190,7 +190,7 @@ export default class EffectOpenAndClose extends cc.Component {
                 case EffectType.bottomIn:
                     let toY = -cc.winSize.height;
                     cc.tween(this.effect_par)
-                        .to(0.3, { y: toY }, cc.easeOut(3))
+                        .to(0.4, { y: toY }, cc.easeSineOut())
                         .call(() => {
                             // this.effect_par.active = false;
                             cb && cb();

assets/script/game/data/GameData.ts

@@ -107,6 +107,7 @@ export class GameData {
     /** 最大可种植产品可更新到服务器标识 */
     public maxProductToServer = false;
 
+    public authUIType = 0;
     /**
      * 初始化游戏数据：网络配置信息，用户信息
      * @returns 
@@ -212,6 +213,9 @@ export class GameData {
         this.playerProp.speedUpLeftTimes = res_data.speedUpLeftTimes;
         this.playerProp.completeFarmTaskTimes = res_data.completeFarmTaskTimes;
         this.playerProp.orderData = res_data.userOrderTaskInfo;
+        console.log("==============initPlayerProp");
+        console.log(res_data.userOrderTaskInfo);
+        mk.console.logSingle('userOrderTaskInfo', res_data.userOrderTaskInfo);
         this.cloneOrderData();
 
         mk.data.setTAUserID(gData.loginData.uin);
@@ -248,21 +252,32 @@ export class GameData {
 
         let value = mk.storage.getStorage(StorageKey.copyOrderData);
         if (value && !isRefresh) {
-            this.playerProp.copyOrderData = value;
+            this.playerProp.copyOrderData = [];
+            let v = value.split(",");
+            for(let i = 0; i != v.length; ++i)
+            {
+                this.playerProp.copyOrderData.push(parseInt(v[i]));
+            }
         } else {
-            if (this.playerProp.orderData) {
+            let orderData = this.playerProp.orderData;
+            if (orderData) {
                 this.playerProp.copyOrderData = [];
-                let len = this.playerProp.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);
+                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);
+                }       
             }
         }
+
+        mk.console.logSingle('cloneOrderData', this.playerProp.copyOrderData);
     }
 
     public updateOrderTaskCopyData(id: number) {
-        if (this.playerProp.orderData) {
+        if (this.playerProp.orderData && this.playerProp.orderData.orderTaskList) {
             let productJson = this.configs.Product;
             let orderData = this.playerProp.orderData.orderTaskList;
             let len = orderData.length;
@@ -277,6 +292,9 @@ export class GameData {
                     }
                 }
             }
+        }else{
+            this.playerProp.copyOrderData = [];
+            cc.sys.localStorage.removeItem(StorageKey.copyOrderData);
         }
     }
 
@@ -703,8 +721,8 @@ export class GameData {
         gData.gameData.init_task = true;
         this.playerProp.userFarmTaskInfo = response.data.userFarmTaskInfo;
         if (this.playerProp.userFarmTaskInfo.completeCount >= this.playerProp.userFarmTaskInfo.taskCount) {
-            mk.ui.closeAllUI();
-            mk.guide.open(4);
+            //mk.ui.closeAllUI();
+            //mk.guide.open(4);
         }
         // if (isNeedRefresh) {
         //     gData.gameData.init_task = true;

assets/script/game/data/module/BlessingBagData.ts

@@ -66,7 +66,8 @@ export class BlessingBagData extends Data {
         * @param cb 提现回调
        */
     async addProgress() {
-        let data = { "updateType": this.videoRbData.isVideo };
+        //let data = { "updateType": this.videoRbData.isVideo };
+        let data = { "updateType": 0 };
         let response = await mk.http.sendData('/welFare/updateWelFareTask', data);
 
         if (response.errcode != 0) {

assets/script/game/data/module/RewardData.ts

@@ -50,7 +50,7 @@ export class RewardData extends Data {
         gData.reward.data = [];
     }
 
-    public flyCoinAnim(world_Pos: cc.Vec2 = null) {
+    public flyCoinAnim(world_Pos: cc.Vec2 = null, isMatchOrder = false) {
         if (!gData.reward.data || !gData.reward.data.length) return;
         let is_add_money = true;
         const i_count = gData.reward.data.length;
@@ -60,6 +60,10 @@ export class RewardData extends Data {
             mk.audio.playEffect('redmoney');
             let endPos = '';
             let num = 10;
+            if(isMatchOrder)
+            {
+                num = 4;
+            }
             let scale = -1;
             if( gData.reward.data[i].rewardType === RewardType.productTimes)
             {
@@ -73,10 +77,10 @@ export class RewardData extends Data {
         }
     }
 
-    public getReward(world_Pos: cc.Vec2)
+    public getReward(world_Pos: cc.Vec2, isMatchOrder = false)
     {
         //let world_Pos = this.node_hb.node.parent.convertToWorldSpaceAR(this.node_hb.node.getPosition());
-        this.flyCoinAnim(world_Pos);
+        this.flyCoinAnim(world_Pos, isMatchOrder);
         if (this.callback) {
             this.callback();
             this.callback = null;

assets/script/game/game/Game.ts

@@ -1,5 +1,6 @@
 import Util from "../../before/util/Util";
 import JsbSystem from "../../mk/system/JsbSystem";
+import TimeUtil from "../../mk/utils/TimeUtil";
 import SetGray from "../component/SetGray";
 import { AdFun, RateConfig } from "../data/AdData";
 import { DataEventId, GameProp, ProductType, VideoAdType } from "../data/GameData";
@@ -87,8 +88,8 @@ export default class Game extends cc.Component {
     @property({ type: cc.Node, displayName: '图鉴种植节点' })
     node_farmMapProduct: cc.Node = null;
 
-    @property({ type: cc.Label, displayName: '描述' })
-    lbl_farmMapDes: cc.Label = null;
+    @property({ type: cc.RichText, displayName: '描述' })
+    lbl_farmMapDes: cc.RichText = null;
     @property({ displayName: '数字组', type: cc.Label })
     lbl_value: cc.Label[] = [];
 
@@ -107,6 +108,9 @@ export default class Game extends cc.Component {
     @property({ displayName: '领奖按钮', type: SetGray })
     node_getOrderReward: SetGray = null;
 
+    @property({ displayName: '手指', type: cc.Node })
+    node_orderHand: cc.Node = null;
+
 
     posY = 0;
     /** 是否开始增加次数倒计时 */
@@ -281,8 +285,7 @@ export default class Game extends cc.Component {
             this.lbl_addHb.string = "+" + add.toString();
             gData.gameData.addHb = 0;
 
-            if(add > 0)
-            {
+            if (add > 0) {
                 cc.Tween.stopAllByTarget(this.node_addHb);
                 this.node_addHb.active = true;
                 this.node_addHb.scale = 0;
@@ -620,13 +623,26 @@ export default class Game extends cc.Component {
 
         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();
     }
 
+    public moveUpAndDownFarmMapUI(isMoveUp) {
+        cc.Tween.stopAllByTarget(this.node_farmMapUI);
+        if (isMoveUp) {
+            cc.tween(this.node_farmMapUI).to(0.2, { y: 540 }).start();
+        } else {
+            cc.tween(this.node_farmMapUI).to(0.2, { y: 240 }).start();
+        }
+    }
+
+    public clickFarmMapUIBtn() {
+        gData.plantData.openPanel(this.productType, 1, this.productIndex - 1);
+    }
+
     private uiShowType = 3;
     private productType = ProductType.nzw;
     private productIndex = 0;
@@ -673,7 +689,7 @@ export default class Game extends cc.Component {
                         let times = gData.gameData.getProductMakeTimesById(data.picture - 1);
                         let plantName = gData.gameData.getProductMap(data.picture - 1).name;
                         let des = this.getDesByType(data);
-                        this.lbl_farmMapDes.string = `${des}${data.value}次${plantName}(${times}/${data.value})`;
+                        this.lbl_farmMapDes.string = `<color=#7E411F>${des}<color=#FF0000>${data.value}</c>次${plantName} <color=#FF0000>${times}</c>/${data.value}</color>`;
                         //this.sp_farmMapIcon.spriteFrame = await mk.loader.load('module/farmMap/texture/gift', cc.SpriteFrame);
                         return;
                     }
@@ -694,7 +710,7 @@ export default class Game extends cc.Component {
             let times = gData.gameData.getProductMakeTimesById(data.picture - 1);
             let plantName = gData.gameData.getProductMap(data.picture - 1).name;
             let des = this.getDesByType(data);
-            this.lbl_farmMapDes.string = `${des}${data.value}次${plantName}(${times}/${data.value})`;;
+            this.lbl_farmMapDes.string = `<color=#7E411F>${des}<color=#FF0000>${data.value}</c>次${plantName} <color=#FF0000>${times}</c>/${data.value}</color>`;
         }
     }
 
@@ -911,9 +927,13 @@ export default class Game extends cc.Component {
                 if (completeCount >= 3) {
                     this.isGray = false;
                     this.node_getOrderReward.setGray(false, true);
+                    this.node_getOrderReward.getComponent(cc.Animation).play();
+                    this.node_orderHand.active = true;
                 } else {
                     this.isGray = true;
                     this.node_getOrderReward.setGray(true, true);
+                    this.node_getOrderReward.getComponent(cc.Animation).stop();
+                    this.node_orderHand.active = false;
                 }
             } else {
                 console.log('订单数据错误');
@@ -941,7 +961,7 @@ export default class Game extends cc.Component {
         gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
         gData.gameData.cloneOrderData(true);
 
-        gData.reward.adData = {videoRedMoney: {videoRewardList:null}};
+        gData.reward.adData = { videoRedMoney: { videoRewardList: null } };
         gData.reward.adData.videoRedMoney.videoRewardList = [{ rewardType: 1, rewardNum: response.data.redMoneyAddition }]
         //gData.reward.adData = response.data.redMoneyAddition;
         mk.ui.openPanel('module/reward/reward');
@@ -961,21 +981,26 @@ export default class Game extends cc.Component {
                     else {
                         plantPath = 'game/coregame/texture/factory_icons/factory_';
                     }
-                    let crop = await mk.pool.getPrefab('game/prefab/crop');
-                    let sf = await mk.loader.load(plantPath + plantId, cc.SpriteFrame);
-                    crop.getComponent(cc.Sprite).spriteFrame = sf;
                     await this.updataOrderProgress(this.orderPicIdArray[i].ID);
-                    mk.fly.playFlyAniExtra(farmNode, this.sp_cropIcon[i].node, crop, 0.6, ()=>{
-                        this.doFlyOrderAni(i);
-                    });       
+                    //await mk.time.WaitForSeconds(1);
+                    for (let index = 0; index != 3; ++index) {
+                        let crop = await mk.pool.getPrefab('game/prefab/crop');
+                        let sf = await mk.loader.load(plantPath + plantId, cc.SpriteFrame);
+                        crop.getComponent(cc.Sprite).spriteFrame = sf;
+                        mk.fly.playFlyAniExtra(farmNode, this.sp_cropIcon[i].node, crop, 0.6, index * 0.2, () => {
+                            if(index == 1)
+                            {
+                                this.doFlyOrderAni(i);
+                            }
+                        });
+                    }
                 }
                 break;
             }
         }
     }
 
-    public doFlyOrderAni(index)
-    {
+    public doFlyOrderAni(index) {
         let orderData = gData.gameData.playerProp.orderData;
         if (orderData) {
             let isComplete = true;
@@ -991,18 +1016,23 @@ export default class Game extends cc.Component {
             if (isComplete) {
                 this.isGray = false;
                 this.node_getOrderReward.setGray(false, true);
-            } 
-            
+                this.node_getOrderReward.getComponent(cc.Animation).play();
+                this.node_orderHand.active = true;
+                mk.ui.closeAllUI();
+                let isGuide = mk.guide.open(3);
+                if (!isGuide) {
+                    mk.tip.pop("订单已完成，快领奖吧!");
+                }
+            }
+
             {
                 let dataE = orderData.orderTaskList[index];
-                if(dataE)
-                {       
-                    if(dataE.completeCount == dataE.taskCount)
-                    {
+                if (dataE) {
+                    if (dataE.completeCount == dataE.taskCount) {
                         this.lbl_progress[index].node.active = false;
                         this.sp_mark[index].node.active = true;
-                    }else{
-                        
+                    } else {
+
                         this.lbl_progress[index].string = `${dataE.completeCount}/${dataE.taskCount}`;
                         cc.Tween.stopAllByTarget(this.lbl_progress[index].node);
                         cc.tween(this.lbl_progress[index].node).to(0.1, { scale: 1.4 }).to(0.05, { scale: 1 }).start();
@@ -1021,5 +1051,19 @@ export default class Game extends cc.Component {
 
         gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
     }
+
+    public clickOrderUIBtn() {
+        let data = gData.gameData.playerProp.orderData;
+        let orderData = data.orderTaskList;
+        let copyData = gData.gameData.playerProp.copyOrderData;
+        if (data && orderData && copyData) {
+            let num = 0;
+            for (let i = 0; i != orderData.length; ++i) {
+                num += (orderData[i].taskCount - copyData[i])
+            }
+            mk.guide.curDes = `<color=8A4312>继续生产${num}次，很快就\n可以提现了！</color>`;
+            //mk.guide.open(2, curDes);
+        }
+    }
 }
 

assets/script/game/module/reward/Reward.ts

@@ -113,12 +113,12 @@ export default class Reward extends cc.Component {
      */
     private clickGetReward() {
         // cc.log('获取奖励：', gData.reward.data);
-        if (gData.reward.data[0].rewardType == RewardType.productTimes) {
-            let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
-            let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
-            let curDes = `<color=8A4312>继续生产，还有<color=ff0000>${count - com}次</color>即可\n提现<color=ff0000>！</color></color>`;
-            mk.guide.open(3, curDes);
-        }
+        // if (gData.reward.data[0].rewardType == RewardType.productTimes) {
+        //     let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
+        //     let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
+        //     let curDes = `<color=8A4312>继续生产，还有<color=ff0000>${count - com}次</color>即可\n提现<color=ff0000>！</color></color>`;
+        //     mk.guide.open(3, curDes);
+        // }
 
         let world_Pos = this.node_hb.node.parent.convertToWorldSpaceAR(this.node_hb.node.getPosition());
         gData.reward.flyCoinAnim(world_Pos);

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

@@ -43,8 +43,17 @@ export default class ProductReward extends cc.Component {
 
                     isGuide = true;
                     this.scheduleOnce(() => {
-                        let curDes = `<color=8A4312>再<color=ff0000>生产${count - com}次</color>，即可<color=ff0000>提现</color>，\n快领取次数吧！</color>`;
-                        mk.guide.open(2, curDes);
+                        let data = gData.gameData.playerProp.orderData;
+                        let orderData = data.orderTaskList;
+                        let copyData = gData.gameData.playerProp.copyOrderData;
+                        if (data && orderData && copyData) {
+                            let num = 0;
+                            for (let i = 0; i != orderData.length; ++i) {
+                                num += (orderData[i].taskCount - copyData[i])
+                            }
+                            let curDes = `<color=8A4312>再收获${num}次，就可以完成\n订单，提现仅一步之遥！</color>`;
+                            mk.guide.open(2, curDes);
+                        }
                     }, 0.5)
                 } else {
                     this.node_Uncomplete.active = false;

assets/script/mk/system/FlySystem.ts

@@ -172,15 +172,19 @@ export default class FlySystem extends cc.Component {
         }).start();
     }
 
-    public playFlyAniExtra(startTarget: cc.Node, endTarget: cc.Node, cloneTarget: cc.Node, duration: number, callFuc: Function = null) {
+    public playFlyAniExtra(startTarget: cc.Node, endTarget: cc.Node, cloneTarget: cc.Node, duration: number, delayTime: number = 0,callFuc: Function = null) {
         let worldPos_1 = startTarget.parent.convertToWorldSpaceAR(startTarget.getPosition());
         let pos_1 = this.node.convertToNodeSpaceAR(worldPos_1);
         let worldPos_2 = endTarget.parent.convertToWorldSpaceAR(endTarget.getPosition());
         let pos_2 = this.node.convertToNodeSpaceAR(worldPos_2);
         if (cloneTarget) {
+            let dir = cc.v2(mk.math.random(-1, 1, false), mk.math.random(-1, 1, false));
+            dir = dir.normalize();
+            let deltaInit = cc.v2(mk.math.random(10, 160, false) * dir.x, mk.math.random(10, 160, false) * dir.y);
+            pos_1.add(dir);
             cloneTarget.setParent(this.node);
             cloneTarget.setPosition(pos_1);
-            cc.tween(cloneTarget).to(duration, { position: cc.v3(pos_2) }, cc.easeSineOut()).call(() => {
+            cc.tween(cloneTarget).delay(delayTime).to(duration, { position: cc.v3(pos_2) }, cc.easeSineOut()).call(() => {
                 if (callFuc) {
                     callFuc();
                 }

assets/script/mk/system/GuideSystem.ts

@@ -13,7 +13,7 @@ export default class GuideSystem {
 
     public open(id, curDes = '') {
         if (gData.gameData.configs.ServerConfig.NewUserGuide == '0') {
-            return
+            return false;
         }
 
         this.curDes = curDes;
@@ -31,16 +31,17 @@ export default class GuideSystem {
 
         if (this.crtGuideID >= 9999) {
             mk.console.log("新手引导已做完");
-            return;
+            return false;
         }
         if (id <= this.crtGuideID && this.crtGuideID > 0) {
             mk.console.log("当前引导已做过：" + id);
-            return;
+            return false;
         }
         gData.guideData.crtID = id;
         this.crtGuideID = id;
         mk.ui.openPanel("module/guide/guide", OpenActionType.normal, this.ui);
         this.setGuideID(this.crtGuideID++);
+        return true;
     }
 
     /** 开启一个引导后直接默认已完成 */

assets/script/mk/utils/LogUtil.ts

@@ -9,7 +9,7 @@ export default class LogUtil {
      * 是否显示Log
      * @description
      */
-    public ifShowLog: boolean = false;
+    public ifShowLog: boolean = true;
 
     /**
      * 标签符号

assets/script/mk/utils/TimeUtil.ts

@@ -3,6 +3,9 @@
  * @author 邹勇
  */
 export default class TimeUtil {
+    static WaitForSeconds(arg0: number) {
+        throw new Error("Method not implemented.");
+    }
     constructor() {
 
     }

build/jsb-link/assets/internal/config.json

@@ -1 +1 @@
-{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","60AwGqM1dKELCGhPAR+jK6","02delMVqdBD70a/HSD99FK"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[20,3,1,4,18,6,0,11,15,16,19,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}
+{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","02delMVqdBD70a/HSD99FK","60AwGqM1dKELCGhPAR+jK6"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[19,3,1,4,18,6,0,11,15,16,20,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}

build/jsb-link/assets/resources/import/0c/0c05d35e-1ee3-41ee-8749-1bbaa1f16142.json

@@ -0,0 +1 @@
+[1,["43n3IuNChKI5tEnKMZ6IYt"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"hb5","rect":[0,0,29,32],"offset":[0,0],"originalSize":[29,32],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/0c/0c30d114-ea86-4c28-b240-cbcb5bdc2aea.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/0c/0cfd27d7-1f80-4ee9-b1ae-91c08fea5e0f.json

@@ -0,0 +1 @@
+[1,["2d9/boW4tEeLEIEu5eovJ5"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"gou1","rect":[0,0,43,43],"offset":[0,0],"originalSize":[43,43],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/1f/1fab6436-aa21-4f60-8cb0-d54da3689428.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/26/268df3e0-c961-4534-bfe0-19d0f4527be6.json

@@ -0,0 +1 @@
+[1,["ecpdLyjvZBwrvm+cedCcQy","d28bad6d-ac92-49a6-a9a6-ad6a05f2101c@6c48a"],["_spriteFrame","root","node","data"],[["cc.Prefab",["_name"],2],["cc.Node",["_name","_components","_prefab","_contentSize","_trs"],2,9,4,5,7],["cc.Sprite",["node","_materials","_spriteFrame"],3,1,3,6],["cc.PrefabInfo",["root"],3,1]],[[0,0,2],[1,0,1,2,3,4,2],[2,0,1,2,1],[3,0,1]],[[0,"crop"],[1,"crop",[[2,-2,[0],1]],[3,-1],[5,175,173],[-91.155,12.43,0,0,0,0,1,0.4,0.4,1]]],0,[0,1,1,0,2,1,0,3,1,2],[0,0],[-1,0],[0,1]]

build/jsb-link/assets/resources/import/2d/2df7f6e8-5b8b-4478-b108-12ee5ea2f279.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/3b/3bc62a14-4210-47fd-af1a-988c58f662a7.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/43/430f0337-3ac7-4c23-a0d7-c9f9d2a42e99.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/43/439f722e-3428-4a23-9b44-9ca319e8862d.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/52/526bcf93-ff77-4008-b749-cbc96cd2dc5f.json

@@ -0,0 +1 @@
+[1,["43DwM3OsdMI6DXyfnSpC6Z"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"icon_rewu","rect":[0,0,76,72],"offset":[0,0],"originalSize":[76,72],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/9b/9b019288-0df7-4f5b-9faf-c27aea78e948.json

@@ -0,0 +1 @@
+[1,["1fq2Q2qiFPYIyw1U2jaJQo"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"bg3","rect":[0,0,97,26],"offset":[0,0],"originalSize":[97,26],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/aa/aa6b0e5b-6f90-4dfc-8309-f0e8af548ade.json

@@ -0,0 +1 @@
+[1,["d9SJCRh+JIM49YmxUL5S7h"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"bg4","rect":[0,0,304,70],"offset":[0,0],"originalSize":[304,70],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/b3/b30df4d5-116b-40ae-b30e-f826be09e5cd.json

@@ -0,0 +1 @@
+[1,["dcITw0RpBFVq0aaNc8jy7z"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"gou","rect":[0,0,30,27],"offset":[0,0],"originalSize":[30,27],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/bb/bb96797f-a651-41e3-ab7f-cceb4747352a.json

@@ -0,0 +1 @@
+[1,["0cMNEU6oZMKLJAy8tb3Crq"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"bg2","rect":[0,0,109,122],"offset":[0,0],"originalSize":[109,122],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/cc/cc0a06a5-c8da-4009-bce9-866e58d64796.json

@@ -0,0 +1 @@
+[1,["3bxioUQhBH/a8amIxY9mKn"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"bg1","rect":[0,0,486,154],"offset":[0,0],"originalSize":[486,154],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/d9/d9489091-87e2-4833-8f58-9b150be52ee1.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/dc/dc213c34-4690-4556-ad1a-68d73c8f2ef3.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

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

@@ -10,7 +10,7 @@ UM_SECRET="";       //友盟秘钥
 WX_APP_ID="wxd98fe9d52af10e59"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u5f00\u519c\u573a\u5f53\u9996\u5bcc
 PACKAGE_NAME=com.aries.kncdsf.mz
-VERSION_NAME=1.1.3
+VERSION_NAME=1.1.4
 VERSION_CODE=1
 TOPON="a60af425829e4e,66b742dd0e502b64d783d9c66a9d30c4,b60af42bb7253c,b60af42bbb9a8a,b60af42bc3ee53,b60af42bba453f,b60af42bc9e854,b60af42bc0de73,b6167ea26616bf"; //巨量渠道topon的 AppId,AppSecreate,激励视频，插屏，信息流，开屏,banner,全屏,大插屏
-APP_CONFIG_CODE="1.1.3"
+APP_CONFIG_CODE="1.1.4"

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