修改一键生产只生产农作物

assets/script/game/data/GameData.ts

@@ -135,6 +135,8 @@ export class GameData {
     //全屏插屏展示开关
     public fullScreenAdSwitch: string[] = [];
 
+    //是否在做订单刷新动画
+    public isDoOrderRefreshAni: boolean = false;
     /**
      * 初始化游戏数据：网络配置信息，用户信息
      * @returns 
@@ -916,20 +918,22 @@ export class GameData {
             //     this.doJudgeOrderLogic(haveEmpty);
             // }
             //let next1 = gData.pastureSystem.nextPasture(haveEmpty);
-            let next1 = gData.pastureSystem.nextPastureExtra();
-            if (!next1) {
-                //let next2 = gData.factorySystem.nextFactory(haveEmpty);
-                let next2 = gData.factorySystem.nextFactoryExtra();
-                if (!next2) {
-                    this.nextType = 0;
-                }
-                else {
-                    //this.nextType = 3;
-                }
-            }
-            else {
-                //this.nextType = 2;
-            }
+
+            // let next1 = gData.pastureSystem.nextPastureExtra();
+            // if (!next1) {
+            //     //let next2 = gData.factorySystem.nextFactory(haveEmpty);
+            //     let next2 = gData.factorySystem.nextFactoryExtra();
+            //     if (!next2) {
+            //         this.nextType = 0;
+            //     }
+            //     else {
+            //         //this.nextType = 3;
+            //     }
+            // }
+            // else {
+            //     //this.nextType = 2;
+            // }
+            this.nextType = 0;
         }
         else {
             //this.nextType = 1;
@@ -2084,9 +2088,9 @@ class PlayerProp {
         gData.gameData.init_wallet_redMoney = true;
         mk.event.emit('refreshCoin');
 
-        if(this._redMoney >= 300000){
+        if(!mk.guide.isGuideComplete() && this._redMoney >= 300000){
             let isHaveUI = mk.ui.isPopPanel();
-            if(!isHaveUI){
+            if(!isHaveUI && !gData.gameData.isDoOrderRefreshAni){
                 mk.guide.open(13);
             }    
         }

assets/script/game/game/Game.ts

@@ -1131,6 +1131,7 @@ export default class Game extends cc.Component {
         mk.ui.openPanel('module/reward/reward');
 
         if(isGame){
+            gData.gameData.isDoOrderRefreshAni = true;
             this.node_crop.forEach((v) => {
                 v.active = false;
             })
@@ -1156,6 +1157,7 @@ export default class Game extends cc.Component {
     }
 
     public showRefreshLogic() {
+        gData.gameData.isDoOrderRefreshAni = false;
         this.node_crop.forEach((v) => {
             v.active = true;
         })