Skip to content

Commit 98b9917

Browse files
unanmedunanmed
committed
Merge branch 'v2.x'
2 parents 95419b4 + d617455 commit 98b9917

File tree

19 files changed

+1137
-84
lines changed

19 files changed

+1137
-84
lines changed

‎README.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,21 @@ HTML5 canvas制作的魔塔样板，支持全平台游戏！
6161
├── main.js # JS程序的入口，将动态对所需JS进行加载
6262
├── runtime.d.js # 样板运行时的类型标注
6363
├── server.py # 使用python编写的启动服务
64+
├── server.js # 使用js编写的启动服务，支持热重载等功能，需要用node运行
6465
├── style.css # 游戏所需要用到的样式表
6566
└── 启动服务.exe # 一个本地的HTTP服务器，也能支撑前端的一些POST请求从而能拓展JS的IO功能。
6667
```
6768

6869
## 更新说明
6970

71+
## 2023.1 HTML5魔塔样板V2.10.1
72+
73+
* [x] 进一步高清化ui
74+
* [x] 修复编辑器中缩略图显示bug
75+
* [x] 修复对称飞等缩略图的显示bug
76+
* [x] 将横屏隐藏状态栏分离成底部工具栏与隐藏左侧状态栏两个设置
77+
* [x] 换用新版热重载插件，修复一直报错的问题
78+
7079
### 2022.9 HTML5魔塔样板V2.10.0
7180

7281
* [x] 「自动存档」事件指令支持像打怪开门的自动存档一样，在读档后回到事件触发前了。
@@ -178,7 +187,7 @@ HTML5 canvas制作的魔塔样板，支持全平台游戏！
178187
### 2020.11.8 HTML5魔塔样板V2.7.3
179188

180189
* [x] 内置高清UI，界面更清晰！
181-
* [x] 完整的emoji支持！现在可以对话中直接使用emiji了。
190+
* [x] 完整的emoji支持！现在可以对话中直接使用emoji了。
182191
* [x] 动画添加多音效支持！可在注册时绑定。
183192
* [x] 事件编辑器的自动补全增加图块图标。
184193
* [x] terrains追加薄墙图块，支持单方向通行。

‎_server/CodeMirror/beautify.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_server/CodeMirror/jshint.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_server/css/FiraCode.ttf‎

283 KB
Binary file not shown.

‎_server/css/editor.css‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,3 +699,12 @@ div.checkboxSet {
699699
.etableInputDiv textarea:hover {
700700
margin: -5px;
701701
}
702+
703+
@font-face {
704+
font-family: code;
705+
src: url(./FiraCode.ttf);
706+
}
707+
708+
.main .CodeMirror {
709+
font-family: code, 微软雅黑, 黑体, 新宋体, Verdana;
710+
}

‎_server/css/editor_mobile.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,3 +710,11 @@ div.checkboxSet {
710710
margin: -5px;
711711
}
712712

713+
@font-face {
714+
font-family: Fira;
715+
src: url(./FiraCode.ttf);
716+
}
717+
718+
.main .CodeMirror {
719+
font-family: Fira, Menlo, Consolas, 'Courier New', Courier, monospace;
720+
}

‎_server/editor_multi.js‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ editor_multi = function () {
77
var extraKeys = {
88
"Ctrl-/": function (cm) { cm.toggleComment(); },
99
"Ctrl-B": function (cm) { ternServer.jumpToDef(cm); },
10-
"Ctrl-Q": function(cm) { ternServer.rename(cm); },
10+
"Ctrl-Q": function (cm) { ternServer.rename(cm); },
1111
"Cmd-F": CodeMirror.commands.findPersistent,
1212
"Ctrl-F": CodeMirror.commands.findPersistent,
1313
"Ctrl-R": CodeMirror.commands.replaceAll,
14-
"Ctrl-D": function(cm){ cm.foldCode(cm.getCursor()); },
14+
"Ctrl-D": function (cm) { cm.foldCode(cm.getCursor()); },
1515
"Ctrl-O": function () { editor_multi.openUrl('/_docs/#/api'); },
1616
"Ctrl-P": function () { editor_multi.openUrl('https://h5mota.com/plugins/'); }
1717
};
@@ -48,14 +48,14 @@ editor_multi = function () {
4848
'Ctrl-P': '打开在线插件列表（Ctrl+P）'
4949
};
5050

51-
document.getElementById('codemirrorCommands').innerHTML =
52-
"<option value='' selected>执行操作...</option>" +
51+
document.getElementById('codemirrorCommands').innerHTML =
52+
"<option value='' selected>执行操作...</option>" +
5353
Object.keys(commandsName).map(function (name) {
5454
return "<option value='" + name + "'>" + commandsName[name] + "</option>"
5555
}).join('');
5656

5757
var coredef = terndefs_f6783a0a_522d_417e_8407_94c67b692e50[2];
58-
Object.keys(core.material.enemys).forEach(function (name){
58+
Object.keys(core.material.enemys).forEach(function (name) {
5959
coredef.core.material.enemys[name] = {
6060
"!type": "enemy",
6161
"!doc": core.material.enemys[name].name || "怪物"
@@ -236,7 +236,15 @@ editor_multi = function () {
236236
document.getElementById('left7').style = 'z-index:-1;opacity: 0;';
237237
}
238238
editor_multi.setLint = function () {
239-
codeEditor.setOption("lint", editor_multi.lintAutocomplete);
239+
if (editor_multi.lintAutocomplete) {
240+
codeEditor.setOption("lint", {
241+
options: {
242+
esversion: 2021
243+
}
244+
});
245+
} else {
246+
codeEditor.setOption("lint", false);
247+
}
240248
codeEditor.setOption("autocomplete", editor_multi.lintAutocomplete);
241249
document.getElementById("lintCheckbox").checked = editor_multi.lintAutocomplete;
242250
}
@@ -253,7 +261,7 @@ editor_multi = function () {
253261
var _format = function () {
254262
if (!editor_multi.lintAutocomplete) return;
255263
var offset = (codeEditor.getScrollInfo() || {}).top || 0;
256-
_setValue(js_beautify(codeEditor.getValue(), {
264+
_setValue(beautifier.js(codeEditor.getValue(), {
257265
brace_style: "collapse-preserve-inline",
258266
indent_with_tabs: true,
259267
jslint_happy: true
@@ -486,6 +494,22 @@ editor_multi = function () {
486494
editor_multi.importFile(dict[mod])
487495
}
488496

497+
// 字体大小
498+
{
499+
const CONFIG_KEY = "editor_multi.fontSize";
500+
let fontsize = editor.config.get(CONFIG_KEY, 14);
501+
const input = document.getElementById("editor_multi_fontsize");
502+
const check = document.getElementById("editor_multi_fontweight")
503+
input.value = fontsize;
504+
editor_multi.setFontSize = function () {
505+
const value = Number(input.value);
506+
editor.config.set(CONFIG_KEY, value);
507+
const ele = codeEditor.getWrapperElement()
508+
ele.style.fontSize = `${value}px`;
509+
ele.style.fontWeight = `${check.checked ? 'bold' : 'normal'}`
510+
}
511+
}
512+
489513
return editor_multi;
490514
}
491515
//editor_multi=editor_multi();

‎_server/table/data.comment.js‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -555,14 +555,20 @@ var data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
555555
"autoScale": {
556556
"_leaf": true,
557557
"_type": "checkbox",
558-
"_docs": "自动缩放最大化",
559-
"_data": "是否自动缩放最大化，关闭后不再最大化"
558+
"_docs": "自动缩放",
559+
"_data": "是否自动缩放至合适值"
560560
},
561561
"extendToolbar": {
562562
"_leaf": true,
563563
"_type": "checkbox",
564-
"_docs": "横屏隐藏状态栏",
565-
"_data": "在横屏状态下是否隐藏左侧状态栏，从而获得仿RM的沉浸式体验"
564+
"_docs": "画面下方道具栏",
565+
"_data": "开启后道具栏会被挪动至游戏画面的下方"
566+
},
567+
"hideLeftStatusBar": {
568+
"_leaf": true,
569+
"_type": "checkbox",
570+
"_docs": "隐藏左侧状态栏",
571+
"_data": "是否隐藏左侧状态栏，开启后强制开启画面下方道具栏"
566572
},
567573
"flyNearStair": {
568574
"_leaf": true,

‎editor-mobile.html‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -242,15 +242,21 @@ <h3>事件编辑器 &nbsp;&nbsp;
242242
<button onclick="confirmColor()">确定</button>
243243
</div>
244244
<div id="left7" style="z-index:-1;opacity: 0;"><!-- 多行文本编辑器 -->
245-
<button onclick="editor_multi.confirm()">确认</button>
246-
<button onclick="editor_multi.cancel()">取消</button>
247-
<button onclick="editor_multi.confirm(true)">应用</button>
248-
<button onclick="editor_multi.format()">格式化</button>
249-
<button id="editor_multi_preview" style="display: none;">预览</button>
250-
<input type="checkbox" onclick="editor_multi.toggerLint()" id="lintCheckbox"
251-
style="vertical-align: middle;margin-left:6px"/>
252-
<span style="vertical-align: middle; margin-left: -3px">语法检查</span>
253-
<select id="codemirrorCommands" onchange="editor_multi.doCommand(this)" style="vertical-align: middle; margin-left: 6px;"></select>
245+
<div>
246+
<button onclick="editor_multi.confirm()">确认</button>
247+
<button onclick="editor_multi.cancel()">取消</button>
248+
<button onclick="editor_multi.confirm(true)">应用</button>
249+
<button onclick="editor_multi.format()">格式化</button>
250+
<button id="editor_multi_preview" style="display: none;">预览</button>
251+
<input type="checkbox" onclick="editor_multi.toggerLint()" id="lintCheckbox"
252+
style="vertical-align: middle;margin-left:6px"/>
253+
<span style="vertical-align: middle; margin-left: -3px">语法检查</span>
254+
<select id="codemirrorCommands" onchange="editor_multi.doCommand(this)" style="vertical-align: middle; margin-left: 6px;"></select>
255+
<span>字体大小</span>
256+
<input style="width: 40px" type="number" onchange="editor_multi.setFontSize()" id="editor_multi_fontsize" />
257+
<span>字体加粗</span>
258+
<input style="width: 40px" type="checkbox" onchange="editor_multi.setFontSize()" id="editor_multi_fontweight" />
259+
</div>
254260
<textarea id="multiLineCode" name="multiLineCode"></textarea>
255261
</div>
256262
<div id="left8" class='leftTab' style="z-index:-1;opacity: 0;"><!-- functions -->

‎editor.html‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,21 @@ <h3>事件编辑器 &nbsp;&nbsp;
238238
<button onclick="confirmColor()">确定</button>
239239
</div>
240240
<div id="left7" style="z-index:-1;opacity: 0;"><!-- 多行文本编辑器 -->
241-
<button onclick="editor_multi.confirm()">确认</button>
242-
<button onclick="editor_multi.cancel()">取消</button>
243-
<button onclick="editor_multi.confirm(true)">应用</button>
244-
<button onclick="editor_multi.format()">格式化</button>
245-
<button id="editor_multi_preview" style="display: none;">预览</button>
246-
<input type="checkbox" onclick="editor_multi.toggerLint()" id="lintCheckbox"
247-
style="vertical-align: middle;margin-left:6px"/>
248-
<span style="vertical-align: middle; margin-left: -3px">语法检查</span>
249-
<select id="codemirrorCommands" onchange="editor_multi.doCommand(this)" style="vertical-align: middle; margin-left: 6px;"></select>
241+
<div>
242+
<button onclick="editor_multi.confirm()">确认</button>
243+
<button onclick="editor_multi.cancel()">取消</button>
244+
<button onclick="editor_multi.confirm(true)">应用</button>
245+
<button onclick="editor_multi.format()">格式化</button>
246+
<button id="editor_multi_preview" style="display: none;">预览</button>
247+
<input type="checkbox" onclick="editor_multi.toggerLint()" id="lintCheckbox"
248+
style="vertical-align: middle;margin-left:6px"/>
249+
<span style="vertical-align: middle; margin-left: -3px">语法检查</span>
250+
<select id="codemirrorCommands" onchange="editor_multi.doCommand(this)" style="vertical-align: middle; margin-left: 6px;"></select>
251+
<span>字体大小</span>
252+
<input style="width: 40px" type="number" onchange="editor_multi.setFontSize()" id="editor_multi_fontsize" />
253+
<span>字体加粗</span>
254+
<input style="width: 40px" type="checkbox" onchange="editor_multi.setFontSize()" id="editor_multi_fontweight" />
255+
</div>
250256
<textarea id="multiLineCode" name="multiLineCode"></textarea>
251257
</div>
252258
<div id="left8" class='leftTab' style="z-index:-1;opacity: 0;"><!-- functions -->

0 commit comments

Comments
 (0)