diff --git a/_server/editor_file.js b/_server/editor_file.js index f07a70c3..6094be7a 100644 --- a/_server/editor_file.js +++ b/_server/editor_file.js @@ -816,6 +816,39 @@ editor_file = function (editor, callback) { //////////////////////////////////////////////////////////////////// + editor_file.editCommonEvent = function (actionList, callback) { + /*actionList:[ + ["change","['test']",['123']], + ] + 为[]时只查询不修改 + */ + var data_obj = events_c12a15a8_c380_4b28_8144_256cba95f760.commonEvent; + if (!isset(callback)) { + printe('未设置callback'); + throw('未设置callback') + } + ; + if (isset(actionList) && actionList.length > 0) { + actionList.forEach(function (value) { + value[1] = "['commonEvent']" + value[1]; + }); + saveSetting('events', actionList, function (err) { + callback([ + Object.assign({},data_obj), + editor_file.eventsComment._data.commonEvent, + err]); + }); + } else { + callback([ + Object.assign({},data_obj), + editor_file.eventsComment._data.commonEvent, + null]); + } + } + //callback([obj,commentObj,err:String]) + + //////////////////////////////////////////////////////////////////// + var isset = function (val) { if (val == undefined || val == null) { return false; @@ -979,6 +1012,17 @@ editor_file = function (editor, callback) { editor_file.saveFloorFile(callback); return; } + if (file == 'events') { + actionList.forEach(function (value) { + eval("events_c12a15a8_c380_4b28_8144_256cba95f760" + value[1] + '=' + JSON.stringify(value[2])); + }); + var datastr = 'var events_c12a15a8_c380_4b28_8144_256cba95f760 = \n'; + datastr += JSON.stringify(events_c12a15a8_c380_4b28_8144_256cba95f760, null, '\t'); + fs.writeFile('project/events.js', encode(datastr), 'base64', function (err, data) { + callback(err); + }); + return; + } callback('出错了,要设置的文件名不识别'); } diff --git a/_server/events.comment.js b/_server/events.comment.js index 4a4f1094..157becee 100644 --- a/_server/events.comment.js +++ b/_server/events.comment.js @@ -1,30 +1,36 @@ var events_comment_c456ea59_6018_45ef_8bcc_211a24c627dc = { - + "_type": "object", - "_data": function (key) { - var obj = { - "addPoint": { - "_leaf": true, - "_type": "event", - "_range": "thiseval instanceof Array", - "_event": "commonEvent", - "_data": "加点事件,可以双击进入事件编辑器" - }, - "test": { - "_leaf": true, - "_type": "event", - "_range": "thiseval instanceof Array", - "_event": "commonEvent", - "_data": "测试事件, events.comment.js中标记了_range不能为null, 所以应该无法删除" - }, - } - if (obj[key]) return obj[key]; - return { - "_leaf": true, - "_type": "event", - "_event": "commonEvent", - "_data": "自定义公共事件,可以双击进入事件编辑器" + "_data": { + "commonEvent": { + + "_type": "object", + "_data": function (key) { + var obj = { + "addPoint": { + "_leaf": true, + "_type": "event", + "_range": "thiseval instanceof Array", + "_event": "commonEvent", + "_data": "加点事件,可以双击进入事件编辑器" + }, + "test": { + "_leaf": true, + "_type": "event", + "_range": "thiseval instanceof Array", + "_event": "commonEvent", + "_data": "测试事件, events.comment.js中标记了_range不能为null, 所以应该无法删除" + }, + } + if (obj[key]) return obj[key]; + return { + "_leaf": true, + "_type": "event", + "_event": "commonEvent", + "_data": "自定义公共事件,可以双击进入事件编辑器" + } + } } } } \ No newline at end of file diff --git a/project/events.js b/project/events.js index b9f7661e..425e4497 100644 --- a/project/events.js +++ b/project/events.js @@ -1,5 +1,11 @@ var events_c12a15a8_c380_4b28_8144_256cba95f760 = { - "test": ["应该无法删除"], - "test2": ["应该可以删除"] + "commonEvent": { + "test": [ + "应该无法删除" + ], + "test2": [ + "应该可以删除" + ] + } } \ No newline at end of file