Commit Graph

57 Commits

Author SHA1 Message Date
oc
f97495a6b6 Support Reborn 2018-03-03 23:34:10 +08:00
YouWei Zhao
b7a8820a75 分离index.html中用户修改的部分 2018-02-28 15:12:29 +08:00
YouWei Zhao
8f6dbbbe59 分离index.html中用户修改的部分 2018-02-28 14:45:13 +08:00
YouWei Zhao
2334a7dd06 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-appendPic-20180218
# Conflicts:
#	libs/core.js
#	main.js
2018-02-27 18:05:31 +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
9197a4d727 分离了楼层文件之外的数据的注释 2018-01-06 22:25:19 +08:00
YouWei Zhao
137554623e 改变目录结构 2018-01-05 19:55:53 +08:00