diff --git a/assets/Script/prop/Boom.ts b/assets/Script/prop/Boom.ts index 0b1c15e..2e663f2 100644 --- a/assets/Script/prop/Boom.ts +++ b/assets/Script/prop/Boom.ts @@ -59,6 +59,11 @@ export default class Boom extends cc.Component { updateTime() { if (MapConroler._instance.iceTrue() == true) return; if (MapConroler._instance.pause == true) return; + if (this.node.parent) { + if (this.node.parent.getComponent("Block").block_Info.floor) { + return; + } + } this.time--; NumberToImage.numberToImageNodes(this.time, 20, 8, "lock_", this.node.getChildByName("time"), false); if (this.time <= 0) { diff --git a/assets/Script/prop/Freeze.ts b/assets/Script/prop/Freeze.ts index 3a7d511..733c467 100644 --- a/assets/Script/prop/Freeze.ts +++ b/assets/Script/prop/Freeze.ts @@ -42,6 +42,11 @@ export default class Freeze extends cc.Component { } reduce(number) { + if (this.node.parent) { + if (this.node.parent.getComponent("Block").block_Info.floor) { + return; + } + } this.time -= number; if (this.time <= 0) this.time = 0 NumberToImage.numberToImageNodes(this.time, 40, 25, "ice_", this.node.getChildByName("time"), false); diff --git a/assets/custom/Json/level476.json b/assets/custom/Json/level476.json index 672db1f..9389bca 100644 --- a/assets/custom/Json/level476.json +++ b/assets/custom/Json/level476.json @@ -109,12 +109,13 @@ { "block": 3, "color": 6, - "type": 0, + "type": 6, "position": { "x": 60, "y": -180, "z": 0 }, + "boomTime": 15, "floor": 2, "floorTime": 10, "id": 270