From fd5e0032ab83ed0e1549dae28a24906019ac7063 Mon Sep 17 00:00:00 2001
From: YouWei Zhao <zhao.uv@gmail.com>
Date: Sun, 11 Mar 2018 19:56:21 +0800
Subject: [PATCH] =?UTF-8?q?editor=E5=9C=A8=E7=BC=96=E8=BE=91enemy.js?=
 =?UTF-8?q?=E6=97=B6=E4=B8=80=E4=B8=AA=E6=80=AA=E7=89=A9=E4=B8=80=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复了codeAreaHL不是全局量导致的bug
---
 _server/editor_blockly.js | 2 +-
 _server/editor_file.js    | 7 ++++++-
 _server/vm.js             | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js
index a6e22dee..71d5915d 100644
--- a/_server/editor_blockly.js
+++ b/_server/editor_blockly.js
@@ -267,7 +267,7 @@ xhr.onreadystatechange = function (){
 xhr.open('GET','_server/blockly/MotaAction.g4',true);
 xhr.send(null);
 
-var codeAreaHL = CodeMirror.fromTextArea(document.getElementById("codeArea"), {
+codeAreaHL = CodeMirror.fromTextArea(document.getElementById("codeArea"), {
   lineNumbers: true,
   matchBrackets: true,
   lineWrapping: true,
diff --git a/_server/editor_file.js b/_server/editor_file.js
index 9b576dc7..3e1de7c0 100644
--- a/_server/editor_file.js
+++ b/_server/editor_file.js
@@ -525,7 +525,12 @@ editor_file = function(editor, callback){
         eval("enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80"+value[1]+'='+JSON.stringify(value[2]));
       });
       var datastr='enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = \n';
-      datastr+=JSON.stringify(enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80,null,4);
+      var emap={};
+      var estr = JSON.stringify(enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80,function(k,v){if(v.hp!=null){var id_ = editor.guid();emap[id_]=JSON.stringify(v);return id_;}else return v},4);
+      for(var id_ in emap){
+        estr = estr.replace('"'+id_+'"',emap[id_])
+      }
+      datastr+=estr;
       fs.writeFile('project/enemys.js',encode(datastr),'base64',function(err, data){
         callback(err);
       });
diff --git a/_server/vm.js b/_server/vm.js
index 28405689..a9dc2a6c 100644
--- a/_server/vm.js
+++ b/_server/vm.js
@@ -1,7 +1,7 @@
 // vue 相关处理
 
 document.body.onmousedown = function(e){
-  console.log(e);
+  //console.log(e);
   var eid=[];
   e.path.forEach(function(node){
     if(!node.getAttribute)return;
@@ -11,7 +11,7 @@ document.body.onmousedown = function(e){
       eid.push(id_);
     }
   });
-  console.log(eid);
+  //console.log(eid);
   if(eid.indexOf('edit')===-1){
     if(eid.indexOf('tip')===-1)selectBox.isSelected = false;
   }