From 60d47e347171b1ef533520d33ac9ee5213396352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?DragonRatTiger=20/=20=E3=83=AA=E3=83=A5=E3=82=A6=E3=82=B3?= Date: Thu, 24 Oct 2024 10:06:20 -0500 Subject: [PATCH] Fix default keybinds being wiped if new Config file is created (#722) * Update ImGuiDebugWindow.cs * Fix default keybinds being wiped when creating new Config --- OpenTaiko/src/Common/CConfigIni.cs | 29 ++++++++++++------------ OpenTaiko/src/Common/ImGuiDebugWindow.cs | 6 ++--- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/OpenTaiko/src/Common/CConfigIni.cs b/OpenTaiko/src/Common/CConfigIni.cs index e8200f52..a37ed6ce 100644 --- a/OpenTaiko/src/Common/CConfigIni.cs +++ b/OpenTaiko/src/Common/CConfigIni.cs @@ -1618,6 +1618,21 @@ internal class CConfigIni : INotifyPropertyChanged { this.ConfigIniFileName = ""; this.dicJoystick = new Dictionary(10); this.dicGamepad = new Dictionary(10); + + this.sectionProcess = new Dictionary>() { + { ESectionType.System, this.ProcessSystemSection }, + { ESectionType.AutoPlay, this.ProcessAutoPlaySection }, + { ESectionType.HitRange, this.ProcessHitRangeSection }, + { ESectionType.Log, this.ProcessLogSection }, + { ESectionType.PlayOption, this.ProcessPlayOptionSection }, + { ESectionType.ViewerOption, this.ProcessViewerOptionSection }, + { ESectionType.GUID, this.ProcessGuidSection }, + { ESectionType.DrumsKeyAssign, this.ProcessDrumKeyAssignmentSection }, + { ESectionType.SystemKeyAssign, this.ProcessSystemKeyAssignmentSection }, + { ESectionType.TrainingKeyAssign, this.ProcessTrainingKeyAssignmentSection }, + { ESectionType.DEBUG, this.ProcessDebugSection }, + }; + this.SetDefaultKeyAssignments(); #region [ velocityMin ] @@ -1669,20 +1684,6 @@ internal class CConfigIni : INotifyPropertyChanged { this.nDisplayTimesMs = 3000; // #32072 2013.10.24 yyagi Semi-Invisibleでの、チップ再表示期間 this.nFadeoutTimeMs = 2000; // #32072 2013.10.24 yyagi Semi-Invisibleでの、チップフェードアウト時間 - this.sectionProcess = new Dictionary>() { - { ESectionType.System, this.ProcessSystemSection }, - { ESectionType.AutoPlay, this.ProcessAutoPlaySection }, - { ESectionType.HitRange, this.ProcessHitRangeSection }, - { ESectionType.Log, this.ProcessLogSection }, - { ESectionType.PlayOption, this.ProcessPlayOptionSection }, - { ESectionType.ViewerOption, this.ProcessViewerOptionSection }, - { ESectionType.GUID, this.ProcessGuidSection }, - { ESectionType.DrumsKeyAssign, this.ProcessDrumKeyAssignmentSection }, - { ESectionType.SystemKeyAssign, this.ProcessSystemKeyAssignmentSection }, - { ESectionType.TrainingKeyAssign, this.ProcessTrainingKeyAssignmentSection }, - { ESectionType.DEBUG, this.ProcessDebugSection }, - }; - bViewerVSyncWait = true; bViewerShowDebugStatus = true; bViewerTimeStretch = false; diff --git a/OpenTaiko/src/Common/ImGuiDebugWindow.cs b/OpenTaiko/src/Common/ImGuiDebugWindow.cs index 69016747..adb10fc7 100644 --- a/OpenTaiko/src/Common/ImGuiDebugWindow.cs +++ b/OpenTaiko/src/Common/ImGuiDebugWindow.cs @@ -411,11 +411,11 @@ public static class ImGuiDebugWindow { "Dan Red Full Combo", "TEXTURE_LUA_DANFC"); currentStageMemoryUsage += CTextureListPopup(OpenTaiko.stage演奏ドラム画面.actEnd.Dan_Red_PerfectScript, "Dan Red Perfect", "TEXTURE_LUA_DANPFC"); - currentStageMemoryUsage += CTextureListPopup(OpenTaiko.stage演奏ドラム画面.actEnd.Dan_Red_PassScript, + currentStageMemoryUsage += CTextureListPopup(OpenTaiko.stage演奏ドラム画面.actEnd.Dan_Gold_PassScript, "Dan Gold Clear", "TEXTURE_LUA_DANGOLDCLEAR"); - currentStageMemoryUsage += CTextureListPopup(OpenTaiko.stage演奏ドラム画面.actEnd.Dan_Red_FullComboScript, + currentStageMemoryUsage += CTextureListPopup(OpenTaiko.stage演奏ドラム画面.actEnd.Dan_Gold_FullComboScript, "Dan Gold Full Combo", "TEXTURE_LUA_DANGOLDFC"); - currentStageMemoryUsage += CTextureListPopup(OpenTaiko.stage演奏ドラム画面.actEnd.Dan_Red_PerfectScript, + currentStageMemoryUsage += CTextureListPopup(OpenTaiko.stage演奏ドラム画面.actEnd.Dan_Gold_PerfectScript, "Dan Gold Perfect", "TEXTURE_LUA_DANGOLDPFC"); break; default: