From bb0b2e8f51d2d4021b7af0fb819c5942ef5386a0 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Tue, 20 Jul 2021 17:40:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=98=E8=B4=B4=E9=94=99=E4=BD=8D=20&=20?=
 =?UTF-8?q?=E5=A4=A7=E5=9C=B0=E5=9B=BE=E6=9C=80=E8=BF=91=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _server/editor.js          | 1 +
 _server/editor_mappanel.js | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/_server/editor.js b/_server/editor.js
index 4950fb52..47ca6fa3 100644
--- a/_server/editor.js
+++ b/_server/editor.js
@@ -481,6 +481,7 @@ editor.prototype._updateMap_bigmap = function () {
     editor.uivalues.bigmapInfo.left = core.__PIXELS__ * Math.max(0, (1 - width / height) / 2);
     editor.uivalues.bigmapInfo.size = core.__PIXELS__ / Math.max(width, height);
     this.drawEventBlock();
+    this.updateLastUsedMap();
 }
 
 editor.prototype.updateMap = function () {
diff --git a/_server/editor_mappanel.js b/_server/editor_mappanel.js
index 32998bdf..f69c4584 100644
--- a/_server/editor_mappanel.js
+++ b/_server/editor_mappanel.js
@@ -35,11 +35,10 @@ editor_mappanel_wrapper = function (editor) {
         if (editor.uivalues.bigmap) {
             var info = editor.uivalues.bigmapInfo;
             var size = loc.size / 32 * info.size;
-            editor.pos = {
+            return {
                 x: core.clamp(Math.floor((loc.x - info.left) / size), 0, editor.currentFloorData.width - 1),
                 y: core.clamp(Math.floor((loc.y - info.top) / size), 0, editor.currentFloorData.height - 1),
             }
-            return editor.pos;
         }
 
         var offsetX = 0, offsetY = 0;
@@ -47,8 +46,7 @@ editor_mappanel_wrapper = function (editor) {
             offsetX = core.bigmap.offsetX / 32;
             offsetY = core.bigmap.offsetY / 32;
         }
-        editor.pos = { 'x': ~~(loc.x / loc.size) + offsetX, 'y': ~~(loc.y / loc.size) + offsetY }
-        return editor.pos;
+        return { 'x': ~~(loc.x / loc.size) + offsetX, 'y': ~~(loc.y / loc.size) + offsetY }
     }
 
     /**
@@ -90,9 +88,10 @@ editor_mappanel_wrapper = function (editor) {
         editor.uivalues.lastMoveE=e;
         var loc = editor.uifunctions.eToLoc(e);
         var pos = editor.uifunctions.locToPos(loc, true);
+        editor.pos = pos;
 
         if (editor.uivalues.bindSpecialDoor.loc != null) {
-            var x = editor.pos.x, y = editor.pos.y, id = (editor.map[y][x] || {}).id;
+            var x = pos.x, y = pos.y, id = (editor.map[y][x] || {}).id;
             // 检测是否是怪物
             if (id && editor.game.getEnemy(id)) {
                 var locstr = x + "," + y, index = editor.uivalues.bindSpecialDoor.enemys.indexOf(locstr);