Commit Graph

1196 Commits

Author SHA1 Message Date
ckcz123
6011545f68 blockNumber: & UnaryOperators 2020-07-05 18:28:02 +08:00
ckcz123
ba64fb0cac \g可以切换字体 2020-07-05 10:59:21 +08:00
ckcz123
9ce7815b7b revert project to v2.x 2020-07-04 20:14:09 +08:00
ckcz123
ffbf527892 删除平滑移动镜头插件 2020-07-04 20:11:55 +08:00
ckcz123
981538a175 Fix clearStatusBar 2020-07-04 18:22:25 +08:00
ckcz123
53573ead5e 地图绘制优化;缓存 2020-07-04 18:08:15 +08:00
ckcz123
3523358cba 大地图绘制缩略图 2020-07-03 22:12:15 +08:00
ckcz123
bde409bae2 Optimize extractBlocks 2020-07-03 17:06:26 +08:00
ckcz123
94e62f926a 地图绘制双缓冲 2020-07-03 15:11:31 +08:00
ckcz123
b2fb0721ba Merge branch 'v2.x' into v2.x-bigmap 2020-07-03 12:54:11 +08:00
ckcz123
1b4f8f3688 修复编辑器大地图透明地面问题 2020-07-03 12:53:48 +08:00
ckcz123
49ca100dfd 优化瞬移判定和自动寻路算法 2020-07-02 22:10:26 +08:00
ckcz123
1574e189b8 Merge branch 'v2.x' into v2.x-bigmap 2020-07-02 12:31:55 +08:00
ckcz123
7e38486c80 修复全局商店\r和\n转义问题 2020-07-02 00:08:46 +08:00
ckcz123
5b4075fc8a 超大地图显伤 2020-07-01 20:18:41 +08:00
ckcz123
dbf328512a Bigmap v2 implementation 2020-06-30 22:02:28 +08:00
ckcz123
835d34e6c3 Bigmap prototype 2020-06-30 19:11:19 +08:00
ckcz123
1879d69670 Fix searchBlock bug 2020-06-28 22:28:28 +08:00
ckcz123
064ebfb69d Fix type:update 2020-06-28 14:50:43 +08:00
ckcz123
9387479b73 Fix mobile z-index 2020-06-28 13:37:34 +08:00
ckcz123
ea2fdb2887 getToolboxItems;48的怪物上16像素透明 2020-06-27 13:08:27 +08:00
ckcz123
fa7f6ab764 物品分类插件 2020-06-25 16:29:54 +08:00
ckcz123
31da8f8eb5 选项框颜色;本地文档 2020-06-24 11:21:17 +08:00
ckcz123
ae57ae2cf5 读档GUID检查;同步存档缩短长度 2020-06-23 21:54:07 +08:00
ckcz123
7433b5117d Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2020-06-23 19:59:43 +08:00
ckcz123
dbb46023c9 Fix editor_color 2020-06-23 19:59:34 +08:00
ckcz123
14199c0cd3 Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2020-06-22 14:49:38 +08:00
ckcz123
942e256e0a getStatusLabel 2020-06-22 14:49:01 +08:00
ckcz123
8f50e1cf58 更多内置插件;V2.7.1 GA 2020-06-20 23:37:47 +08:00
ckcz123
34080197f7 blockly自动补全 2020-06-19 11:23:18 +08:00
ckcz123
398dfaed20 H键帮助 2020-06-18 16:17:11 +08:00
ckcz123
138800ed07 Fix scrollbar 2020-06-17 21:01:09 +08:00
ckcz123
7f5b6b6ba1 Fix scrollTo in Edge 2020-06-17 19:55:10 +08:00
ckcz123
25ab3d78b6 编辑器大地图模式 2020-06-17 19:28:52 +08:00
ckcz123
fbdf2d2a96 编辑器大地图模式 2020-06-17 17:32:58 +08:00
ckcz123
aa4de2df2c Fix flag:hard negative 2020-06-17 15:11:42 +08:00
ckcz123
34753d9552 Fix bugs 2020-06-16 23:30:47 +08:00
ckcz123
53ee07348f Avoid override field color 2020-06-16 19:41:52 +08:00
ckcz123
3d49b62e18 Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2020-06-16 19:22:21 +08:00
ckcz123
69b688bdfd 分区砍层插件 2020-06-16 18:24:19 +08:00
ckcz123
53b45ce3dc Blockly dark theme 2020-06-15 23:44:25 +08:00
ckcz123
5e5087f693 Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2020-06-15 22:20:32 +08:00
YouWei Zhao
d163555786 fix Bool 2020-06-15 22:12:11 +08:00
ckcz123
418e2d5989 Fix height of body 2020-06-15 21:57:34 +08:00
ckcz123
88ec58ead9 Fix dark theme 2020-06-15 21:30:17 +08:00
ckcz123
3d315ed8f6 Multiline input 2020-06-15 20:10:40 +08:00
ckcz123
176e5a9798 更新blockly到最新;修复复制粘贴问题 2020-06-15 17:22:40 +08:00
Zhang Chen
0a14502d94
Merge pull request #489 from zhaouv/update-blockly
update blockly version & fix copy
2020-06-15 15:23:15 +08:00
ckcz123
ed40419e42 编辑器夜间模式 2020-06-15 14:41:41 +08:00
ckcz123
68fd076b06 浏览地图时进行标记;数据统计部分楼层 2020-06-15 12:03:31 +08:00
ckcz123
11d1e18a37 毒衰咒处理不走公共事件 2020-06-15 11:22:11 +08:00
ckcz123
037b00e4b8 录像折叠 2020-06-13 21:35:50 +08:00
YouWei Zhao
dac62c128d update blockly version & fix copy
其余的修改的blockly函数的修复要依照blockly对应的分支的来重写
多行文本的使用参照文档
2020-06-13 21:09:13 +08:00
ckcz123
bbbbf9b565 存档笔记 2020-06-13 17:50:23 +08:00
ckcz123
1b1b46fa6d Suppress warnings 2020-06-12 21:45:57 +08:00
ckcz123
12d134b1dc 跳跃事件支持增量 2020-06-12 15:54:54 +08:00
ckcz123
e11532ed3c 道具商店支持经验 2020-06-12 14:54:03 +08:00
ckcz123
1ceb496d2e 后退最近访问的楼层 2020-06-12 14:41:09 +08:00
ckcz123
508c7ba310 地图多选点 2020-06-12 14:00:17 +08:00
ckcz123
dcef38ce61 Merge branch 'v2.7' into v2.x 2020-06-12 12:33:30 +08:00
ckcz123
58bb89c87c 地图未保存时的刷新提示 2020-06-10 22:14:00 +08:00
ckcz123
8ae45444d6 Fix turnBlock selectPoint 2020-06-10 10:21:50 +08:00
ckcz123
15e1b5ebd2 Merge branch 'v2.7' into v2.x 2020-06-09 20:40:50 +08:00
ckcz123
9d8c6a74ab 支持3x4道具快速追加 2020-06-09 20:38:43 +08:00
ckcz123
d93af5ea52 Merge branch 'v2.7' into v2.x 2020-06-09 20:29:00 +08:00
ckcz123
4fbda13848 Merge branch 'v2.7' of https://github.com/ckcz123/mota-js into v2.7 2020-06-09 20:27:06 +08:00
ckcz123
a6235117b2 拖动素材快速追加 2020-06-09 20:27:02 +08:00
ckcz123
4eb894193c Avoid scrollbar overlaying lastUsed 2020-06-09 16:24:18 +08:00
ckcz123
16502c0efb merge editor.css and editor_mode.css 2020-06-09 14:07:45 +08:00
ckcz123
afbfde5dc2 Merge branch 'v2.7' into v2.x 2020-06-09 12:28:51 +08:00
ckcz123
fda4949403 修复额外素材的区域不消失的问题 2020-06-09 12:27:24 +08:00
ckcz123
3828308cd8 修复地图存储问题 2020-06-09 11:48:49 +08:00
ckcz123
62e7be6319 分离editor_color.css从而更方便进行配色 2020-06-09 11:02:15 +08:00
ckcz123
e83eecde63 分离editor_color.css从而更方便进行配色 2020-06-09 10:58:08 +08:00
Zhang Chen
b51083fafc
Merge pull request #485 from zhaouv/blockly-dark-theme
blockly dark theme
2020-06-08 19:29:38 +08:00
ckcz123
39c792d1eb 额外素材注册的提示 2020-06-08 16:46:18 +08:00
ckcz123
4e0d981e4a Fix known bugs 2020-06-08 11:33:17 +08:00
ckcz123
3c0b3a8db8 HTML5魔塔样板V2.7 2020-06-07 20:08:07 +08:00
ckcz123
7980de899c 大幅优化文档 2020-06-07 18:32:20 +08:00
YouWei Zhao
db653ec14e blockly dark theme 2020-06-07 15:25:15 +08:00
ckcz123
a52c151dd8 最近使用图块可滚动 2020-06-07 11:29:03 +08:00
ckcz123
a64f80414a Compress CodeMirror 2020-06-07 11:02:06 +08:00
ckcz123
3282aba011 修复前景层bug;修复自动补全 2020-06-07 00:16:11 +08:00
ckcz123
9342c12842 更新自动补全 2020-06-06 22:59:10 +08:00
ckcz123
dbc541ca65 给codemirror增加更多插件 2020-06-06 18:11:44 +08:00
ckcz123
befd822206 更新函数自动补全 2020-06-06 16:02:04 +08:00
ckcz123
d3817ce868 更新函数自动补全 2020-06-06 16:01:18 +08:00
YouWei Zhao
30a4b04440 translate defs.js 2020-06-06 14:34:31 +08:00
ckcz123
53ae839457 更新变量的自动补全 2020-06-06 10:29:06 +08:00
ckcz123
923f16e77e 更新自动补全信息 2020-06-06 00:27:02 +08:00
ckcz123
eba9b80d68 更新core的基本信息 2020-06-05 19:04:22 +08:00
ckcz123
cd561072c6 Optimize defs.js 2020-06-05 16:46:17 +08:00
ckcz123
f9786a7de3 showDoc on cursor 2020-06-05 09:12:16 +08:00
ckcz123
d3e27a76c8 Update lint 2020-06-04 23:11:56 +08:00
ckcz123
6508e2af98 Use tern to auto-complete 2020-06-04 20:49:30 +08:00
ckcz123
f865914139 一些细节的修复 2020-06-04 12:05:49 +08:00
ckcz123
2feed20190 修复数值操作默认值 2020-06-03 22:15:55 +08:00
ckcz123
c60ae14ae2 Fix v2.7 工程 2020-06-03 21:05:38 +08:00
ckcz123
bb1e8060bd Optimize jshint.min.js 2020-06-03 19:46:01 +08:00
YouWei Zhao
ce0deb4877 jump_s 2020-06-03 16:22:41 +08:00
YouWei Zhao
f8dd9159fe change fixed list to EnemyId_List 2020-06-03 15:58:24 +08:00
YouWei Zhao
bede1ff661 调整事件块双击&添加第一个menu例子 2020-06-03 15:47:56 +08:00
ckcz123
afbfb305ef 编辑器动画预览 2020-06-03 14:33:44 +08:00
ckcz123
3ecc62b11f Small fixes 2020-06-03 10:50:40 +08:00
ckcz123
7bc2a868b4 Remove 416 from editor 2020-06-02 20:38:52 +08:00
ckcz123
35e8784da5 预览立绘和图片;选择bgm 2020-06-02 18:03:23 +08:00
ckcz123
934aa025f8 显示文本立绘块 2020-06-02 16:40:25 +08:00
ckcz123
5e74584426 运算符 2020-06-02 14:47:31 +08:00
ckcz123
c7dc28f3a9 翻译数值操作运算符 2020-06-02 14:06:08 +08:00
ckcz123
5c16fa55b2 更新五图层插件 2020-06-02 11:21:50 +08:00
ckcz123
57ef15745c Update uievent onKeyDown 2020-06-02 00:17:13 +08:00
ckcz123
45e6864c07 Fix small bugs 2020-06-01 11:28:10 +08:00
ckcz123
48c4d57cd3 Fix small bugs 2020-06-01 11:25:02 +08:00
ckcz123
1e7bbac498 Copy floorId 2020-05-31 21:59:40 +08:00
ckcz123
8154275884 楼传落点 2020-05-31 16:52:27 +08:00
ckcz123
753bd92cc1 搜索事件块 2020-05-31 13:17:40 +08:00
ckcz123
d5bdb1f49a 重构存读档结构 2020-05-31 13:08:11 +08:00
ckcz123
c2a2c58b5f 修复怪物ID问题;骷髅素材 2020-05-30 23:00:07 +08:00
ckcz123
c4d11b1ee5 使用ajax获得index.html 2020-05-30 19:03:56 +08:00
ckcz123
9ab7150088 简化五图层插件 2020-05-30 18:43:51 +08:00
Zhang Chen
73de017d92
Merge pull request #473 from tocque/chore2.x
inject index.html
2020-05-30 17:00:14 +08:00
ckcz123
217e9f8966 大地图选点;removeBlock自动元件 2020-05-30 12:28:24 +08:00
tocque
b0a544ba6c inject index.html 2020-05-30 11:43:24 +08:00
ckcz123
8409bb13ed 样板层文案;关门音效 2020-05-30 10:58:16 +08:00
YouWei Zhao
3e2d773f63 修复右键bug&文档链接&修复强制战斗 2020-05-30 10:29:03 +08:00
ckcz123
9c503bed90 修复右键菜单反复弹出问题 2020-05-28 23:00:16 +08:00
ckcz123
8220860c68 修复额外素材可通行性问题 2020-05-28 20:37:07 +08:00
ckcz123
fa82673848 替换素材;修复蓝点问题 2020-05-28 19:53:59 +08:00
ckcz123
95cbebb62c 五图层插件 2020-05-28 19:11:20 +08:00
ckcz123
b83b4cdf64 批量清空道具怪物属性 2020-05-28 18:34:53 +08:00
ckcz123
20432b0e05 更新楼层属性勾选框位置 2020-05-28 15:25:45 +08:00
ckcz123
64052d1901 高亮fff4bb->ffd700 2020-05-28 14:37:02 +08:00
ckcz123
f63f97244e Fix changeFloor bug 2020-05-26 23:25:19 +08:00
ckcz123
91f73e7c49 Fix bugs 2020-05-26 21:40:48 +08:00
ckcz123
1d6a29cdf6 光环检查问题 2020-05-26 19:57:13 +08:00
ckcz123
6d0765e15e 怪物属性内置颜色 2020-05-26 18:28:58 +08:00
ckcz123
20f2671206 怪物详细信息光环错误;钥匙不消耗 2020-05-26 14:40:04 +08:00
ckcz123
f90814b5ff 修复地图编辑框的bug;干掉历史遗留的全局变量 2020-05-26 10:49:43 +08:00
ckcz123
9f139d1a7a 绘制矩形和图片旋转 2020-05-25 19:51:27 +08:00
ckcz123
b6ecb6526e reset config.json 2020-05-25 13:15:35 +08:00
ckcz123
5314aa491c Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2020-05-25 13:14:18 +08:00
ckcz123
8b183544c9 修复商店录像bug;怪物属性多选框;修复接档工具bug 2020-05-25 13:13:41 +08:00
Zhang Chen
7a07195b2c
Merge pull request #470 from AutumnOrange51/v2.x
V2.x
2020-05-25 11:41:04 +08:00
AutumnOrange51
321d5c5ada update docs 2020-05-24 23:24:30 +08:00
Zhang Chen
1b46551894
Merge pull request #468 from zhaouv/editor-doc
doc:修改编辑器
2020-05-24 20:11:56 +08:00
ckcz123
5f7bdb781b 替换按钮颜色 2020-05-24 18:59:18 +08:00
ckcz123
fc5623514b 右键反复弹窗;上下楼选点;放缩dom 2020-05-24 18:53:56 +08:00
YouWei Zhao
c17d3cb109 doc:修改编辑器 2020-05-24 18:30:20 +08:00
ckcz123
5d553e399a 绑定上下楼梯事件 2020-05-24 11:49:00 +08:00
ckcz123
07eb9fdbe6 移除nowLoc,合并存档同步,竖屏标题页面,右键焦点 2020-05-24 10:50:13 +08:00
ckcz123
ac78f738ff Fix bug 2020-05-23 21:40:13 +08:00
ckcz123
2adf9ed529 接档工具 2020-05-23 19:33:12 +08:00
ckcz123
b9957b51a4 更新录像系统 2020-05-23 15:43:04 +08:00
ckcz123
7d6f5f35fb 合并items 2020-05-23 11:57:39 +08:00
ckcz123
11f32eb701 初始化和读档优化:不重建全部blocks 2020-05-23 10:14:00 +08:00
ckcz123
7707e9f689 合并全塔属性的样式 2020-05-23 08:04:41 +08:00
YouWei Zhao
7f79e9be59
Merge branch 'v2.x' into blockly-entrance 2020-05-22 21:24:50 +08:00
ckcz123
10c972dc0b ID:this代表当前点 2020-05-22 21:17:42 +08:00
YouWei Zhao
e5440ddc18 取消中文替换的前缀判定 2020-05-22 21:08:56 +08:00
YouWei Zhao
f923a7c997 简化补全分类判断代码 2020-05-22 20:40:15 +08:00
YouWei Zhao
e157d0735c 调整自动补全的配置 2020-05-22 20:28:35 +08:00
YouWei Zhao
5130969bdb Merge branch 'ckcz123/v2.x' into blockly-entrance 2020-05-22 19:57:08 +08:00
YouWei Zhao
daa014b7b3 update converter.bundle&调整双击blockly的判定 2020-05-22 19:49:05 +08:00
ckcz123
363d451f50 道具与怪物名的替换 2020-05-22 19:45:43 +08:00
ckcz123
2ac5a58e7b Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2020-05-22 18:44:48 +08:00
ckcz123
c41887bb19 MotaActionParse -> MotaActionParser 2020-05-22 18:44:27 +08:00
Zhang Chen
d3a03dc29e
Merge pull request #463 from zhaouv/blockly-entrance
更换options的引用
2020-05-22 18:42:35 +08:00
ckcz123
ba4e76d1ee Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2020-05-22 18:39:04 +08:00
ckcz123
a22c80e5bd 右键拉框复制剪切粘贴 2020-05-22 18:38:10 +08:00
YouWei Zhao
cd27054679 更换options的引用 2020-05-22 16:38:13 +08:00
Zhang Chen
29d9822916
Merge pull request #462 from zhaouv/blockly-entrance
add ===&move initscript
2020-05-22 12:42:57 +08:00
YouWei Zhao
a8d98bcb25 add ===&move initscript 2020-05-22 11:07:32 +08:00
ckcz123
c6d2bbeea5 Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2020-05-22 10:43:17 +08:00
ckcz123
6ab04d71c8 勇士帧动画;ratio;优化注释 2020-05-22 10:43:03 +08:00
Zhang Chen
63369a4312
Merge pull request #461 from zhaouv/blockly-entrance
Blockly entrance
2020-05-22 10:32:29 +08:00
Zhang Chen
5119f44a4e
Merge pull request #460 from zhaouv/map-edit
选中区域
2020-05-22 10:31:28 +08:00
YouWei Zhao
df7da15f9f 入口方块筛选&移除 dom entrytype 2020-05-22 10:10:43 +08:00
YouWei Zhao
53f98f7b3a update converter.bundle 2020-05-22 09:47:32 +08:00
ckcz123
237b6a4926 门信息&朝向的图块 2020-05-21 12:32:33 +08:00
ckcz123
57fff1b3e2 Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2020-05-21 10:58:27 +08:00
ckcz123
e6b4c78114 楼层贴图图块化 2020-05-21 10:58:20 +08:00
ckcz123
803b7c3cc4 楼层色调颜色选择器 2020-05-20 23:52:02 +08:00
ckcz123
9f42963db8 右键复制粘贴事件 2020-05-20 22:35:08 +08:00
ckcz123
b2b60b133e :x, :y, :o 翻转图片绘制 2020-05-20 17:48:17 +08:00
YouWei Zhao
4c94ce4edb 选中区域 2020-05-20 14:49:05 +08:00
ckcz123
7b54f0d3d3 装备同时支持数值和百分比属性 2020-05-20 13:58:42 +08:00
ckcz123
c9f66a959c Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2020-05-19 23:04:19 +08:00
ckcz123
fb49beb1fd 增加砍层插件 2020-05-19 23:03:53 +08:00
YouWei Zhao
075390df0a tileset平铺 2020-05-19 22:57:24 +08:00
ckcz123
dc5ff0e309 额外素材拖框绘制 2020-05-19 21:56:25 +08:00
Zhang Chen
0bfef141c7
Merge pull request #458 from zhaouv/map-edit
保存地图高亮和框选素材
2020-05-19 21:17:34 +08:00
YouWei Zhao
ebbb4b8b46 fix unhighlight button 2020-05-19 20:30:07 +08:00
YouWei Zhao
bdca4fdd55 框选tileset 2020-05-19 20:24:08 +08:00
YouWei Zhao
0bd37974a2 fix regexp format for moblie 2020-05-19 17:12:01 +08:00
ckcz123
1567b736e1 show/hideHero with time 2020-05-19 17:00:18 +08:00
YouWei Zhao
eca70afcc4 fix missing in exchangePos 2020-05-19 16:27:32 +08:00
YouWei Zhao
fa61c25cf8 highlight savefloor button 2020-05-19 14:24:08 +08:00
ckcz123
91e4e40fc0 转变图块带淡入淡出时间和异步效果 2020-05-19 14:00:57 +08:00
ckcz123
b45afe0ae4 设置开门时间 2020-05-19 13:09:35 +08:00
ckcz123
c2f8c37983 难度选择分歧事件 2020-05-19 12:58:31 +08:00