diff --git a/assets/Script/Block.ts b/assets/Script/Block.ts index ec4c9d9..cf7e670 100644 --- a/assets/Script/Block.ts +++ b/assets/Script/Block.ts @@ -1500,8 +1500,6 @@ export default class Block extends cc.Component { else { MapConroler._instance.costHammer(); } - MapConroler._instance.usePause(); - return false; } this.startPos = this.node.position; @@ -2084,7 +2082,7 @@ export default class Block extends cc.Component { // 与eliminate(魔法棒)的区别:锤子消除有更长的动画和震动效果 // 处理流程: // 1. 清除定时器 - // 2. 设置暂停状态,标记被锤子消除 + // 2. 标记被锤子消除,保留当前计时状态 // 3. 如果是锤子模式(ishammer): // a. 计算锤子落点位置(根据方块锚点anchorX不同而不同) // b. 延时300ms后播放锤子音效 @@ -2110,7 +2108,6 @@ export default class Block extends cc.Component { let self = this; this.isEliminatedByHammer = true; //锤子状态消失 - if (MapConroler && MapConroler._instance) MapConroler._instance.pause = true; if (MapConroler._instance.ishammer == true) { let parentSize = this.node.getContentSize(); setTimeout(() => { diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index 7d8b1f8..4ac4093 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -6044,8 +6044,6 @@ export default class MapConroler extends cc.Component { this.hammerMask.active = true; this.hammer = true; this.ishammer = true; - this.stopBoom(); - this.pause = true; // this.hammerLabel.string = cc.fx.GameConfig.GM_INFO.hammerAmount.toString(); if (this.guideHammerPending) this.destroyPropGuideMask(); return true; @@ -6073,12 +6071,6 @@ export default class MapConroler extends cc.Component { this.hammer = false; this.ishammer = false; - if (this.iceTrue() == false && !this.isPauseOpen() && !this.shopPause) { - this.pause = false; - if (this.gameStart == true) this.startBoom(); - } - - // 如果是使用连胜免费锤子,则不隐藏按钮并恢复其状态 if (this.hammerSpecial) { // console.log("取消的是连胜免费锤子"); diff --git a/assets/Script/module/Config/GameConfig.ts b/assets/Script/module/Config/GameConfig.ts index 0fd7d0b..efd5f02 100644 --- a/assets/Script/module/Config/GameConfig.ts +++ b/assets/Script/module/Config/GameConfig.ts @@ -718,7 +718,7 @@ export class GameConfig { vibrateOpen: true, //震动 coinnum: 0, //每局的金币数 paid_user: false, //是否是付费用户 - version: "1.0.59", //版本号 + version: "1.0.60", //版本号 shushu_DistinctId: "", //数数访客ID shushu_AccountId: "", //数数账号ID uid: "", //用户和后端唯一id diff --git a/tools/test-prop-guide.cjs b/tools/test-prop-guide.cjs index a45ce18..d6d3e3f 100644 --- a/tools/test-prop-guide.cjs +++ b/tools/test-prop-guide.cjs @@ -176,7 +176,7 @@ test('guide hammer cannot be cancelled after GuideMask is destroyed; striking cl assert.equal(map.ishammer, true); assert.equal(map.hammerMask.active, true); assert.equal(gameNode.getChildByName('Mask').active, true); - assert.equal(map.pause, true); + assert.equal(map.pause, false); assert.equal(info.hammerAmount, 3); map.costHammer(); // The valid block hit calls this existing consumption entry point.