动画音效补全 & 原始数值

This commit is contained in:
ckcz123 committed 2020-10-18 12:02:48 +08:00
1 parent 0e1f4242d6
commit 8b6ff17c53
9 files changed
+84 -28

No files matched your search

+2 -2
View File
@@ -3361,8 +3361,8 @@ Floor_List
/*Floor_List ['floorId',':before',':next',':now']*/;
Stair_List
: '坐标'|'上楼梯'|'下楼梯'|'保持不变'|'中心对称点'|'x对称点'|'y对称点'
/*Stair_List ['loc','upFloor','downFloor',':now',':symmetry',':symmetry_x',':symmetry_y']*/;
: '坐标'|'上楼梯'|'下楼梯'|'保持不变'|'中心对称点'|'x对称点'|'y对称点'|'楼传落点'
/*Stair_List ['loc','upFloor','downFloor',':now',':symmetry',':symmetry_x',':symmetry_y','flyPoint']*/;
SetTextPosition_List
: '不改变'|'距离顶部'|'居中'|'距离底部'
+2 -2
View File
@@ -261,11 +261,11 @@ editor_table_wrapper = function (editor) {
var thiseval = vobj;
var comment = String(cobj._data);
var charlength = 15;
// var charlength = 15;
// "['a']['b']" => "b"
var shortField = field.split("']").slice(-2)[0].split("['").slice(-1)[0];
// 把长度超过 charlength 的字符改成 固定长度+...的形式
shortField = (shortField.length < charlength ? shortField : shortField.slice(0, charlength) + '...');
// shortField = (shortField.length < charlength ? shortField : shortField.slice(0, charlength) + '...');
// 完整的内容转义后供悬停查看
var commentHTMLescape = editor.util.HTMLescape(comment);
+7 -2
View File
@@ -754,6 +754,7 @@ editor_ui_wrapper = function (editor) {
}
// 显示每一项内容
var hasAudio = false;
var html = "<p style='margin-left: 10px; line-height: 25px'>";
html += "<button onclick='editor.uievent._selectAllMaterial(true)'>全选</button>"+
"<button style='margin-left: 10px' onclick='editor.uievent._selectAllMaterial(false)'>全不选</button><br/>";
@@ -765,7 +766,7 @@ editor_ui_wrapper = function (editor) {
html += '<br style="display:none"/><img key="'+directory+one+'" style="display:none; max-width: 100%"/>';
}
// 试听音频
if (one.endsWith('.mp3') || one.endsWith('.wmv') || one.endsWith('.ogg') || one.endsWith('.wav')) {
if (one.endsWith('.mp3') || one.endsWith('.ogg') || one.endsWith('.wav') || one.endsWith('.m4a') || one.endsWith('.flac')) {
html += "<button onclick='editor.uievent._previewMaterialAudio(this)' style='margin-left: 10px'>播放</button>";
html += `<small style='display:none; margin-left: 15px'>0:00 / 0:00</small><br style="display:none"/>
<audio preload="none" src="${directory+one}" ontimeupdate="editor.uievent._previewMaterialAudio_onTimeUpdate(this)"></audio>
@@ -773,17 +774,21 @@ editor_ui_wrapper = function (editor) {
}
// 预览动画
if (directory.indexOf('animates') >= 0) {
var audios = Object.keys(core.material.sounds).sort().join(",");
html += "<button onclick='editor.uievent._previewMaterialAnimate(this)' style='margin-left: 10px'>预览</button>";
html += `<span style="display:none; margin-left: 10px" key="${directory+one+'.animate'}"><br/>音效:<input type="text" />
html += `<span style="display:none; margin-left: 10px" key="${directory+one+'.animate'}"><br/>音效
<input type="text" class="awesomplete" data-list="${audios}" data-minchars="1" data-autofirst="true"/>
<button onclick="editor.uievent._previewMaterialAnimate_previewSound(this)" style='marin-left: 10px'>试听</button>
<button onclick="editor.uievent._previewMaterialAnimate_saveSound(this)">保存</button><br/>
</span>`;
hasAudio = true;
}
html += '<br/>';
});
html += "</p>";
html += "<p style='margin-left: 10px'><small>如果文件未在此列表显示,请检查文件名是否合法(只能由数字字母下划线横线和点组成),后缀名是否正确。</small></p>";
uievent.elements.extraBody.innerHTML = html;
if (hasAudio) new Awesomplete(".awesomplete");
});
}
+11 -4
View File
@@ -505,10 +505,17 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
},
"bgm": {
"_leaf": true,
"_type": "select",
"_select": {
"values": [null].concat(Object.keys(editor.core.material.bgms))
},
"_type": "material",
"_directory": "./project/bgms/",
"_transform": (function (one) {
if (one.endsWith('.mp3') || one.endsWith('.ogg') || one.endsWith('.wav') || one.endsWith('.m4a') || one.endsWith('.flac'))
return one;
return null;
}).toString(),
"_onconfirm": (function (previous, current) {
if (current.length == 0) return null;
return current[0];
}).toString(),
"_docs": "背景音乐",
"_data": "到达该层后默认播放的BGM"
},
+11 -4
View File
@@ -136,10 +136,17 @@ var data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
},
"startBgm": {
"_leaf": true,
"_type": "select",
"_select": {
"values": [null].concat(Object.keys(editor.core.material.bgms))
},
"_type": "material",
"_directory": "./project/bgms/",
"_transform": (function (one) {
if (one.endsWith('.mp3') || one.endsWith('.ogg') || one.endsWith('.wav') || one.endsWith('.m4a') || one.endsWith('.flac'))
return one;
return null;
}).toString(),
"_onconfirm": (function (previous, current) {
if (current.length == 0) return null;
return current[0];
}).toString(),
"_docs": "标题音乐",
"_data": "在标题界面应该播放的bgm内容"
},