jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge difference of 13 & 15

Browse Source
This commit is contained in:
ckcz123 2021-09-03 13:39:18 +08:00
parent c131649873
commit 2ea0787e87
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_server/MotaAction.g4
View File

@ -636,8 +636,8 @@ return '{' + [
mainStyle_m
: '主要样式设置：' '标题界面背景图（554x422）：' EvalString BGNL? Newline
'竖屏标题界面背景图（422x580）' EvalString BGNL? Newline
: '主要样式设置：' '标题界面背景图：' EvalString BGNL? Newline
'竖屏标题界面背景图：' EvalString BGNL? Newline
'标题样式；可写 display: none 隐藏标题' EvalString BGNL? Newline
'标题按钮样式：' EvalString BGNL? Newline
'横屏状态栏背景；url(...) 0 0/100% 100% no-repeat 可将图片拉伸自适配' BGNL? Newline EvalString BGNL? Newline

6
_server/editor_datapanel.js
View File

@ -180,6 +180,12 @@ editor_datapanel_wrapper = function (editor) {
editor.uifunctions.createNewMaps_func = function () {
document.getElementById('newMapWidth').value = core.__SIZE__;
document.getElementById('newMapHeight').value = core.__SIZE__;
document.getElementById('newMapsWidth').value = core.__SIZE__;
document.getElementById('newMapsHeight').value = core.__SIZE__;
var newMaps = document.getElementById('newMaps');
var newFloors = document.getElementById('newFloors');
newMaps.onclick = function () {

4
_server/table/data.comment.js
View File

@ -138,9 +138,9 @@ var data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
"equipName": {
"_leaf": true,
"_type": "textarea",
"_range": "(thiseval instanceof Array && thiseval.length<=6)||thiseval==null",
"_range": "(thiseval instanceof Array)||thiseval==null",
"_docs": "装备孔",
"_data": "装备位名称，为不超过6个的数组，此项的顺序与equiptype数值关联；例如可写[\"武器\",\"防具\",\"首饰\"]等等。"
"_data": "装备位名称，为一个数组，此项的顺序与equiptype数值关联；例如可写[\"武器\",\"防具\",\"首饰\"]等等。"
},
"startBgm": {
"_leaf": true,

8
editor-mobile.html
View File

@ -29,9 +29,9 @@
<div id="editTip">
<input id='newFileName' placeholder="新楼层id" style="width: 100px"/>
<span style="vertical-align: bottom">宽</span>
<input id='newMapWidth' value="13" style="width: 20px"/>
<input id='newMapWidth' style="width: 20px"/>
<span style="vertical-align: bottom">高</span>
<input id='newMapHeight' value="13" style="width: 20px"/>
<input id='newMapHeight' style="width: 20px"/>
<input type="checkbox" id='newMapStatus' checked='checked' style='vertical-align: bottom'/>
<span style='vertical-align: bottom;'>保留楼层属性</span>
<br/>
@ -55,9 +55,9 @@
<input id='newFloorNames' style="width: 70px" value='${i}'/>
<br/>
<span style="vertical-align: bottom">宽</span>
<input id='newMapsWidth' value="13" style="width: 20px"/>
<input id='newMapsWidth' style="width: 20px"/>
<span style="vertical-align: bottom">高</span>
<input id='newMapsHeight' value="13" style="width: 20px"/>
<input id='newMapsHeight' style="width: 20px"/>
<input type="checkbox" id='newMapsStatus' checked='checked' style='vertical-align: bottom'/>
<span style='vertical-align: bottom; margin-left: -4px'>保留楼层属性</span>
<br/>

8
editor.html
View File

@ -29,9 +29,9 @@
<input type="button" value="新建空白地图" id='newMap'/>
<input id='newFileName' placeholder="新楼层id" style="width: 70px"/>
<span style="vertical-align: bottom">宽</span>
<input id='newMapWidth' value="13" style="width: 20px"/>
<input id='newMapWidth' style="width: 20px"/>
<span style="vertical-align: bottom">高</span>
<input id='newMapHeight' value="13" style="width: 20px"/>
<input id='newMapHeight' style="width: 20px"/>
<input type="checkbox" id='newMapStatus' checked='checked' style='vertical-align: bottom'/>
<span style='vertical-align: bottom; margin-left: -4px'>保留楼层属性</span>
</div>
@ -51,9 +51,9 @@
<span style="vertical-align: bottom">状态栏名称: </span>
<input id='newFloorNames' style="width: 70px" value='${i}'/>
<span style="vertical-align: bottom">宽</span>
<input id='newMapsWidth' value="13" style="width: 20px"/>
<input id='newMapsWidth' style="width: 20px"/>
<span style="vertical-align: bottom">高</span>
<input id='newMapsHeight' value="13" style="width: 20px"/>
<input id='newMapsHeight' style="width: 20px"/>
<input type="checkbox" id='newMapsStatus' checked='checked' style='vertical-align: bottom'/>
<span style='vertical-align: bottom; margin-left: -4px'>保留楼层属性</span>
<br/>