YouWei Zhao
|
2b069b7614
|
集成blockly的事件编辑器
目前只能在正确的事件上工作,尚未处理null
|
2018-02-15 00:18:00 +08:00 |
|
YouWei Zhao
|
d0115230d7
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-201802102001
# Conflicts:
# libs/icons.js
# libs/maps.js
|
2018-02-14 13:57:09 +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
|
8977ac5137
|
editor 全GUI编辑
|
2018-01-09 15:22:11 +08:00 |
|
YouWei Zhao
|
13aca79afb
|
Update editor_file.js
|
2018-01-07 22:14:51 +08:00 |
|
YouWei Zhao
|
9197a4d727
|
分离了楼层文件之外的数据的注释
|
2018-01-06 22:25:19 +08:00 |
|
YouWei Zhao
|
62fbd21836
|
Update editor_file.js
|
2018-01-05 20:43:11 +08:00 |
|
YouWei Zhao
|
137554623e
|
改变目录结构
|
2018-01-05 19:55:53 +08:00 |
|