diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index 1ac9d1b..576cf5d 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -170,7 +170,7 @@ export default class MapConroler extends cc.Component { revolving_state: number = 0;//是否是旋转门关卡,0:不是,1:顺时针旋转,2:逆时针旋转 revolvingWallArray: any; //旋转门数组 jumpWallArray: any; //跳跃门数组 - jump_state: number = 0;//跳跃门关卡的顺时针逆时针顺序,1:顺时针,2:逆时针 + jump_state: any;//跳跃门关卡的顺时针逆时针顺序,true:顺时针,false:逆时针,null则没有 hitSoundCount: number; hitSoundTime: number; hammerSpecial: boolean = false; @@ -190,6 +190,7 @@ export default class MapConroler extends cc.Component { private magicEffect1: cc.Node = null; // 第一套特效节点 private magicEffect2: cc.Node = null; // 第二套特效节点 questionArray: any[]; + jumpDirection: any; onLoad() { //以下为检验关卡 @@ -254,7 +255,7 @@ export default class MapConroler extends cc.Component { this.changeColor = false; this.floorMove = false; this.revolving_state = 0; - this.jump_state = 0; + this.jump_state = null; this.hitSoundCount = 0; this.hitSoundTime = 0; this.cityRank = cc.fx.GameConfig.GM_INFO.cityRank; @@ -873,7 +874,7 @@ export default class MapConroler extends cc.Component { if (this.revolving_state != 0) { this.createRevolvingWall(); } - if (this.jump_state != 0) { + if (this.jump_state != null) { this.createJumpWall(); } } @@ -1229,8 +1230,8 @@ export default class MapConroler extends cc.Component { else if (doorInfo[j].special == 5) { this.revolving_state = 2; } - else if (doorInfo[j].jump != undefined && doorInfo[j].jump != null) { - this.jump_state = doorInfo[j].jump; + else if (doorInfo[j].jumpDirection != undefined && doorInfo[j].jumpDirection != null) { + this.jump_state = doorInfo[j].jumpDirection; } wall.getComponent("Wall").init(doorInfo[j], null, null, null); this.wallArray.push(wall.parent); @@ -1327,10 +1328,10 @@ export default class MapConroler extends cc.Component { // 移动到下一组的位置 i += length; } - if (this.jump_state == 1) { + if (this.jump_state == true) { } //如果是逆时针 - else if (this.jump_state == 2) { + else if (this.jump_state == false) { let wallStart = this.jumpWallArray[0]; // 获取从索引1开始的剩余元素 const restOfArray = this.jumpWallArray.slice(1); @@ -1510,6 +1511,7 @@ export default class MapConroler extends cc.Component { } } return null; + } getMinAndMax(block) { @@ -1729,6 +1731,7 @@ export default class MapConroler extends cc.Component { return jg; } } + var recorder } if (pz == 0) jg = -1; @@ -1744,7 +1747,6 @@ export default class MapConroler extends cc.Component { } //粘合块解锁状态变化 this.changeAdhesive(); - console.log("粘合块处理完毕"); } changeFreeze() { diff --git a/assets/Script/module/Tool/GameTool.ts b/assets/Script/module/Tool/GameTool.ts index 5afa533..2e8c43c 100644 --- a/assets/Script/module/Tool/GameTool.ts +++ b/assets/Script/module/Tool/GameTool.ts @@ -443,8 +443,8 @@ var GameTool = { //关卡上限 maxLevel() { let jg = false; - if (cc.fx.GameConfig.GM_INFO.level > 1049) { - cc.fx.GameConfig.GM_INFO.level = 1050; + if (cc.fx.GameConfig.GM_INFO.level > 1099) { + cc.fx.GameConfig.GM_INFO.level = 1100; jg = true; } return jg; diff --git a/assets/custom/Json/level1051.json b/assets/custom/Json/level1051.json index 45631f5..7c247f0 100644 --- a/assets/custom/Json/level1051.json +++ b/assets/custom/Json/level1051.json @@ -43,7 +43,8 @@ "num": 10, "color": 10, "special": 0, - "jump": 1, + "jump": true, + "jumpDirection": true, "length": 2 }, {