发包

assets/script/before/GamePlay.ts

@@ -619,9 +619,9 @@ export default class GamePlay extends cc.Component {
         this.refreshGame();
 
         let level = gData.gameData.getProp(GameProp.levelNum);
-        if (level % 5 == 0) {
-            mk.ad.showInterAd(1);
-        }
+        // if (level % 5 == 0) {
+        //     mk.ad.showInterAd(1);
+        // }
 
         mk.data.sendDataEvent('TapChapter', `${level}`);
     }
@@ -718,7 +718,6 @@ export default class GamePlay extends cc.Component {
     /**游戏结束 */
     gameOver() {
         mk.data.setTAEventUser(1, 'video_play_time', 1);
-        gData.reward.subType = 2;
         mk.ad.videoAdType = VideoAdType.video_init_23;
         gData.adData.curRedBagAdFun = AdFun.settlement;
         mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');

assets/script/before/main/FarmCountDown.ts

@@ -55,6 +55,7 @@ export class FarmCountDown extends cc.Component {
         } else if (this.counting && now > this.ripeTime) {
             if (!this.isRipeInit) {
                 this.isRipeInit = true;
+                console.log('onRiped   start');
                 this.riped();
             }
         }
@@ -125,10 +126,12 @@ export class FarmCountDown extends cc.Component {
         }
 
         if (sick) {
+            console.log('onRiped   ' + 1111);
             this.sickIcon.active = true;
             this.onSick && this.onSick.emit([sendToServer]);
         }
         else {
+            console.log('onRiped   ' + 2222);
             this.ripedIcon.active = true;
             this.onRiped && this.onRiped.emit([sendToServer]);
         }

assets/script/before/main/FarmIcon.ts

@@ -179,6 +179,8 @@ export class FarmIcon extends cc.Component {
         //gData.gameData.nextMake = null;
         gData.gameData.setNextProduct(false);
 
+        gData.gameData.gameStyle.doCropFlyLogic(this.plantID);
+
         if (gData.harvestData.getType == 0) {
             gData.farmGradeData.addGradeExp(ExpAddType.EAT_harvest, this.node);
         }
@@ -215,7 +217,7 @@ export class FarmIcon extends cc.Component {
             this.plantIcon.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + this.plantID, cc.SpriteFrame);
             this.plantIcon.getComponent(cc.Animation).play();
             this.plantIcon.getComponent(cc.Animation).on(cc.Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
-            
+
             //this.doMakePlantFinishLogic();
             let flyRed = await gData.gameData.updateNewTaskProgress();
             return flyRed;
@@ -236,7 +238,8 @@ export class FarmIcon extends cc.Component {
     }
 
     /** 成熟 */
-    public async onRiped(sendToServer) {
+    public onRiped(sendToServer) {
+        console.log('onRiped   ' + this.configID);
         this.data.state = FarmState.Ripe;
         gData.gameData.setFarmDataMap(this.configID, this.data, sendToServer);
     }
@@ -249,14 +252,19 @@ export class FarmIcon extends cc.Component {
 
     private doMakePlantFinishLogic() {
         let config = gData.gameData.getProductMap(this.plantID);
-        if (mk.guide.getCurGuideIdString() == "10_2") {
-            this.data.growSpan = 0;
-            this.data.state = FarmState.Ripe;
-        } else {
-            let growSpan = Date.now() + config.time * 1000;
-            this.data.growSpan = growSpan;
-            this.data.state = FarmState.Growing;
-        }
+        // if (mk.guide.getCurGuideIdString() == "10_2") {
+        //     this.data.growSpan = 0;
+        //     this.data.state = FarmState.Ripe;
+        // } else {
+        //     let growSpan = Date.now() + config.time * 1000;
+        //     this.data.growSpan = growSpan;
+        //     this.data.state = FarmState.Growing;
+        // }
+
+        let growSpan = Date.now() + config.time * 1000;
+        this.data.growSpan = growSpan;
+        this.data.state = FarmState.Growing;
+
         this.data.productID = this.plantID;
         gData.gameData.setFarmDataMap(this.configID, this.data);
         gData.gameData.isProducting = false;

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

@@ -80,8 +80,6 @@ export default class HarvestData extends Data {
         gData.reward.adData = gData.harvestData.adData;
         // gData.reward.data = gData.harvestData.adData.videoRedMoney.videoRewardList;
 
-        gData.gameData.gameStyle.doCropFlyLogic(this.plantID);
-
         gData.reward.callback = gData.harvestData.call;
         mk.ui.openPanel('module/reward/reward');
 

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

@@ -21,12 +21,6 @@ export class RewardData extends Data {
 
     /** 回调函数 */
     public callback = null;
-    /**
-     * 气泡子红包类型
-     * - 1 主界面气泡、关卡气泡
-     * - 2 关卡消除
-     */
-    subType: number = 1;
 
     //reward界面关闭回调
     closeUICallBack: Function = null;

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

@@ -10272,6 +10272,7 @@ this.normalCount.string = e;
 this.normalProgress.fillRange = 1 - (this.ripeTime - t) / (1e3 * this.totleTime);
 } else if (this.counting && t > this.ripeTime && !this.isRipeInit) {
 this.isRipeInit = !0;
+console.log("onRiped   start");
 this.riped();
 }
 };
@@ -10325,9 +10326,11 @@ e = !0;
 gData.gameData.RawInsectCurArr[2]++;
 }
 if (e) {
+console.log("onRiped   1111");
 this.sickIcon.active = !0;
 this.onSick && this.onSick.emit([ t ]);
 } else {
+console.log("onRiped   2222");
 this.ripedIcon.active = !0;
 this.onRiped && this.onRiped.emit([ t ]);
 }
@@ -10976,6 +10979,7 @@ t = this.node.getChildByName("hb");
 this.node.removeChild(t);
 gData.gameData.setFarmDataMap(this.configID, this.data);
 gData.gameData.setNextProduct(!1);
+gData.gameData.gameStyle.doCropFlyLogic(this.plantID);
 0 == gData.harvestData.getType ? gData.farmGradeData.addGradeExp(s.ExpAddType.EAT_harvest, this.node) : gData.farmGradeData.addGradeExp(s.ExpAddType.EAT_others, this.node);
 gData.gameData.popTableScreenADLogic(7);
 mk.guide.open(16);
@@ -11036,28 +11040,18 @@ return [ 2, !1 ];
 });
 };
 e.prototype.onRiped = function(t) {
-return r(this, void 0, void 0, function() {
-return c(this, function() {
+console.log("onRiped   " + this.configID);
 this.data.state = s.FarmState.Ripe;
 gData.gameData.setFarmDataMap(this.configID, this.data, t);
-return [ 2 ];
-});
-});
 };
 e.prototype.onSick = function(t) {
 this.data.state = s.FarmState.Sick;
 gData.gameData.setFarmDataMap(this.configID, this.data, t);
 };
 e.prototype.doMakePlantFinishLogic = function() {
-var t = gData.gameData.getProductMap(this.plantID);
-if ("10_2" == mk.guide.getCurGuideIdString()) {
-this.data.growSpan = 0;
-this.data.state = s.FarmState.Ripe;
-} else {
-var e = Date.now() + 1e3 * t.time;
+var t = gData.gameData.getProductMap(this.plantID), e = Date.now() + 1e3 * t.time;
 this.data.growSpan = e;
 this.data.state = s.FarmState.Growing;
-}
 this.data.productID = this.plantID;
 gData.gameData.setFarmDataMap(this.configID, this.data);
 gData.gameData.isProducting = !1;
@@ -17662,7 +17656,6 @@ a.Inst.finalGetScore = 0;
 a.Inst.initScore();
 this.refreshGame();
 var t = gData.gameData.getProp(f.GameProp.levelNum);
-t % 5 == 0 && mk.ad.showInterAd(1);
 mk.data.sendDataEvent("TapChapter", "" + t);
 };
 e.prototype.refreshGame = function() {
@@ -17704,7 +17697,6 @@ this.gameOver();
 };
 e.prototype.gameOver = function() {
 mk.data.setTAEventUser(1, "video_play_time", 1);
-gData.reward.subType = 2;
 mk.ad.videoAdType = f.VideoAdType.video_init_23;
 gData.adData.curRedBagAdFun = m.AdFun.settlement;
 mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
@@ -21170,7 +21162,6 @@ gData.reward.data = gData.harvestData.adData.videoRedMoney.videoRewardList;
 gData.reward.addReward();
 } else {
 gData.reward.adData = gData.harvestData.adData;
-gData.gameData.gameStyle.doCropFlyLogic(this.plantID);
 gData.reward.callback = gData.harvestData.call;
 mk.ui.openPanel("module/reward/reward");
 1 == this.isCrops_ ? mk.data.sendDataEvent(l.DataEventId.button_click, "动物超级加倍收获") : 2 == this.isCrops_ && mk.data.sendDataEvent(l.DataEventId.button_click, "商品超级加倍收获");
@@ -31846,7 +31837,6 @@ var e = null !== t && t.apply(this, arguments) || this;
 e.add_redbag_value = 0;
 e._data = [];
 e.callback = null;
-e.subType = 1;
 e.closeUICallBack = null;
 e.isAddMoney = !1;
 return e;

packages-hot-update/cfg.json

@@ -12,7 +12,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/"
     ],
-    "buildTime": 1642757695728,
-    "genTime": 1642757695728,
+    "buildTime": 1642764729927,
+    "genTime": 1642764729927,
     "genVersion": null
 }