Merge branch 'v2.x' into refactoring-editor

This commit is contained in:
oc 2019-05-04 23:30:54 +08:00
commit cbf3dfbc36

View File

@ -1253,7 +1253,7 @@ actions.prototype._clickShop = function (x, y) {
actions.prototype._keyDownShop = function (keycode) {
// 商店界面长按空格连续购买
if (keycode == 32) {
if (keycode == 32 && core.status.event.selection != core.status.event.data.shop.choices.length) {
this._selectChoices(core.status.event.data.shop.choices.length + 1, keycode, this._clickShop);
return;
}
@ -1266,7 +1266,7 @@ actions.prototype._keyUpShop = function (keycode) {
core.events._exitShop();
return;
}
if (keycode != 32) {
if (keycode != 32 || core.status.event.selection == core.status.event.data.shop.choices.length) {
this._selectChoices(core.status.event.data.shop.choices.length + 1, keycode, this._clickShop);
return;
}