From 839c6e502b867fb1efb81fb2a1bc530f2bf6bdf5 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Tue, 20 Jul 2021 18:03:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9id=E5=90=8E=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=9C=80=E8=BF=91=E4=BD=BF=E7=94=A8=E7=B4=A0=E6=9D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _server/editor.js           | 5 ++++-
 _server/editor_datapanel.js | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/_server/editor.js b/_server/editor.js
index 47ca6fa3..823c60d8 100644
--- a/_server/editor.js
+++ b/_server/editor.js
@@ -627,7 +627,10 @@ editor.prototype.drawInitData = function (icons) {
     editor.uivalues.foldPerCol = editor.config.get('foldPerCol', 50);
     // var imgNames = Object.keys(images);  //还是固定顺序吧；
     editor.setLastUsedType(editor.config.get('lastUsedType', 'recent'));
-    editor.uivalues.lastUsed = editor.config.get("lastUsed", []);
+    var ids = editor.ids.map(function (x) {return x.id || "";});
+    editor.uivalues.lastUsed = editor.config.get("lastUsed", []).filter(function (one) {
+        return ids.indexOf(one.id) >= 0;
+    });
     var imgNames = ["terrains", "animates", "enemys", "enemy48", "items", "npcs", "npc48", "autotile"];
 
     for (var ii = 0; ii < imgNames.length; ii++) {
diff --git a/_server/editor_datapanel.js b/_server/editor_datapanel.js
index 1439bade..95f2fc31 100644
--- a/_server/editor_datapanel.js
+++ b/_server/editor_datapanel.js
@@ -334,6 +334,14 @@ editor_datapanel_wrapper = function (editor) {
                     printe('不得使用保留关键字作为id！');
                     return;
                 }
+                if (editor_mode.info.images == 'autotile') {
+                    printe('自动元件不可修改id！');
+                    return;
+                }
+                if (editor_mode.info.idnum >= 10000) {
+                    printe('额外素材不可修改id！');
+                    return;
+                }
                 editor.file.changeIdAndIdnum(id, null, editor_mode.info, function (err) {
                     if (err) {
                         printe(err);