Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-docs-20180313
This commit is contained in:
commit
07811f67d7
@ -157,7 +157,7 @@ editor_mode.prototype.objToTd = function(thiseval,comment,field){
|
|||||||
}
|
}
|
||||||
|
|
||||||
editor_mode.prototype.indent = function(field){
|
editor_mode.prototype.indent = function(field){
|
||||||
var num = 4;
|
var num = '\t';
|
||||||
if(field.indexOf("['main']")===0)return 0;
|
if(field.indexOf("['main']")===0)return 0;
|
||||||
if(field.indexOf("['flyRange']")!==-1)return 0;
|
if(field.indexOf("['flyRange']")!==-1)return 0;
|
||||||
if(field==="['special']")return 0;
|
if(field==="['special']")return 0;
|
||||||
|
|||||||
@ -40,7 +40,7 @@ editor_multi.hide = function(){document.getElementById('left7').style='z-index:-
|
|||||||
|
|
||||||
editor_multi.indent = function(field){
|
editor_multi.indent = function(field){
|
||||||
if(editor && editor.mode && editor.mode.indent)return editor.mode.indent(field);
|
if(editor && editor.mode && editor.mode.indent)return editor.mode.indent(field);
|
||||||
return 4;
|
return '\t';
|
||||||
}
|
}
|
||||||
|
|
||||||
editor_multi.import = function(id_){
|
editor_multi.import = function(id_){
|
||||||
|
|||||||
@ -126,7 +126,6 @@ data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
|
|||||||
"sword5": 160,
|
"sword5": 160,
|
||||||
"shield5": 160,
|
"shield5": 160,
|
||||||
"moneyPocket": 500,
|
"moneyPocket": 500,
|
||||||
/****** 怪物相关 ******/
|
|
||||||
'breakArmor': 0.9,
|
'breakArmor': 0.9,
|
||||||
'counterAttack': 0.1,
|
'counterAttack': 0.1,
|
||||||
'purify': 3,
|
'purify': 3,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user