Merge branch 'v2.x' into refactoring-editor
This commit is contained in:
commit
cbf3dfbc36
@ -1253,7 +1253,7 @@ actions.prototype._clickShop = function (x, y) {
|
|||||||
|
|
||||||
actions.prototype._keyDownShop = function (keycode) {
|
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);
|
this._selectChoices(core.status.event.data.shop.choices.length + 1, keycode, this._clickShop);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -1266,7 +1266,7 @@ actions.prototype._keyUpShop = function (keycode) {
|
|||||||
core.events._exitShop();
|
core.events._exitShop();
|
||||||
return;
|
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);
|
this._selectChoices(core.status.event.data.shop.choices.length + 1, keycode, this._clickShop);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user