Commit Graph

2718 Commits

Author SHA1 Message Date
ckcz123
11f32eb701 初始化和读档优化:不重建全部blocks 2020-05-23 10:14:00 +08:00
ckcz123
7707e9f689 合并全塔属性的样式 2020-05-23 08:04:41 +08:00
Zhang Chen
566462d6ea
Merge pull request #464 from zhaouv/blockly-entrance
merge
2020-05-22 21:25:58 +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
012c8d7d80 更新keyboard 2020-05-21 22:04:21 +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
d1edf27dde fix core.status.floorId in afterXXX 2020-05-20 11:28:56 +08:00
ckcz123
c285584b1b Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2020-05-20 11:14:35 +08:00
ckcz123
9818065eae Update _drawHero_updateViewport 2020-05-20 11:14:19 +08:00
ckcz123
1b8fa24dbb enemy.experience->exp 2020-05-19 23:27:35 +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
Zhang Chen
67a88a7c18
Merge pull request #459 from zhaouv/map-edit
tileset平铺
2020-05-19 23:01:54 +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
ckcz123
9143d687d4 用户调整游戏放缩 2020-05-19 21:11:50 +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