Commit Graph

141 Commits

Author SHA1 Message Date
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
oc
f26293a7ad Open book while viewing maps 2018-02-04 16:22:12 +08:00
oc
c0bfac2f36 Enemy Vampire 2018-01-24 14:33:57 +08:00
oc
ad3272f23e Update V1.3.2 2018-01-20 23:49:26 +08:00
oc
1213a32cc5 Equipment 2018-01-20 22:46:24 +08:00
ckcz123
07f71ed617 Zone Square 2018-01-19 12:44:20 +08:00
oc
f2843eca9a Fix Damage Bug 2018-01-18 01:21:27 +08:00
oc
7c40ae3da9 Fix Damage Bug 2018-01-18 01:17:59 +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
oc
d0774de9f0 Ver 1.3 2018-01-01 09:40:38 +08:00
YouWei Zhao
5f248444ec merge 1.3 into 2.0 2017-12-31 10:30:01 +08:00
oc
a58067cd6a Update V1.3 2017-12-31 01:35:21 +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
ckcz123
f3ab1dc83f Update damage 2017-12-29 18:00:12 +08:00
oc
53ba0d4f51 Update BGM 2017-12-29 16:47:09 +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
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
84f44ae08a Update Map Generator 2017-12-27 13:55:28 +08:00
oc
6a4be76625 Update Map Generator 2017-12-21 22:39:40 +08:00
oc
91b19477f8 领域夹击处理机制更新 2017-12-20 16:48:11 +08:00
oc
f919f7bffd Custom Event: Hero Move 2017-12-19 23:07:38 +08:00
ckcz123
c635218959 Fix Bug 2017-12-17 22:35:58 +08:00
ckcz123
0de35b6258 更新Autotile和感叹号 2017-12-17 18:01:45 +08:00
oc
e77762b10f 怪物双属性 2017-12-17 14:39:21 +08:00
oc
2f42a9402b Battle 2017-12-15 21:25:33 +08:00
oc
3f10919c00 V0.1 2017-12-15 14:23:27 +08:00
oc
eb77c48057 Update Final 2017-12-09 14:39:48 +08:00
oc
9e37717f24 Sample2 2017-12-08 13:04:20 +08:00
oc
f176716816 Finish sample1 2017-12-08 02:19:56 +08:00
oc
31e5f5d81a Reformat code 2017-12-05 21:47:46 +08:00
oc
dd994e447f Update Template 2017-12-05 01:10:20 +08:00
oc
4297e6998c First Commit 2017-12-04 01:35:38 +08:00