11

assets/resources/module/speedUpUI/speedUp.prefab

@@ -3337,7 +3337,7 @@
       "__id__": 2
     },
     "open_effect": 1,
-    "isOpenCloseEffect": true,
+    "isOpenCloseEffect": false,
     "close_effect": 1,
     "close_toPoint": "",
     "close_uibg": false,

assets/script/before/main/FactorySystem.ts

@@ -49,4 +49,17 @@ export default class FactorySystem {
             }
         }
     }
+
+    canSpeedUp() {
+        let can = false;
+        let len = this.factoryIcons.length;
+        for (var i = 0; i < len; i++) {
+            if (this.factoryIcons[i].data.state == FactroyState.Producting) {
+                can = true;
+                break;
+            }
+        }
+
+        return can;
+    }
 }

assets/script/before/main/FarmSystem.ts

@@ -76,5 +76,18 @@ export class FarmSystem {
             }
         }
     }
+
+    public canSpeedUp() {
+        let can = false;
+        let len = this.farms.length;
+        for (let i = 0; i < len; i++) {
+            if (this.farms[i].data.state == FarmState.Growing) {
+                can = true;
+                break;
+            }
+        }
+
+        return can;
+    }
 }
 

assets/script/before/main/PastureSystem.ts

@@ -52,4 +52,17 @@ export default class PastureSystem {
             }
         }
     }
+
+    canSpeedUp() {
+        let can = false;
+        let len = this.pastureIcons.length;
+        for (var i = 0; i < len; i++) {
+            if (this.pastureIcons[i].data.state == PastureState.Growing) {
+                can = true;
+                break;
+            }
+        }
+
+        return can;
+    }
 }

assets/script/before/map/MapMove.ts

@@ -116,6 +116,8 @@ export class MapMove extends cc.Component {
     }
 
     private clickSpeedup() {
+        
+        mk.ui.openPanel('module/speedUpUI/speedUp');
         mk.data.sendDataEvent(DataEventId.button_click, "全体加速icon");
     }
 }

assets/script/game/data/GameData.ts

@@ -980,6 +980,19 @@ export class GameData {
         }
     }
 
+    checkCanSpeedUp() {
+        let can = false;
+        can = gData.farmSystem.canSpeedUp();
+        if (!can) {
+            can = gData.pastureSystem.canSpeedUp();
+            if (!can) {
+                can = gData.factorySystem.canSpeedUp();
+            }
+        }
+
+        return can;
+    }
+
     setHarvest() {
         gData.farmSystem.setHarvest();
         gData.pastureSystem.setHarvest();

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

@@ -72,13 +72,12 @@ export default class SpeedUpUI extends cc.Component {
 
     private clickWatchVideoBtn() {
         mk.audio.playEffect("button");
-
+        mk.ui.closePanel(this.node.name);
         mk.ad.videoAdType = VideoAdType.video_init_14;
         mk.ad.watchAd((success) => {
             if (success) {
                 gData.adData.watchVideo(null);
                 gData.gameData.setHarvest();
-                mk.ui.closePanel(this.node.name);
                 mk.tip.pop('加速成功！');
             }
         })