OSDN Git Service

#36057 configファイルがxml化したため、従来Config.iniファイルを直接編集することでのみ設定変更できていた項目が、設定変更しづらくなった。
[dtxmania/dtxmania.git] / DTXManiaプロジェクト / コード / ステージ / 04.コンフィグ / CActConfigList.cs
index 9e38d74..fdb8f6c 100644 (file)
@@ -14,6 +14,8 @@ namespace DTXMania
                STDGBSValue<COptionLabel> ReturnToMenu;\r
                STDGBSValue<COptionLabel> KeyAssignMenu;\r
                STDGBSValue<COptionLabel> DisplayMenu;\r
+               STDGBSValue<COptionLabel> EDrumsMenu;\r
+               COptionLabel HitRangeMenu;\r
                COptionStringList skins;\r
 \r
                bool b項目リスト側にフォーカスがある;\r
@@ -146,6 +148,14 @@ namespace DTXMania
                        {\r
                                t項目リストの設定(Eメニュー種別.Bass);\r
                        }\r
+                       else if (this.eメニュー種別 == Eメニュー種別.EDrumsSettings)\r
+                       {\r
+                               t項目リストの設定(Eメニュー種別.Drums);\r
+                       }\r
+                       else if (this.eメニュー種別 == Eメニュー種別.HitRangeSettings)\r
+                       {\r
+                               t項目リストの設定(Eメニュー種別.System);\r
+                       }\r
                }\r
 \r
                public bool tEnter押下()\r
@@ -311,6 +321,27 @@ namespace DTXMania
                                list項目リスト.Add(CDTXMania.Instance.ConfigIni.nMinComboDisp.Bass);\r
                                list項目リスト.Add(CDTXMania.Instance.ConfigIni.bGraph.Bass);\r
                        }\r
+                       else if (eMenu == Eメニュー種別.EDrumsSettings)\r
+                       {\r
+                               list項目リスト.Add(ReturnToMenu.Drums);\r
+                               list項目リスト.Add(CDTXMania.Instance.ConfigIni.nVelocityMin.LC);\r
+                               list項目リスト.Add(CDTXMania.Instance.ConfigIni.nVelocityMin.HH);\r
+                               list項目リスト.Add(CDTXMania.Instance.ConfigIni.nVelocityMin.SD);\r
+                               list項目リスト.Add(CDTXMania.Instance.ConfigIni.nVelocityMin.BD);\r
+                               list項目リスト.Add(CDTXMania.Instance.ConfigIni.nVelocityMin.HT);\r
+                               list項目リスト.Add(CDTXMania.Instance.ConfigIni.nVelocityMin.LT);\r
+                               list項目リスト.Add(CDTXMania.Instance.ConfigIni.nVelocityMin.FT);\r
+                               list項目リスト.Add(CDTXMania.Instance.ConfigIni.nVelocityMin.CY);\r
+                               list項目リスト.Add(CDTXMania.Instance.ConfigIni.nVelocityMin.RD);\r
+                       }\r
+                       else if (eMenu == Eメニュー種別.HitRangeSettings)\r
+                       {\r
+                               list項目リスト.Add(ReturnToMenu.System);\r
+                               list項目リスト.Add(CDTXMania.Instance.ConfigIni.nHitRange.Perfect);\r
+                               list項目リスト.Add(CDTXMania.Instance.ConfigIni.nHitRange.Great);\r
+                               list項目リスト.Add(CDTXMania.Instance.ConfigIni.nHitRange.Good);\r
+                               list項目リスト.Add(CDTXMania.Instance.ConfigIni.nHitRange.Poor);\r
+                       }\r
                        else if (eMenu == Eメニュー種別.KeyAssignSystem)\r
                        {\r
                                list項目リスト.Add(ReturnToMenu.System);\r
@@ -365,7 +396,7 @@ namespace DTXMania
                        {\r
                                list項目リスト.Add(ReturnToMenu.System);\r
                                COptionStringList langlist = new COptionStringList("default");\r
-                               langlist.Initialize(cr.Label("strCfgLanguage"), cr.Explanation("strCfgLanguage"), cr.LanguageList );\r
+                               langlist.Initialize( "strCfgLanguage", cr.LanguageDispList );\r
                                langlist.Index = CDTXMania.Instance.Resources.LanguageCodeIndex;\r
                                langlist.OnEnterDelegate = () =>\r
                                {\r
@@ -376,7 +407,7 @@ namespace DTXMania
                                list項目リスト.Add( langlist );\r
                        \r
                                COptionString enumsongs = new COptionString("");\r
-                               enumsongs.Initialize( cr.Label("strCfgSysEnumSongs"), cr.Explanation("strCfgSysEnumSongs") );\r
+                               enumsongs.Initialize( "strCfgSysEnumSongs" );\r
                                list項目リスト.Add(enumsongs);\r
                                list項目リスト.Add(CDTXMania.Instance.ConfigIni.eDark);\r
                                list項目リスト.Add(CDTXMania.Instance.ConfigIni.nRisky);\r
@@ -409,6 +440,7 @@ namespace DTXMania
                                list項目リスト.Add(CDTXMania.Instance.ConfigIni.bUseBoxDefSkin);\r
                                list項目リスト.Add(skins);\r
                                list項目リスト.Add(DisplayMenu.System);\r
+                               list項目リスト.Add(HitRangeMenu);\r
                                list項目リスト.Add(KeyAssignMenu.System);\r
                                enumsongs.OnEnterDelegate = () =>\r
                                {\r
@@ -429,7 +461,7 @@ namespace DTXMania
                        {\r
                                list項目リスト.Add(ReturnToMenu.Drums);\r
                                COptionEnum<EThreeState> AllAuto = new COptionEnum<EThreeState>(EThreeState.X);\r
-                               AllAuto.Initialize( cr.Label("strCfgDrAllAuto"), cr.Explanation("strCfgDrAllAuto"), typeof(EThreeState));\r
+                               AllAuto.Initialize( "strCfgDrAllAuto", typeof(EThreeState));\r
                                AllAuto.OnEnterDelegate = () =>\r
                                {\r
                                        if ( AllAuto.Value == EThreeState.X )\r
@@ -458,13 +490,14 @@ namespace DTXMania
                                list項目リスト.Add(CDTXMania.Instance.ConfigIni.bDrumsHitSound);\r
                                list項目リスト.Add(CDTXMania.Instance.ConfigIni.bEmphasizePlaySound.Drums);\r
                                list項目リスト.Add(DisplayMenu.Drums);\r
+                               list項目リスト.Add(EDrumsMenu.Drums);\r
                                list項目リスト.Add(KeyAssignMenu.Drums);\r
                        }\r
                        else if (eMenu == Eメニュー種別.Guitar)\r
                        {\r
                                list項目リスト.Add(ReturnToMenu.Guitar);\r
                                COptionEnum<EThreeState> AllAuto = new COptionEnum<EThreeState>(EThreeState.X);\r
-                               AllAuto.Initialize( cr.Label("strCfgDrAllAuto"), cr.Explanation("strCfgDrAllAuto"), typeof(EThreeState));\r
+                               AllAuto.Initialize( "strCfgDrAllAuto", typeof(EThreeState));\r
                                AllAuto.OnEnterDelegate = () =>\r
                                {\r
                                        if ( AllAuto.Value == EThreeState.X )\r
@@ -490,7 +523,7 @@ namespace DTXMania
                        {\r
                                list項目リスト.Add(ReturnToMenu.Bass);\r
                                COptionEnum<EThreeState> AllAuto = new COptionEnum<EThreeState>(EThreeState.X);\r
-                               AllAuto.Initialize( cr.Label("strCfgDrAllAuto"), cr.Explanation("strCfgDrAllAuto"), typeof(EThreeState));\r
+                               AllAuto.Initialize( "strCfgDrAllAuto", typeof(EThreeState));\r
                                AllAuto.OnEnterDelegate = () =>\r
                                {\r
                                        if ( AllAuto.Value == EThreeState.X )\r
@@ -567,18 +600,23 @@ namespace DTXMania
                                this.nスクロール用タイマ値 = -1;\r
                                this.ct三角矢印アニメ = new CCounter();\r
 \r
+\r
                                DisplayMenu = new STDGBSValue<COptionLabel>();\r
                                KeyAssignMenu = new STDGBSValue<COptionLabel>();\r
+                               EDrumsMenu = new STDGBSValue<COptionLabel>();\r
                                ReturnToMenu = new STDGBSValue<COptionLabel>();\r
 \r
                                CResources cr = CDTXMania.Instance.Resources;\r
-                               for (EPart i = EPart.Drums; i <= EPart.System; ++i)\r
+                               for ( EPart i = EPart.Drums; i <= EPart.System; ++i )\r
                                {\r
-                                       DisplayMenu[i] = new COptionLabel( cr.Label("strCfgDisplayOption"), cr.Explanation("strCfgDisplayOption") );\r
-                                       KeyAssignMenu[i] = new COptionLabel( cr.Label("strCfgInputOption"), cr.Explanation("strCfgInputOption") );\r
-                                       ReturnToMenu[i] = new COptionLabel( cr.Label("strCfgReturnToMenu"), cr.Explanation("strCfgReturnToMenu") );\r
+                                       DisplayMenu[i] = new COptionLabel( "strCfgDisplayOption" );\r
+                                       KeyAssignMenu[i] = new COptionLabel( "strCfgInputOption" );\r
+                                       ReturnToMenu[i] = new COptionLabel( "strCfgReturnToMenu" );\r
                                }\r
 \r
+                               EDrumsMenu[ EPart.Drums ] = new COptionLabel( "strCfgEDrumsOption" );\r
+                               HitRangeMenu = new COptionLabel( "strCfgHitRangeOption" );\r
+\r
                                DisplayMenu.Drums.OnEnterDelegate = () =>\r
                                {\r
                                        t項目リストの設定(Eメニュー種別.DisplayDrums);\r
@@ -629,6 +667,14 @@ namespace DTXMania
                                {\r
                                        t項目リストの設定(Eメニュー種別.System);\r
                                };\r
+                               EDrumsMenu.Drums.OnEnterDelegate = () =>\r
+                               {\r
+                                       t項目リストの設定(Eメニュー種別.EDrumsSettings);\r
+                               };\r
+                               HitRangeMenu.OnEnterDelegate = () =>\r
+                               {\r
+                                       t項目リストの設定( Eメニュー種別.HitRangeSettings );\r
+                               };\r
 \r
                                #region [ スキン選択肢と、現在選択中のスキン(index)の準備 #28195 2012.5.2 yyagi ]\r
                                int ns = (CDTXMania.Instance.Skin.strSystemSkinSubfolders == null) ? 0 : CDTXMania.Instance.Skin.strSystemSkinSubfolders.Length;\r
@@ -1097,6 +1143,8 @@ namespace DTXMania
                        DisplayDrums,\r
                        DisplayGuitar,\r
                        DisplayBass,\r
+                       EDrumsSettings,\r
+                       HitRangeSettings,\r
                        Unknown\r
                }\r
 \r