diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index f5ea2a9..404df62 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -1225,14 +1225,13 @@ export default class MapConroler extends cc.Component { if (wall[0].getChildByName("wall").getComponent("Wall").special == special) { wallArray.push(i); for (let k = 0; k < wall.length; k++) { - wall[k].getChildByName("wall").getComponent("Wall").special = 0; + wall[k].getChildByName("wall").getComponent("Wall").special = wall[k].getChildByName("wall").getComponent("Wall").specialBackup; wall[k].getChildByName("wall").getComponent("Wall").changeRevolvingWall(); } } } for (let j = 0; j < wallArray.length; j++) { - if (wallArray[j] < (this.revolvingWallArray.length - 1)) { let wall2 = this.revolvingWallArray[wallArray[j] + 1]; for (let k = 0; k < wall2.length; k++) { diff --git a/assets/Script/Wall.ts b/assets/Script/Wall.ts index b376295..95b55ae 100644 --- a/assets/Script/Wall.ts +++ b/assets/Script/Wall.ts @@ -133,6 +133,7 @@ export default class Wall extends cc.Component { longAndShort: number[] = []; // 长短变化的门 order: boolean = true; // 顺序门 length: number = 0; // 门的长度 + specialBackup: any; // 特殊门的备份,但是不备份 旋转门 // LIFE-CYCLE CALLBACKS: @@ -182,8 +183,15 @@ export default class Wall extends cc.Component { //this.node.getChildByName("num").getComponent(cc.Label).string = ":" + this.node.parent.zIndex; } if (wall_Info != null) { + this.specialBackup = 0; this.color = this.wall_Info.color; this.special = this.wall_Info.special; + if (this.special != WallSpecial.旋转门顺时针 && this.special != WallSpecial.旋转门逆时针) { + this.specialBackup = this.special; + } + else { + this.special = this.wall_Info.special; + } this.num = this.wall_Info.num; this.length = this.wall_Info.length; let name2 = "rotate" + this.wall_Info.length; @@ -493,6 +501,7 @@ export default class Wall extends cc.Component { resetFreeze() { this.special = 0; + this.specialBackup = 0; if (this.freezeNode) { cc.fx.AudioManager._instance.playEffect("freezeDoor", null); this.freezeNode.active = false; diff --git a/assets/Script/module/Tool/GameTool.ts b/assets/Script/module/Tool/GameTool.ts index ad5c0d4..85291de 100644 --- a/assets/Script/module/Tool/GameTool.ts +++ b/assets/Script/module/Tool/GameTool.ts @@ -399,8 +399,8 @@ var GameTool = { //关卡上限 maxLevel() { let jg = false; - if (cc.fx.GameConfig.GM_INFO.level > 669) { - cc.fx.GameConfig.GM_INFO.level = 670; + if (cc.fx.GameConfig.GM_INFO.level > 689) { + cc.fx.GameConfig.GM_INFO.level = 690; jg = true; } return jg; diff --git a/assets/Script/prop/Lock.ts b/assets/Script/prop/Lock.ts index ea02a31..e0aaa4b 100644 --- a/assets/Script/prop/Lock.ts +++ b/assets/Script/prop/Lock.ts @@ -43,6 +43,7 @@ export default class Lock extends cc.Component { } else if (this.type == "wall") { if (this.node.parent) this.node.parent.getChildByName("wall").getComponent("Wall").special = 0; + if (this.node.parent) this.node.parent.getChildByName("wall").getComponent("Wall").specialBackup = 0; } this.node.destroy(); this.node.removeFromParent();