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

969 Commits

Author SHA1 Message Date
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
ckcz123
0974656ad1 Restructure 2018-03-03 21:07:26 +08:00
YouWei Zhao
8c484d84d9 fix bug 2018-03-01 16:00:38 +08:00
YouWei Zhao
2f50978612 Update blockly 2018-02-28 20:25:53 +08:00
YouWei Zhao
5da6ad56d0 Update blockly 2018-02-28 17:59:03 +08:00
YouWei Zhao
d754df5a83 修改event显伤的默认值 2018-02-28 14:48:14 +08:00
YouWei Zhao
3be76240ff 可设置可不设置的增加null选项 2018-02-28 14:02:34 +08:00
YouWei Zhao
7b2c7c3509 Update editor-blockly-template 
事件模板中添加
检测音乐如果没有开启则系统提示开启
 2018-02-23 16:28:49 +08:00
YouWei Zhao
bb6a9e3266 Merge remote-tracking branch 'refs/remotes/origin/dev-2.0-blockly-20180214' into dev-2.0-appendPic-20180218 2018-02-21 18:09:39 +08:00
YouWei Zhao
e436a5f995 追加素材完成 2018-02-21 18:09:19 +08:00
YouWei Zhao
e6d9eceba9 blockly-setText-bold 2018-02-21 00:15:44 +08:00
YouWei Zhao
2bff3f8e4e Merge remote-tracking branch 'refs/remotes/origin/dev-2.0-blockly-20180214' into dev-2.0-appendPic-20180218 2018-02-20 21:21:20 +08:00
YouWei Zhao
ad398c3560 0-12 -> Int 2018-02-20 21:19:19 +08:00
YouWei Zhao
11fb1b19c1 Merge remote-tracking branch 'refs/remotes/origin/dev-2.0-blockly-20180214' into dev-2.0-appendPic-20180218 2018-02-20 20:52:35 +08:00
YouWei Zhao
89bd795cf0 blockly中支持show hide多事件以及type:input 2018-02-20 20:45:18 +08:00
YouWei Zhao
f67b88d38e add tab for appendPic 2018-02-19 12:07:49 +08:00
YouWei Zhao
d003dbf84b editor:修改成功或失败会有相应的提示 
不再时只是throw错误
 2018-02-19 10:26:23 +08:00
YouWei Zhao
cdff0e8abd 修复了添加物品怪物的新id时,没有添加items.js或enemys.js中数据的bug 2018-02-18 18:37:39 +08:00
YouWei Zhao
93160d2156 引入CodeMirror作为多行文本编辑器 2018-02-17 17:16:05 +08:00
YouWei Zhao
9fe928530c fix bug: default floor in floor selecter of editor 2018-02-15 19:23:37 +08:00
YouWei Zhao
7c33ce6b1f fix bug 
可以正确的处理null了
 2018-02-15 10:00:02 +08:00
YouWei Zhao
2b069b7614 集成blockly的事件编辑器 
目前只能在正确的事件上工作,尚未处理null
 2018-02-15 00:18:00 +08:00
YouWei Zhao
5939d27508 add tab for blockly 2018-02-14 14:51:10 +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
YouWei Zhao
fbb05c4649 MotaAction.g4 && ~~'动作列表'~~ 
添加了语法的描述文件MotaAction.g4
移除了blockly中'动作列表'的字样
 2018-01-26 01:15:20 +08:00
YouWei Zhao
6ea6bea7a7 blockly 
_server/blockly/motaActionBlockyDemo.html
实现了文档中 choices: 给用户提供选项 中的复杂事件
 2018-01-24 22:14:09 +08:00
echo
524c8be9a8 fix bug 2018-01-20 14:13:32 +08:00
echo
f5b8ac521c fix bug 2018-01-20 14:06:04 +08:00
echo
f47eefeea8 fix IE bug 2018-01-20 13:56:44 +08:00
echo
b7cd8c0dc1 fix bug: polyfill old version of IE 2018-01-20 13:30:36 +08:00
echo
6fbffd75bf fix bug 2018-01-11 19:43:43 +08:00
echo
75404428ed fix bug 2018-01-11 17:51:58 +08:00
YouWei Zhao
0c24e662c9 editor 2018-01-09 23:45:16 +08:00
echo
d1a937628c gui:fix a bug 2018-01-09 21:20:36 +08:00
echo
4db9583e41 merge from master 2018-01-09 21:13:05 +08:00
YouWei Zhao
bb08b1fb61 Update editor_mode.js 2018-01-09 15:44:44 +08:00
YouWei Zhao
8977ac5137 editor 全GUI编辑 2018-01-09 15:22:11 +08:00
YouWei Zhao
eb8a045816 把editor的代码拆分到单独的文件中 2018-01-08 19:28:11 +08:00
YouWei Zhao
f493bc1577 添加了2.0的修改说明 2018-01-08 16:15:32 +08:00
YouWei Zhao
1854d96fce editor_file.js的修改数据功能完成 
通过了editor_file_test.html中的简单测试,有待更进一步的测试
 2018-01-07 22:52:18 +08:00
YouWei Zhao
13aca79afb Update editor_file.js 2018-01-07 22:14:51 +08:00
YouWei Zhao
9197a4d727 分离了楼层文件之外的数据的注释 2018-01-06 22:25:19 +08:00
YouWei Zhao
62fbd21836 Update editor_file.js 2018-01-05 20:43:11 +08:00
YouWei Zhao
4659f4ddcd editor.changeFloor 2018-01-02 13:35:27 +08:00
YouWei Zhao
5671d5501e 取消了editor模式的部分动画 & fix bug 2018-01-02 12:37:40 +08:00
YouWei Zhao
a9835de64a editor_file & comment.js 2018-01-01 19:31:32 +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
62b11fc3a0 Update editor_file.js 2018-01-01 02:07:55 +08:00
echo
878d27eb0a add bgimg seletion 2017-12-31 15:27:58 +08:00
echo
8b8538ccfd add ground select 2017-12-31 13:10:56 +08:00
YouWei Zhao
5f248444ec merge 1.3 into 2.0 2017-12-31 10:30:01 +08:00
YouWei Zhao
5e00ff8a50 editor.file 2017-12-31 09:13:24 +08:00
echo
d37c28abdf for v1.3 2017-12-31 01:07:25 +08:00
echo
c45c638599 for 2.0 2017-12-30 22:04:37 +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
0a15e303c1 重构drawMapGui 2017-12-26 00:55:41 +08:00
echo
2e7aa2dec0 update drawmapgui 2017-12-22 00:29:04 +08:00
echo
bc789fc0df update drawMapGui 2017-12-21 22:35:12 +08:00
oc
8d6a75929d Fix HTTP Bug 2017-12-21 20:54:08 +08:00