From ed9550a773a8ec0200462271a095a95d66433b21 Mon Sep 17 00:00:00 2001 From: YouWei Zhao Date: Thu, 31 Jan 2019 16:56:08 -0500 Subject: [PATCH] common event-create create js file&obj, load them in main and editor_file --- _server/editor_file.js | 1 + _server/events.comment.js | 30 ++++++++++++++++++++++++++++++ _server/maps.comment.js | 2 +- main.js | 2 +- project/events.js | 5 +++++ 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 _server/events.comment.js create mode 100644 project/events.js diff --git a/_server/editor_file.js b/_server/editor_file.js index 2fe185c5..202b17b9 100644 --- a/_server/editor_file.js +++ b/_server/editor_file.js @@ -7,6 +7,7 @@ editor_file = function (editor, callback) { 'comment': 'comment', 'data.comment': 'dataComment', 'functions.comment': 'functionsComment', + 'events.comment': 'eventsComment', } for (var key in commentjs) { (function (key) { diff --git a/_server/events.comment.js b/_server/events.comment.js new file mode 100644 index 00000000..4a4f1094 --- /dev/null +++ b/_server/events.comment.js @@ -0,0 +1,30 @@ +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": "自定义公共事件,可以双击进入事件编辑器" + } + } +} \ No newline at end of file diff --git a/_server/maps.comment.js b/_server/maps.comment.js index be2e8db8..187119a9 100644 --- a/_server/maps.comment.js +++ b/_server/maps.comment.js @@ -1,4 +1,4 @@ -var maps_comment_90f36752_8815_4be8_b32b_d7fad1d0542e = +var maps_comment_c456ea59_6018_45ef_8bcc_211a24c627dc = { ////////////////////////// 地形部分 ////////////////////////// diff --git a/main.js b/main.js index 0f6da394..4dd18be2 100644 --- a/main.js +++ b/main.js @@ -75,7 +75,7 @@ function main() { 'loader', 'control', 'utils', 'items', 'icons', 'maps', 'enemys', 'events', 'actions', 'data', 'ui', 'core' ]; this.pureData = [ - 'data', 'enemys', 'icons', 'maps', 'items', 'functions' + 'data', 'enemys', 'icons', 'maps', 'items', 'functions', 'events' ]; this.materials = [ 'animates', 'enemys', 'hero', 'items', 'npcs', 'terrains', 'enemy48', 'npc48' diff --git a/project/events.js b/project/events.js new file mode 100644 index 00000000..b9f7661e --- /dev/null +++ b/project/events.js @@ -0,0 +1,5 @@ +var events_c12a15a8_c380_4b28_8144_256cba95f760 = +{ + "test": ["应该无法删除"], + "test2": ["应该可以删除"] +} \ No newline at end of file