yangzhao/MatchMaster
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新使用锤子时不 暂停时间

Browse Source
This commit is contained in:
COMPUTER\EDY 2026-09-18 11:06:25 +08:00
parent 9ae6b0e6af
commit fdd3d748f4
4 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/Script/Block.ts
View File

@ -1500,8 +1500,6 @@ export default class Block extends cc.Component {
else { else {
MapConroler._instance.costHammer(); MapConroler._instance.costHammer();
} }
MapConroler._instance.usePause();
return false; return false;
} }
this.startPos = this.node.position; this.startPos = this.node.position;
@ -2084,7 +2082,7 @@ export default class Block extends cc.Component {
// 与eliminate(魔法棒)的区别：锤子消除有更长的动画和震动效果 // 与eliminate(魔法棒)的区别：锤子消除有更长的动画和震动效果
// 处理流程： // 处理流程：
// 1. 清除定时器 // 1. 清除定时器
// 2. 设置暂停状态，标记被锤子消除 // 2. 标记被锤子消除，保留当前计时状态
// 3. 如果是锤子模式(ishammer)： // 3. 如果是锤子模式(ishammer)：
// a. 计算锤子落点位置（根据方块锚点anchorX不同而不同） // a. 计算锤子落点位置（根据方块锚点anchorX不同而不同）
// b. 延时300ms后播放锤子音效 // b. 延时300ms后播放锤子音效
@ -2110,7 +2108,6 @@ export default class Block extends cc.Component {
let self = this; let self = this;
this.isEliminatedByHammer = true; this.isEliminatedByHammer = true;
//锤子状态消失 //锤子状态消失
if (MapConroler && MapConroler._instance) MapConroler._instance.pause = true;
if (MapConroler._instance.ishammer == true) { if (MapConroler._instance.ishammer == true) {
let parentSize = this.node.getContentSize(); let parentSize = this.node.getContentSize();
setTimeout(() => { setTimeout(() => {

8
assets/Script/Map.ts
View File

@ -6044,8 +6044,6 @@ export default class MapConroler extends cc.Component {
this.hammerMask.active = true; this.hammerMask.active = true;
this.hammer = true; this.hammer = true;
this.ishammer = true; this.ishammer = true;
this.stopBoom();
this.pause = true;
// this.hammerLabel.string = cc.fx.GameConfig.GM_INFO.hammerAmount.toString(); // this.hammerLabel.string = cc.fx.GameConfig.GM_INFO.hammerAmount.toString();
if (this.guideHammerPending) this.destroyPropGuideMask(); if (this.guideHammerPending) this.destroyPropGuideMask();
return true; return true;
@ -6073,12 +6071,6 @@ export default class MapConroler extends cc.Component {
this.hammer = false; this.hammer = false;
this.ishammer = false; this.ishammer = false;
if (this.iceTrue() == false && !this.isPauseOpen() && !this.shopPause) {
this.pause = false;
if (this.gameStart == true) this.startBoom();
}
// 如果是使用连胜免费锤子，则不隐藏按钮并恢复其状态 // 如果是使用连胜免费锤子，则不隐藏按钮并恢复其状态
if (this.hammerSpecial) { if (this.hammerSpecial) {
// console.log("取消的是连胜免费锤子"); // console.log("取消的是连胜免费锤子");

2
assets/Script/module/Config/GameConfig.ts
View File

@ -718,7 +718,7 @@ export class GameConfig {
vibrateOpen: true, //震动 vibrateOpen: true, //震动
coinnum: 0, //每局的金币数 coinnum: 0, //每局的金币数
paid_user: false, //是否是付费用户 paid_user: false, //是否是付费用户
version: "1.0.59", //版本号 version: "1.0.60", //版本号
shushu_DistinctId: "", //数数访客ID shushu_DistinctId: "", //数数访客ID
shushu_AccountId: "", //数数账号ID shushu_AccountId: "", //数数账号ID
uid: "", //用户和后端唯一id uid: "", //用户和后端唯一id

2
tools/test-prop-guide.cjs
View File

@ -176,7 +176,7 @@ test('guide hammer cannot be cancelled after GuideMask is destroyed; striking cl
assert.equal(map.ishammer, true); assert.equal(map.ishammer, true);
assert.equal(map.hammerMask.active, true); assert.equal(map.hammerMask.active, true);
assert.equal(gameNode.getChildByName('Mask').active, true); assert.equal(gameNode.getChildByName('Mask').active, true);
assert.equal(map.pause, true); assert.equal(map.pause, false);
assert.equal(info.hammerAmount, 3); assert.equal(info.hammerAmount, 3);
map.costHammer(); // The valid block hit calls this existing consumption entry point. map.costHammer(); // The valid block hit calls this existing consumption entry point.