fBEFh+X18*}jRDk!-Ogzar%HSc5&cZju`8QGD5x8oj@oYa
zKW5ihzu+op6WUw!MK@4KFbjdCrb^tU&r-ruBEnZu-DmM
zwHt;@Uu7S$V2^7Tw2^0*-5jxCu1>Is>!b{7U$v1Ar<+e1GD9n7cX^`cyp{UdM`ref_Fw5#?7bSc+z?IhZ(
zc>8|teVMm6b6wB%b*{DCdz`mVLj$bV`#0zg$6085`+0kNc2fJvo`p62r`=#nf=-9Q
zTP{}C)r270*A)#74$C~(Rxk~G`NC$
zhsHK1(SOH?ZAcFxvUgL4pITOFv~=jKc{8F1*b>v#-eG6$IM%Xz9oIS>>^?!ujP59H
zJ*T}|cW)nuD?vpdH`^?H6N7^s9`#FU`^0sp9%P$iK6V;sT?RW`
zM1wA5zu50_WU}6PQA_lM?;d>rL0zXDc9{E~WD6ZGQ_o3qHe`+PQWOi-z@9e8){u4V
zNA!TpVV}SnvTlO>c0Z_(pbMS}ESC)ybO~RA&1Itn9db{=^ZsT*f5rqGu_=OnOrOBa
z#;isl!xxhpv-&}f{0bZdFib=1+FEgute-jsSAf5+}|
zQ;g<=da%y~eG0msEylZP8fG1+C%blBjNS$HV%r5h3hK=k%%?}G!?!Z
z`120=V|TB<;%T^uFMeOvcLH^cx_YPn)zO#D612|o9caFw7aZq74{&dV|I5B5u?8BOgLg^)Ud@;ruZj~vv6&U}ZmPQYb#1RxWMPJzUGZr+E$QUXfqHPK
zyW;b+a;}}YR&(vcbuiaaTqi;^@%j((CcB%PW^>&MHP~Q{bQH89o5q4~JMkUfQK
zt@dU{CswQFrdP4m>;T?1tY#Ap1HX~zmN5i6%R7>7(CGM~m|Jn`UGdFgby|z`d9c)b
zHz0nQ@dsw6u)g|sz%#D5m|HuSvX|}D+^GlH9?>}?{Ui1ZdrLb8UFQD+x01%*Z*Zu@
zhFjsVX?5C)U{mNl8Ev48)4OU%w0GP?v<+-zV3c-DD-OQJj%m}q5pi2CI<4OqBgz>sG84-mtb)
z8=-B{Rjt-X|&`Y7$in)I5$3hkiTT8=9YeJt80zkNB@^&qfTqH1p^h>@1&IJuj(4#8MRtQ`W}6h{$=nz
zy_AumiAtl4Zm#huAEp!7zz
z+4|qT&7kzkp-xzA?iR3|3TkYd{tEX0PS|Ie==Qv)wQZ07M^6X1H~K1VEi{j#2io8G
z``V7_ef7b%uMj%Y_N|^47zbTopJdat91N#v*%_HAt0rZtO|#KO)U>I34f_5*n2C|M
zqAa(qn}3eYZM!*rK6HD^B1|~sUIkt6UTZUJwO8;&+NsTV*V%Sz)7&%l7WzE@R`^KQIf9Z}sGOD+E-i^Z9
z*J;_%3_G=*UeceqJuOJ>$6UG4d4YWB9XzJBLH4v@i-i3{jVwJJq_zyw*l1hqEz$0m
z+6lVbQ3YL|e!ZdNEv^kWw?K6G=-t6FtPnTvoAAO9@D|0g5N8idOv3prdb_bimrm?Av
z)jz){q(__Vt%+{kd!%vN&1@z-Gguh0ofu19yDDo`{=7lAyN2B}u72mf)A(=cFk@v=
zwJ~T{zo!?zTm0~e4|~D;T$V;2SN=
z7F9o&@?3qRk6l{_tg-e%_>Zer?k%{pIhY13q~xn*W#0^}eGQ9PTgqZ&=ykuJwVx
K{GipgcK$E6H5e)Y
From c17d3cb1098a8faa2aa95e1f0d9ebfd9b2675265 Mon Sep 17 00:00:00 2001
From: YouWei Zhao
Date: Sun, 24 May 2020 18:30:20 +0800
Subject: [PATCH 02/73] =?UTF-8?q?doc:=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91?=
=?UTF-8?q?=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
_docs/editor.md | 312 ++++++++++++++++++++++++++++++++++++++++
_server/editor_table.js | 2 +
2 files changed, 314 insertions(+)
create mode 100644 _docs/editor.md
diff --git a/_docs/editor.md b/_docs/editor.md
new file mode 100644
index 00000000..4834dee8
--- /dev/null
+++ b/_docs/editor.md
@@ -0,0 +1,312 @@
+# 修改编辑器
+
+在改动core时, 有时会相应的更改project中存储数据的结构, 而表格和事件编辑器不做相应更改的话就无法顺畅的编辑改动了结构的数据了, 此文档帮助造塔者进行`配置表格`的修改, 以及修改_server/MotaAction.g4和其他相关文件来调整事件编辑器的图块.
+
+## 修改表格
+
+### demo - 给怪物增加 _速度_ 属性
+
+点击素材区的怪物后点击配置表格, 或者直接打开_server/table/comment.js
+拉到`【怪物】相关的表格配置`的部分
+``` js
+// --------------------------- 【怪物】相关的表格配置 --------------------------- //
+ "enemys": {
+ "_type": "object",
+ "_data": {
+ "id": {
+ "_leaf": true,
+ "_type": "disable",
+ "_docs": "怪物ID",
+ "_data": "怪物ID,可于页面底部修改"
+ },
+ "name": {
+ "_leaf": true,
+ "_type": "textarea",
+ "_string": true,
+ "_data": "名称"
+ },
+ "displayIdInBook": {
+ "_leaf": true,
+ "_type": "textarea",
+ "_string": true,
+ "_docs": "手册映射ID",
+ "_data": "在怪物手册中映射到的怪物ID。如果此项不为null,则在怪物手册中,将用目标ID来替换该怪物原本的ID。常被运用在同一个怪物的多朝向上。"
+ },
+ "hp": {
+ "_leaf": true,
+ "_type": "textarea",
+ "_data": "生命值"
+ },
+ "atk": {
+ "_leaf": true,
+ "_type": "textarea",
+ "_data": "攻击力"
+ },
+```
+可以看到, project/enemys.js 中怪物的属性
+```js
+"greenSlime": {"name":"绿头怪","hp":100,"atk":120,"def":0,"money":1,"exp":1,"point":0,"special":[1,5,7,8]},
+```
+被逐条列出并解释
+
+把hp的部分复制一份并修改
+```js
+ "speed": {
+ "_leaf": true,
+ "_type": "textarea",
+ "_data": "速度"
+ },
+```
+刷新之后, 怪物的表格在hp下面就多出了speed一项, 剪辑后出现在了怪物属性中
+```js
+"greenSlime": {"name":"绿头怪","hp":100,"atk":120,"def":0,"money":1,"exp":1,"point":0,"special":[1,5,7,8],"speed":123123},
+```
+### 表格配置项含义
+
+可以看出表格配置中的对象是一层套一层的结构, `_`开头的和数据的名字间隔着展开, 忽略所有`_`的层级的话, 这个对象和project中的对象是有相同的结构
+
+**_leaf** 为真的项对应的数据将作为表格的编辑的内容, 数字/字符串/空对象和数组会被自动计算为true, 非空的对象和数组会被计算为false, 手动填写_leaf的值可以强制不展开对象和数组来进行编辑
+
+**_type** 决定了表格如何展示该数据
++ select 使用下拉菜单展示
++ checkbox 使用勾选框展示
++ checkboxSet 使用勾选框组展示
++ 其他 使用文本框展示, 根据类型区分, 双击或点编辑会有以下行为
+ - textarea 文本编辑器(_type的默认值)
+ - event 事件编辑器
+ - material 素材选取
+ - color 取色器
+ - disable 不允许编辑
+
+当某个event例如 门信息编辑 无法适应修改后的数据结构, 可以修改事件编辑器, 也可以把_type改成textarea
+以上类型的格式要如何写请搜索例如`"_type": "checkboxSet"`来查找例子, 此处不展示
+
+**_range** 被编辑的值会作为`thiseval`来进行检测, 当字符串为真时才接收这个值, 同时当删除表格时会判定_range是否接收null
+
+**拓展性**
+
+注意这是js文件, 可以使用表达式, 如下例子引用了别处的数据作为下拉菜单
+```js
+ "bgm": {
+ "_leaf": true,
+ "_type": "select",
+ "_select": {
+ "values": [null].concat(Object.keys(editor.core.material.bgms))
+ },
+ "_docs": "背景音乐",
+ "_data": "到达该层后默认播放的BGM"
+ },
+```
+
+同时`_`开头的项可以使用函数. 同一级中`_data`最先被计算. 复杂的结构的注释可以利用函数动态生成
+`_data`的参数`key`是各子项的名字, 其他`_`开头的参数是`args`详见editor_table.prototype.objToTable的注释
+例如: 自动事件数组, `"_leaf": false`强制展开, 通过`_action`函数即使为空也显示两个空白的项, 同时`_data`函数给自动事件的每一项标记为event
+```js
+ "autoEvent": {
+ "_type": "object",
+ "_leaf": false,
+ "_action": function (args) {
+ args.vobj = args.vobj || {};
+ for (var ii = 0; ii < 2; ii++) {
+ args.vobj[ii] = args.vobj[ii] || null;
+ }
+ },
+ "_data": function (key) {
+ return {
+ "_leaf": true,
+ "_type": "event",
+ "_event": "autoEvent",
+ "_data": "自动事件"
+ }
+ }
+ },
+```
+
+## 修改事件编辑器
+
+_type为event的表格项, 在双击时会进入事件编辑器. 是由[antlr-blockly](https://github.com/zhaouv/antlr-blockly)生成的图块式的可视化编辑器
+
+_event的内容例如autoEvent则是使用的入口图块的类型
+
+请先查看[antlr-blockly的文档](https://zhaouv.github.io/antlr-blockly/docs/#/README)来了解.g4语法文件和可视化编辑器blockly以及库antlr-blockly的基础知识
+
+### 事件编辑器的运行机制简介
+
+事件编辑器编辑一个表格项的流程有以下几步
++ 加载表格中的json, 将其根据类别转化成图块
++ 通过拖拽填写图块编辑内容
++ 将图块转化回json置入表格
+
+其中图块到json 是由_server/MotaAction.g4完成的
+json到图块 是由_server/MotaActionParser.js完成的, 并依赖图块在g4中的定义
+
+图块到json首先由入口方块出发, 入口方块又依次去获取了嵌入在其中的方块和域, 嵌入的方块再递归访问其嵌入的内容, 从而访问了所有方块上域中的信息.
+例如 event_m 通过 action_0 获取了其中嵌入的所有语句生成的json, 插入到其自身的键'data'中
+
+```antlr
+//事件 事件编辑器入口之一
+event_m
+ : '事件' BGNL? Newline '覆盖触发器' Bool '启用' Bool '通行状态' B_0_List '显伤' Bool BGNL? Newline action+ BEND
+
+
+/* event_m
+tooltip : 编辑魔塔的事件
+helpUrl : https://h5mota.com/games/template/_docs/#/event
+default : [false,null,null,null,null]
+B_0_List_0=eval(B_0_List_0);
+var code = {
+ 'trigger': Bool_0?'action':null,
+ 'enable': Bool_1,
+ 'noPass': B_0_List_0,
+ 'displayDamage': Bool_2,
+ 'data': 'data_asdfefw'
+}
+if (!Bool_0 && Bool_1 && (B_0_List_0===null) && Bool_2) code = 'data_asdfefw';
+code=JSON.stringify(code,null,2).split('"data_asdfefw"').join('[\n'+action_0+']\n');
+return code;
+*/;
+```
+
+值得注意的是shoplist和action这样的语句集合, 语句集合会选择其中的最后一项作为父方块的默认块, 所以在希望其允许空时, 要制作一个空项放在语句集合定义的末尾, 例如
+```antlr
+shoplist
+ : shopsub
+ | shopitem
+ | shopcommonevent
+ | emptyshop
+ ;
+
+emptyshop
+ : Newline
+
+
+/* emptyshop
+var code = ' \n';
+return code;
+*/;
+```
+
+json到图块则是从ActionParser.prototype.parse出发, 递归的将js对象变为图块, 例如event类型的json, 使用event_m入口图块, 将obj.trigger/enable/noPass/displayDamage填到域中, obj.data交给this.parseList转化为语句的图块, 与g4中注入的语句做相反的事情
+```js
+ActionParser.prototype.parse = function (obj,type) {
+ switch (type) {
+ case 'event':
+ if(!obj)obj={};
+ if(typeof(obj)===typeof('')) obj={'data':[obj]};
+ if(obj instanceof Array) obj={'data':obj};
+ return MotaActionBlocks['event_m'].xmlText([
+ obj.trigger==='action',obj.enable,obj.noPass,obj.displayDamage,this.parseList(obj.data)
+ ]);
+```
+
+### demo - 给已有图块添加新域
+
+例如给'播放背景音乐'图块再额外加一个参数列表
+
+不熟悉时, 对任意图块来说这都算是最简单粗暴的修改方式了, 复杂的修改需求也只需要改这一下, 只是填图块时没那么方便
+
+编辑g4时推荐使用vscode, 搜索并安装插件mota-js
+
+playBgm_s
+ : '播放背景音乐' EvalString '开始播放秒数' Int '持续到下个本事件' Bool '参数列表' JsonEvalString? Newline
+
+
+/* playBgm_s
+tooltip : playBgm: 播放背景音乐
+helpUrl : https://h5mota.com/games/template/_docs/#/event?id=playbgm%EF%BC%9A%E6%92%AD%E6%94%BE%E8%83%8C%E6%99%AF%E9%9F%B3%E4%B9%90
+default : ["bgm.mp3", 0, true]
+allBgms : ['EvalString_0']
+colour : this.soundColor
+Int_0 = Int_0 ? (', "startTime": '+Int_0) : '';
+Bool_0 = Bool_0 ? ', "keep": true' : '';
+if (JsonEvalString_0) {
+ JsonEvalString_0 = ', "args": ' +JsonEvalString_0;
+}
+var code = '{"type": "playBgm", "name": "'+EvalString_0+'"'+Int_0+Bool_0+JsonEvalString_0+'},\n';
+return code;
+*/;
+
+使用了类型JsonEvalString, 并在注入的代码中处理了其新增出的JsonEvalString_0要如何体现在这个方块产生的json
+此处使用了antlr-blockly产生的'类型名_次数'的默认名称, 也可以开头加一行`name : [null,null,null,'args']`来把这个变量命名为args, 对于setText_s这种域比较多的块会很有帮助.
+在MotaAction中, 除了默认的Int/Number等
+常规的字符串使用EvalString
+ID类型的使用IdString
+允许空的自然数使用IntString
+位置坐标使用PosString
+不转义的多行文本使用RawEvalString
+json类型的文本使用JsonEvalString
+
+相应的也需要改json到图块的部分
+
+ break;
+ case "playBgm":
+ this.next = MotaActionBlocks['playBgm_s'].xmlText([
+ data.name,data.startTime||0,data.keep||false,data.args,this.next]);
+ break
+ case "pauseBgm":
+
+
+### demo - 增加新语句图块
+
+假设已经制作了一个名为`陨石坠落`的公共事件, 其参数列表是长度3的数组, 依次是陨石颜色, 陨石位置, 爆炸范围.
+
+每次要使用插入公共事件并要填`陨石坠落`和形如`[[231,231,41],[5,7],1]`的长而且带有格式的内容, 并且无法使用取色器和地图选点功能. 此时就可以借助'注册一个自定义事件'并填加新语句图块来解决这个问题.
+
+首先注册成名为'meteorite'的事件, 再插件编写的init中添加以下内容
+```js
+core.registerEvent('meteorite', function(data){
+ core.insertAction({"type": "insert", "name": "陨石坠落", "args": [data.color,data.loc,data.range]})
+})
+```
+
+然后再g4中修改以下位置(请善用搜索来定位)
+
+ | drawSelector_1_s
+ | unknown_s
+ | function_s
+ | meteorite_s
+ | pass_s
+ ;
+
+text_0_s
+
+并在分号后面添加
+
+```antlr
+meteorite_s
+ : '陨石坠落' '颜色' ColorString? Colour 'x' PosString ',' 'y' PosString '爆炸范围' Int Newline
+
+
+/* meteorite_s
+tooltip : 陨石坠落
+helpUrl : https://h5mota.com/games/template/_docs/#/event
+default : ["255,0,0,1",'rgba(255,0,0,1)',"0","0",1]
+selectPoint : ["PosString_0", "PosString_1"]
+colour : this.soundColor
+var loc = ', "loc": ['+PosString_0+','+PosString_1+']';
+ColorString_0 = ColorString_0 ? (', "color": ['+ColorString_0+']') : '';
+var code = '{"type": "meteorite"'+ColorString_0+loc+', "range": '+Int_0+'},\n';
+return code;
+*/;
+```
+
+希望是特效的颜色, 于是在g4搜索'画面闪烁', 找到了`colour : this.soundColor`, 抄出其中的颜色的写法, 地图选点的写法同理, 搜索'强制战斗'后模仿其写法
+
+在MotaActionParser.js中添加json到图块的代码, 同理模仿'画面闪烁'和'强制战斗'
+
+ break;
+ case "playBgm":
+ this.next = MotaActionBlocks['playBgm_s'].xmlText([
+ data.name,data.startTime||0,data.keep||false,this.next]);
+ break
+ case "meteorite":
+ data.color = this.Colour(data.color)
+ this.next = MotaActionBlocks['meteorite_s'].xmlText([
+ data.color,'rgba('+data.color+')',data.loc[0],data.loc[1],data.range,this.next]);
+ case "pauseBgm":
+
+最后在editor_blocklyconfig.js中将其加入到工具栏中
+
+ '特效/声音':[
+ MotaActionBlocks['meteorite_s'].xmlText(),
+ MotaActionBlocks['sleep_s'].xmlText(),
diff --git a/_server/editor_table.js b/_server/editor_table.js
index 59389e76..d61c2360 100644
--- a/_server/editor_table.js
+++ b/_server/editor_table.js
@@ -83,6 +83,8 @@ editor_table_wrapper = function (editor) {
/**
* checkboxset中checkbox的onchange
+ * 这个函数本质是模板editor_table.prototype.checkboxSetMember的一部分
+ * 故放在HTML模板分类下
*/
editor_table.prototype.checkboxSetMemberOnchange = function (onemember) {
var thisset=onemember.parentNode
From 36fa9696b497ed6a9aa45cf9a0c563ec33707474 Mon Sep 17 00:00:00 2001
From: YouWei Zhao
Date: Sun, 24 May 2020 18:53:01 +0800
Subject: [PATCH 03/73] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
_docs/editor.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/_docs/editor.md b/_docs/editor.md
index 4834dee8..99b0496c 100644
--- a/_docs/editor.md
+++ b/_docs/editor.md
@@ -57,7 +57,7 @@
"_data": "速度"
},
```
-刷新之后, 怪物的表格在hp下面就多出了speed一项, 剪辑后出现在了怪物属性中
+刷新之后, 怪物的表格在hp下面就多出了speed一项, 编辑后出现在了怪物属性中
```js
"greenSlime": {"name":"绿头怪","hp":100,"atk":120,"def":0,"money":1,"exp":1,"point":0,"special":[1,5,7,8],"speed":123123},
```
@@ -252,14 +252,14 @@ json类型的文本使用JsonEvalString
每次要使用插入公共事件并要填`陨石坠落`和形如`[[231,231,41],[5,7],1]`的长而且带有格式的内容, 并且无法使用取色器和地图选点功能. 此时就可以借助'注册一个自定义事件'并填加新语句图块来解决这个问题.
-首先注册成名为'meteorite'的事件, 再插件编写的init中添加以下内容
+首先注册成名为'meteorite'的事件, 在插件编写的init中添加以下内容
```js
core.registerEvent('meteorite', function(data){
core.insertAction({"type": "insert", "name": "陨石坠落", "args": [data.color,data.loc,data.range]})
})
```
-然后再g4中修改以下位置(请善用搜索来定位)
+然后在g4中修改以下位置(请善用搜索来定位)
| drawSelector_1_s
| unknown_s
From fc5623514b06e8c84f995018465232dd5bf7c4af Mon Sep 17 00:00:00 2001
From: ckcz123
Date: Sun, 24 May 2020 18:53:56 +0800
Subject: [PATCH 04/73] =?UTF-8?q?=E5=8F=B3=E9=94=AE=E5=8F=8D=E5=A4=8D?=
=?UTF-8?q?=E5=BC=B9=E7=AA=97;=E4=B8=8A=E4=B8=8B=E6=A5=BC=E9=80=89?=
=?UTF-8?q?=E7=82=B9;=E6=94=BE=E7=BC=A9dom?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
_server/editor_listen.js | 16 +++++++--------
_server/editor_mappanel.js | 33 ++++++++++++++++++++---------
_server/editor_mode.js | 15 +++++++++++++-
_server/editor_table.js | 41 ++++++++++++++++++++++++++++++++++---
_server/table/comment.js | 6 +++---
libs/control.js | 3 +++
libs/core.js | 4 +++-
libs/events.js | 2 +-
project/fonts/number.ttf | Bin 0 -> 4312 bytes
styles.css | 16 +++++++--------
v2.x-final更新.txt | 2 +-
11 files changed, 102 insertions(+), 36 deletions(-)
create mode 100644 project/fonts/number.ttf
diff --git a/_server/editor_listen.js b/_server/editor_listen.js
index ebbf0369..0707ec28 100644
--- a/_server/editor_listen.js
+++ b/_server/editor_listen.js
@@ -28,15 +28,15 @@ editor_listen_wrapper = function (editor) {
editor.dom.iconLib.onmouseup = editor.uifunctions.material_onup
editor.dom.iconLib.oncontextmenu = function (e) { e.preventDefault() }
- editor.dom.extraEvent.onmousedown = editor.uifunctions.extraEvent_click
- editor.dom.chooseThis.onmousedown = editor.uifunctions.chooseThis_click
- editor.dom.chooseInRight.onmousedown = editor.uifunctions.chooseInRight_click
- editor.dom.copyLoc.onmousedown = editor.uifunctions.copyLoc_click
- editor.dom.pasteLoc.onmousedown = editor.uifunctions.pasteLoc_click
- editor.dom.clearEvent.onmousedown = editor.uifunctions.clearEvent_click
- editor.dom.clearLoc.onmousedown = editor.uifunctions.clearLoc_click
+ editor.dom.extraEvent.onmouseup = editor.uifunctions.extraEvent_click
+ editor.dom.chooseThis.onmouseup = editor.uifunctions.chooseThis_click
+ editor.dom.chooseInRight.onmouseup = editor.uifunctions.chooseInRight_click
+ editor.dom.copyLoc.onmouseup = editor.uifunctions.copyLoc_click
+ editor.dom.pasteLoc.onmouseup = editor.uifunctions.pasteLoc_click
+ editor.dom.clearEvent.onmouseup = editor.uifunctions.clearEvent_click
+ editor.dom.clearLoc.onmouseup = editor.uifunctions.clearLoc_click
- editor.dom.lastUsed.onmousedown = editor.uifunctions.lastUsed_click;
+ editor.dom.lastUsed.onmouseup = editor.uifunctions.lastUsed_click;
editor.dom.lastUsed.oncontextmenu = function (e) { e.preventDefault(); }
editor.dom.clearLastUsedBtn.onclick = editor.uifunctions.clearLastUsedBtn_click;
editor.dom.lockMode.onchange = editor.uifunctions.lockMode_onchange;
diff --git a/_server/editor_mappanel.js b/_server/editor_mappanel.js
index 4c95c61d..8237d950 100644
--- a/_server/editor_mappanel.js
+++ b/_server/editor_mappanel.js
@@ -436,13 +436,9 @@ editor_mappanel_wrapper = function (editor) {
* 隐藏右键菜单
*/
editor.uifunctions.hideMidMenu = function () {
- if (editor.isMobile) {
- setTimeout(function () {
- editor.dom.midMenu.style = 'display:none';
- }, 200)
- } else {
+ setTimeout(function () {
editor.dom.midMenu.style = 'display:none';
- }
+ }, 100)
}
/**
@@ -582,6 +578,8 @@ editor_mappanel_wrapper = function (editor) {
editor.uifunctions.chooseThis_click = function (e) {
editor.uifunctions.hideMidMenu();
e.stopPropagation();
+ e.stopImmediatePropagation();
+ e.preventDefault();
selectBox.isSelected(false);
editor_mode.onmode('nextChange');
@@ -589,6 +587,7 @@ editor_mappanel_wrapper = function (editor) {
//editor_mode.loc();
//tip.whichShow(1);
if (editor.isMobile) editor.showdataarea(false);
+ return false;
}
/**
@@ -598,8 +597,11 @@ editor_mappanel_wrapper = function (editor) {
editor.uifunctions.chooseInRight_click = function (e) {
editor.uifunctions.hideMidMenu();
e.stopPropagation();
+ e.stopImmediatePropagation();
+ e.preventDefault();
var thisevent = editor[editor.layerMod][editor.pos.y][editor.pos.x];
editor.setSelectBoxFromInfo(thisevent, true);
+ return false;
}
/**
@@ -609,11 +611,12 @@ editor_mappanel_wrapper = function (editor) {
editor.uifunctions.copyLoc_click = function (e) {
editor.uifunctions.hideMidMenu();
e.stopPropagation();
+ e.stopImmediatePropagation();
e.preventDefault();
editor_mode.onmode('');
editor.uivalues.copyedInfo = editor.copyFromPos();
printf('该点事件已复制');
- return;
+ return false;
}
/**
@@ -623,10 +626,11 @@ editor_mappanel_wrapper = function (editor) {
editor.uifunctions.pasteLoc_click = function (e) {
editor.uifunctions.hideMidMenu();
e.stopPropagation();
+ e.stopImmediatePropagation();
e.preventDefault();
if (!editor.uivalues.copyedInfo) {
printe("没有复制的事件");
- return;
+ return false;
}
editor.savePreMap();
editor_mode.onmode('');
@@ -641,7 +645,7 @@ editor_mappanel_wrapper = function (editor) {
editor.uifunctions.unhighlightSaveFloorButton();
editor.drawPosSelection();
});
- return;
+ return false;
}
/**
@@ -650,8 +654,11 @@ editor_mappanel_wrapper = function (editor) {
*/
editor.uifunctions.clearEvent_click = function (e) {
e.stopPropagation();
+ e.stopImmediatePropagation();
+ e.preventDefault();
editor.clearPos(false);
editor.uifunctions.unhighlightSaveFloorButton();
+ return false;
}
/**
@@ -660,8 +667,11 @@ editor_mappanel_wrapper = function (editor) {
*/
editor.uifunctions.clearLoc_click = function (e) {
e.stopPropagation();
+ e.stopImmediatePropagation();
+ e.preventDefault();
editor.clearPos(true);
editor.uifunctions.unhighlightSaveFloorButton();
+ return false;
}
/**
@@ -845,7 +855,10 @@ editor_mappanel_wrapper = function (editor) {
}
editor.uifunctions.lastUsed_click = function (e) {
- if (editor.isMobile) return;
+ e.preventDefault();
+ e.stopImmediatePropagation();
+ e.stopPropagation();
+ if (editor.isMobile) return false;
var scrollLeft = document.documentElement.scrollLeft || document.body.scrollLeft
var scrollTop = document.documentElement.scrollTop || document.body.scrollTop
diff --git a/_server/editor_mode.js b/_server/editor_mode.js
index d7b8e728..7ebc5b95 100644
--- a/_server/editor_mode.js
+++ b/_server/editor_mode.js
@@ -57,7 +57,20 @@ editor_mode = function (editor) {
printe(objs_.slice(-1)[0]);
throw (objs_.slice(-1)[0])
}
- ; printf('修改成功' + (data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d.firstData.name == 'template' ? '\n\n请注意:全塔属性的name尚未修改,请及时予以设置' : ''));
+ ;
+ var str = '修改成功!';
+ if (data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d.firstData.name == 'template')
+ str += '\n请注意:全塔属性的name尚未修改,请及时予以设置。';
+ if (mode == 'enemyitem') {
+ if (editor.info && editor.info.idnum) {
+ var block = editor.core.maps.blocksInfo[editor.info.idnum];
+ if (block.doorInfo != null && block.doorInfo.keys != null && Object.keys(block.doorInfo.keys).length > 0
+ && block.trigger != 'openDoor') {
+ str += "\n你修改了门信息,但触发器未改成openDoor,请修改否则无法撞击开门。"
+ }
+ }
+ }
+ printf(str);
if (callback) callback();
}
switch (mode) {
diff --git a/_server/editor_table.js b/_server/editor_table.js
index ddf31798..6e792a48 100644
--- a/_server/editor_table.js
+++ b/_server/editor_table.js
@@ -49,10 +49,11 @@ editor_table_wrapper = function (editor) {
editor_table.prototype.checkboxSetMember = function (value,key,prefixString) {
return /* html */`${prefixString}\n`;
}
- editor_table.prototype.editGrid = function (showComment, showEdit) {
+ editor_table.prototype.editGrid = function (showComment, showEdit, showCopy) {
var list = [];
if (showComment) list.push("");
- if (showEdit) list.push("");
+ if (showEdit) list.push("");
+ if (showCopy) list.push("");
return list.join(' ');
}
@@ -79,7 +80,7 @@ editor_table_wrapper = function (editor) {
| ${shortField} |
${shortComment || commentHTMLescape} |
${tdstr} |
- ${editor.table.editGrid(shortComment, type != 'select' && type != 'checkbox' && type != 'checkboxSet' && type != 'disable')} |
+ ${editor.table.editGrid(shortComment, type != 'select' && type != 'checkbox' && type != 'checkboxSet' && type != 'disable', type == 'disable')} |
\n`
}
@@ -416,6 +417,22 @@ editor_table_wrapper = function (editor) {
if (cobj._type === 'textarea') editor_multi.import(guid, { lint: cobj._lint, string: cobj._string });
if (cobj._type === 'material') editor.table.selectMaterial(input, cobj);
if (cobj._type === 'color') editor.table.selectColor(input);
+ if (cobj._type === 'point') editor.table.selectPoint(input);
+ }
+
+ editor_table.prototype.onCopyBtnClick = function (button) {
+ var tr = button.parentNode.parentNode;
+ var input = tr.children[2].children[0].children[0];
+ var value = JSON.parse(input.value);
+ if (value == null) {
+ printe('没有赋值的内容');
+ return;
+ }
+ if (core.copy(value.toString())) {
+ printf('复制成功!');
+ } else {
+ printe('无法复制此内容,请手动选择复制');
+ }
}
/**
@@ -431,6 +448,7 @@ editor_table_wrapper = function (editor) {
if (cobj._type === 'textarea') editor_multi.import(guid, { lint: cobj._lint, string: cobj._string });
if (cobj._type === 'material') editor.table.selectMaterial(input, cobj);
if (cobj._type === 'color') editor.table.selectColor(input);
+ if (cobj._type === 'point') editor.table.selectPoint(input);
} else if (editor_mode.doubleClickMode === 'add') {
editor_mode.doubleClickMode = 'change';
editor.table.addfunc(guid, obj, commentObj, thisTr, input, field, cobj, modeNode)
@@ -466,6 +484,23 @@ editor_table_wrapper = function (editor) {
})
}
+ editor_table.prototype.selectPoint = function (input) {
+ var x = 0, y = 0, value = input.value;
+ if (value != null) {
+ try {
+ var loc = JSON.parse(value);
+ if (loc instanceof Array && loc.length == 2) {
+ x = loc[0];
+ y = loc[1];
+ }
+ } catch (e) {}
+ }
+ editor.uievent.selectPoint(editor.currentFloorId, x, y, true, function (floorId, x, y) {
+ input.value = '['+x+','+y+']';
+ input.onchange();
+ })
+ }
+
/**
* 删除表格项
*/
diff --git a/_server/table/comment.js b/_server/table/comment.js
index 698cf390..14a709e0 100644
--- a/_server/table/comment.js
+++ b/_server/table/comment.js
@@ -282,7 +282,7 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
"_type": "select",
"_select": {
"values": [
- "null",
+ null,
"openDoor",
"pushBox",
"ski",
@@ -446,14 +446,14 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
},
"upFloor": {
"_leaf": true,
- "_type": "textarea",
+ "_type": "point",
"_range": "thiseval==null||((thiseval instanceof Array) && thiseval.length==2)",
"_docs": "上楼点",
"_data": "该层上楼点,如[2,3]。\n如果此项不为null,则楼层转换时的stair:upFloor,以及楼传器的落点会被替换成该点而不是该层的上楼梯。"
},
"downFloor": {
"_leaf": true,
- "_type": "textarea",
+ "_type": "point",
"_range": "thiseval==null||((thiseval instanceof Array) && thiseval.length==2)",
"_docs": "下楼点",
"_data": "该层下楼点,如[2,3]。\n如果此项不为null,则楼层转换时的stair:downFloor,以及楼传器的落点会被替换成该点而不是该层的下楼梯。"
diff --git a/libs/control.js b/libs/control.js
index 93d8f5fd..f099f45b 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -2721,6 +2721,9 @@ control.prototype._resize_gameGroup = function (obj) {
floorMsgGroup.style = obj.globalAttribute.floorChangingStyle;
floorMsgGroup.style.width = obj.outerSize - 2 * obj.BORDER + "px";
floorMsgGroup.style.height = totalHeight - 2 * obj.BORDER + "px";
+ floorMsgGroup.style.fontSize = 16 * core.domStyle.scale + "px";
+ // startPanel
+ core.dom.startPanel.style.fontSize = 16 * core.domStyle.scale + "px";
// musicBtn
if (core.domStyle.isVertical || core.domStyle.scale < 1) {
core.dom.musicBtn.style.right = core.dom.musicBtn.style.bottom = "3px";
diff --git a/libs/core.js b/libs/core.js
index 0da652b7..bb01d112 100644
--- a/libs/core.js
+++ b/libs/core.js
@@ -230,7 +230,9 @@ core.prototype.init = function (coreData, callback) {
core.extensions._load(function () {
core._afterLoadResources(callback);
});
- });
+ });
+ core.dom.musicBtn.style.display = 'block';
+ core.setMusicBtn();
}
core.prototype._init_flags = function () {
diff --git a/libs/events.js b/libs/events.js
index bb455bc6..509e5092 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -2972,7 +2972,7 @@ events.prototype.checkLvUp = function () {
}
events.prototype._checkLvUp_check = function () {
- if (core.flags.statusBarItems.indexOf('enableLevelUp')>=0 || !core.firstData.levelUp
+ if (core.flags.statusBarItems.indexOf('enableLevelUp')<0 || !core.firstData.levelUp
|| core.status.hero.lv >= core.firstData.levelUp.length) return null;
// 计算下一个所需要的数值
var next = (core.firstData.levelUp[core.status.hero.lv] || {});
diff --git a/project/fonts/number.ttf b/project/fonts/number.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..bcf90fae15a92f26dae9f2bf31c86319c458ea77
GIT binary patch
literal 4312
zcmchbe@xZa6~NE;fjr>B;{iSp0ePZ8iwKAg;Tzn-ox35h$nw*Tgm^
zZD!i6>$-JK)}~8cQ;S`eCTiW*)i|ei^JlgGER@=+P_bHFYug0QKKJ{+dyc4hneM}FBYGHN4pPSn>`*N*Nu>|yKZnhJR4h@+gAC+
zY%TD*>8H^ZZr#uPbjObpDnAu(q%A(QBV(;0!cV;#vDVWE>l2SX!=C5q)2s4|XS0Zw
zM67k>_H6sdZ%h1g7rrsz!Amn~Lx==rPl~b6$V7L9pNyL7k!UmLKM>a8@U^QtS{N0Q
zb&;Zr*h8Ph(`9TC>*YxE2-#ecbcdx#j8E(l{QBU+v`4&>=g<*SE`<&q$(ZF1Jqr3k
zhmL}N$f3Ph_LxIQvx5!rR%8t8l*=;?ZApq8bZC$G<*Y+TNQ+!`=txPiY8-kLbcaJn
zLI2#Ly%J^p-l3yqtktc-HWjny>|
zET~(ty0N;|c&x5sQr_qeO2Ys#5#$KDH34V&bqp#O-IWbCRs#87Gm_
z!!r^z{5s|2kdXarArqp1bBLstqR8iHiIG_HG|sMyo6q_G_m;Edux3G9k8>C-!@w7e
z`LrI9s4=v5k!S=lmF7@1V4il{EFGLY$7t!a8rp2yGFm%r6KyH2!JZ_N$ur>dMoCnZ
z*M+!f!$-RiALA9TH^v43b$mi>v_wb8x)AUg-seK1FGgZwT-KKqXZSc5lH+3~Ha6ac
z(bw@ozfXKVzY8e|hEH%IH6c#o;#@XiOu+B~7t)jb;`b-HkeQqy2?@zAgn|JH1cEM%
zPf3)-#1t2D(vl@PIn9OqjGzRA87>rNrAlgQmJ220($t@ro
zGWDhhv|G>VSv>>3uZQ&u{X&Ygls$Z)*Yp~dn8b`CSt2jV{TytwWgJx+sb4a(A3P3j
z(dGIZeO9+y52AmAOqJV=CAuH&P5K;K59>$zk&)Sb)C|3y`X}(X?qQ`fMj}gDWv|@J
zK{tuREJW^)WA!A{rLXE{Ey9jt_~EngTQh8_Z9e|EpUr?v^qsl{@r4
zIUs|K7yYxnkN5Om3Cb8rmE1wqs4@PWo=4XqeMK+JH;|>-(q8S=_Xt`SA$)^XjW(kPu%w1ODa9r(O(Qb`
zR}I-^o+Fsy9bwwCeuuhrY#1jKzSwg)(Xx}Oo=g6j_$(tn_j$VH*0A=Go_B&WEH=*KYjhf^VqWl>
zteS`;sVhB+%ikfXF6u?xp09%#7faC68Pm>P@Y`SoSC%x%ww?SGwXj9Xta(y4nBnOf
zT%+f4g`a(ieG0s(J4mb^!^>E33Tx~m$+~dtS-qlHkWY|oE<3YiE?1B$C?TM|TtY-%
zqcqafa^HzZvHk9@DdBx-}PSx}CkF*sgY}9Gm!D00WvqK|8N0xm;%;P3#Zc_le
z{#Z|QkDN$t82%FcF;mr+Y$EU0k{98uGj1442FuFRzgs^hr(Og*WglkE;GA0~-y;S^
z1Fw3zlus&Mt&i!W`W^H>B0rS1oZ0hPc7s`nY+g!SX4!F>KsmbFhy0CTSk{H5!zEwo
z95!(l3nbY!m4jE3Bv~(G*-7Gb+DXoUm~x1-eUgLq0ZGuSoF?Yg)5XY7IN##64I{P_
zm$yxFla_v7C%18v?!eoVx#8YQ9`L?r<`q3iL_>C7WD?E&ME)0e|JUfdhzot>4b@E5
zoAV1m{yyjEA>tX1q=`E+xw#g6;5&+tgcNUpXp`#ifks&DFF^`Dgf
zS^bb+b5%7(QpEQ_8AWDZmgdD3;w3gk7I9%LH%gefo9x(2e)dpqfJYjLMZy1|Mm+P;
z-;e)JqWw5Nzf3*`?UU{nc42&VVUUk+4u&8-lgRbO@-*KKZIo`IeV!Y8o??I7!MDI(
z^0NS}!FL6Cy_hq$2OADz^;JHey;@*hK;v%LlObxzyt}d-Pj^!_y9T%0W6aJjXuq+V
zI$SEd`S@HQ3)x|=5fPI!x(nQ
Date: Sun, 24 May 2020 18:59:18 +0800
Subject: [PATCH 05/73] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=8C=89=E9=92=AE?=
=?UTF-8?q?=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
_server/editor_blockly.js | 2 +-
_server/editor_mappanel.js | 2 +-
_server/editor_table.js | 2 +-
migration.html | 5 +++++
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js
index 9ab7f75b..e352376b 100644
--- a/_server/editor_blockly.js
+++ b/_server/editor_blockly.js
@@ -147,7 +147,7 @@ editor_blockly = function () {
editor_blockly.highlightParse = function (shouldHighLight) {
if (shouldNotifyParse == shouldHighLight) return;
shouldNotifyParse = shouldHighLight;
- blocklyParseBtn.style.background = shouldNotifyParse ? '#FFCCAA' : 'unset';
+ blocklyParseBtn.style.background = shouldNotifyParse ? '#fff4bb' : 'unset';
}
editor_blockly.cancel = function () {
diff --git a/_server/editor_mappanel.js b/_server/editor_mappanel.js
index 8237d950..86a894c0 100644
--- a/_server/editor_mappanel.js
+++ b/_server/editor_mappanel.js
@@ -830,7 +830,7 @@ editor_mappanel_wrapper = function (editor) {
editor.uifunctions.highlightSaveFloorButton=function(){
var saveFloor = document.getElementById('saveFloor');
- saveFloor.style.background='#FFCCAA';
+ saveFloor.style.background='#fff4bb';
}
editor.uifunctions.unhighlightSaveFloorButton=function(){
diff --git a/_server/editor_table.js b/_server/editor_table.js
index 6e792a48..80ed94f4 100644
--- a/_server/editor_table.js
+++ b/_server/editor_table.js
@@ -71,7 +71,7 @@ editor_table_wrapper = function (editor) {
---- |
---- |
${field} |
- |
+ |
\n`
}
diff --git a/migration.html b/migration.html
index 4129e54b..5a5faf63 100644
--- a/migration.html
+++ b/migration.html
@@ -83,6 +83,11 @@ if (functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a.events.setInitData || !plugin
「绘制圆」「绘制圆边框」「重启当前事件」已经被删除,并且无法再在游戏中使用,请替换成等价的写法。