diff --git a/libs/actions.js b/libs/actions.js index 708341d2..efe3c4e6 100644 --- a/libs/actions.js +++ b/libs/actions.js @@ -2526,38 +2526,38 @@ actions.prototype._clickSettings = function (x, y) { var selection = y - topIndex; core.status.event.selection = selection; switch (selection) { - // case 0: - // core.status.event.selection = 0; - // core.playSound('确定'); - // core.ui._drawSwitchs(); - // break; case 0: + core.status.event.selection = 0; + core.playSound('确定'); + core.tryUseItem('setting'); + break; + case 1: // core.playSound('确定'); core.ui._drawKeyBoard(); break; - case 1: + case 2: // core.playSound('确定'); core.clearUI(); core.ui._drawViewMaps(); break; - case 2: + case 3: core.status.event.selection = 0; core.playSound('确定'); core.ui._drawNotes(); break; - case 3: + case 4: core.status.event.selection = 0; core.playSound('确定'); core.ui._drawSyncSave(); break; - case 4: + case 5: core.status.event.selection = 0; core.playSound('确定'); core.ui._drawGameInfo(); break; - case 5: - return core.confirmRestart(); case 6: + return core.confirmRestart(); + case 7: core.playSound('取消'); core.ui.closePanel(); break; diff --git a/libs/events.js b/libs/events.js index 622151bf..f4f06c01 100644 --- a/libs/events.js +++ b/libs/events.js @@ -3807,8 +3807,10 @@ events.prototype.tryUseItem = function (itemId) { return core.ui._drawCenterFly(); } if (core.canUseItem(itemId)) { + const noRouteList = ['setting']; + // setting使用不计入录像。弹幕机postman需要计入,因为它带有后续选项 core.ui.closePanel(); - core.useItem(itemId); + core.useItem(itemId, noRouteList.includes(itemId)); } else { core.playSound('操作失败'); core.drawTip("当前无法使用" + core.material.items[itemId].name, itemId); diff --git a/libs/ui.js b/libs/ui.js index 4958430f..f5032540 100644 --- a/libs/ui.js +++ b/libs/ui.js @@ -2008,8 +2008,7 @@ ui.prototype._drawSwitchs_action = function () { ui.prototype._drawSettings = function () { core.status.event.id = 'settings'; this.drawChoices(null, [ - // "系统设置", "虚拟键盘", "浏览地图", "存档笔记", "同步存档", "游戏信息", "返回标题", "返回游戏" - "虚拟键盘", "浏览地图", "存档笔记", "同步存档", "游戏信息", "返回标题", "返回游戏" + "系统设置", "虚拟键盘", "浏览地图", "存档笔记", "同步存档", "游戏信息", "返回标题", "返回游戏" ]); }