From f48e8dcf17947fb389cdaedd75a6556a23f4b18f Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Fri, 30 Oct 2020 20:47:25 +0800 Subject: [PATCH] Fix midMenu --- _server/editor.js | 1 + _server/editor_mappanel.js | 4 +--- _server/editor_ui.js | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/_server/editor.js b/_server/editor.js index 595b9fbe..580e03a5 100644 --- a/_server/editor.js +++ b/_server/editor.js @@ -324,6 +324,7 @@ editor.prototype.mapInit = function () { editor.currentFloorData.firstArrive = []; editor.currentFloorData.eachArrive = []; editor.currentFloorData.events = {}; + editor.currentFloorData.autoEvent = {}; editor.currentFloorData.changeFloor = {}; editor.currentFloorData.afterBattle = {}; editor.currentFloorData.afterGetItem = {}; diff --git a/_server/editor_mappanel.js b/_server/editor_mappanel.js index 1292f398..3a4fd25f 100644 --- a/_server/editor_mappanel.js +++ b/_server/editor_mappanel.js @@ -501,9 +501,7 @@ editor_mappanel_wrapper = function (editor) { */ editor.uifunctions.hideMidMenu = function () { editor.uivalues.lastMoveE={buttons:0,clientX:0,clientY:0}; - setTimeout(function () { - editor.dom.midMenu.style = 'display:none'; - }, 100) + editor.dom.midMenu.style = 'display:none'; } /** diff --git a/_server/editor_ui.js b/_server/editor_ui.js index 5c389596..0117a9b6 100644 --- a/_server/editor_ui.js +++ b/_server/editor_ui.js @@ -120,10 +120,10 @@ editor_ui_wrapper = function (editor) { } } //editor.mode.onmode(''); - if (e.button != 2 && !editor.isMobile) { + if (e.button != 2 && !editor.isMobile && clickpath.indexOf('midMenu') === -1) { editor.uifunctions.hideMidMenu(); } - if (clickpath.indexOf('down') !== -1 && clickpath.indexOf('midMenu') === -1 && editor.isMobile && clickpath.indexOf('midMenu') === -1) { + if (clickpath.indexOf('down') !== -1 && clickpath.indexOf('midMenu') === -1 && editor.isMobile) { editor.uifunctions.hideMidMenu(); } if (clickpath.length >= 2 && clickpath[0].indexOf('id_') === 0) { editor.lastClickId = clickpath[0] }