diff --git a/libs/actions.js b/libs/actions.js index 0ec76d04..16b3baae 100644 --- a/libs/actions.js +++ b/libs/actions.js @@ -1760,7 +1760,7 @@ actions.prototype.clickSwitchs = function (x,y) { core.ui.drawSwitchs(); break; case 7: - core.setFlag('bigmapMoveDirectly', !core.getFlag('bigmapMoveDirectly', false)); + core.setFlag('clickMove', !core.getFlag('clickMove', true)); core.ui.drawSwitchs(); break; case 8: diff --git a/libs/control.js b/libs/control.js index db94bd37..65fe545a 100644 --- a/libs/control.js +++ b/libs/control.js @@ -447,7 +447,7 @@ control.prototype.setAutomaticRoute = function (destX, destY, stepPostfix) { // 单击瞬间移动 if (core.status.heroStop) { - if (core.control.tryMoveDirectly(destX, destY)) + if (stepPostfix.length<=1 && core.getFlag('clickMove', true) && core.control.tryMoveDirectly(destX, destY)) return; } diff --git a/libs/maps.js b/libs/maps.js index 9a319ca6..f0e40315 100644 --- a/libs/maps.js +++ b/libs/maps.js @@ -310,12 +310,6 @@ maps.prototype.canMoveDirectly = function (destX,destY) { var fromX = core.getHeroLoc('x'), fromY = core.getHeroLoc('y'); if (fromX==destX&&fromY==destY) return 0; - // 大地图且会改变左上角坐标,不能 - var sx = core.clamp(fromX-6,0,core.bigmap.width-13), sy = core.clamp(fromY-6,0,core.bigmap.height-13), - ex = core.clamp(destX-6,0,core.bigmap.width-13), ey = core.clamp(destY-6,0,core.bigmap.height-13); - - if (!core.hasFlag('bigmapMoveDirectly') && (sx!=ex || sy!=ey)) return -1; - // 无视起点事件 var nowBlockId = core.getBlockId(fromX, fromY); if ((nowBlockId!=null&&nowBlockId!='upFloor'&&nowBlockId!='downFloor'&&nowBlockId!='portal' diff --git a/libs/ui.js b/libs/ui.js index bdace20d..745ae1ad 100644 --- a/libs/ui.js +++ b/libs/ui.js @@ -823,7 +823,7 @@ ui.prototype.drawSwitchs = function() { "临界显伤: "+(core.flags.displayCritical ? "[ON]" : "[OFF]"), "领域显伤: "+(core.flags.displayExtraDamage ? "[ON]" : "[OFF]"), "新版存档: "+(core.platform.useLocalForage ? "[ON]":"[OFF]"), - "大地图瞬移:"+(core.hasFlag('bigmapMoveDirectly') ? "[ON]":"[OFF]"), + "单击瞬移: "+(core.getFlag('clickMove', true) ? "[ON]":"[OFF]"), "查看工程", "下载离线版本", "返回主菜单"