Commit Graph

116 Commits

Author SHA1 Message Date
YouWei Zhao
eb8a045816 把editor的代码拆分到单独的文件中 2018-01-08 19:28:11 +08:00
YouWei Zhao
c0481b5e12
Merge fix bug
Master
2018-01-08 16:22:53 +08:00
oc
0d4ba49cc3 Fix Some Bugs 2018-01-08 13:19:32 +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
YouWei Zhao
5671d5501e 取消了editor模式的部分动画 & fix bug 2018-01-02 12:37:40 +08:00
YouWei Zhao
a9835de64a editor_file & comment.js 2018-01-01 19:31:32 +08:00
YouWei Zhao
f6f4745b5d Merge remote-tracking branch 'refs/remotes/origin/master' into 2.0-1.3-merge
# Conflicts:
#	drawMapGUI.html
#	libs/core.js
#	libs/data.js
#	libs/enemys.js
#	libs/maps.js
#	main.js
2018-01-01 11:45:29 +08:00
oc
d0774de9f0 Ver 1.3 2018-01-01 09:40:38 +08:00
oc
4ae315d53f Avoid Cache 2018-01-01 01:56:11 +08:00
ckcz123
4c80b0216d Fix Doc Bug 2017-12-31 22:52:59 +08:00
ckcz123
2f50679891 V1.3 2017-12-31 22:43:19 +08:00
ckcz123
bd1ad3916a Merge branch 'master' of https://github.com/ckcz123/mota-js 2017-12-31 22:31:55 +08:00
ckcz123
3195e1d505 Update 2017-12-31 22:31:50 +08:00
echo
ab1f9bb4d5 merge ckcz123 2017-12-31 22:23:44 +08:00
echo
92a2c8cef1 update autotile 2017-12-31 22:00:26 +08:00
oc
e1fdfa3da5 战前剧情 2017-12-31 16:54:58 +08:00
oc
81727e1e71 战前剧情 2017-12-31 16:25:49 +08:00
YouWei Zhao
5438001ea0 editor: import main.js
画图部分完美结合
2017-12-31 15:29:44 +08:00
ckcz123
334e215009 可以使用自己的图片素材作为背景 2017-12-31 14:58:35 +08:00
YouWei Zhao
ba7bbbc7be editor: import main.js
目前状态是都能工作,需要重写editor的方法
2017-12-31 12:15:19 +08:00
YouWei Zhao
fd8a03a90d merge 1.3 into 2.0
merge data
2017-12-31 10:49:57 +08:00
YouWei Zhao
5f248444ec merge 1.3 into 2.0 2017-12-31 10:30:01 +08:00
oc
4bfb23b845 Merge branch 'master' of https://github.com/ckcz123/mota-js 2017-12-31 01:35:30 +08:00
oc
a58067cd6a Update V1.3 2017-12-31 01:35:21 +08:00
echo
9ce6ba8d3f merge ckcz123 2017-12-31 01:16:58 +08:00
echo
04eaf07ed1 merge ckcz123 2017-12-31 01:12:44 +08:00
YouWei Zhao
627bcee8c4 main.init('editor') 2017-12-30 21:18:58 +08:00
ckcz123
2d9278f8f6 Monster Detail 2017-12-30 18:05:21 +08:00
ckcz123
f2bfa7cd84 Update Enemy Detail 2017-12-30 17:25:39 +08:00
oc
9ecccf35de N连击 2017-12-30 15:58:42 +08:00
oc
c0d67d431c N连击 2017-12-30 15:38:54 +08:00
oc
0c61b6d28d Add Point' 2017-12-30 14:28:21 +08:00
echo
1a67fec545 重构&更新autotile算法 2017-12-29 18:35:06 +08:00
ckcz123
f3ab1dc83f Update damage 2017-12-29 18:00:12 +08:00
oc
53ba0d4f51 Update BGM 2017-12-29 16:47:09 +08:00
oc
7e832d0496 Music 2017-12-29 12:39:49 +08:00
oc
02b67f3c40 Music 2017-12-29 12:32:18 +08:00
oc
95686a637c Music 2017-12-29 12:28:59 +08:00
oc
5f7a03ec70 FloorMsgGroup 2017-12-28 22:02:08 +08:00
oc
c99997dca4 支持阻击 2017-12-28 19:16:31 +08:00
YouWei Zhao
d8ea628f11 重命名目录 2017-12-28 17:15:45 +08:00
YouWei Zhao
8873991004 数据json化 2017-12-28 16:19:38 +08:00
oc
8dcb6cb61a Update Snipe 2017-12-28 13:27:54 +08:00
oc
dab6656720 领域、夹击机制更新 2017-12-28 12:08:01 +08:00
oc
b549a5fd19 Enable Level Up 2017-12-28 09:23:46 +08:00
oc
fc01f43336 Enable Level Up 2017-12-28 09:20:16 +08:00
oc
68f0a28a61 Enable Level Up 2017-12-28 09:17:35 +08:00
oc
cf02a59dee Update Status Bar 2017-12-28 01:51:13 +08:00
oc
38672bd677 Update Curtain 2017-12-27 23:45:44 +08:00