diff --git a/index.html b/index.html
index ab56d366..a233f02a 100644
--- a/index.html
+++ b/index.html
@@ -163,6 +163,8 @@
![]()
![]()
![]()
+ ![]()
+ ![]()
![]()
![]()
diff --git a/libs/control.js b/libs/control.js
index 26ea5c27..dfc71552 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -3327,13 +3327,21 @@ control.prototype.setToolbarButton = function (useButton) {
["rollback", "undoRollback"].forEach(function (t) {
core.statusBar.image[t].style.display = 'none';
});
- ["btn1", "btn2", "btn3", "btn4", "btn5", "btn6", "btn7", "btn8"].forEach(function (t) {
+ ["btn1", "btn2", "btn3", "btn4", "btn5", "btn6", "btn7", "btnAlt"].forEach(function (t) {
core.statusBar.image[t].style.display = 'block';
})
- main.statusBar.image.btn8.style.filter = core.getLocalStorage('altKey') ? 'sepia(1) contrast(1.5)' : '';
+ if (!core.flags.showHard) {
+ ["btn8", "btn9"].forEach(function (t) {
+ core.statusBar.image[t].style.display = 'block';
+ });
+ }
+ main.statusBar.image.btnAlt.style.filter = core.getLocalStorage('altKey') ? 'sepia(1) contrast(1.5)' : '';
}
else {
- ["btn1", "btn2", "btn3", "btn4", "btn5", "btn6", "btn7", "btn8"].forEach(function (t) {
+ ["btn1", "btn2", "btn3", "btn4", "btn5", "btn6", "btn7", "btnAlt"].forEach(function (t) {
+ core.statusBar.image[t].style.display = 'none';
+ });
+ ["btn8", "btn9"].forEach(function (t) {
core.statusBar.image[t].style.display = 'none';
});
["book", "fly", "toolbox", "save", "load", "settings"].forEach(function (t) {
diff --git a/main.js b/main.js
index c923587c..ed4ca6b3 100644
--- a/main.js
+++ b/main.js
@@ -122,6 +122,8 @@ function main () {
'btn6': document.getElementById("img-btn6"),
'btn7': document.getElementById("img-btn7"),
'btn8': document.getElementById("img-btn8"),
+ 'btn9': document.getElementById("img-btn9"),
+ 'btnAlt': document.getElementById("img-btnAlt"),
'rollback': document.getElementById("img-rollback"),
'undoRollback': document.getElementById("img-undoRollback"),
'single': document.getElementById("img-single"),
@@ -164,10 +166,12 @@ function main () {
'btn6': 32,
'btn7': 33,
'btn8': 34,
- 'rollback': 35,
- 'undoRollback': 36,
- 'single': 37,
- 'valve': 38,
+ 'btn9': 35,
+ 'btnAlt': 36,
+ 'rollback': 37,
+ 'undoRollback': 38,
+ 'single': 39,
+ 'valve': 40,
},
'floor': document.getElementById('floor'),
'name': document.getElementById('name'),
@@ -843,16 +847,26 @@ main.prototype.listen = function () {
};
main.statusBar.image.btn8.onclick = function (e) {
+ e.stopPropagation();
+ main.core.onkeyUp({ "keyCode": 56, "altKey": core.getLocalStorage('altKey') });
+ };
+
+ main.statusBar.image.btn9.onclick = function (e) {
+ e.stopPropagation();
+ main.core.onkeyUp({ "keyCode": 57, "altKey": core.getLocalStorage('altKey') });
+ };
+
+ main.statusBar.image.btnAlt.onclick = function (e) {
e.stopPropagation();
if (core.getLocalStorage('altKey')) {
core.removeLocalStorage('altKey');
core.drawTip("Alt模式已关闭。");
- main.statusBar.image.btn8.style.filter = '';
+ main.statusBar.image.btnAlt.style.filter = '';
}
else {
core.setLocalStorage('altKey', true);
core.drawTip("Alt模式已开启；此模式下1~7按钮视为Alt+1~7。");
- main.statusBar.image.btn8.style.filter = 'sepia(1) contrast(1.5)';
+ main.statusBar.image.btnAlt.style.filter = 'sepia(1) contrast(1.5)';
}
};
diff --git a/project/functions.js b/project/functions.js
index 90881971..96118c28 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -995,6 +995,18 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
else core.getNextItem();
}
break;
+ case 56: // 快捷键8：空白
+ {
+ const item = core.getLocalStorage('hotkey8');
+ if (item) tryUseItem(item);
+ }
+ break;
+ case 57: // 快捷键9：空白
+ {
+ const item = core.getLocalStorage('hotkey9');
+ if (item) tryUseItem(item);
+ }
+ break;
case 118: // F7：开启debug模式
case 119: // F8：由于F7与部分浏览器有冲突，故新增F8
core.debug();
diff --git a/project/materials/icons.png b/project/materials/icons.png
index fd4d0519..4c9b08f1 100644
Binary files a/project/materials/icons.png and b/project/materials/icons.png differ
diff --git a/project/plugins.js b/project/plugins.js
index feb2f082..9b73dc54 100644
--- a/project/plugins.js
+++ b/project/plugins.js
@@ -4406,6 +4406,12 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
case '7':
itemName = '轻按';
break;
+ case '8':
+ itemName = '空白';
+ break;
+ case '9':
+ itemName = '空白';
+ break;
}
}
let text = '\\i[btn' + num + ']: ';
@@ -4419,7 +4425,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
['clearHotKeys', new Setting(
() => '',
function () {
- for (let i = 1; i <= 7; i++) {
+ for (let i = 1; i <= 9; i++) {
core.setLocalStorage('hotkey' + i, null);
}
this.menu.drawContent();
@@ -5003,7 +5009,9 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
['1,4', new SettingButton(40, 280, 150, 25, 'setHotKey', ['5'])],
['2,4', new SettingButton(220, 280, 150, 25, 'setHotKey', ['6'])],
['1,5', new SettingButton(40, 310, 150, 25, 'setHotKey', ['7'])],
- ['1,6', new SettingButton(300, 350, 42, 25, 'clearHotKeys')],
+ ['2,5', new SettingButton(220, 310, 150, 25, 'setHotKey', ['8'])],
+ ['1,6', new SettingButton(40, 340, 150, 25, 'setHotKey', ['9'])],
+ ['2,6', new SettingButton(300, 350, 42, 25, 'clearHotKeys')],
]);
const consoleMenu = new SettingOnePage('console');