Commit Graph

5 Commits

Author SHA1 Message Date
oc
66117ebf08 Support Callback in Editor 2018-03-05 19:37:21 +08:00
YouWei Zhao
c5dc50803b Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-201802102001 2018-02-12 15:30:42 +08:00
YouWei Zhao
85c4d8a622 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into 2.0-for-merge
Conflicts:
_server/vm.js
drawMapGUI.html
index.html
libs/core.js
libs/data.js
libs/enemys.js
libs/icons.js
libs/items.js
libs/maps.js
main.js
project/floors/sample1.js
project/images/yewai.png
project/images/常用素材:如需使用请直接替换目录中的对应文件/items1:圆形宝石.png
styles.css
2018-02-10 16:35:38 +08:00
YouWei Zhao
13aca79afb Update editor_file.js 2018-01-07 22:14:51 +08:00
YouWei Zhao
137554623e 改变目录结构 2018-01-05 19:55:53 +08:00