diff --git a/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs b/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs index 01e9c11d..02e0f99c 100644 --- a/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs +++ b/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs @@ -1087,6 +1087,7 @@ namespace TJAPlayer3 OnlineLounge_Side_Menu = TxC(ONLINELOUNGE + @"Side_Menu.png"); OnlineLounge_Context = TxC(ONLINELOUNGE + @"Context.png"); OnlineLounge_Song_Box = TxC(ONLINELOUNGE + @"Song_Box.png"); + OnlineLounge_Return_Box = TxC(ONLINELOUNGE + @"Return_Box.png"); #endregion @@ -1099,6 +1100,7 @@ namespace TJAPlayer3 OpenEncyclopedia_Background = TxC(OPENENCYCLOPEDIA + @"Background.png"); OpenEncyclopedia_Context = TxC(OPENENCYCLOPEDIA + @"Context.png"); OpenEncyclopedia_Side_Menu = TxC(OPENENCYCLOPEDIA + @"Side_Menu.png"); + OpenEncyclopedia_Return_Box = TxC(OPENENCYCLOPEDIA + @"Return_Box.png"); #endregion @@ -2109,6 +2111,7 @@ namespace TJAPlayer3 OnlineLounge_Center_Menu_Box_Slot, OnlineLounge_Side_Menu, OnlineLounge_Context, + OnlineLounge_Return_Box, OnlineLounge_Song_Box; #endregion @@ -2121,6 +2124,7 @@ namespace TJAPlayer3 public CTexture OpenEncyclopedia_Background, OpenEncyclopedia_Context, + OpenEncyclopedia_Return_Box, OpenEncyclopedia_Side_Menu; #endregion diff --git a/TJAPlayer3/Stages/12.OnlineLounge/CStageOnlineLounge.cs b/TJAPlayer3/Stages/12.OnlineLounge/CStageOnlineLounge.cs index 31c43383..34364065 100644 --- a/TJAPlayer3/Stages/12.OnlineLounge/CStageOnlineLounge.cs +++ b/TJAPlayer3/Stages/12.OnlineLounge/CStageOnlineLounge.cs @@ -219,9 +219,19 @@ namespace TJAPlayer3 tmpTex.color4 = _color; tmpSubtitle.color4 = _color; - TJAPlayer3.Tx.OnlineLounge_Song_Box?.tUpdateColor4(_color); - TJAPlayer3.Tx.OnlineLounge_Song_Box?.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 350, baseY + 100 * i); + if (pos == 0) + { + TJAPlayer3.Tx.OnlineLounge_Return_Box?.tUpdateColor4(_color); + TJAPlayer3.Tx.OnlineLounge_Return_Box?.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 350, baseY + 100 * i); + } + else + { + TJAPlayer3.Tx.OnlineLounge_Song_Box?.tUpdateColor4(_color); + TJAPlayer3.Tx.OnlineLounge_Song_Box?.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 350, baseY + 100 * i); + } + + tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 350, baseY + 18 + 100 * i); tmpSubtitle.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 350, baseY + 46 + 100 * i); diff --git a/TJAPlayer3/Stages/15.OpenEncyclopedia/CEncyclopediaControler.cs b/TJAPlayer3/Stages/15.OpenEncyclopedia/CEncyclopediaControler.cs index 7a8cfb53..8a07372c 100644 --- a/TJAPlayer3/Stages/15.OpenEncyclopedia/CEncyclopediaControler.cs +++ b/TJAPlayer3/Stages/15.OpenEncyclopedia/CEncyclopediaControler.cs @@ -65,7 +65,7 @@ namespace TJAPlayer3 } catch { - return "[File fetching failed]"; + return "[File not found]"; } } @@ -101,7 +101,7 @@ namespace TJAPlayer3 Submenus[0].Item1 = -1; Submenus[0].Item2 = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture( - new TitleTextureKey(CLangManager.LangInstance.GetString(401), _pfEncyclopediaMenu, Color.White, Color.DarkOrange, 1000)); + new TitleTextureKey(CLangManager.LangInstance.GetString(401), _pfEncyclopediaMenu, Color.White, Color.Brown, 1000)); for (int i = 1; i < _count; i++) { @@ -109,7 +109,7 @@ namespace TJAPlayer3 var _menu = _current.Menus[_idx]; Submenus[i].Item1 = _menu.Key; Submenus[i].Item2 = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture( - new TitleTextureKey(_GetSectionContents(_menu.Key, true), _pfEncyclopediaMenu, Color.White, Color.DarkOrange, 1000)); + new TitleTextureKey(_GetSectionContents(_menu.Key, true), _pfEncyclopediaMenu, Color.White, Color.Brown, 1000)); } } diff --git a/TJAPlayer3/Stages/15.OpenEncyclopedia/COpenEncyclopedia.cs b/TJAPlayer3/Stages/15.OpenEncyclopedia/COpenEncyclopedia.cs index 65e3fb35..63f10f11 100644 --- a/TJAPlayer3/Stages/15.OpenEncyclopedia/COpenEncyclopedia.cs +++ b/TJAPlayer3/Stages/15.OpenEncyclopedia/COpenEncyclopedia.cs @@ -95,16 +95,21 @@ namespace TJAPlayer3 if (i != 0) { + TJAPlayer3.Tx.OpenEncyclopedia_Return_Box?.tUpdateColor4(C変換.ColorToColor4(Color.DarkGray)); TJAPlayer3.Tx.OpenEncyclopedia_Side_Menu?.tUpdateColor4(C変換.ColorToColor4(Color.DarkGray)); _menu.Item2?.tUpdateColor4(C変換.ColorToColor4(Color.DarkGray)); } else { + TJAPlayer3.Tx.OpenEncyclopedia_Return_Box?.tUpdateColor4(C変換.ColorToColor4(Color.White)); TJAPlayer3.Tx.OpenEncyclopedia_Side_Menu?.tUpdateColor4(C変換.ColorToColor4(Color.White)); _menu.Item2?.tUpdateColor4(C変換.ColorToColor4(Color.White)); } - TJAPlayer3.Tx.OpenEncyclopedia_Side_Menu?.t2D中心基準描画(TJAPlayer3.app.Device, 320, 360 + i * 90); + if (_pos == 0) + TJAPlayer3.Tx.OpenEncyclopedia_Return_Box?.t2D中心基準描画(TJAPlayer3.app.Device, 320, 360 + i * 90); + else + TJAPlayer3.Tx.OpenEncyclopedia_Side_Menu?.t2D中心基準描画(TJAPlayer3.app.Device, 320, 360 + i * 90); _menu.Item2?.t2D中心基準描画(TJAPlayer3.app.Device, 320, 360 + i * 90); } @@ -140,7 +145,7 @@ namespace TJAPlayer3 _backToMain = _b2; if (_b1) - TJAPlayer3.Skin.sound変更音.t再生する(); + TJAPlayer3.Skin.sound決定音.t再生する(); else TJAPlayer3.Skin.sound取消音.t再生する(); } diff --git a/Test/Encyclopedia/Menus/1/jp.txt b/Test/Encyclopedia/Menus/1/jp.txt new file mode 100644 index 00000000..e88ded96 --- /dev/null +++ b/Test/Encyclopedia/Menus/1/jp.txt @@ -0,0 +1 @@ +Test1 \ No newline at end of file diff --git a/Test/Encyclopedia/Menus/10/jp.txt b/Test/Encyclopedia/Menus/10/jp.txt new file mode 100644 index 00000000..3071f6b2 --- /dev/null +++ b/Test/Encyclopedia/Menus/10/jp.txt @@ -0,0 +1 @@ +Test10 \ No newline at end of file diff --git a/Test/Encyclopedia/Menus/11/jp.txt b/Test/Encyclopedia/Menus/11/jp.txt new file mode 100644 index 00000000..003b8134 --- /dev/null +++ b/Test/Encyclopedia/Menus/11/jp.txt @@ -0,0 +1 @@ +Test11 \ No newline at end of file diff --git a/Test/Encyclopedia/Menus/2/jp.txt b/Test/Encyclopedia/Menus/2/jp.txt new file mode 100644 index 00000000..da8f2098 --- /dev/null +++ b/Test/Encyclopedia/Menus/2/jp.txt @@ -0,0 +1 @@ +Test2 \ No newline at end of file diff --git a/Test/Encyclopedia/Pages/100/jp.txt b/Test/Encyclopedia/Pages/100/jp.txt new file mode 100644 index 00000000..8fa60367 --- /dev/null +++ b/Test/Encyclopedia/Pages/100/jp.txt @@ -0,0 +1,3 @@ +This is a test page +with the number +100 \ No newline at end of file diff --git a/Test/Encyclopedia/Pages/101/jp.txt b/Test/Encyclopedia/Pages/101/jp.txt new file mode 100644 index 00000000..25aff016 --- /dev/null +++ b/Test/Encyclopedia/Pages/101/jp.txt @@ -0,0 +1,3 @@ +This is a test page +with the number +101 \ No newline at end of file diff --git a/Test/Encyclopedia/Pages/102/jp.txt b/Test/Encyclopedia/Pages/102/jp.txt new file mode 100644 index 00000000..559445e9 --- /dev/null +++ b/Test/Encyclopedia/Pages/102/jp.txt @@ -0,0 +1,3 @@ +This is a test page +with the number +102 \ No newline at end of file diff --git a/Test/System/SimpleStyle/Graphics/12_OnlineLounge/Return_Box.png b/Test/System/SimpleStyle/Graphics/12_OnlineLounge/Return_Box.png new file mode 100644 index 00000000..628dd5ac Binary files /dev/null and b/Test/System/SimpleStyle/Graphics/12_OnlineLounge/Return_Box.png differ diff --git a/Test/System/SimpleStyle/Graphics/15_OpenEncyclopedia/Return_Box.png b/Test/System/SimpleStyle/Graphics/15_OpenEncyclopedia/Return_Box.png new file mode 100644 index 00000000..0ad4c26b Binary files /dev/null and b/Test/System/SimpleStyle/Graphics/15_OpenEncyclopedia/Return_Box.png differ diff --git a/Test/System/SimpleStyle/Graphics/15_OpenEncyclopedia/Side_Menu.png b/Test/System/SimpleStyle/Graphics/15_OpenEncyclopedia/Side_Menu.png index 0ad4c26b..a1c1e795 100644 Binary files a/Test/System/SimpleStyle/Graphics/15_OpenEncyclopedia/Side_Menu.png and b/Test/System/SimpleStyle/Graphics/15_OpenEncyclopedia/Side_Menu.png differ