This commit is contained in:
ckcz123 2019-04-05 20:20:35 +08:00
parent 6e66af683f
commit 3ee88eddea
2 changed files with 13 additions and 3 deletions

View File

@ -891,6 +891,7 @@ actions.prototype._clickAction = function (x, y) {
core.doAction(); core.doAction();
} }
} }
return;
} }
if (core.status.event.data.type == 'confirm') { if (core.status.event.data.type == 'confirm') {
@ -904,6 +905,7 @@ actions.prototype._clickAction = function (x, y) {
core.insertAction(core.status.event.ui.no); core.insertAction(core.status.event.ui.no);
core.doAction(); core.doAction();
} }
return;
} }
} }
@ -911,10 +913,12 @@ actions.prototype._clickAction = function (x, y) {
actions.prototype._keyDownAction = function (keycode) { actions.prototype._keyDownAction = function (keycode) {
if (core.status.event.data.type == 'choices') { if (core.status.event.data.type == 'choices') {
this._keyDownChoices(keycode); this._keyDownChoices(keycode);
return;
} }
if (core.status.event.data.type == 'confirm' && (keycode == 37 || keycode == 39)) { if (core.status.event.data.type == 'confirm' && (keycode == 37 || keycode == 39)) {
core.status.event.selection = 1 - core.status.event.selection; core.status.event.selection = 1 - core.status.event.selection;
core.drawConfirmBox(core.status.event.ui.text); core.drawConfirmBox(core.status.event.ui.text);
return;
} }
} }
@ -984,6 +988,7 @@ actions.prototype._clickBook = function (x, y) {
var index = this.HSIZE * page + parseInt(y / 2); var index = this.HSIZE * page + parseInt(y / 2);
core.ui.drawBook(index); core.ui.drawBook(index);
core.ui.drawBookDetail(index); core.ui.drawBookDetail(index);
return;
} }
return; return;
} }
@ -1127,17 +1132,20 @@ actions.prototype._clickViewMaps = function (x, y) {
index++; index++;
if (index < core.floorIds.length) if (index < core.floorIds.length)
core.ui.drawMaps(index); core.ui.drawMaps(index);
return;
} }
else if (y >= this.HSIZE + 2 && (mh == this.SIZE || (x >= per && x <= this.LAST - per))) { if (y >= this.HSIZE + 2 && (mh == this.SIZE || (x >= per && x <= this.LAST - per))) {
index--; index--;
while (index >= 0 && index != now && core.status.maps[core.floorIds[index]].cannotViewMap) while (index >= 0 && index != now && core.status.maps[core.floorIds[index]].cannotViewMap)
index--; index--;
if (index >= 0) if (index >= 0)
core.ui.drawMaps(index); core.ui.drawMaps(index);
return;
} }
else if (x >= per && x <= this.LAST - per && y >= this.HSIZE - 1 && y <= this.HSIZE + 1) { if (x >= per && x <= this.LAST - per && y >= this.HSIZE - 1 && y <= this.HSIZE + 1) {
core.clearMap('data'); core.clearMap('data');
core.ui.closePanel(); core.ui.closePanel();
return;
} }
} }
@ -1243,7 +1251,9 @@ actions.prototype._clickQuickShop = function (x, y) {
// 离开 // 离开
else if (y == topIndex + keys.length) else if (y == topIndex + keys.length)
core.ui.closePanel(); core.ui.closePanel();
return;
} }
return;
} }
////// 快捷商店界面时,放开某个键的操作 ////// ////// 快捷商店界面时,放开某个键的操作 //////

View File

@ -377,7 +377,7 @@ events.prototype.openDoor = function (x, y, needKey, callback) {
events.prototype._openDoor_check = function (id, x, y, needKey) { events.prototype._openDoor_check = function (id, x, y, needKey) {
// 是否存在门或暗墙 // 是否存在门或暗墙
if (!core.terrainExists(x, y, id) || !(id.endsWith("Door") || id.endsWith("Wall")) if (!core.terrainExists(x, y, id) || !(id.endsWith("Door") || id.endsWith("Wall"))
|| !core.material.icons.animates[id]) { || core.material.icons.animates[id] == null) {
core.clearContinueAutomaticRoute(); core.clearContinueAutomaticRoute();
return false; return false;
} }