#36195 選曲画面上部のオプションパネルで、Hidden設定の時にSudが、Sudden設定の時にHidが表示されている問題を修正。(スキン側を修正しているので注意)

#36057 X座標/Y座標を設定するCONFIGURATION部分の説明文を追加。また、キーコンフィグの英文説明を追加。

git-svn-id: http://svn.osdn.jp/svnroot/dtxmania/trunk@1005 16f42ceb-6dc6-49c8-ba94-f2d53467949d

diff --git a/DTXManiaプロジェクト/コード/ステージ/04.コンフィグ/CConfigXml.cs b/DTXManiaプロジェクト/コード/ステージ/04.コンフィグ/CConfigXml.cs
index 84526a3..3b965e5 100644 (file)
--- a/DTXManiaプロジェクト/コード/ステージ/04.コンフィグ/CConfigXml.cs
+++ b/DTXManiaプロジェクト/コード/ステージ/04.コンフィグ/CConfigXml.cs
@@ -830,67 +830,67 @@ namespace DTXMania
                        strASIODevice.Initialize( "strCfgSysASIODevice", asiodevs);\r
 \r
                        int crdStep = 10;\r
-                       cdInstX.Drums.Both.Initialize("DrumsX(Both)", Properties.Resources.strCfgDispDrumsXBoth, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdInstX.Drums.DrOnly.Initialize("DrumsX(Dr)", Properties.Resources.strCfgDispDrumsXDr, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdInstX.Guitar.Both.Initialize("GuitarX(Both)", Properties.Resources.strCfgDispGuitarXBoth, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdInstX.Guitar.GBOnly.Initialize("GuitarX(GB)", Properties.Resources.strCfgDispGuitarXGB, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdInstX.Bass.Both.Initialize("BassX(Both)", Properties.Resources.strCfgDispBassXBoth, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdInstX.Bass.GBOnly.Initialize("BassX(GB)", Properties.Resources.strCfgDispBassXGB, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-\r
-                       cdDebugX.DrOnly.Initialize("DebugX(Dr)", Properties.Resources.strCfgDispDebugXDr, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdDebugX.Both.Initialize("DebugX(Both)", Properties.Resources.strCfgDispDebugXBoth, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdDebugX.GBOnly.Initialize("DebugX(GB)", Properties.Resources.strCfgDispDebugXGB, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdDebugY.DrOnly.Initialize("DebugY(Dr)", Properties.Resources.strCfgDispDebugYDr, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdDebugY.Both.Initialize("DebugY(Both)", Properties.Resources.strCfgDispDebugYBoth, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdDebugY.GBOnly.Initialize("DebugY(GB)", Properties.Resources.strCfgDispDebugYGB, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-\r
-                       cdMovieX.DrOnly.Initialize("MovieX(Dr)", Properties.Resources.strCfgDispMovieXDr, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdMovieX.Both.Initialize("MovieX(Both)", Properties.Resources.strCfgDispMovieXBoth, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdMovieX.GBOnly.Initialize("MovieX(GB)", Properties.Resources.strCfgDispMovieXGB, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdMovieY.DrOnly.Initialize("MovieY(Dr)", Properties.Resources.strCfgDispMovieYDr, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdMovieY.Both.Initialize("MovieY(Both)", Properties.Resources.strCfgDispMovieYBoth, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdMovieY.GBOnly.Initialize("MovieY(GB)", Properties.Resources.strCfgDispMovieYGB, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-\r
-                       cdComboX.Drums.Both.Initialize("ComboX(Both)", Properties.Resources.strCfgDispDrComboXBoth, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdComboX.Drums.DrOnly.Initialize("ComboX(Dr)", Properties.Resources.strCfgDispDrComboXDr, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdComboX.Guitar.Both.Initialize("ComboX(Both)", Properties.Resources.strCfgDispGtComboXBoth, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdComboX.Guitar.GBOnly.Initialize("ComboX(GB)", Properties.Resources.strCfgDispGtComboXGB, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdComboX.Bass.Both.Initialize("ComboX(Both)", Properties.Resources.strCfgDispBsComboXBoth, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-                       cdComboX.Bass.GBOnly.Initialize("ComboX(GB)", Properties.Resources.strCfgDispBsComboXGB, 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
-\r
-                       cdComboY.Drums.Both.Initialize("ComboY(Both)", Properties.Resources.strCfgDispDrComboYBoth, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdComboY.Drums.DrOnly.Initialize("ComboY(Dr)", Properties.Resources.strCfgDispDrComboYDr, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdComboY.Guitar.Both.Initialize("ComboY(Both)", Properties.Resources.strCfgDispGtComboYBoth, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdComboY.Guitar.GBOnly.Initialize("ComboY(GB)", Properties.Resources.strCfgDispGtComboYGB, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdComboY.Bass.Both.Initialize("ComboY(Both)", Properties.Resources.strCfgDispBsComboYBoth, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdComboY.Bass.GBOnly.Initialize("ComboY(GB)", Properties.Resources.strCfgDispBsComboYGB, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-\r
-                       cdJudgeLineY.Drums.Initialize("JudgeLine", Properties.Resources.strCfgDispDrJudgeLine, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdJudgeLineY.Guitar.Initialize("JudgeLine", Properties.Resources.strCfgDispGtJudgeLine, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdJudgeLineY.Bass.Initialize("JudgeLine", Properties.Resources.strCfgDispBsJudgeLine, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-\r
-                       cdJudgeY.Drums.Initialize("Judge", Properties.Resources.strCfgDispDrJudge, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdJudgeY.Guitar.Initialize("Judge", Properties.Resources.strCfgDispGtJudge, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-                       cdJudgeY.Bass.Initialize("Judge", Properties.Resources.strCfgDispBsJudge, 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
-\r
-                       cdLaneOrder.LC.Initialize("LC Order", Properties.Resources.strCfgDispLaneOrderLC, 0, 8);\r
-                       cdLaneOrder.HH.Initialize("HH Order", Properties.Resources.strCfgDispLaneOrderHH, 0, 8);\r
-                       cdLaneOrder.SD.Initialize("SD Order", Properties.Resources.strCfgDispLaneOrderSD, 0, 8);\r
-                       cdLaneOrder.BD.Initialize("BD Order", Properties.Resources.strCfgDispLaneOrderBD, 0, 8);\r
-                       cdLaneOrder.HT.Initialize("HT Order", Properties.Resources.strCfgDispLaneOrderHT, 0, 8);\r
-                       cdLaneOrder.LT.Initialize("LT Order", Properties.Resources.strCfgDispLaneOrderLT, 0, 8);\r
-                       cdLaneOrder.FT.Initialize("FT Order", Properties.Resources.strCfgDispLaneOrderFT, 0, 8);\r
-                       cdLaneOrder.CY.Initialize("CY Order", Properties.Resources.strCfgDispLaneOrderCY, 0, 8);\r
-\r
-                       cdLaneOrder.GtR.Initialize("R Order", Properties.Resources.strCfgDispLaneOrderGtR, 0, 4);\r
-                       cdLaneOrder.GtG.Initialize("G Order", Properties.Resources.strCfgDispLaneOrderGtG, 0, 4);\r
-                       cdLaneOrder.GtB.Initialize("B Order", Properties.Resources.strCfgDispLaneOrderGtB, 0, 4);\r
-                       cdLaneOrder.GtW.Initialize("W Order", Properties.Resources.strCfgDispLaneOrderGtW, 0, 4);\r
-\r
-                       cdLaneOrder.BsR.Initialize("R Order", Properties.Resources.strCfgDispLaneOrderBsR, 0, 4);\r
-                       cdLaneOrder.BsG.Initialize("G Order", Properties.Resources.strCfgDispLaneOrderBsG, 0, 4);\r
-                       cdLaneOrder.BsB.Initialize("B Order", Properties.Resources.strCfgDispLaneOrderBsB, 0, 4);\r
-                       cdLaneOrder.BsW.Initialize("W Order", Properties.Resources.strCfgDispLaneOrderBsW, 0, 4);\r
+                       cdInstX.Drums.Both.Initialize("strCfgDispDrumsXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdInstX.Drums.DrOnly.Initialize("strCfgDispDrumsXDr", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdInstX.Guitar.Both.Initialize("strCfgDispGuitarXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdInstX.Guitar.GBOnly.Initialize("strCfgDispGuitarXGB", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdInstX.Bass.Both.Initialize("strCfgDispBassXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdInstX.Bass.GBOnly.Initialize("strCfgDispBassXGB", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+\r
+                       cdDebugX.DrOnly.Initialize("strCfgDispDebugXDr", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdDebugX.Both.Initialize("strCfgDispDebugXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdDebugX.GBOnly.Initialize("strCfgDispDebugXGB", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdDebugY.DrOnly.Initialize("strCfgDispDebugYDr", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdDebugY.Both.Initialize("strCfgDispDebugYBoth", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdDebugY.GBOnly.Initialize("strCfgDispDebugYGB", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+\r
+                       cdMovieX.DrOnly.Initialize("strCfgDispMovieXDr", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdMovieX.Both.Initialize("strCfgDispMovieXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdMovieX.GBOnly.Initialize("strCfgDispMovieXGB", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdMovieY.DrOnly.Initialize("strCfgDispMovieYDr", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdMovieY.Both.Initialize("strCfgDispMovieYBoth", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdMovieY.GBOnly.Initialize("strCfgDispMovieYGB", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+\r
+                       cdComboX.Drums.Both.Initialize("strCfgDispDrComboXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdComboX.Drums.DrOnly.Initialize("strCfgDispDrComboXDr", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdComboX.Guitar.Both.Initialize("strCfgDispGtComboXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdComboX.Guitar.GBOnly.Initialize("strCfgDispGtComboXGB", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdComboX.Bass.Both.Initialize("strCfgDispBsComboXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+                       cdComboX.Bass.GBOnly.Initialize("strCfgDispBsComboXGB", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);\r
+\r
+                       cdComboY.Drums.Both.Initialize("strCfgDispDrComboYBoth", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdComboY.Drums.DrOnly.Initialize("strCfgDispDrComboYDr", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdComboY.Guitar.Both.Initialize("strCfgDispGtComboYBoth", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdComboY.Guitar.GBOnly.Initialize("strCfgDispGtComboYGB", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdComboY.Bass.Both.Initialize("strCfgDispBsComboYBoth", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdComboY.Bass.GBOnly.Initialize("strCfgDispBsComboYGB", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+\r
+                       cdJudgeLineY.Drums.Initialize("strCfgDispDrJudgeLine", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdJudgeLineY.Guitar.Initialize("strCfgDispGtJudgeLine", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdJudgeLineY.Bass.Initialize("strCfgDispBsJudgeLine", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+\r
+                       cdJudgeY.Drums.Initialize("strCfgDispDrJudge", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdJudgeY.Guitar.Initialize("strCfgDispGtJudge", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+                       cdJudgeY.Bass.Initialize("strCfgDispBsJudge", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);\r
+\r
+                       cdLaneOrder.LC.Initialize("strCfgDispLaneOrderLC", 0, 8);\r
+                       cdLaneOrder.HH.Initialize("strCfgDispLaneOrderHH", 0, 8);\r
+                       cdLaneOrder.SD.Initialize("strCfgDispLaneOrderSD", 0, 8);\r
+                       cdLaneOrder.BD.Initialize("strCfgDispLaneOrderBD", 0, 8);\r
+                       cdLaneOrder.HT.Initialize("strCfgDispLaneOrderHT", 0, 8);\r
+                       cdLaneOrder.LT.Initialize("strCfgDispLaneOrderLT", 0, 8);\r
+                       cdLaneOrder.FT.Initialize("strCfgDispLaneOrderFT", 0, 8);\r
+                       cdLaneOrder.CY.Initialize("strCfgDispLaneOrderCY", 0, 8);\r
+\r
+                       cdLaneOrder.GtR.Initialize("strCfgDispLaneOrderGtR", 0, 4);\r
+                       cdLaneOrder.GtG.Initialize("strCfgDispLaneOrderGtG", 0, 4);\r
+                       cdLaneOrder.GtB.Initialize("strCfgDispLaneOrderGtB", 0, 4);\r
+                       cdLaneOrder.GtW.Initialize("strCfgDispLaneOrderGtW", 0, 4);\r
+\r
+                       cdLaneOrder.BsR.Initialize("strCfgDispLaneOrderBsR", 0, 4);\r
+                       cdLaneOrder.BsG.Initialize("strCfgDispLaneOrderBsG", 0, 4);\r
+                       cdLaneOrder.BsB.Initialize("strCfgDispLaneOrderBsB", 0, 4);\r
+                       cdLaneOrder.BsW.Initialize("strCfgDispLaneOrderBsW", 0, 4);\r
 \r
                        SetEnterDelegates();\r
                }\r

diff --git a/DTXManiaプロジェクト/コード/ステージ/04.コンフィグ/CStageコンフィグ.cs b/DTXManiaプロジェクト/コード/ステージ/04.コンフィグ/CStageコンフィグ.cs
index ee604ce..2eb7c6d 100644 (file)
--- a/DTXManiaプロジェクト/コード/ステージ/04.コンフィグ/CStageコンフィグ.cs
+++ b/DTXManiaプロジェクト/コード/ステージ/04.コンフィグ/CStageコンフィグ.cs
@@ -204,11 +204,11 @@ namespace DTXMania
 \r
                                prvFont = new CPrivateFastFont(CSkin.Path(@"Graphics\fonts\mplus-1p-heavy.ttf"), (int)(18 * Scale.Y));\r
                                string[] strMenuItem = { \r
-                                       "strCfgSysMenuItem",\r
-                                       "strCfgDrMenuItem",\r
-                                       "strCfgGtMenuItem",\r
-                                       "strCfgBsMenuItem",\r
-                                       "strCfgExitMenuItem"\r
+                                       "strCfgSysMenuDesc",\r
+                                       "strCfgDrMenuDesc",\r
+                                       "strCfgGtMenuDesc",\r
+                                       "strCfgBsMenuDesc",\r
+                                       "strCfgExitMenuDesc"\r
                                };\r
                                txMenuItemLeft = new CTexture[strMenuItem.Length, 2];\r
                                for (int i = 0; i < strMenuItem.Length; i++)\r

diff --git a/DTXManiaプロジェクト/作成資料/@むかしの。/オプションパネル.psd b/DTXManiaプロジェクト/作成資料/@むかしの。/オプションパネル.psd
index 79b2925..aa81375 100644 (file)
Binary files a/DTXManiaプロジェクト/作成資料/@むかしの。/オプションパネル.psd and b/DTXManiaプロジェクト/作成資料/@むかしの。/オプションパネル.psd differ

diff --git a/実行時フォルダ/DTXManiaGR.exe b/実行時フォルダ/DTXManiaGR.exe
index cdb9b41..5d2e783 100644 (file)
Binary files a/実行時フォルダ/DTXManiaGR.exe and b/実行時フォルダ/DTXManiaGR.exe differ

diff --git a/実行時フォルダ/System/Default/Graphics/Screen option panels.png b/実行時フォルダ/System/Default/Graphics/Screen option panels.png
index 3c439fc..db9356c 100644 (file)
Binary files a/実行時フォルダ/System/Default/Graphics/Screen option panels.png and b/実行時フォルダ/System/Default/Graphics/Screen option panels.png differ

diff --git a/実行時フォルダ/System/resources.csv b/実行時フォルダ/System/resources.csv
index 8acdfb1..e22a003 100644 (file)
Binary files a/実行時フォルダ/System/resources.csv and b/実行時フォルダ/System/resources.csv differ

diff --git a/実行時フォルダ/System/resources.xlsx b/実行時フォルダ/System/resources.xlsx
index 1150fc6..37bce44 100644 (file)
Binary files a/実行時フォルダ/System/resources.xlsx and b/実行時フォルダ/System/resources.xlsx differ