diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index 10281b2..b5afa2d 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -2145,13 +2145,7 @@ export default class MapConroler extends cc.Component { } cc.fx.GameTool.shushu_Track("finish_stage", data); - if (cc.fx.GameConfig.GM_INFO.otherLevel == 0) { - let data2 = { - is_frenzy: this.is_frenzy, - count: cc.fx.GameConfig.GM_INFO.winStreak - } - cc.fx.GameTool.shushu_Track("hammer_frenzy", data2); - } + //// if (cc.fx.GameConfig.GM_INFO.winStreak < 10 || cc.fx.GameConfig.GM_INFO.otherLevel > 0) { // if (cc.fx.GameConfig.GM_INFO.revive == 0 && this.revive) { @@ -2695,7 +2689,7 @@ export default class MapConroler extends cc.Component { return; } this.lastHammerTime = Date.now(); - if (this.magicMask.active == true || this.timeNumber <= 1 || this.gameOver || this.gameWin) { + if ((this.magicMask.active == true && this.magicMask.opacity == 254) || this.timeNumber <= 1 || this.gameOver || this.gameWin) { return; } let hammerBtn = this.node.parent.getChildByName("Bottom").getChildByName("destroyBtn"); @@ -2872,6 +2866,7 @@ export default class MapConroler extends cc.Component { } const timestamp = Date.now(); this.magicMask.active = true; + this.magicMask.opacity = 254; setTimeout(() => { // this.magicMask.active = true; ////false // magicBtn.getComponent("btnControl").setTouch(true); diff --git a/assets/Script/SceneManager.ts b/assets/Script/SceneManager.ts index da715da..138d521 100644 --- a/assets/Script/SceneManager.ts +++ b/assets/Script/SceneManager.ts @@ -236,7 +236,7 @@ export default class SceneManager extends cc.Component { is_frenzy: MapConroler._instance.is_frenzy, count: cc.fx.GameConfig.GM_INFO.winStreak } - cc.fx.GameTool.shushu_Track("hammer_frenzy", data2); + // cc.fx.GameTool.shushu_Track("hammer_frenzy", data2); } } diff --git a/assets/Script/module/Tool/GameTool.ts b/assets/Script/module/Tool/GameTool.ts index 958103c..cc99a0c 100644 --- a/assets/Script/module/Tool/GameTool.ts +++ b/assets/Script/module/Tool/GameTool.ts @@ -387,7 +387,7 @@ var GameTool = { is_frenzy: is_frenzy, count: cc.fx.GameConfig.GM_INFO.winStreak } - cc.fx.GameTool.shushu_Track("hammer_frenzy", data2); + // cc.fx.GameTool.shushu_Track("hammer_frenzy", data2); MiniGameSdk.API.shushu_SetSuperProperties(null); } @@ -954,12 +954,7 @@ var GameTool = { success: data.success || null, //被帮助关卡是否成功 } break; - case "hammer_frenzy": - eventData = { - is_frenzy: data.is_frenzy, - count: data.count - } - break; + case "daily_task": eventData = { task_id: data.id, diff --git a/assets/share/share.png.meta b/assets/share/share.png.meta index cd7f215..b680c8d 100644 --- a/assets/share/share.png.meta +++ b/assets/share/share.png.meta @@ -8,8 +8,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 1630, - "height": 172, + "width": 1020, + "height": 983, "platformSettings": {}, "subMetas": {} } \ No newline at end of file