From 57c5d983f459407a62765586f0917a22cb517ee0 Mon Sep 17 00:00:00 2001
From: YouWei Zhao <zhao.uv@gmail.com>
Date: Sat, 12 Jan 2019 11:01:52 -0500
Subject: [PATCH] =?UTF-8?q?more=20friendly=20to=20version=20migration=20?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E8=83=BD=E6=89=93=E5=BC=80=E7=9A=84=E5=9C=A8?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E4=B8=AD=E5=B0=BD=E9=87=8F=E4=B9=9F?=
 =?UTF-8?q?=E4=B8=8D=E5=B4=A9=E6=8E=89,=20=E4=BB=A5=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=BE=88=E6=B7=B1=E7=9A=84data?=
 =?UTF-8?q?=E5=92=8Ccomment=E5=90=8E=E7=9A=84=E7=89=88=E6=9C=AC=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _server/comment.js           | 16 ++++++++--------
 _server/data.comment.js      | 16 ++++++++--------
 _server/editor_mode.js       |  5 ++---
 _server/functions.comment.js | 14 +++++++-------
 4 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/_server/comment.js b/_server/comment.js
index e7e80b72..72474062 100644
--- a/_server/comment.js
+++ b/_server/comment.js
@@ -1,14 +1,14 @@
 var comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
 {
-    "_leaf": false,
+    
     "_type": "object",
     "_data": {
         "items": {
-            "_leaf": false,
+            
             "_type": "object",
             "_data": {
                 "items": {
-                    "_leaf": false,
+                    
                     "_type": "object",
                     "_data": {
                         "cls": {
@@ -89,7 +89,7 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
         },
         "items_template" : {'cls': 'items', 'name': '新物品'},
         "enemys": {
-            "_leaf": false,
+            
             "_type": "object",
             "_data": {
                 "name": {
@@ -197,7 +197,7 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
         },
         "enemys_template" : {'name': '新敌人', 'hp': 0, 'atk': 0, 'def': 0, 'money': 0, 'experience': 0, 'point': 0, 'special': 0},
         "maps": {
-            "_leaf": false,
+            
             "_type": "object",
             "_data": {
                 "id": {
@@ -271,11 +271,11 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
             }
         },
         "floors": {
-            "_leaf": false,
+            
             "_type": "object",
             "_data": {
                 "floor": {
-                    "_leaf": false,
+                    
                     "_type": "object",
                     "_data": {
                         "floorId": {
@@ -407,7 +407,7 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
                     }
                 },
                 "loc": {
-                    "_leaf": false,
+                    
                     "_type": "object",
                     "_data": {
                         "events": {
diff --git a/_server/data.comment.js b/_server/data.comment.js
index 17cad58a..8f157bcf 100644
--- a/_server/data.comment.js
+++ b/_server/data.comment.js
@@ -1,10 +1,10 @@
 var data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
 {
-    "_leaf": false,
+    
     "_type": "object",
     "_data": {
         "main": {
-            "_leaf": false,
+            
             "_type": "object",
             "_data": {
                 "floorIds": {
@@ -125,7 +125,7 @@ var data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
             }
         },
         "firstData": {
-            "_leaf": false,
+            
             "_type": "object",
             "_data": {
                 "title": {
@@ -154,7 +154,7 @@ var data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
                     "_data": "初始楼层的ID"
                 },
                 "hero": {
-                    "_leaf": false,
+                    
                     "_type": "object",
                     "_data": {
                         "name": {
@@ -214,7 +214,7 @@ var data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
                             "_data": "初始装上的装备，此处建议请直接留空数组"
                         },
                         "items": {
-                            "_leaf": false,
+                            
                             "_type": "object",
                             "_data": {
                                 "keys": {
@@ -245,7 +245,7 @@ var data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
                             "_data": "初始可飞的楼层；一般留空数组即可"
                         },
                         "loc": {
-                            "_leaf": false,
+                            
                             "_type": "object",
                             "_data": {
                                 "direction": {
@@ -316,7 +316,7 @@ var data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
             }
         },
         "values": {
-            "_leaf": false,
+            
             "_type": "object",
             "_data": {
                 "lavaDamage": {
@@ -407,7 +407,7 @@ var data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
             }
         },
         "flags": {
-            "_leaf": false,
+            
             "_type": "object",
             "_data": {
                 "enableFloor": {
diff --git a/_server/editor_mode.js b/_server/editor_mode.js
index f9a9375a..45dd604f 100644
--- a/_server/editor_mode.js
+++ b/_server/editor_mode.js
@@ -109,7 +109,7 @@ editor_mode = function (editor) {
                         console.error('comment和data不匹配,请在群 HTML5造塔技术交流群 959329661 内反馈')
                         id_815975ad_ee6f_4684_aac7_397b7e392702=1;
                     }
-                    continue;
+                    pvobj[ii]=null;
                 }
                 var field = pfield + "['" + ii + "']";
                 var cfield = pcfield + "['_data']['" + ii + "']";
@@ -278,7 +278,7 @@ editor_mode = function (editor) {
     editor_mode.prototype.objToTr_ = function (obj, commentObj, field, cfield, vobj, cobj) {
         var guid = editor.guid();
         var thiseval = vobj;
-        var comment = cobj._data;
+        var comment = String(cobj._data);
 
         var charlength = 10;
         // "['a']['b']" => "b"
@@ -305,7 +305,6 @@ editor_mode = function (editor) {
 
     editor_mode.prototype.objToTd_ = function (obj, commentObj, field, cfield, vobj, cobj) {
         var thiseval = vobj;
-        if (thiseval === undefined) thiseval = null;
         if (cobj._select) {
             var values = cobj._select.values;
             var outstr = ['<select>\n', "<option value='", JSON.stringify(thiseval), "'>", JSON.stringify(thiseval), '</option>\n'];
diff --git a/_server/functions.comment.js b/_server/functions.comment.js
index fc21ae17..89181b22 100644
--- a/_server/functions.comment.js
+++ b/_server/functions.comment.js
@@ -1,10 +1,10 @@
 var functions_comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
 {
-    "_leaf": false,
+    
     "_type": "object",
     "_data": {
         "events": {
-            "_leaf": false,
+            
             "_type": "object",
             "_data": {
                 "initGame": {
@@ -106,7 +106,7 @@ var functions_comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
             }
         },
         "enemys": {
-            "_leaf": false,
+            
             "_type": "object",
             "_data": {
                 "getSpecials": {
@@ -136,7 +136,7 @@ var functions_comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
             }
         },
         "actions": {
-            "_leaf": false,
+            
             "_type": "object",
             "_data": {
                 "onKeyUp": {
@@ -148,7 +148,7 @@ var functions_comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
             }
         },
         "control": {
-            "_leaf": false,
+            
             "_type": "object",
             "_data": {
                 "flyTo": {
@@ -178,7 +178,7 @@ var functions_comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
             }
         },
         "ui": {
-            "_leaf": false,
+            
             "_type": "object",
             "_data": {
                 "drawStatusBar": {
@@ -202,7 +202,7 @@ var functions_comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
             }
         },
         "plugins": {
-            "_leaf": false,
+            
             "_type": "object",
             "_data": {
                 "parallelDo": {