jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge branch 'v2.x'

Browse Source
This commit is contained in:
oc 2019-05-04 23:31:19 +08:00
commit e0060cc486
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/actions.js
View File

@ -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;
} }

4
libs/ui.js
View File

@ -2032,7 +2032,7 @@ ui.prototype._drawEquipbox_description = function (info, max_height) {
this._drawEquipbox_drawStatusChanged(info, curr, equip, equipType); this._drawEquipbox_drawStatusChanged(info, curr, equip, equipType);
} }
ui.prototype._drawEquipbox_getStatusChanged = function (info, equip, equipType) { ui.prototype._drawEquipbox_getStatusChanged = function (info, equip, equipType, y) {
var compare, differentMode = null; var compare, differentMode = null;
if (info.index < this.LAST) compare = core.compareEquipment(null, info.selectId); if (info.index < this.LAST) compare = core.compareEquipment(null, info.selectId);
else { else {
@ -2053,7 +2053,7 @@ ui.prototype._drawEquipbox_getStatusChanged = function (info, equip, equipType)
} }
ui.prototype._drawEquipbox_drawStatusChanged = function (info, y, equip, equipType) { ui.prototype._drawEquipbox_drawStatusChanged = function (info, y, equip, equipType) {
var compare = this._drawEquipbox_getStatusChanged(info, equip, equipType); var compare = this._drawEquipbox_getStatusChanged(info, equip, equipType, y);
if (compare == null) return; if (compare == null) return;
var obj = { drawOffset: 10, y: y }; var obj = { drawOffset: 10, y: y };