Commit Graph

35 Commits

Author SHA1 Message Date
YouWei Zhao
eb8a045816 把editor的代码拆分到单独的文件中 2018-01-08 19:28:11 +08:00
YouWei Zhao
9197a4d727 分离了楼层文件之外的数据的注释 2018-01-06 22:25:19 +08:00
YouWei Zhao
137554623e 改变目录结构 2018-01-05 19:55:53 +08:00
YouWei Zhao
4659f4ddcd editor.changeFloor 2018-01-02 13:35:27 +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
YouWei Zhao
97838927db fix bug 2018-01-01 02:40:21 +08:00
YouWei Zhao
4f6bf850f8 editor: import main.js
editor完全使用core的数据
2017-12-31 15:49:03 +08:00
YouWei Zhao
5438001ea0 editor: import main.js
画图部分完美结合
2017-12-31 15:29:44 +08:00
echo
878d27eb0a add bgimg seletion 2017-12-31 15:27:58 +08:00
YouWei Zhao
ba7bbbc7be editor: import main.js
目前状态是都能工作,需要重写editor的方法
2017-12-31 12:15:19 +08:00
YouWei Zhao
fb7749a67e fix bug 2017-12-31 10:54:11 +08:00
YouWei Zhao
5f248444ec merge 1.3 into 2.0 2017-12-31 10:30:01 +08:00
echo
d37c28abdf for v1.3 2017-12-31 01:07:25 +08:00
YouWei Zhao
627bcee8c4 main.init('editor') 2017-12-30 21:18:58 +08:00
YouWei Zhao
f92124e162 editor.file demo 2017-12-30 12:02:19 +08:00
echo
1a67fec545 重构&更新autotile算法 2017-12-29 18:35:06 +08:00
YouWei Zhao
8873991004 数据json化 2017-12-28 16:19:38 +08:00
YouWei Zhao
24689ce46e Update drawMapGUI
把错误图块标红,改成了点导出,如果失败了,把所有未识别id的块标红5秒
2017-12-26 09:15:19 +08:00
YouWei Zhao
0a15e303c1 重构drawMapGui 2017-12-26 00:55:41 +08:00
echo
77f43a8d5a change color 2017-12-24 00:02:48 +08:00
echo
d85cb2574c fix font & selectbox bug 2017-12-22 22:53:28 +08:00
echo
a6b61c6589 fix some bug 2017-12-22 19:29:27 +08:00
echo
bf75aad55b fix font? 2017-12-22 14:17:15 +08:00
echo
c7879dfa14 fix font? 2017-12-22 14:12:12 +08:00
echo
9b33c7ee49 undo something 2017-12-22 13:33:11 +08:00
echo
f1e1725e9f use local jslib 2017-12-22 13:17:45 +08:00
echo
a71174f55f fix gui layout 2017-12-22 13:11:33 +08:00
echo
2e7aa2dec0 update drawmapgui 2017-12-22 00:29:04 +08:00
echo
c4d1f61737 update drawmapgui 2017-12-22 00:17:15 +08:00
echo
bc789fc0df update drawMapGui 2017-12-21 22:35:12 +08:00
oc
9d07b2ba22 Ver 1.2 2017-12-21 01:11:36 +08:00
oc
0b08cd4533 Update PS Tool 2017-12-18 23:59:28 +08:00
echo
3a7c988148 drawmapgui: update layout 2017-12-18 22:14:42 +08:00
YouWei Zhao
1663575f57 drawMapGUI
基本完成了issues/9的初期目标
2017-12-18 16:16:44 +08:00
YouWei Zhao
0e45b60ccc demo
只能画出图片
2017-12-18 13:14:17 +08:00