Merge difference of 13 & 15

This commit is contained in:
ckcz123 committed 2021-09-03 13:39:18 +08:00
1 parent c131649873
commit 2ea0787e87
5 files changed
+18 -12

No files matched your search

+2 -2
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
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 () {
+2 -2
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,