diff --git a/libs/control.js b/libs/control.js index 86dc36f9..18b1af11 100644 --- a/libs/control.js +++ b/libs/control.js @@ -1168,9 +1168,11 @@ control.prototype.checkBlock = function () { // 追猎需要等待阻击完成,避免发生碰撞导致怪物消失 先清理四周追猎,追猎移动,再清理一轮四周的追猎 const currChase = core.status.checkBlock.chase[loc]; if (currChase && currChase.length > 0) { - const adjacentChase = core.checkBlock_adjacentChase(); - if (adjacentChase && adjacentChase.length > 0) core.push(actions, adjacentChase); - // core.push(actions, { "type": "function", "async": true, "function": "function(){\ncore.checkBlock_adjacentChase();\n}" }); + if (actions.length === 0) { + const adjacentChase = core.checkBlock_adjacentChase(); + if (adjacentChase && adjacentChase.length > 0) core.push(actions, adjacentChase); + } + else core.push(actions, { "type": "function", "async": true, "function": "function(){\ncore.checkBlock_adjacentChase(true);\n}" }); } const chaseAction = this._checkBlock_chase(currChase); if (chaseAction.length > 0) core.push(actions, chaseAction); diff --git a/project/floors/MT0.js b/project/floors/MT0.js index 088ced9e..321cc315 100644 --- a/project/floors/MT0.js +++ b/project/floors/MT0.js @@ -14,12 +14,12 @@ main.floors.MT0= [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 1, 0, 0, 0,201, 0, 0,201, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0,201, 0, 0, 0], - [ 0, 1, 0, 0, 0, 57, 0, 0,203, 0, 0, 0, 0], - [ 0, 0, 1, 0, 37, 35, 12, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0,201,202, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], @@ -38,56 +38,14 @@ main.floors.MT0= } ], "parallelDo": "", - "events": { - "6,8": [ - { - "type": "setValue", - "name": "item:poisonWine", - "value": "2" - }, - { - "type": "setValue", - "name": "item:yellowKey", - "value": "99" - }, - { - "type": "setValue", - "name": "item:silverCoin", - "value": "999" - }, - { - "type": "comment", - "text": "unlockControl" - } - ], - "3,8": [ - { - "type": "moveHero", - "steps": [ - "up:8" - ] - } - ] - }, + "events": {}, "changeFloor": {}, "afterBattle": {}, "afterGetItem": {}, "afterOpenDoor": {}, "cannotMove": {}, "bgmap": [ - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [167,167,167,167,167,167,167,167,167,167,167,167,167], - [ 0, 0,167, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0,167, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + ], "fgmap": [