kaka hace 4 años
padre
commit
820f64ac0b

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
assets/resources/module/login/hot/project.manifest


+ 10 - 12
assets/script/before/view/uiItem/PlantItem.ts

@@ -170,21 +170,19 @@ export default class PlantItem extends cc.Component {
             gData.plantData.init_ani = true;
             let pos = this.nameIcon.node.parent.convertToWorldSpaceAR(this.nameIcon.node.getPosition());
             gData.gameData.gameStyle.dpFlyRedAni(pos);
-        }
 
-        let orderPlantTimes = gData.gameData.getProp(GameProp.orderPlantTimes);
 
-        if (orderPlantTimes[this.data.id] == undefined) {
-            orderPlantTimes[this.data.id] = 1;
-        }
-        else {
-            orderPlantTimes[this.data.id]++;
+            let orderPlantTimes = gData.gameData.getProp(GameProp.orderPlantTimes);
+            if (orderPlantTimes[this.data.id] == undefined) {
+                orderPlantTimes[this.data.id] = 1;
+            }
+            else {
+                orderPlantTimes[this.data.id]++;
+            }
+            gData.gameData.setProp(GameProp.orderPlantTimes, orderPlantTimes);
+            this.checkOrder();
+            mk.data.sendDataEvent('Plant', this.data.name);
         }
-
-        mk.data.sendDataEvent('Plant', this.data.name);
-
-        gData.gameData.setProp(GameProp.orderPlantTimes, orderPlantTimes);
-        this.checkOrder();
     }
 
     getDesByType() {

+ 8 - 2
assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -186,7 +186,6 @@ export default class NewOpenRedBag extends cc.Component {
 
     private async clickOpenBtn() {
         mk.audio.playEffect("button");
-        mk.ui.closePanel(this.name);
         if (this.sp_icon.node.active) {
             this.creatorDownLoadTask();
             switch (gData.moreGame.openType) {
@@ -204,6 +203,7 @@ export default class NewOpenRedBag extends cc.Component {
                     break;
             }
             gData.moreGame.openType = -1;
+            mk.ui.closePanel(this.name);
         }
         else {
             if (gData.adData.curRedBagAdFun == AdFun.harvest) {
@@ -240,14 +240,18 @@ export default class NewOpenRedBag extends cc.Component {
                     });
                 }
                 else {
+                    if (gData.adData.curRedBagAdFun == AdFun.settlement) {
+                        GamePlay.Inst.nextLevel();
+                    }
                     gData.adData.curRedBagAdFun = null;
+
+                    mk.ui.closePanel(this.node.name);
                 }
             });
         }
     }
 
     private clickCloseBtn() {
-        // mk.audio.playEffect("closeButton");
         gData.adData.checkShowFullInter(1, InterFullAdType.interstitial2_init_1);
 
         if (gData.adData.curRedBagAdFun == AdFun.settlement) {
@@ -255,6 +259,8 @@ export default class NewOpenRedBag extends cc.Component {
         }
 
         gData.adData.curRedBagAdFun = null;
+
+        mk.ui.closePanel(this.node.name);
     }
 
     cool = false

BIN
build/jsb-link/assets/main/index.jsc


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
build/jsb-link/assets/resources/config.json


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest


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

@@ -27291,7 +27291,6 @@ return c(this, function(a) {
 switch (a.label) {
 case 0:
 mk.audio.playEffect("button");
-mk.ui.closePanel(this.name);
 if (!this.sp_icon.node.active) return [ 3, 1 ];
 this.creatorDownLoadTask();
 switch (gData.moreGame.openType) {
@@ -27311,6 +27310,7 @@ case 3:
 mk.data.sendDataEvent(d.DataEventId.htRedBag_eject, "关闭农场等级奖励界面-领取");
 }
 gData.moreGame.openType = -1;
+mk.ui.closePanel(this.name);
 return [ 3, 4 ];
 
 case 1:
@@ -27357,7 +27357,9 @@ a.sent();
 return [ 3, 3 ];
 
 case 2:
+gData.adData.curRedBagAdFun == u.AdFun.settlement && s.default.Inst.nextLevel();
 gData.adData.curRedBagAdFun = null;
+mk.ui.closePanel(this.node.name);
 a.label = 3;
 
 case 3:
@@ -27378,6 +27380,7 @@ e.prototype.clickCloseBtn = function() {
 gData.adData.checkShowFullInter(1, d.InterFullAdType.interstitial2_init_1);
 gData.adData.curRedBagAdFun == u.AdFun.settlement && s.default.Inst.nextLevel();
 gData.adData.curRedBagAdFun = null;
+mk.ui.closePanel(this.node.name);
 };
 e.prototype.creatorDownLoadTask = function() {
 if (!this.cool) {
@@ -29108,11 +29111,11 @@ if ("0" == gData.gameData.funOpenData[4]) return [ 2 ];
 gData.plantData.init_ani = !0;
 e = this.nameIcon.node.parent.convertToWorldSpaceAR(this.nameIcon.node.getPosition());
 gData.gameData.gameStyle.dpFlyRedAni(e);
-}
 null == (a = gData.gameData.getProp(l.GameProp.orderPlantTimes))[this.data.id] ? a[this.data.id] = 1 : a[this.data.id]++;
-mk.data.sendDataEvent("Plant", this.data.name);
 gData.gameData.setProp(l.GameProp.orderPlantTimes, a);
 this.checkOrder();
+mk.data.sendDataEvent("Plant", this.data.name);
+}
 return [ 2 ];
 }
 });

+ 2 - 2
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": 1642746438561,
-    "genTime": 1642746438561,
+    "buildTime": 1642749610029,
+    "genTime": 1642749610029,
     "genVersion": null
 }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
packages-hot-update/manifest/project.manifest


BIN
packages-hot-update/versions/ver_1_0.13.zip


Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio