Merge pull request #74 from zhaouv/v2.0-editor-20180304

editor在编辑enemy.js时一个怪物一行
This commit is contained in:
Zhang Chen 2018-03-11 20:41:07 +08:00 committed by GitHub
commit 640baac703
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions

View File

@ -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,

View File

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

View File

@ -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;
}