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);