From 5bcf8a5f6db46fff9ac8660f59f617ab594d565f Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Tue, 13 Apr 2021 15:18:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8D=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _server/editor_datapanel.js |  2 +-
 _server/editor_file.js      | 17 +++++------------
 libs/control.js             |  4 ++--
 libs/maps.js                |  2 +-
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/_server/editor_datapanel.js b/_server/editor_datapanel.js
index d4567810..1439bade 100644
--- a/_server/editor_datapanel.js
+++ b/_server/editor_datapanel.js
@@ -191,7 +191,7 @@ editor_datapanel_wrapper = function (editor) {
             if (!floorIds) return;
             var from = parseInt(document.getElementById('newMapsFrom').value),
                 to = parseInt(document.getElementById('newMapsTo').value);
-            if (!core.isset(from) || !core.isset(to) || from > to || from < 0 || to < 0) {
+            if (!core.isset(from) || !core.isset(to) || from > to) {
                 printe("请输入有效的起始和终止楼层");
                 return;
             }
diff --git a/_server/editor_file.js b/_server/editor_file.js
index 278c56e1..5125ffa3 100644
--- a/_server/editor_file.js
+++ b/_server/editor_file.js
@@ -311,13 +311,11 @@ editor_file = function (editor, callback) {
         }
         var c=image.toUpperCase().charAt(0);
 
-        // terrains id
-        var terrainsId = [];
-        Object.keys(core.material.icons.terrains).forEach(function (id) {
-            terrainsId[core.material.icons.terrains[id]]=id;
-        })
-
         var allIds = [];
+        Object.keys(icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1[image] || {}).forEach(function (v) {
+            allIds[icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1[image][v]] = v;
+        });
+
         editor.ids.forEach(function (v) {
             if (v.images==image) {
                 allIds[v.y]=v;
@@ -339,12 +337,7 @@ editor_file = function (editor, callback) {
             // get id num
             var id = c+idnum;
 
-            if (image=='terrains' && terrainsId[y] != null) {
-                id=terrainsId[y];
-            }
-            else {
-                iconActions.push(["add", "['" + image + "']['" + id + "']", y])
-            }
+            iconActions.push(["add", "['" + image + "']['" + id + "']", y])
             mapActions.push(["add", "['" + idnum + "']", {'cls': image, 'id': id}]);
             faceIds.push({idnum: idnum, id: id});
             if (image=='items')
diff --git a/libs/control.js b/libs/control.js
index f4a2ddd9..92c75826 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -2387,8 +2387,8 @@ control.prototype.clearRouteFolding = function () {
 
 ////// 检查录像折叠 //////
 control.prototype.checkRouteFolding = function () {
-    // 未开启、未开始游戏、正在事件中：不执行
-    if (!core.flags.enableRouteFolding || !core.isPlaying() || core.status.event.id) {
+    // 未开启、未开始游戏、录像播放中、正在事件中：不执行
+    if (!core.flags.enableRouteFolding || !core.isPlaying() || core.isReplaying() || core.status.event.id) {
         return this.clearRouteFolding();
     }
     var hero = core.clone(core.status.hero, function (name, value) {
diff --git a/libs/maps.js b/libs/maps.js
index e64c315c..02a7f09a 100644
--- a/libs/maps.js
+++ b/libs/maps.js
@@ -50,7 +50,7 @@ maps.prototype.loadFloor = function (floorId, map) {
     if (map instanceof Array) {
         map = {"map": map};
     }
-    if (!map.map) map.map = floor.map;
+    if (!map.map) map.map = core.clone(floor.map);
     var content = {};
     var notCopy = this._loadFloor_doNotCopy();
     for (var name in floor) {