jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity
1,265 Commits 1 Branch 2 Tags 50 MiB
11af6673ee
Commit Graph

310 Commits

Author SHA1 Message Date
YouWei Zhao
5f411c0acc editor brushMod 
editor.brushMod = "line"; // ["line","rectangle"]
 2018-07-21 22:18:19 +08:00
ckcz123
e987725523 V2.3.3 2018-07-21 14:59:45 +08:00
oc
1d70bcd131 Move enemy functions to proect 2018-07-19 02:08:04 +08:00
YouWei Zhao
08e0e70acd ondblclick 2018-07-09 22:48:45 +08:00
YouWei Zhao
338323c748 drag 2018-07-09 22:30:43 +08:00
ckcz123
9b5a7689c8 Fix width 2018-07-09 18:23:08 +08:00
Zhang Chen
f74b8fd136
Merge pull request #173 from zhaouv/editor-mobile-ui 
show data area when change editModeSelect
 2018-07-09 17:26:12 +08:00
YouWei Zhao
2444464d60 show data area when change editModeSelect 2018-07-09 17:14:53 +08:00
Zhang Chen
4cb74061c1
Merge pull request #172 from zhaouv/editor-mobile-ui 
Update mobile ui
 2018-07-09 15:27:46 +08:00
YouWei Zhao
2798c0cf58 fix resize 2018-07-09 14:31:18 +08:00
YouWei Zhao
ba954e27d8 Update mobile ui 2018-07-09 00:40:27 +08:00
Zhang Chen
382cd6a4e3
Merge pull request #170 from zhaouv/editor-mobile-ui 
fix resize bug
 2018-07-08 12:27:44 +08:00
YouWei Zhao
7901113564 fix resize bug 2018-07-08 11:20:00 +08:00
Zhang Chen
a03252d4a4
Merge pull request #168 from zhaouv/editor-mobile-ui 
Update mobile ui
 2018-07-07 17:06:40 +08:00
YouWei Zhao
189ef85b2a Update mobile ui 2018-07-07 17:05:20 +08:00
oc
bd2340168c setVolume fade 2018-07-07 02:11:41 +08:00
YouWei Zhao
0288f42c8d fix getCategory 
修复了getCategory,因为命名不一致带来bug的可能, 方便添加新分类
 2018-07-05 20:39:32 +08:00
YouWei Zhao
cd23d0abba finish 2018-07-05 18:13:04 +08:00
YouWei Zhao
11ed345321 mainview 2018-07-05 13:27:17 +08:00
YouWei Zhao
9a276883da init 2018-07-05 12:11:53 +08:00
oc
2a5d318675 Fix ChangeFloor Bug 2018-07-04 02:09:08 +08:00
ckcz123
74d3fd070e Follow Effect 2018-07-03 18:56:35 +08:00
YouWei Zhao
36440ba768 _string 2018-07-01 20:02:54 +08:00
YouWei Zhao
a54029fbf3 editor: copy event 
改变复制事件的方向
 2018-07-01 20:00:22 +08:00
oc
7ce005d770 Autosize 2018-06-30 00:31:58 +08:00
YouWei Zhao
9ddefed070 hide point_m 
隐藏入口方块中的加点
入口方块类型错误时同步的报错
 2018-06-29 23:11:08 +08:00
YouWei Zhao
a9d92e7996 fix bug in editor 
1.比如道具效果 useItemEffect
等，在新注册后默认是null；如果要编辑需要先改成空的双引号""，然后再双击编辑；否则直接双击的话系统会认为是一个JSON，写脚本就会出错
2.事件编辑器保存时检测用的框是否是正确
 2018-06-29 22:57:49 +08:00
YouWei Zhao
67e6bdb261 blockly bug fix 
opendoor_s
changeFloor_s
data.loc[0]||''
 2018-06-28 11:27:26 +08:00
oc
33325dc902 MoveBlock & move hero 2018-06-25 01:02:31 +08:00
oc
b0b4cd45c9 Fix bug 2018-06-22 01:20:35 +08:00
oc
78d39dbd79 Update data.comment 2018-06-21 23:01:08 +08:00
oc
dd12470866 V2.3.1 2018-06-16 23:23:19 +08:00
oc
f9bb336769 Mouse wheel to changefloor 2018-06-05 23:10:50 +08:00
Zhang Chen
206b763b88
Merge pull request #138 from zhaouv/v2.x 
V2 x
 2018-06-05 22:00:17 +08:00
YouWei Zhao
a7f156b73b blockly侧边栏改成中文 2018-06-05 14:29:09 +08:00
oc
e18d3c4cf7 snow four directions 2018-06-03 10:19:28 +08:00
oc
4b66b7b9c0 :before & :next 2018-06-03 10:08:46 +08:00
oc
91baf5e655 Fix Bug 2018-05-27 21:26:58 +08:00
oc
76773e717d Compress Blockly & Fix Autocomplete 2018-05-25 23:59:08 +08:00
oc
87532e268a __door__ 2018-05-25 11:02:55 +08:00
oc
9f86b525f6 Update docs 2018-05-25 10:52:36 +08:00
YouWei Zhao
fc538c994c remove the using of core in fs.js 2018-05-24 12:57:48 +08:00
YouWei Zhao
7f7ad9a44a alertWhenCompress 2018-05-24 12:32:18 +08:00
oc
10159547ea Fix Bug 2018-05-24 01:38:34 +08:00
oc
0c61b1aa45 statistics 2018-05-22 18:48:04 +08:00
oc
303fb53dbf debug mode 2018-05-19 00:36:13 +08:00
ckcz123
cbaf2b1641 Update Docs 2018-05-18 15:14:21 +08:00
oc
d6b217730b PGUP change floor 2018-05-18 09:48:41 +08:00
oc
c0fb3621ca new door & remove dragon 2018-05-18 00:50:47 +08:00
oc
e3c923d059 Auto register 2018-05-18 00:19:56 +08:00
oc
1ec381bbdc Auto register 2018-05-18 00:09:07 +08:00
ckcz123
4b17b25b15 use mp3 2018-05-15 20:38:58 +08:00
oc
0517e0f145 Fix flyrange bug 2018-05-15 00:02:35 +08:00
ckcz123
7af4e6d456 Update Docs 2018-05-13 16:10:13 +08:00
ckcz123
25ac0e13cb bgm autoreplay 2018-05-13 12:30:36 +08:00
oc
a9301f7cd9 wait: get info 2018-05-12 23:20:26 +08:00
YouWei Zhao
932bbfd60b menu 2018-05-11 16:26:27 +08:00
YouWei Zhao
b5c9df41a8 menu css 2018-05-11 15:15:42 +08:00
YouWei Zhao
4e1eafc2ba 右键菜单 - 在素材区选中 2018-05-10 22:49:22 +08:00
oc
3ead5eab94 start.md 2018-05-10 01:37:04 +08:00
oc
647dda4836 save floor status 2018-05-09 15:27:41 +08:00
oc
df4d8cdf9e save floor status 2018-05-09 13:26:51 +08:00
oc
6253ccb84a while support 2018-05-09 13:03:45 +08:00
YouWei Zhao
8518acf234 blockly:while break continue 2018-05-09 01:41:35 +08:00
oc
01860884a1 Weak percentage 2018-05-08 00:54:54 +08:00
oc
06dfa942ec Auto register 2018-05-07 00:09:14 +08:00
oc
6db581b929 draw event block 2018-05-06 23:03:50 +08:00
oc
579c57dc03 draw event block 2018-05-06 23:02:24 +08:00
oc
b04b45070f competition mode 2018-05-06 21:11:56 +08:00
oc
4ecac00f6d Remove isEquipment 2018-05-06 20:43:25 +08:00
ckcz123
992511160e Draw Status Bar 2018-05-06 17:32:56 +08:00
oc
91b5f740a6 Move Image 2018-05-06 01:27:27 +08:00
oc
a60dc1ece1 deal with cheat 2018-05-06 00:21:47 +08:00
oc
eafcfa4deb setVolume 2018-05-05 01:54:57 +08:00
oc
9beec9f3ce Support flag in loc & Replay 6x 2018-05-05 01:28:43 +08:00
Zhang Chen
669c59ff41
Merge pull request #111 from zhaouv/v2.0-20180428 
V2 0 20180428
 2018-04-29 13:32:34 +08:00
YouWei Zhao
d4a427b477 blockly: shop 2018-04-29 13:12:26 +08:00
YouWei Zhao
3629c8485a 坐标支持flag:xx 
show和hide的多事件除外
 2018-04-29 11:15:40 +08:00
YouWei Zhao
ba5055c587 重构blockly下拉菜单实现 2018-04-28 23:55:07 +08:00
oc
fd57f77c95 event:wait 2018-04-28 23:31:18 +08:00
oc
2b0150270c Move comment to _server 2018-04-26 00:13:18 +08:00
ckcz123
e6ccdf75ed setHero -> setHeroIcon 2018-04-25 17:46:28 +08:00
oc
7009b57c10 setHero 2018-04-25 15:56:41 +08:00
oc
01c4ea4d31 setHeroIcon 2018-04-25 15:26:44 +08:00
oc
e01d90cdfd upFloor & downFloor 2018-04-25 14:51:16 +08:00
oc
81ccf6a08f Fix gameover & new map 2018-04-21 12:59:58 +08:00
ckcz123
8e68f1fbdf Animate image & Gif support 2018-04-18 18:11:21 +08:00
oc
a31991c16a Replay & Sleep 2018-04-18 14:08:31 +08:00
oc
81df4a9b19 Reformat _server & delete map 2018-04-18 00:28:53 +08:00
oc
bff5298c7a Fix Negative Point 2018-04-17 23:42:31 +08:00
oc
e38f131f53 New empty map & autosave map 2018-04-17 00:45:17 +08:00
oc
cd9ec2b112 support negative value 2018-04-12 00:50:08 +08:00
YouWei Zhao
28c8c89616 fix bug 2018-03-22 17:01:22 +08:00
YouWei Zhao
5e706e1111 fix bug && 细节调整 
editor编辑设为自动保存
全塔属性保存后，切到其他标签切回来不变
Ctrl+Z
调整blockly滚轮方向
 2018-03-22 16:57:32 +08:00
YouWei Zhao
84b788c311 fix bug 2018-03-19 14:25:10 +08:00
oc
e88c5ad67f Lint Checkbox 2018-03-17 23:27:43 +08:00
Zhang Chen
7f3b86e2f7
Merge pull request #91 from zhaouv/v2.0-comment-20180316 
V2 0 comment 20180316
 2018-03-17 22:07:47 +08:00
YouWei Zhao
82e6b8e760 取消editor_multi的自动检测 2018-03-17 17:47:07 +08:00
YouWei Zhao
c192a2b62c 重构comment 2018-03-17 17:40:13 +08:00
Zhang Chen
c791566044
Merge pull request #90 from zhaouv/v2.0-editor-docs-20180313 
lint检查
 2018-03-17 11:55:59 +08:00
YouWei Zhao
12a7d213f2 调整blockly滚动条 2018-03-17 01:24:06 +08:00
YouWei Zhao
8400cd0051 重构遍历生成表格 2018-03-16 22:33:11 +08:00
YouWei Zhao
f825d0f482 Merge remote-tracking branch 'refs/remotes/origin/v2.0-editor-docs-20180313' into v2.0-comment-20180316 2018-03-16 20:27:09 +08:00
YouWei Zhao
6a5906b0da lint检查 2018-03-16 20:25:51 +08:00
YouWei Zhao
fabb45dbbf 重构table recursionParse 2018-03-16 20:19:38 +08:00
oc
36fa4af7c6 Save floorId 2018-03-16 19:33:48 +08:00
YouWei Zhao
07811f67d7 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-docs-20180313 2018-03-16 19:08:22 +08:00
YouWei Zhao
1eab391b5b type:function的lint 2018-03-16 19:07:52 +08:00
oc
1764592f62 Use Tab to indent 2018-03-16 01:07:21 +08:00
YouWei Zhao
e1786c40eb 判断是否开启lint和自动补全 2018-03-16 00:45:23 +08:00
YouWei Zhao
4d9327854d Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-docs-20180313 
# Conflicts:
#	_server/editor_blockly.js
 2018-03-16 00:28:17 +08:00
YouWei Zhao
7403fa72c7 修改滚轮行为 2018-03-16 00:25:56 +08:00
oc
7f5752ee94 options 2018-03-15 23:02:09 +08:00
ckcz123
955476285d Shop Template 2018-03-15 21:07:53 +08:00
ckcz123
dc35bc7adf Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 2018-03-15 19:51:45 +08:00
ckcz123
42fa7ffa7f CSS 2018-03-15 19:51:39 +08:00
Zhang Chen
9fc0937c81
Merge pull request #86 from zhaouv/v2.0-editor-docs-20180313 
V2 0 editor docs 20180313
 2018-03-15 19:18:22 +08:00
ckcz123
ef643a97af Javascript Lint 2018-03-15 19:16:50 +08:00
YouWei Zhao
8fd8e27baa type:choice允许缺省text 2018-03-15 18:44:40 +08:00
YouWei Zhao
875726cbbe Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-docs-20180313 2018-03-15 18:26:18 +08:00
ckcz123
a02682cb7e Autocomplete & Css 2018-03-15 18:21:54 +08:00
YouWei Zhao
f933ca5435 编辑mapblocksinfo 2018-03-15 17:25:47 +08:00
YouWei Zhao
1c45bfee3f 修复点confirm事件编辑器的输入文本不消失的bug 2018-03-15 16:45:17 +08:00
YouWei Zhao
1f221a1600 editor中显示useItem和canUseItem 2018-03-15 16:25:16 +08:00
YouWei Zhao
7c82f4e9fb show MapBlocksInfo 2018-03-15 15:46:53 +08:00
oc
27b44b874f Fix V2.0 Bug 2018-03-14 22:14:10 +08:00
Zhang Chen
3577f42623
Merge pull request #79 from zhaouv/v2.0-editor-docs-20180313 
不打印调试信息;修改事件的trigger
 2018-03-14 00:22:51 +08:00
YouWei Zhao
b86d734655 不打印调试信息;修改事件的trigger 2018-03-14 00:18:19 +08:00
Zhang Chen
7544f2e284
Merge pull request #78 from zhaouv/v2.0-editor-docs-20180313 
editor使用文档
 2018-03-13 16:10:04 +08:00
YouWei Zhao
2c7162467f editor使用文档 
editor使用文档
type:win lose允许缺省
 2018-03-13 14:45:43 +08:00
ckcz123
eb3088a3f0 css 2018-03-13 13:14:45 +08:00
YouWei Zhao
40488a0784 editor支持48*32 2018-03-13 11:23:33 +08:00
YouWei Zhao
6be440a99d 发生不合要求的更改时显示field 2018-03-12 11:06:04 +08:00
YouWei Zhao
45f27530a0 editor:更改部分内容显示的缩进 2018-03-12 00:02:28 +08:00
YouWei Zhao
fd5e0032ab editor在编辑enemy.js时一个怪物一行 
修复了codeAreaHL不是全局量导致的bug
 2018-03-11 19:56:21 +08:00
YouWei Zhao
ae0a8be8f1 editor细节调整 2018-03-10 21:00:18 +08:00
YouWei Zhao
628d7eeafa 删除过时的文件 
已经无法工作的editor_file_test.html
旧版的blockly
已经无效的2.0diff
 2018-03-10 20:07:16 +08:00
YouWei Zhao
46d4d77bde fix bug 以及调整追加素材的字体 2018-03-10 19:36:53 +08:00
YouWei Zhao
3b9e03efee editor的tips的样式 2018-03-10 17:11:38 +08:00
YouWei Zhao
68fa560b0c 对function更好的支持 2018-03-10 16:41:50 +08:00
YouWei Zhao
15cdfa0f23 function调整 2018-03-10 14:10:42 +08:00
YouWei Zhao
9ee85323df editor实现$range以及细节调整 2018-03-10 13:27:13 +08:00
YouWei Zhao
38842a7200 editor细节优化 2018-03-09 22:50:59 +08:00
YouWei Zhao
8e3c1b5c67 表格css以及编辑细节调整 2018-03-09 20:46:34 +08:00
YouWei Zhao
a695dcd6cf editor前端上切换模式 2018-03-08 19:00:20 +08:00
YouWei Zhao
05982bfaf4 issue #57 
#57
 2018-03-07 22:44:57 +08:00
YouWei Zhao
39db1cd235 blockly改为弹窗 2018-03-07 17:35:15 +08:00
oc
66117ebf08 Support Callback in Editor 2018-03-05 19:37:21 +08:00
YouWei Zhao
df89fd0b7c 调整 editor.file & editor.mode 2018-03-04 11:11:52 +08:00
oc
2f5caae07c Support Reborn 2018-03-03 23:48:46 +08:00