From 053665d081dd3a513d8a27e2f8bc4c7029363c47 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Wed, 1 May 2019 16:24:25 +0800
Subject: [PATCH] changeId

---
 _server/editor_file_unsorted.js | 37 ++++++++++-----------------------
 _server/editor_mode.js          |  6 ++++--
 _server/editor_unsorted_2.js    | 22 +++++++++++++++++++-
 editor-mobile.html              |  4 ++++
 editor.html                     |  4 ++++
 project/items.js                |  2 +-
 6 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/_server/editor_file_unsorted.js b/_server/editor_file_unsorted.js
index 780f312e..04c46d99 100644
--- a/_server/editor_file_unsorted.js
+++ b/_server/editor_file_unsorted.js
@@ -310,44 +310,29 @@ editor_file = function (editor, callback) {
         }else{
             //检查maps中是否有重复的idnum或id
             for (var ii in editor.core.maps.blocksInfo) {
-                if (ii == idnum && idnum != info.idnum) {
-                    callback('idnum重复了');
-                    return;
-                }
-                if (editor.core.maps.blocksInfo[ii].id == id && id != info.id) {
+                if (editor.core.maps.blocksInfo[ii].id == id) {
                     callback('id重复了');
                     return;
                 }
             }
-            if (idnum != info.idnum && id != info.id) {
-                callback('此版本idnum和id一次只允许修改一个, 请修改idnum刷新后再修改id');
-                return;
-            }
-            if (idnum == info.idnum && id == info.id) {
-                callback('无改动');
-                return;
-            }
-            
-            if (idnum != info.idnum){//修改idnum
-                maps_90f36752_8815_4be8_b32b_d7fad1d0542e[idnum] = maps_90f36752_8815_4be8_b32b_d7fad1d0542e[info.idnum];
-                delete(maps_90f36752_8815_4be8_b32b_d7fad1d0542e[info.idnum]);
-            } else {//修改id
-                maps_90f36752_8815_4be8_b32b_d7fad1d0542e[idnum].id = id;
-                var obj=Object.assign({},icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1,items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a,{enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80:enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80})
+            idnum = info.idnum;
+
+            maps_90f36752_8815_4be8_b32b_d7fad1d0542e[idnum].id = id;
+
+            var arr=[icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1,items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a,{enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80:enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80}]
+            arr.forEach(function (obj) {
                 for(var jj in obj){
                     var ii=obj[jj]
                     if (ii.hasOwnProperty(info.id)){
-                    ii[id]=ii[info.id];
-                    delete(ii[info.id]);
+                        ii[id]=ii[info.id];
+                        delete(ii[info.id]);
                     }
                 }
-            }
+            });
+
             editor.file.save_icons_maps_items_enemys(callback)
             
         }
-        
-        
-        
     }
     //callback(err:String)
     editor.file.editItem = function (id, actionList, callback) {
diff --git a/_server/editor_mode.js b/_server/editor_mode.js
index 0627e903..8bf22dc9 100644
--- a/_server/editor_mode.js
+++ b/_server/editor_mode.js
@@ -145,13 +145,15 @@ editor_mode = function (editor) {
 
         if (!core.isset(editor_mode.info.id)) {
             // document.getElementById('table_a3f03d4c_55b8_4ef6_b362_b345783acd72').innerHTML = '';
-            document.getElementById('enemyItemTable').style.display = 'none';
             document.getElementById('newIdIdnum').style.display = 'block';
+            document.getElementById('enemyItemTable').style.display = 'none';
+            document.getElementById('changeId').style.display = 'none';
             return;
         }
 
-        document.getElementById('newIdIdnum').style.display = 'block';
+        document.getElementById('newIdIdnum').style.display = 'none';
         document.getElementById('enemyItemTable').style.display = 'block';
+        document.getElementById('changeId').style.display = 'block';
 
         var objs = [];
         if (editor_mode.info.images == 'enemys' || editor_mode.info.images == 'enemy48') {
diff --git a/_server/editor_unsorted_2.js b/_server/editor_unsorted_2.js
index 6ac8c1b2..ceb3bf16 100644
--- a/_server/editor_unsorted_2.js
+++ b/_server/editor_unsorted_2.js
@@ -19,7 +19,7 @@ editor_unsorted_2_wrapper=function(editor_mode){
                         printe(err);
                         throw(err)
                     }
-                    printe(core.isset(editor_mode.info.id)?'修改id和idnum成功,请F5刷新编辑器':'添加id和idnum成功,请F5刷新编辑器');
+                    printe('添加id和idnum成功,请F5刷新编辑器');
                 });
             } else {
                 printe('请输入id和idnum');
@@ -36,6 +36,26 @@ editor_unsorted_2_wrapper=function(editor_mode){
             })
         }
 
+        var changeId = document.getElementById('changeId');
+        changeId.children[1].onclick = function () {
+            var id = changeId.children[0].value;
+            if (id) {
+                if (!/^[0-9a-zA-Z_]+$/.test(id)) {
+                    printe('不合法的id，请使用字母、数字或下划线')
+                    return;
+                }
+                editor.file.changeIdAndIdnum(id, null, editor_mode.info, function (err) {
+                    if (err) {
+                        printe(err);
+                        throw(err);
+                    }
+                    printe('修改id成功,请F5刷新编辑器');
+                });
+            } else {
+                printe('请输入要修改到的ID');
+            }
+        }
+
         var selectFloor = document.getElementById('selectFloor');
         editor.game.getFloorFileList(function (floors) {
             var outstr = [];
diff --git a/editor-mobile.html b/editor-mobile.html
index 508d25f9..563c0b7e 100644
--- a/editor-mobile.html
+++ b/editor-mobile.html
@@ -141,6 +141,10 @@
                 <br/>
                 <button style="margin-top: 10px">自动注册</button>
             </div>
+            <div id='changeId'><!-- id and idnum -->
+                <input placeholder="修改图块id为"/>
+                <button>save</button>
+            </div>
         </div>
     </div>
     <div id="left4" class='leftTab' style="z-index:-1;opacity: 0;"><!-- floor -->
diff --git a/editor.html b/editor.html
index adcc55e0..7af5e35d 100644
--- a/editor.html
+++ b/editor.html
@@ -137,6 +137,10 @@
                 <br/>
                 <button style="margin-top: 10px">自动注册</button>
             </div>
+            <div id='changeId'><!-- id and idnum -->
+                <input placeholder="修改图块id为"/>
+                <button>save</button>
+            </div>
         </div>
     </div>
     <div id="left4" class='leftTab' style="z-index:-1;opacity: 0;"><!-- floor -->
diff --git a/project/items.js b/project/items.js
index efda5b71..bc656898 100644
--- a/project/items.js
+++ b/project/items.js
@@ -416,5 +416,5 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
 		"yellowJewel": "true",
 		"skill1": "true"
 	},
-	"canEquip": {}
+	"equipCondition": {}
 }
\ No newline at end of file