From b9957b51a4ac0580ef4eea9355fb87b8cfe01193 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Sat, 23 May 2020 15:43:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BD=95=E5=83=8F=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _server/editor_mappanel.js | 41 +-------------------------------------
 _server/editor_ui.js       |  2 +-
 libs/control.js            |  2 +-
 libs/events.js             |  3 ++-
 4 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/_server/editor_mappanel.js b/_server/editor_mappanel.js
index 8cce7cc2..160631bf 100644
--- a/_server/editor_mappanel.js
+++ b/_server/editor_mappanel.js
@@ -232,10 +232,7 @@ editor_mappanel_wrapper = function (editor) {
                 // 左键拖拽: 交换
                 //tip.whichShow(1);
                 // editor.movePos(editor.uivalues.startPos, editor.uivalues.endPos);
-                if (editor.layerMod == 'map')
-                    editor.exchangePos(editor.uivalues.startPos, editor.uivalues.endPos);
-                else
-                    editor.exchangeBgFg(editor.uivalues.startPos, editor.uivalues.endPos, editor.layerMod);
+                editor.exchangePos(editor.uivalues.startPos, editor.uivalues.endPos);
                 editor.uifunctions.unhighlightSaveFloorButton();
                 editor.dom.euiCtx.clearRect(0, 0, core.__PIXELS__, core.__PIXELS__);
             }
@@ -973,42 +970,6 @@ editor_mappanel_wrapper = function (editor) {
         }
     }
     
-    editor.constructor.prototype.moveBgFg = function (startPos, endPos, name, callback) {
-        if (!startPos || !endPos || ["bgmap","fgmap"].indexOf(name)<0) return;
-        if (startPos.x == endPos.x && startPos.y == endPos.y) return;
-        editor[name][endPos.y][endPos.x] = editor[name][startPos.y][startPos.x];
-        editor[name][startPos.y][startPos.x] = 0;
-        editor.updateMap();
-        editor.file.saveFloorFile(function (err) {
-            if (err) {
-                printe(err);
-                throw(err)
-            }
-            ;printf('移动图块成功');
-            editor.drawPosSelection();
-            if (callback) callback();
-        });
-    }
-    
-    editor.constructor.prototype.exchangeBgFg = function (startPos, endPos, name, callback) {
-        if (!startPos || !endPos || ["bgmap","fgmap"].indexOf(name)<0) return;
-        if (startPos.x == endPos.x && startPos.y == endPos.y) return;
-        var value = editor[name][endPos.y][endPos.x];
-        editor[name][endPos.y][endPos.x] = editor[name][startPos.y][startPos.x];
-        editor[name][startPos.y][startPos.x] = value;
-        editor.updateMap();
-        editor.file.saveFloorFile(function (err) {
-            if (err) {
-                printe(err);
-                throw(err)
-            }
-            ;printf('交换图块成功');
-            editor.drawPosSelection();
-            if (callback) callback();
-        });
-    
-    }
-    
     editor.constructor.prototype.clearPos = function (clearPos, pos, callback) {
         var fields = Object.keys(editor.file.comment._data.floors._data.loc._data);
         pos = pos || editor.pos;
diff --git a/_server/editor_ui.js b/_server/editor_ui.js
index fff57c1b..f545e4ad 100644
--- a/_server/editor_ui.js
+++ b/_server/editor_ui.js
@@ -31,7 +31,7 @@ editor_ui_wrapper = function (editor) {
             'ESC或点击空白处可以自动保存当前修改',
             'H键可以打开操作帮助哦',
             'tileset平铺模式可以在地图上拖动来平铺框选的图形',
-            '可以拖动地图上的图块和事件，或按Ctrl+C, Ctrl+X和Ctrl+V进行复制，剪切和粘贴，Delete删除',
+            '可以拖动地图上的图块和事件；或按Ctrl+C, Ctrl+X和Ctrl+V进行复制，剪切和粘贴，Delete删除；右键也可以拉框选择区域',
             'Alt+数字键保存图块，数字键读取保存的图块',
         ];
         if (value == null) value = Math.floor(Math.random() * tips.length);
diff --git a/libs/control.js b/libs/control.js
index 3de2103f..b37438f9 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -730,7 +730,7 @@ control.prototype.waitHeroToStop = function(callback) {
                 core.setHeroLoc('direction', lastDirection);
             core.drawHero();
             callback();
-        }, core.status.replay.speed == 24 ? 0 : 30);
+        }, core.status.replay.speed == 24 ? 1 : 30);
     }
 }
 
diff --git a/libs/events.js b/libs/events.js
index 44b2054f..96c4548b 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -444,7 +444,8 @@ events.prototype.openDoor = function (x, y, needKey, callback) {
         core.removeBlock(x, y);
         setTimeout(function () {
             core.status.replay.animate = false;
-            core.events.afterOpenDoor(id, x, y, callback);
+            core.events.afterOpenDoor(id, x, y);
+            if (callback) callback();
         }, 1); // +1是为了录像检测系统
     } else {
         this._openDoor_animate(id, x, y, callback);