diff --git a/_server/editor_mappanel.js b/_server/editor_mappanel.js index f69c4584..8f497c93 100644 --- a/_server/editor_mappanel.js +++ b/_server/editor_mappanel.js @@ -529,6 +529,7 @@ editor_mappanel_wrapper = function (editor) { */ editor.uifunctions._extraEvent_bindStartPoint = function (thisevent) { if (thisevent != 0) return false; + if (!confirm('再次确认,你想绑定此点为出生点吗?')) return false; editor.mode.onmode('tower'); editor.mode.addAction(["change", "['firstData']['floorId']", editor.currentFloorId]); editor.mode.addAction(["change", "['firstData']['hero']['loc']['x']", editor.pos.x]); diff --git a/_server/editor_ui.js b/_server/editor_ui.js index da16508f..d40f35a0 100644 --- a/_server/editor_ui.js +++ b/_server/editor_ui.js @@ -756,12 +756,20 @@ editor_ui_wrapper = function (editor) { if (callback) callback(list); } + var _isTileset = directory.indexOf('project/tilesets') >= 0; + // 显示每一项内容 var html = "
";
html += ""+
"
";
+ if (_isTileset) {
+ html += "警告!额外素材一旦注册成功将不可删除,否则可能会导致素材错位风险!如果你不再想用某个额外素材,"
+ +"但又不想让它出现在素材区,可以考虑使用空气墙同名替换该额外素材文件。
"
+ }
data.forEach(function (one) {
- html += `= 0? 'checked' : ''} /> ${one}`;
+ var checked = value.indexOf(one) >= 0? 'checked' : '';
+ var disabled = _isTileset && value.indexOf(one) >= 0 ? 'disabled' : ''
+ html += ` ${one}`;
// 预览图片
if (one.endsWith('.png') || one.endsWith('.jpg') || one.endsWith('.jpeg') || one.endsWith('.gif')) {
html += "";
@@ -789,7 +797,7 @@ editor_ui_wrapper = function (editor) {
uievent._selectAllMaterial = function (checked) {
Array.from(document.getElementsByClassName('materialCheckbox')).forEach(function (one) {
- one.checked = checked;
+ if (!one.disabled) one.checked = checked;
})
}