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

Fix Events.js Bug

Browse Source
This commit is contained in:
oc 2018-01-24 20:01:46 +08:00
parent c0bfac2f36
commit 4f283b0ffe
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/events.js
View File

@ -568,12 +568,15 @@ events.prototype.openShop = function(shopId, needVisited) {
var actions = []; var actions = [];
if (core.isset(core.status.event.data) && core.isset(core.status.event.data.actions)) if (core.isset(core.status.event.data) && core.isset(core.status.event.data.actions))
actions=core.status.event.data.actions; actions=core.status.event.data.actions;
var fromList;
if (core.isset(core.status.event.data) && core.isset(core.status.event.data.fromList))
fromList = core.status.event.data.fromList;
core.ui.closePanel(); core.ui.closePanel();
core.lockControl(); core.lockControl();
// core.status.event = {'id': 'shop', 'data': {'id': shopId, 'shop': shop}}; // core.status.event = {'id': 'shop', 'data': {'id': shopId, 'shop': shop}};
core.status.event.id = 'shop'; core.status.event.id = 'shop';
core.status.event.data = {'id': shopId, 'shop': shop, 'actions': actions}; core.status.event.data = {'id': shopId, 'shop': shop, 'actions': actions, 'fromList': fromList};
core.status.event.selection = selection; core.status.event.selection = selection;
// 拼词 // 拼词
@ -1171,6 +1174,11 @@ events.prototype.keyDownShop = function (keycode) {
////// 商店界面时，放开某个键的操作 ////// ////// 商店界面时，放开某个键的操作 //////
events.prototype.keyUpShop = function (keycode) { events.prototype.keyUpShop = function (keycode) {
if (keycode==27 || keycode==88) { if (keycode==27 || keycode==88) {
if (core.status.event.data.actions.length>0) {
core.status.route.push("shop:"+core.status.event.data.id+":"+core.status.event.data.actions.join(""));
}
if (core.status.event.data.fromList) { if (core.status.event.data.fromList) {
core.status.boxAnimateObjs = []; core.status.boxAnimateObjs = [];
core.setBoxAnimate(); core.setBoxAnimate();