Commit Graph

286 Commits

Author SHA1 Message Date
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
oc
998ed9ddc2 Update Ski & Push Bpx 2018-02-14 13:34:44 +08:00
YouWei Zhao
3ab73eb5bc Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-201802102001 2018-02-14 00:15:17 +08:00
oc
e44ff57f26 View maps 2018-02-13 21:03:01 +08:00
oc
5b751aea8a View maps 2018-02-13 21:00:38 +08:00
oc
903725efde Small bug 2018-02-13 16:31:48 +08:00
YouWei Zhao
e1e9ee2f58 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-201802102001 2018-02-12 17:00:07 +08:00
oc
6829e60d43 Update Autosave Bug 2018-02-12 16:41:39 +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
oc
f9a147b0ba Fix a Bug 2018-02-12 14:18:11 +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
oc
c0fcbea201 V1.4.1 2018-02-09 20:56:05 +08:00
oc
fa5aece101 Fix a small bug 2018-02-08 13:38:06 +08:00
oc
3f1a039c86 V1.4 2018-02-06 16:56:27 +08:00
oc
9b48c01c9b V1.4 2018-02-06 14:14:23 +08:00
oc
6bb839f7db Update 2018-02-06 14:07:56 +08:00
oc
d02f9df848 Support Animate 2018-02-06 13:36:18 +08:00
oc
99463c6e5e Support Show Image 2018-02-05 22:16:55 +08:00
oc
aab1bfa40b Support Weather 2018-02-05 21:22:59 +08:00
oc
c1d2e34317 Support Weather 2018-02-05 21:21:50 +08:00
oc
9330a18664 Conversation 2018-02-04 20:06:31 +08:00
oc
f26293a7ad Open book while viewing maps 2018-02-04 16:22:12 +08:00
oc
a6045f321d setRequestAnimationFrame 2018-02-04 15:37:20 +08:00
oc
46fc674b86 setRequestAnimationFrame 2018-02-04 15:33:09 +08:00
oc
a24fc1db38 Fix Hero Bug 2018-02-04 12:26:18 +08:00
oc
02337f0e64 Fix Hero Bug 2018-02-04 12:08:51 +08:00
oc
53ca30a913 Modify trigger 2018-02-04 12:00:04 +08:00
oc
e0b7331a1a Cursor 2018-02-01 22:00:32 +08:00
oc
deb465ed5c Single save 2018-02-01 10:57:38 +08:00
oc
777e296179 Move Directly 2018-01-31 20:29:33 +08:00
oc
aa3d86aaff Move Directly 2018-01-31 20:21:41 +08:00
oc
528c281bd3 Update 2018-01-26 17:26:08 +08:00
oc
875fdc8be8 Fix Replay Time 2018-01-25 02:29:29 +08:00
oc
32c9d58b65 Replay Control 2018-01-25 01:56:00 +08:00
oc
c0bfac2f36 Enemy Vampire 2018-01-24 14:33:57 +08:00
oc
1cc55f5a11 Prompt & Replay 2018-01-22 22:40:49 +08:00
oc
df16c42637 Fix v1.3.2 Bug 2018-01-22 22:19:23 +08:00
oc
6b34e1e126 Fix A small bug 2018-01-22 17:06:49 +08:00
oc
02a0f0aa43 Update Between Attack 2018-01-20 10:10:35 +08:00
ckcz123
07f71ed617 Zone Square 2018-01-19 12:44:20 +08:00
oc
024fed913b Fix Bug 2018-01-18 22:46:33 +08:00
oc
40e207be23 Fix Bug 2018-01-18 21:03:53 +08:00
oc
73e5d96ab4 View Maps 2018-01-18 03:01:46 +08:00
oc
8d9b3f9106 Replay Quick Shop 2018-01-17 22:28:32 +08:00
ckcz123
91cc1046e6 Upload 2018-01-17 20:53:40 +08:00
ckcz123
f736e1cf7b Update Detect 2018-01-17 20:52:20 +08:00
ckcz123
8fe7dd3848 Upload 2018-01-17 20:26:08 +08:00
ckcz123
ee880b7cda Update Detect 2018-01-17 19:15:29 +08:00
ckcz123
254c2e3f68 Update Chrome Detect 2018-01-17 17:10:07 +08:00
ckcz123
aa77e2aa57 Replay 2018-01-17 16:40:37 +08:00
oc
1a3735f52e ReadFile & Download 2018-01-17 15:02:02 +08:00
oc
d172cbcd86 Fix Snipe Bug 2018-01-17 09:39:38 +08:00
ckcz123
c3da5c5e1c Download 2018-01-16 21:16:50 +08:00
ckcz123
290f2ddb1a Replay 2018-01-16 19:55:14 +08:00
ckcz123
9ebb6652c5 Replay 2018-01-16 19:54:18 +08:00
ckcz123
bbf250047f Replay Directions 2018-01-16 12:54:34 +08:00
oc
c8a2edbfc7 Save & Load Route 2018-01-16 00:20:30 +08:00
oc
c88a31f4c3 Record & Encode route 2018-01-15 20:56:57 +08:00
oc
d34642ca70 Update Shops 2018-01-15 19:22:47 +08:00
ckcz123
143a0afd1e Virtual Keyboard 2018-01-12 17:50:15 +08:00
ckcz123
6b80afe9ee Update AutoSave 2018-01-12 15:53:01 +08:00
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
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
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
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
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
oc
0c61b6d28d Add Point' 2017-12-30 14:28:21 +08:00
oc
53ba0d4f51 Update BGM 2017-12-29 16:47:09 +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
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
38672bd677 Update Curtain 2017-12-27 23:45:44 +08:00
ckcz123
e6eca11ead Multiple Autotiles 2017-12-27 16:10:47 +08:00
ckcz123
94aeacf424 多地面素材 2017-12-26 21:39:57 +08:00
ckcz123
795239934f 全键盘操作 2017-12-26 17:32:37 +08:00
ckcz123
f88a160064 全键盘操作 2017-12-26 16:48:49 +08:00
YouWei Zhao
67666f4f09 优化对称飞行器的用户体验
目的地会根据是否能飞显示绿/红框,再次按键或点击执行,从而使得使用飞时,不再需要仔细看位置
2017-12-23 13:06:53 +08:00
YouWei Zhao
2461373ae3 优化对称飞行器的用户体验 2017-12-23 12:45:12 +08:00
oc
fa954f590d Update ReadMe 2017-12-21 19:22:24 +08:00
ckcz123
4fd2174cac Update Server & Fix Bug 2017-12-20 22:35:03 +08:00
oc
91b19477f8 领域夹击处理机制更新 2017-12-20 16:48:11 +08:00
YouWei Zhao
633e248404 bug fix
添加更多的鼠标滚轮支持
2017-12-20 12:46:00 +08:00
oc
f919f7bffd Custom Event: Hero Move 2017-12-19 23:07:38 +08:00
echo
c7ca813e67 core:resize update adapt width 2017-12-18 16:08:46 +08:00
oc
a208b05c8f 箭头 2017-12-18 00:29:09 +08:00
echo
5fd34446c4 core: movehore add arrow block 2017-12-18 00:01:30 +08:00
echo
d3bfc217ae Merge branch 'ckcz123-master' 2017-12-17 22:37:49 +08:00
echo
e4d176c8c4 merge form ckcz 2017-12-17 22:35:59 +08:00
echo
8ae9697c5e core: BFS add arrow block 2017-12-17 22:34:30 +08:00
ckcz123
a6b50c17ab Fix Bug 2017-12-17 22:18:26 +08:00
echo
81d6b03aa5 merge form ckcz 2017-12-17 18:33:12 +08:00
ckcz123
0de35b6258 更新Autotile和感叹号 2017-12-17 18:01:45 +08:00
echo
f6a138b57f core: add arrow block 2017-12-17 16:58:51 +08:00
echo
050138f486 core: add arrow block 2017-12-17 16:35:03 +08:00
oc
e77762b10f 怪物双属性 2017-12-17 14:39:21 +08:00
oc
ce17747968 Merge branch 'master' of https://github.com/ckcz123/mota-js 2017-12-15 21:25:43 +08:00
oc
2f42a9402b Battle 2017-12-15 21:25:33 +08:00
echo
5ecef0f2c9 fix:Aways show canvas border 2017-12-15 16:00:06 +08:00
echo
91a738bb26 fix:Aways show canvas border 2017-12-15 15:51:37 +08:00
echo
f997bc33e9 fix floormsg css 2017-12-15 15:42:13 +08:00
oc
43a58f173d Update 2017-12-15 15:22:45 +08:00
oc
3f10919c00 V0.1 2017-12-15 14:23:27 +08:00
echo
5fa1ace885 delete .min files 2017-12-09 20:17:25 +08:00
echo
09d3fad8e4 update dom layout 2017-12-09 20:08:39 +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
29b4789969 Fix Bug 2017-12-05 22:29:28 +08:00
oc
31e5f5d81a Reformat code 2017-12-05 21:47:46 +08:00
oc
661e848b7b Update Values 2017-12-05 19:47:46 +08:00
oc
959b84b26d 楼梯、传送器 2017-12-05 12:10:58 +08:00
oc
f453f09636 楼梯、传送器 2017-12-05 11:06:52 +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