diff --git a/libs/actions.js b/libs/actions.js index 33d875e9..be76dea8 100644 --- a/libs/actions.js +++ b/libs/actions.js @@ -2486,38 +2486,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.ui._drawSwitchs(); - break; - case 1: // core.playSound('确定'); core.ui._drawKeyBoard(); break; - case 2: + case 1: // core.playSound('确定'); core.clearUI(); core.ui._drawViewMaps(); break; - case 3: + case 2: core.status.event.selection = 0; core.playSound('确定'); core.ui._drawNotes(); break; - case 4: + case 3: core.status.event.selection = 0; core.playSound('确定'); core.ui._drawSyncSave(); break; - case 5: + case 4: core.status.event.selection = 0; core.playSound('确定'); core.ui._drawGameInfo(); break; - case 6: + case 5: return core.confirmRestart(); - case 7: + case 6: core.playSound('取消'); core.ui.closePanel(); break; diff --git a/libs/ui.js b/libs/ui.js index ce644261..a48dcebb 100644 --- a/libs/ui.js +++ b/libs/ui.js @@ -1992,7 +1992,8 @@ ui.prototype._drawSwitchs_action = function () { ui.prototype._drawSettings = function () { core.status.event.id = 'settings'; this.drawChoices(null, [ - "系统设置", "虚拟键盘", "浏览地图", "存档笔记", "同步存档", "游戏信息", "返回标题", "返回游戏" + // "系统设置", "虚拟键盘", "浏览地图", "存档笔记", "同步存档", "游戏信息", "返回标题", "返回游戏" + "虚拟键盘", "浏览地图", "存档笔记", "同步存档", "游戏信息", "返回标题", "返回游戏" ]); } diff --git a/project/plugins.js b/project/plugins.js index c190b68b..ecf47005 100644 --- a/project/plugins.js +++ b/project/plugins.js @@ -4232,7 +4232,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = break; case 'gameView': core.fillText(this.name, '-- 显示 --', 40, 175, ' #FFE4B5', '18px Verdana'); - core.fillText(this.name, '-- 音效 --', 40, 295, ' #FFE4B5', '18px Verdana'); + core.fillText(this.name, '-- 音效 --', 40, 320, ' #FFE4B5', '18px Verdana'); break; case 'key': core.fillText(this.name, '-- 快捷键设置 --', 40, 205, ' #FFE4B5', '18px Verdana'); @@ -4345,15 +4345,17 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = ['1,2', new SettingButton(40, 205, 150, 25, 'HDCanvas')], ['1,3', new SettingButton(40, 230, 150, 25, 'displayEnemyDamage')], ['1,4', new SettingButton(40, 255, 150, 25, 'displayExtraDamage')], - ['1,5', new SettingButton(40, 300, 150, 25, 'bgm')], - ['1,6', new SettingButton(40, 325, 25, 25, 'decreaseVolume')], - ['2,6', new SettingButton(140, 325, 25, 25, 'increaseVolume')], + ['1,5', new SettingButton(40, 280, 150, 25, 'extraDamageType')], + ['1,6', new SettingButton(40, 325, 150, 25, 'bgm')], + ['1,7', new SettingButton(40, 350, 25, 25, 'decreaseVolume')], + ['2,7', new SettingButton(140, 350, 25, 25, 'increaseVolume')], ['2,1', new SettingButton(220, 180, 25, 25, 'zoomIn')], ['3,1', new SettingButton(320, 180, 25, 25, 'zoomOut')], - ['2,2', new SettingButton(220, 205, 150, 25, 'enableEnemyPoint')], - ['2,3', new SettingButton(220, 230, 150, 25, 'displayCritical')], - ['2,5', new SettingButton(220, 300, 150, 25, 'se')], + ['2,2', new SettingButton(220, 205, 150, 25, 'autoScale')], + ['2,3', new SettingButton(220, 230, 150, 25, 'enableEnemyPoint')], + ['2,4', new SettingButton(220, 255, 150, 25, 'displayCritical')], + ['2,6', new SettingButton(220, 325, 150, 25, 'se')], ]); const keyMenu = new SettingOnePage('key');