From 7c82f4e9fb770361638c6bb50bb28bf40dd325c6 Mon Sep 17 00:00:00 2001
From: YouWei Zhao <zhao.uv@gmail.com>
Date: Thu, 15 Mar 2018 15:46:53 +0800
Subject: [PATCH] show MapBlocksInfo

---
 _server/editor.js      |  4 ++--
 _server/editor_file.js | 23 +++++++++++++++++++++++
 _server/editor_mode.js |  7 +++++--
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/_server/editor.js b/_server/editor.js
index 05f77066..afeedd01 100644
--- a/_server/editor.js
+++ b/_server/editor.js
@@ -368,7 +368,7 @@ editor.prototype.listen = function() {
       var pos = locToPos(loc);
       editor_mode.onmode('nextChange');
       editor_mode.onmode('loc');
-      editor_mode.loc();
+      //editor_mode.loc();
       tip.whichShow = 1;
       return;
     }
@@ -530,7 +530,7 @@ editor.prototype.listen = function() {
         tip.infos = JSON.parse(JSON.stringify(editor.info));
         editor_mode.onmode('nextChange');
         editor_mode.onmode('emenyitem');
-        editor_mode.emenyitem();
+        //editor_mode.emenyitem();
       }
     }
   }
diff --git a/_server/editor_file.js b/_server/editor_file.js
index e5f20cb9..30916699 100644
--- a/_server/editor_file.js
+++ b/_server/editor_file.js
@@ -253,6 +253,29 @@ editor_file = function(editor, callback){
   }
   //callback([obj,commentObj,err:String])
 
+  editor_file.editMapBlocksInfo = function(idnum,actionList,callback){
+    /*actionList:[]
+    只允许[]查询
+    */
+    if (!isset(callback)) {printe('未设置callback');throw('未设置callback')};
+    if (isset(actionList) && actionList.length > 0){
+      printe('editor中不允许修改图块的地形信息');throw('editor中不允许修改图块的地形信息');
+    } else {
+      callback([
+        (function(){
+          var locObj=Object.assign({},editor.core.maps.blocksInfo[idnum]);
+          /* Object.keys(editor_file.comment.enemys).forEach(function(v){
+            if (!isset(editor.core.enemys.enemys[id][v]))
+              locObj[v]=null;
+          }); */
+          return locObj;
+        })(),
+        {},/* editor_file.comment.enemys, */
+        null]);
+    }
+  }
+  //callback([obj,commentObj,err:String])
+
   ////////////////////////////////////////////////////////////////////  
 
   editor_file.editLoc = function(x,y,actionList,callback){
diff --git a/_server/editor_mode.js b/_server/editor_mode.js
index 21eac472..9f4cc161 100644
--- a/_server/editor_mode.js
+++ b/_server/editor_mode.js
@@ -182,6 +182,8 @@ editor_mode.prototype.doActionList = function(mode,actionList){
         editor.file.editEnemy(editor_mode.info.id,actionList,function(objs_){/*console.log(objs_);*/if(objs_.slice(-1)[0]!=null){printe(objs_.slice(-1)[0]);throw(objs_.slice(-1)[0])};printf('修改成功')});
       } else if (editor_mode.info.images=='items'){
         editor.file.editItem(editor_mode.info.id,actionList,function(objs_){/*console.log(objs_);*/if(objs_.slice(-1)[0]!=null){printe(objs_.slice(-1)[0]);throw(objs_.slice(-1)[0])};printf('修改成功')});
+      } else {
+        editor.file.editMapBlocksInfo(editor_mode.info.idnum,actionList,function(objs_){/*console.log(objs_);*/if(objs_.slice(-1)[0]!=null){printe(objs_.slice(-1)[0]);throw(objs_.slice(-1)[0])};printf('修改成功')});
       }
       break;
     case 'floor':
@@ -256,8 +258,9 @@ editor_mode.prototype.emenyitem = function(callback){
   } else if (editor_mode.info.images=='items'){
     editor.file.editItem(editor_mode.info.id,[],function(objs_){objs=objs_;/*console.log(objs_)*/});
   } else {
-    document.getElementById('table_a3f03d4c_55b8_4ef6_b362_b345783acd72').innerHTML='';
-    return;
+    /* document.getElementById('table_a3f03d4c_55b8_4ef6_b362_b345783acd72').innerHTML='';
+    return; */
+    editor.file.editMapBlocksInfo(editor_mode.info.idnum,[],function(objs_){objs=objs_;/*console.log(objs_)*/});
   }
   //只查询不修改时,内部实现不是异步的,所以可以这么写
   var tableinfo=editor_mode.objToTable(objs[0],objs[1]);