一键加速功能

assets/resources/animation/Main.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "492c72b5-4111-48c1-b67b-c5f32a220220",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/module/speedUpUI/speedUp.prefab

@@ -3203,10 +3203,12 @@
   },
   {
     "__type__": "cc.ClickEvent",
-    "target": null,
+    "target": {
+      "__id__": 1
+    },
     "component": "",
-    "_componentId": "0c4f2VNCqNOEaoWvFRThSJc",
-    "handler": "clickWatchVideo",
+    "_componentId": "ce0cbelBMNFhJhVPudbuSso",
+    "handler": "clickWatchVideoBtn",
     "customEventData": ""
   },
   {

assets/script/before/main/FactoryIcon.ts

@@ -147,14 +147,12 @@ export class FactoryIcon extends cc.Component {
     }
 
     onRipe() {
-        this._state = FactroyState.Ripe;
         this.data.state = FactroyState.Ripe;
         gData.gameData.setFactoryDataMap(this.configID, this.data);
         gData.gameData.addProductMakeTimesById(this.data.productID);
     }
 
     onSick() {
-        this._state = FactroyState.Sick;
         this.data.state = FactroyState.Sick;
         gData.gameData.setFactoryDataMap(this.configID, this.data);
     }

assets/script/before/main/FactorySystem.ts

@@ -40,4 +40,13 @@ export default class FactorySystem {
     public btnMake() {
         gData.gameData.nextMake.make(gData.gameData.nextCanProduct.picture);
     }
+
+    setHarvest() {
+        let len = this.factoryIcons.length;
+        for (var i = 0; i < len; i++) {
+            if (this.factoryIcons[i].data.state == FactroyState.Producting) {
+                this.factoryIcons[i].countDown.riped();
+            }
+        }
+    }
 }

assets/script/before/main/FarmCountDown.ts

@@ -97,7 +97,7 @@ export class FarmCountDown extends cc.Component {
         }
     }
 
-    private riped(): void {
+    public riped(): void {
         this.counting = false;
         this.normalGroup.active = false;
         if (Math.random() < 0.2) {

assets/script/before/main/FarmIcon.ts

@@ -182,14 +182,12 @@ export class FarmIcon extends cc.Component {
 
     /** 成熟 */
     public async onRiped() {
-        this._state = FarmState.Ripe;
         this.data.state = FarmState.Ripe;
         gData.gameData.setFarmDataMap(this.configID, this.data);
     }
 
     /** 生虫 */
     public onSick() {
-        this._state = FarmState.Sick;
         this.data.state = FarmState.Sick;
         gData.gameData.setFarmDataMap(this.configID, this.data);
     }

assets/script/before/main/FarmSystem.ts

@@ -51,7 +51,8 @@ export class FarmSystem {
 
     /**获取可种植农田 */
     private getCanPlantFarm(): FarmIcon | null {
-        for (let i = 0; i < this.farms.length; i++) {
+        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) {
                 gData.gameData.nextCanProduct = gData.gameData.getRandomPlantConfig();
                 gData.gameData.nextMake = this.farms[i];
@@ -65,5 +66,15 @@ export class FarmSystem {
     public btnMake() {
         gData.gameData.nextMake.plant(gData.gameData.nextCanProduct.picture);
     }
+
+    public setHarvest() {
+        let len = this.farms.length;
+        for (let i = 0; i < len; i++) {
+            if (this.farms[i].data.state == FarmState.Growing) {
+                this.farms[i].process.onSpeed();
+                this.farms[i].countDown.riped();
+            }
+        }
+    }
 }
 

assets/script/before/main/PastureIcon.ts

@@ -203,14 +203,12 @@ export default class PastureIcon extends cc.Component {
     }
 
     onRipe() {
-        this._state = PastureState.Ripe;
         this.data.state = PastureState.Ripe;
         gData.gameData.setPastureDataMap(this.configID, this.data);
         gData.gameData.addProductMakeTimesById(this.data.productID);
     }
 
     onSick() {
-        this._state = PastureState.Sick;
         this.data.state = PastureState.Sick;
         gData.gameData.setPastureDataMap(this.configID, this.data);
     }

assets/script/before/main/PastureSystem.ts

@@ -43,4 +43,13 @@ export default class PastureSystem {
     btnMake() {
         gData.gameData.nextMake.onEat();
     }
+
+    setHarvest() {
+        let len = this.pastureIcons.length;
+        for (var i = 0; i < len; i++) {
+            if (this.pastureIcons[i].data.state == PastureState.Growing) {
+                this.pastureIcons[i].countDown.riped();
+            }
+        }
+    }
 }

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

@@ -64,6 +64,7 @@ export default class ADClearSickPanel extends cc.Component {
             if (success) {
                 // gData.adUnlockData.unlockFarm();
                 gData.adClearSickData.clearSick();
+                gData.adData.watchVideo(null);
 
                 let des = '';
                 switch (gData.adClearSickData.tab) {

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

@@ -10,6 +10,7 @@ export default class ADUnlockPanel extends cc.Component {
         mk.ad.watchAd((success: boolean) => {
             mk.console.log("watchAD:" + success);
             if (success) {
+                gData.adData.watchVideo(null);
                 gData.adUnlockData.unlockFarm();
                 mk.ui.closePanel(this.node.name);
             }

assets/script/game/data/GameData.ts

@@ -944,6 +944,12 @@ export class GameData {
             }
         }
     }
+
+    setHarvest() {
+        gData.farmSystem.setHarvest();
+        gData.pastureSystem.setHarvest();
+        gData.factorySystem.setHarvest();
+    }
 }
 
 /**

assets/script/game/module/blessingBag/BlessingBag.ts

@@ -247,8 +247,8 @@ export default class BlessingBag extends cc.Component {
             mk.ad.watchAd((success: boolean) => {
                 mk.console.log("watchAD:" + success);
                 if (success) {
+                    gData.adData.watchVideo(null);
                     gData.blessingBag.addProgress();
-                    //gData.adData.watchVideo(AdFun.bigCash)
                 }
             });
             //} else {             

assets/script/game/module/farmMap/FarmItem.ts

@@ -158,6 +158,7 @@ export default class FarmItem extends cc.Component {
         mk.ad.videoAdType = VideoAdType.video_init_6;
         mk.ad.watchAd((success) => {
             if (success) {
+                gData.adData.watchVideo(null);
                 gData.farmMapData.isStateChange = true;
                 this.node_getBtn.active = true;
                 this.node_ungetBtn.active = false;

assets/script/game/module/gradeReward/GradeReward.ts

@@ -177,6 +177,7 @@ export class GradeReward extends cc.Component {
         mk.ad.watchAd((success: boolean) => {
             mk.console.log("watchAD:" + success);
             if (success) {
+                gData.adData.watchVideo(null);
                 gData.farmGradeData.addGradeExp(ExpAddType.EAT_video);            
             }
         });

assets/script/game/module/newCashUI/WalletCashOut.ts

@@ -228,6 +228,7 @@ export default class WalletCashOut extends cc.Component {
         mk.ad.watchAd((success: boolean) => {
             mk.console.log("watchAD:" + success);
             if (success) {
+                gData.adData.watchVideo(null);
                 gData.walletCashOutData.addProgress();
             }
         });

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

@@ -22,6 +22,7 @@ export default class ProductReward extends cc.Component {
         mk.ad.videoAdType = VideoAdType.video_init_16;
         mk.ad.watchAd((success: boolean) => {
             if (success) {
+                gData.adData.watchVideo(null);
                 gData.gameData.changeLeftTimes(parseInt(gData.gameData.configs.ServerConfig.ProductionAd));
             }
         })

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

@@ -76,7 +76,10 @@ export default class SpeedUpUI extends cc.Component {
         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('加速成功！');
             }
         })
     }