diff --git a/TJAPlayer3/Character/PuchiChara.cs b/TJAPlayer3/Character/PuchiChara.cs index f444520d..827cc706 100644 --- a/TJAPlayer3/Character/PuchiChara.cs +++ b/TJAPlayer3/Character/PuchiChara.cs @@ -100,7 +100,9 @@ namespace TJAPlayer3 if (chara != null) { - chara.vc拡大縮小倍率 = new Vector3((isBalloon ? TJAPlayer3.Skin.Game_PuchiChara_Scale[1] : TJAPlayer3.Skin.Game_PuchiChara_Scale[0])); + float puchiScale = TJAPlayer3.Skin.Resolution[1] / 720.0f; + + chara.vc拡大縮小倍率 = new Vector3((isBalloon ? TJAPlayer3.Skin.Game_PuchiChara_Scale[1] * puchiScale : TJAPlayer3.Skin.Game_PuchiChara_Scale[0] * puchiScale)); chara.Opacity = alpha; // (isGrowing ? TJAPlayer3.Skin.Game_PuchiChara[1] : 0) => Height diff --git a/TJAPlayer3/Common/CSkin.cs b/TJAPlayer3/Common/CSkin.cs index cabc9b31..5cec56e4 100644 --- a/TJAPlayer3/Common/CSkin.cs +++ b/TJAPlayer3/Common/CSkin.cs @@ -5761,9 +5761,179 @@ namespace TJAPlayer3 { Heya_InfoSection[i] = int.Parse(strSplit[i]); } - } + } #endregion + #region OnlineLounge + else if (strCommand == "OnlineLounge_Side_Menu") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OnlineLounge_Side_Menu[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OnlineLounge_Side_Menu_Text_Offset") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OnlineLounge_Side_Menu_Text_Offset[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OnlineLounge_Side_Menu_Move") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OnlineLounge_Side_Menu_Move[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OnlineLounge_Song") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OnlineLounge_Song[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OnlineLounge_Song_Title_Offset") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OnlineLounge_Song_Title_Offset[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OnlineLounge_Song_SubTitle_Offset") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OnlineLounge_Song_SubTitle_Offset[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OnlineLounge_Song_Move") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OnlineLounge_Song_Move[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OnlineLounge_Context_Charter") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OnlineLounge_Context_Charter[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OnlineLounge_Context_Genre") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OnlineLounge_Context_Genre[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OnlineLounge_Context_Couse_Symbol") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OnlineLounge_Context_Couse_Symbol[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OnlineLounge_Context_Level") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OnlineLounge_Context_Level[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OnlineLounge_Context_Couse_Move") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OnlineLounge_Context_Couse_Move[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OnlineLounge_Downloading") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OnlineLounge_Downloading[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OnlineLounge_Font_OLFont") + { + OnlineLounge_Font_OLFont = int.Parse(strParam); + } + else if (strCommand == "OnlineLounge_Font_OLFontLarge") + { + OnlineLounge_Font_OLFontLarge = int.Parse(strParam); + } + #endregion + + #region OpenEncyclopedia + else if (strCommand == "OpenEncyclopedia_Context_Item2") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OpenEncyclopedia_Context_Item2[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OpenEncyclopedia_Context_Item3") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OpenEncyclopedia_Context_Item3[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OpenEncyclopedia_Context_PageText") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OpenEncyclopedia_Context_PageText[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OpenEncyclopedia_Side_Menu") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OpenEncyclopedia_Side_Menu[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OpenEncyclopedia_Side_Menu_Move") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OpenEncyclopedia_Side_Menu_Move[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OpenEncyclopedia_Side_Menu_Text_Offset") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + OpenEncyclopedia_Side_Menu_Text_Offset[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "OpenEncyclopedia_Font_EncyclopediaMenu_Size") + { + OpenEncyclopedia_Font_EncyclopediaMenu_Size = int.Parse(strParam); + } + #endregion + #region Font else if (strCommand == nameof(Font_Edge_Ratio)) //Config画面や簡易メニューのフォントについて(rhimm) { @@ -5785,6 +5955,203 @@ namespace TJAPlayer3 } #endregion + #region PopupMenu + else if (strCommand == "PopupMenu_Menu_Title") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + PopupMenu_Menu_Title[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "PopupMenu_Title") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + PopupMenu_Title[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "PopupMenu_Menu_Highlight") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + PopupMenu_Menu_Highlight[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "PopupMenu_MenuItem_Name") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + PopupMenu_MenuItem_Name[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "PopupMenu_MenuItem_Value") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + PopupMenu_MenuItem_Value[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "PopupMenu_Move") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + PopupMenu_Move[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "PopupMenu_Font_Size") + { + PopupMenu_Font_Size = int.Parse(strParam); + } + #endregion + + #region NamePlate + else if (strCommand == "NamePlate_Title_Offset") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + NamePlate_Title_Offset[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "NamePlate_Dan_Offset") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + NamePlate_Dan_Offset[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "NamePlate_Name_Offset_Normal") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + NamePlate_Name_Offset_Normal[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "NamePlate_Name_Offset_WithTitle") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + NamePlate_Name_Offset_WithTitle[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "NamePlate_Name_Offset_Full") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + NamePlate_Name_Offset_Full[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "NamePlate_Font_Name_Size_Normal") + { + NamePlate_Font_Name_Size_Normal = int.Parse(strParam); + } + else if (strCommand == "NamePlate_Font_Name_Size_WithTitle") + { + NamePlate_Font_Name_Size_WithTitle = int.Parse(strParam); + } + else if (strCommand == "NamePlate_Font_Title_Size") + { + NamePlate_Font_Title_Size = int.Parse(strParam); + } + else if (strCommand == "NamePlate_Font_Dan_Size") + { + NamePlate_Font_Dan_Size = int.Parse(strParam); + } + #endregion + + #region Modal + else if (strCommand == "Modal_Title_Full") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + Modal_Title_Full[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "Modal_Title_Half_X") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + Modal_Title_Half_X[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "Modal_Title_Half_Y") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + Modal_Title_Half_Y[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "Modal_Text_Full") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + Modal_Text_Full[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "Modal_Text_Full_Move") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + Modal_Text_Full_Move[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "Modal_Text_Half_X") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + Modal_Text_Half_X[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "Modal_Text_Half_Y") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + Modal_Text_Half_Y[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "Modal_Text_Half_Move") + { + string[] strSplit = strParam.Split(','); + for (int i = 0; i < 2; i++) + { + Modal_Text_Half_Move[i] = int.Parse(strSplit[i]); + } + } + else if (strCommand == "Modal_Font_ModalContentHalf_Size") + { + Modal_Font_ModalContentHalf_Size = int.Parse(strParam); + } + else if (strCommand == "Modal_Font_ModalTitleHalf_Size") + { + Modal_Font_ModalTitleHalf_Size = int.Parse(strParam); + } + else if (strCommand == "Modal_Font_ModalContentFull_Size") + { + Modal_Font_ModalContentFull_Size = int.Parse(strParam); + } + else if (strCommand == "Modal_Font_ModalTitleFull_Size") + { + Modal_Font_ModalTitleFull_Size = int.Parse(strParam); + } + #endregion + #endregion } continue; @@ -7007,12 +7374,63 @@ namespace TJAPlayer3 public int Heya_Font_Scale = 14; #endregion + + #region OnlineLounge + public int[] OnlineLounge_Side_Menu = new int[] { 640, 360 }; + public int[] OnlineLounge_Side_Menu_Text_Offset = new int[] { 0, 18 }; + public int[] OnlineLounge_Side_Menu_Move = new int[] { 0, 80 }; + + public int[] OnlineLounge_Song = new int[] { 350, 360 }; + public int[] OnlineLounge_Song_Title_Offset = new int[] { 0, 18 }; + public int[] OnlineLounge_Song_SubTitle_Offset = new int[] { 0, 46 }; + public int[] OnlineLounge_Song_Move = new int[] { 0, 100 }; + + public int[] OnlineLounge_Context_Charter = new int[] { 980, 300 }; + public int[] OnlineLounge_Context_Genre = new int[] { 980, 340 }; + public int[] OnlineLounge_Context_Couse_Symbol = new int[] { 800, 480 }; + public int[] OnlineLounge_Context_Level = new int[] { 900, 494 }; + public int[] OnlineLounge_Context_Couse_Move = new int[] { 240, 60 }; + + public int[] OnlineLounge_Downloading = new int[] { 640, 605 }; + + public int OnlineLounge_Font_OLFont = 14; + public int OnlineLounge_Font_OLFontLarge = 28; + + #endregion + + #region OpenEncyclopedia + + public int[] OpenEncyclopedia_Context_Item2 = new int[] { 960, 180 }; + public int[] OpenEncyclopedia_Context_Item3 = new int[] { 640, 360 }; + public int[] OpenEncyclopedia_Context_PageText = new int[] { 960, 720 }; + public int[] OpenEncyclopedia_Side_Menu = new int[] { 320, 360 }; + public int[] OpenEncyclopedia_Side_Menu_Move = new int[] { 0, 90 }; + public int[] OpenEncyclopedia_Side_Menu_Text_Offset = new int[] { 0, 0 }; + public int OpenEncyclopedia_Font_EncyclopediaMenu_Size = 14; + + #endregion + #region Font public int Font_Edge_Ratio = 30; public int Font_Edge_Ratio_Vertical = 30; public int Text_Correction_X = 0; public int Text_Correction_Y = 0; + #endregion + + #region NamePlate + + public int[] NamePlate_Title_Offset = new int[] { 124, 22 }; + public int[] NamePlate_Dan_Offset = new int[] { 69, 44 }; + public int[] NamePlate_Name_Offset_Normal = new int[] { 121, 36 }; + public int[] NamePlate_Name_Offset_WithTitle = new int[] { 121, 44 }; + public int[] NamePlate_Name_Offset_Full = new int[] { 144, 44 }; + + public int NamePlate_Font_Name_Size_Normal = 15; + public int NamePlate_Font_Name_Size_WithTitle = 12; + public int NamePlate_Font_Title_Size = 11; + public int NamePlate_Font_Dan_Size = 12; + #endregion #region [Mod icons] @@ -7020,10 +7438,41 @@ namespace TJAPlayer3 public int[] ModIcons_OffsetX = { 0, 30, 60, 90, 0, 30, 60, 90 }; public int[] ModIcons_OffsetY = { 0, 0, 0, 0, 30, 30, 30, 30 }; public int[] ModIcons_OffsetX_Menu = { 0, 30, 60, 90, 120, 150, 180, 210 }; - public int[] ModIcons_OffsetY_Menu = { 0, 0, 0, 0, 0, 0, 0, 0 }; + public int[] ModIcons_OffsetY_Menu = { 0, 0, 0, 0, 0, 0, 0, 0 }; #endregion + #region Modal + + public int[] Modal_Title_Full = new int[] { 640, 140 }; + public int[] Modal_Title_Half_X = new int[] { 320, 960 }; + public int[] Modal_Title_Half_Y = new int[] { 290, 290 }; + + public int[] Modal_Text_Full = new int[] { 640, 327 };//445 + public int[] Modal_Text_Full_Move = new int[] { 0, 118 }; + public int[] Modal_Text_Half_X = new int[] { 320, 960 }; + public int[] Modal_Text_Half_Y = new int[] { 383, 383 }; + public int[] Modal_Text_Half_Move = new int[] { 0, 59 }; + + public int Modal_Font_ModalContentHalf_Size = 28; + public int Modal_Font_ModalTitleHalf_Size = 28; + public int Modal_Font_ModalContentFull_Size = 56; + public int Modal_Font_ModalTitleFull_Size = 56; + + #endregion + + #region PopupMenu + + public int[] PopupMenu_Menu_Title = new int[2] { 460, 40 }; + public int[] PopupMenu_Title = new int[2] { 540, 44 }; + public int[] PopupMenu_Menu_Highlight = new int[2] { 480, 46 }; + public int[] PopupMenu_MenuItem_Name = new int[2] { 480, 77 }; + public int[] PopupMenu_MenuItem_Value = new int[2] { 630, 77 }; + public int[] PopupMenu_Move = new int[2] { 0, 32 }; + public int PopupMenu_Font_Size = 18; + + #endregion + #endregion } } \ No newline at end of file diff --git a/TJAPlayer3/Common/C文字コンソール.cs b/TJAPlayer3/Common/C文字コンソール.cs index 262ee656..f0507b60 100644 --- a/TJAPlayer3/Common/C文字コンソール.cs +++ b/TJAPlayer3/Common/C文字コンソール.cs @@ -67,18 +67,6 @@ namespace TJAPlayer3 public override void On活性化() { - this.rc文字の矩形領域 = new Rectangle[3, str表記可能文字.Length ]; - for( int i = 0; i < 3; i++ ) - { - for (int j = 0; j < str表記可能文字.Length; j++) - { - const int regionX = 128, regionY = 16; - this.rc文字の矩形領域[ i, j ].X = ( ( i / 2 ) * regionX ) + ( ( j % regionY ) * nFontWidth ); - this.rc文字の矩形領域[ i, j ].Y = ( ( i % 2 ) * regionX ) + ( ( j / regionY ) * nFontHeight ); - this.rc文字の矩形領域[ i, j ].Width = nFontWidth; - this.rc文字の矩形領域[ i, j ].Height = nFontHeight; - } - } base.On活性化(); } public override void On非活性化() @@ -94,7 +82,24 @@ namespace TJAPlayer3 { this.txフォント8x16[ 0 ] = TJAPlayer3.Tx.TxC(@"Console_Font.png"); this.txフォント8x16[ 1 ] = TJAPlayer3.Tx.TxC(@"Console_Font_Small.png"); - base.OnManagedリソースの作成(); + + nFontWidth = this.txフォント8x16[0].szテクスチャサイズ.Width / 32; + nFontHeight = this.txフォント8x16[0].szテクスチャサイズ.Height / 16; + + this.rc文字の矩形領域 = new Rectangle[3, str表記可能文字.Length]; + for (int i = 0; i < 3; i++) + { + for (int j = 0; j < str表記可能文字.Length; j++) + { + int regionX = nFontWidth * 16, regionY = nFontHeight * 8; + this.rc文字の矩形領域[i, j].X = ((i / 2) * regionX) + ((j % 16) * nFontWidth); + this.rc文字の矩形領域[i, j].Y = ((i % 2) * regionY) + ((j / 16) * nFontHeight); + this.rc文字の矩形領域[i, j].Width = nFontWidth; + this.rc文字の矩形領域[i, j].Height = nFontHeight; + } + } + + base.OnManagedリソースの作成(); } } public override void OnManagedリソースの解放() @@ -120,7 +125,7 @@ namespace TJAPlayer3 //----------------- private Rectangle[,] rc文字の矩形領域; private const string str表記可能文字 = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ "; - private const int nFontWidth = 8, nFontHeight = 16; + private int nFontWidth = 8, nFontHeight = 16; private CTexture[] txフォント8x16 = new CTexture[ 2 ]; //----------------- #endregion diff --git a/TJAPlayer3/Common/Modal.cs b/TJAPlayer3/Common/Modal.cs index c197bd2b..2e06526f 100644 --- a/TJAPlayer3/Common/Modal.cs +++ b/TJAPlayer3/Common/Modal.cs @@ -39,12 +39,12 @@ namespace TJAPlayer3 _boxRect = new Rectangle( (modalFormat == EModalFormat.Full || player == 0) ? 0 - : 640, + : _box.szテクスチャサイズ.Width / 2, 0, (modalFormat == EModalFormat.Full) - ? 1280 - : 640, - 720); + ? _box.szテクスチャサイズ.Width + : _box.szテクスチャサイズ.Width / 2, + _box.szテクスチャサイズ.Height); tGenerateTextures(); @@ -55,12 +55,17 @@ namespace TJAPlayer3 { if (_isSet == true) { - _box?.t2D描画(TJAPlayer3.app.Device, 640 * player, 0, _boxRect); + _box?.t2D描画(TJAPlayer3.app.Device, (_box.szテクスチャサイズ.Width / 2) * player, 0, _boxRect); Point[] Pos = new Point[] { - (modalFormat == EModalFormat.Full) ? new Point(640, 140) : new Point(320 + 640 * player, 290), // title - (modalFormat == EModalFormat.Full) ? new Point(640, tTextCentered() ? 445 : 327) : new Point(320 + 640 * player, tTextCentered() ? 442 : 383), // content + (modalFormat == EModalFormat.Full) ? new Point(TJAPlayer3.Skin.Modal_Title_Full[0], TJAPlayer3.Skin.Modal_Title_Full[1]) : new Point(TJAPlayer3.Skin.Modal_Title_Half_X[player], TJAPlayer3.Skin.Modal_Title_Half_Y[player]), // title + (modalFormat == EModalFormat.Full) ? + new Point(TJAPlayer3.Skin.Modal_Text_Full[0] +(tTextCentered () ? TJAPlayer3.Skin.Modal_Text_Full_Move[0] : 0), + TJAPlayer3.Skin.Modal_Text_Full[1] + (tTextCentered () ? TJAPlayer3.Skin.Modal_Text_Full_Move[1] : 0)) : + + new Point(TJAPlayer3.Skin.Modal_Text_Half_X[player] + (tTextCentered () ? TJAPlayer3.Skin.Modal_Text_Half_Move[0] : 0), + TJAPlayer3.Skin.Modal_Text_Half_Y[player] + (tTextCentered () ? TJAPlayer3.Skin.Modal_Text_Half_Move[1] : 0)), // content }; _ModalTitle?.t2D中心基準描画(TJAPlayer3.app.Device, Pos[0].X, Pos[0].Y); @@ -88,17 +93,17 @@ namespace TJAPlayer3 if (!string.IsNullOrEmpty(TJAPlayer3.ConfigIni.FontName)) { - _pfModalContentHalf = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), 28); - _pfModalTitleHalf = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), 28); - _pfModalContentFull = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), 56); - _pfModalTitleFull = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), 56); + _pfModalContentHalf = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), TJAPlayer3.Skin.Modal_Font_ModalContentHalf_Size); + _pfModalTitleHalf = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), TJAPlayer3.Skin.Modal_Font_ModalTitleHalf_Size); + _pfModalContentFull = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), TJAPlayer3.Skin.Modal_Font_ModalContentFull_Size); + _pfModalTitleFull = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), TJAPlayer3.Skin.Modal_Font_ModalTitleFull_Size); } else { - _pfModalContentHalf = new CPrivateFastFont(new FontFamily("MS UI Gothic"), 28); - _pfModalTitleHalf = new CPrivateFastFont(new FontFamily("MS UI Gothic"), 28); - _pfModalContentFull = new CPrivateFastFont(new FontFamily("MS UI Gothic"), 56); - _pfModalTitleFull = new CPrivateFastFont(new FontFamily("MS UI Gothic"), 56); + _pfModalContentHalf = new CPrivateFastFont(new FontFamily("MS UI Gothic"), TJAPlayer3.Skin.Modal_Font_ModalContentHalf_Size); + _pfModalTitleHalf = new CPrivateFastFont(new FontFamily("MS UI Gothic"), TJAPlayer3.Skin.Modal_Font_ModalTitleHalf_Size); + _pfModalContentFull = new CPrivateFastFont(new FontFamily("MS UI Gothic"), TJAPlayer3.Skin.Modal_Font_ModalContentFull_Size); + _pfModalTitleFull = new CPrivateFastFont(new FontFamily("MS UI Gothic"), TJAPlayer3.Skin.Modal_Font_ModalTitleFull_Size); } } diff --git a/TJAPlayer3/Common/TJAPlayer3.cs b/TJAPlayer3/Common/TJAPlayer3.cs index 8e24dae6..f80389c6 100644 --- a/TJAPlayer3/Common/TJAPlayer3.cs +++ b/TJAPlayer3/Common/TJAPlayer3.cs @@ -2168,9 +2168,6 @@ for (int i = 0; i < 3; i++) { } this.Window.EnableSystemMenu = TJAPlayer3.ConfigIni.bIsEnabledSystemMenu; // #28200 2011.5.1 yyagi // 2012.8.22 Config.iniが無いときに初期値が適用されるよう、この設定行をifブロック外に移動 - - // Init Modal fonts once config.ini parsing is done - Modal.tInitModalFonts(); //--------------------- #endregion @@ -2324,12 +2321,16 @@ for (int i = 0; i < 3; i++) { finally { Trace.Unindent(); - } - //--------------------- + } + + // Init Modal fonts once config.ini parsing is done + // Moved here to reference Skin values. + Modal.tInitModalFonts(); + //--------------------- #endregion - //----------- + //----------- #region [ Timer の初期化 ] - //--------------------- + //--------------------- Trace.TraceInformation( "タイマの初期化を行います。" ); Trace.Indent(); try @@ -3144,8 +3145,9 @@ for (int i = 0; i < 3; i++) { TJAPlayer3.Tx.LoadTexture(); - TJAPlayer3.act文字コンソール.On活性化(); - } + TJAPlayer3.act文字コンソール.On活性化(); + TJAPlayer3.NamePlate.RefleshSkin(); + } #region [ Windowイベント処理 ] private void t指定フォルダ内でのプラグイン検索と生成( string strプラグインフォルダパス, string strプラグイン型名 ) { diff --git a/TJAPlayer3/Stages/05.SongSelect/CActSelectPopupMenu.cs b/TJAPlayer3/Stages/05.SongSelect/CActSelectPopupMenu.cs index c976a04a..beeb6b4a 100644 --- a/TJAPlayer3/Stages/05.SongSelect/CActSelectPopupMenu.cs +++ b/TJAPlayer3/Stages/05.SongSelect/CActSelectPopupMenu.cs @@ -93,9 +93,9 @@ namespace TJAPlayer3 if (prvFont == null) { if (!string.IsNullOrEmpty(TJAPlayer3.ConfigIni.FontName)) - prvFont = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), 18); + prvFont = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), TJAPlayer3.Skin.PopupMenu_Font_Size); else - prvFont = new CPrivateFastFont(new FontFamily("MS UI Gothic"), 18); + prvFont = new CPrivateFastFont(new FontFamily("MS UI Gothic"), TJAPlayer3.Skin.PopupMenu_Font_Size); } } @@ -329,28 +329,30 @@ namespace TJAPlayer3 #region [ ポップアップメニュー 背景描画 ] if ( TJAPlayer3.Tx.Menu_Title != null ) { - TJAPlayer3.Tx.Menu_Title.t2D描画( TJAPlayer3.app.Device, 460, 40 ); + TJAPlayer3.Tx.Menu_Title.t2D描画( TJAPlayer3.app.Device, TJAPlayer3.Skin.PopupMenu_Menu_Title[0], TJAPlayer3.Skin.PopupMenu_Menu_Title[1]); } #endregion #region [ ソートメニュータイトル描画 ] - int x = 540, y = 44; - stqMenuTitle.txName.t2D描画( TJAPlayer3.app.Device, x, y ); + stqMenuTitle.txName.t2D描画( TJAPlayer3.app.Device, TJAPlayer3.Skin.PopupMenu_Title[0], TJAPlayer3.Skin.PopupMenu_Title[1]); #endregion #region [ カーソル描画 ] if ( TJAPlayer3.Tx.Menu_Highlight != null ) { - int height = 32; - int curX = 480; - int curY = 46 + ( height * ( this.n現在の選択行 + 1 ) ); - TJAPlayer3.Tx.Menu_Highlight.t2D描画( TJAPlayer3.app.Device, curX, curY, new Rectangle( 0, 0, 16, 32 ) ); - curX += 0x10; - Rectangle rectangle = new Rectangle( 8, 0, 0x10, 0x20 ); + int curX = TJAPlayer3.Skin.PopupMenu_Menu_Highlight[0] + (TJAPlayer3.Skin.PopupMenu_Move[0] * (this.n現在の選択行 + 1)); + int curY = TJAPlayer3.Skin.PopupMenu_Menu_Highlight[1] + (TJAPlayer3.Skin.PopupMenu_Move[1] * (this.n現在の選択行 + 1)); + + int width = TJAPlayer3.Tx.Menu_Highlight.szテクスチャサイズ.Width / 2; + int height = TJAPlayer3.Tx.Menu_Highlight.szテクスチャサイズ.Height; + + TJAPlayer3.Tx.Menu_Highlight.t2D描画( TJAPlayer3.app.Device, curX, curY, new Rectangle( 0, 0, width, height) ); + curX += width; + Rectangle rectangle = new Rectangle(width / 2, 0, width, height); for ( int j = 0; j < 16; j++ ) { TJAPlayer3.Tx.Menu_Highlight.t2D描画( TJAPlayer3.app.Device, curX, curY, rectangle ); - curX += 16; + curX += width; } - TJAPlayer3.Tx.Menu_Highlight.t2D描画( TJAPlayer3.app.Device, curX, curY, new Rectangle( 0x10, 0, 16, 32 ) ); + TJAPlayer3.Tx.Menu_Highlight.t2D描画( TJAPlayer3.app.Device, curX, curY, new Rectangle(width, 0, width, height) ); } #endregion #region [ ソート候補文字列描画 ] @@ -361,7 +363,8 @@ namespace TJAPlayer3 if ( lciMenuItems[ i ].txName != null ) { int height = lciMenuItems[ i ].rectName.Height; - lciMenuItems[ i ].txName.t2D描画( TJAPlayer3.app.Device, 480, 77 + i * 32 ); + lciMenuItems[ i ].txName.t2D描画( TJAPlayer3.app.Device, TJAPlayer3.Skin.PopupMenu_MenuItem_Name[0] + i * TJAPlayer3.Skin.PopupMenu_Move[0], + TJAPlayer3.Skin.PopupMenu_MenuItem_Name[1] + i * TJAPlayer3.Skin.PopupMenu_Move[1]); } bool bValueBold = (bItemBold || (i == nItemSelecting && bIsSelectingIntItem)) ? true : false; @@ -394,7 +397,8 @@ namespace TJAPlayer3 { using (var ctStr = TJAPlayer3.tテクスチャの生成(bmpStr, false)) { - ctStr.t2D描画(TJAPlayer3.app.Device, 630, 77 + i * 32); + ctStr.t2D描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.PopupMenu_MenuItem_Value[0] + i * TJAPlayer3.Skin.PopupMenu_Move[0], + TJAPlayer3.Skin.PopupMenu_MenuItem_Value[1] + i * TJAPlayer3.Skin.PopupMenu_Move[1]); } } } diff --git a/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drumsキャラクター.cs b/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drumsキャラクター.cs index 1b25ae2e..7ec302be 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drumsキャラクター.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drumsキャラクター.cs @@ -409,7 +409,18 @@ namespace TJAPlayer3 if (bマイどんアクション中[i]) { - var nowOpacity = CharaAction_Balloon_FadeOut[i].Counter.b進行中 ? (int)CharaAction_Balloon_FadeOut[i].GetAnimation() : 255; + var nowOpacity = CharaAction_Balloon_FadeOut[i].Counter.b進行中 ? (int)CharaAction_Balloon_FadeOut[i].GetAnimation() : 255; + + float resolutionScaleX = TJAPlayer3.Skin.Resolution[0] / (float)TJAPlayer3.Skin.Characters_Resolution[this.iCurrentCharacter[i]][0]; + float resolutionScaleY = TJAPlayer3.Skin.Resolution[1] / (float)TJAPlayer3.Skin.Characters_Resolution[this.iCurrentCharacter[i]][1]; + + float chara_x = TJAPlayer3.Skin.Characters_Balloon_X[this.iCurrentCharacter[i]][i]; + float chara_y = TJAPlayer3.Skin.Characters_Balloon_Y[this.iCurrentCharacter[i]][i]; + chara_x *= resolutionScaleX; + chara_y *= resolutionScaleY; + + float charaScale = resolutionScaleY; + if (CharaAction_Balloon_Broke[i]?.b進行中 == true && TJAPlayer3.Skin.Characters_Balloon_Broke_Ptn[this.iCurrentCharacter[i]] != 0) { @@ -421,10 +432,12 @@ namespace TJAPlayer3 if (TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][CharaAction_Balloon_Broke[i].n現在の値] != null) { TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][CharaAction_Balloon_Broke[i].n現在の値].Opacity = nowOpacity; + TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][CharaAction_Balloon_Broke[i].n現在の値].vc拡大縮小倍率.X = charaScale; + TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][CharaAction_Balloon_Broke[i].n現在の値].vc拡大縮小倍率.Y = charaScale; TJAPlayer3.Tx.Characters_Balloon_Broke[this.iCurrentCharacter[i]][CharaAction_Balloon_Broke[i].n現在の値].t2D描画(TJAPlayer3.app.Device, (TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) - + TJAPlayer3.Skin.Characters_Balloon_X[this.iCurrentCharacter[i]][0], - TJAPlayer3.Skin.Characters_Balloon_Y[this.iCurrentCharacter[i]][i]); + + chara_x, + chara_y); } TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画((TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_PuchiChara_BalloonX[0], TJAPlayer3.Skin.Game_PuchiChara_BalloonY[i], false, nowOpacity, true, player : i); @@ -446,10 +459,12 @@ namespace TJAPlayer3 if (TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][CharaAction_Balloon_Miss[i].n現在の値] != null) { TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][CharaAction_Balloon_Miss[i].n現在の値].Opacity = nowOpacity; + TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][CharaAction_Balloon_Miss[i].n現在の値].vc拡大縮小倍率.X = charaScale; + TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][CharaAction_Balloon_Miss[i].n現在の値].vc拡大縮小倍率.Y = charaScale; TJAPlayer3.Tx.Characters_Balloon_Miss[this.iCurrentCharacter[i]][CharaAction_Balloon_Miss[i].n現在の値].t2D描画(TJAPlayer3.app.Device, (TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) - + TJAPlayer3.Skin.Characters_Balloon_X[this.iCurrentCharacter[i]][0], - TJAPlayer3.Skin.Characters_Balloon_Y[this.iCurrentCharacter[i]][i]); + + chara_x, + chara_y); } TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画((TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_PuchiChara_BalloonX[0], TJAPlayer3.Skin.Game_PuchiChara_BalloonY[i], false, nowOpacity, true, player : i); @@ -463,7 +478,16 @@ namespace TJAPlayer3 } else if (CharaAction_Balloon_Breaking[i]?.b進行中 == true && TJAPlayer3.Skin.Characters_Balloon_Breaking_Ptn[this.iCurrentCharacter[i]] != 0) { - TJAPlayer3.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][CharaAction_Balloon_Breaking[i].n現在の値]?.t2D描画(TJAPlayer3.app.Device, (TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Characters_Balloon_X[this.iCurrentCharacter[i]][0], TJAPlayer3.Skin.Characters_Balloon_Y[this.iCurrentCharacter[i]][i]); + if (TJAPlayer3.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][CharaAction_Balloon_Breaking[i].n現在の値] != null) + { + TJAPlayer3.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][CharaAction_Balloon_Breaking[i].n現在の値].vc拡大縮小倍率.X = charaScale; + TJAPlayer3.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][CharaAction_Balloon_Breaking[i].n現在の値].vc拡大縮小倍率.Y = charaScale; + TJAPlayer3.Tx.Characters_Balloon_Breaking[this.iCurrentCharacter[i]][CharaAction_Balloon_Breaking[i].n現在の値].t2D描画(TJAPlayer3.app.Device, + (TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + + chara_x, + chara_y); + } + TJAPlayer3.stage演奏ドラム画面.PuchiChara.On進行描画((TJAPlayer3.Skin.nScrollFieldX[0] - TJAPlayer3.stage演奏ドラム画面.actLaneTaiko.nDefaultJudgePos[0, 0]) + TJAPlayer3.Skin.Game_PuchiChara_BalloonX[0], TJAPlayer3.Skin.Game_PuchiChara_BalloonY[i], false, 255, true, player : i); } diff --git a/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drums連打キャラ.cs b/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drums連打キャラ.cs index 8b596a6e..5d5df68a 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drums連打キャラ.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/CAct演奏Drums連打キャラ.cs @@ -194,13 +194,13 @@ namespace TJAPlayer3 TJAPlayer3.Tx.Effects_Roll[RollCharas[i].Type]?.t2D描画(TJAPlayer3.app.Device, RollCharas[i].X, RollCharas[i].Y); // 画面外にいたら描画をやめさせる - if (RollCharas[i].X < 0 - TJAPlayer3.Tx.Effects_Roll[RollCharas[i].Type].szテクスチャサイズ.Width || RollCharas[i].X > 1280) + if (RollCharas[i].X < 0 - TJAPlayer3.Tx.Effects_Roll[RollCharas[i].Type].szテクスチャサイズ.Width || RollCharas[i].X > TJAPlayer3.Skin.Resolution[0]) { RollCharas[i].Counter.t停止(); RollCharas[i].IsUsing = false; } - if (RollCharas[i].Y < 0 - TJAPlayer3.Tx.Effects_Roll[RollCharas[i].Type].szテクスチャサイズ.Height || RollCharas[i].Y > 720) + if (RollCharas[i].Y < 0 - TJAPlayer3.Tx.Effects_Roll[RollCharas[i].Type].szテクスチャサイズ.Height || RollCharas[i].Y > TJAPlayer3.Skin.Resolution[1]) { RollCharas[i].Counter.t停止(); RollCharas[i].IsUsing = false; diff --git a/TJAPlayer3/Stages/11.Heya/CStageHeya.cs b/TJAPlayer3/Stages/11.Heya/CStageHeya.cs index 76f5b3eb..c7904e2b 100644 --- a/TJAPlayer3/Stages/11.Heya/CStageHeya.cs +++ b/TJAPlayer3/Stages/11.Heya/CStageHeya.cs @@ -230,7 +230,15 @@ namespace TJAPlayer3 int puriColumn = pos % 5; int puriRow = pos / 5; - + + if (TJAPlayer3.Tx.Puchichara[pos].tx != null) + { + float puchiScale = TJAPlayer3.Skin.Resolution[1] / 1080.0f; + + TJAPlayer3.Tx.Puchichara[pos].tx.vc拡大縮小倍率.X = puchiScale; + TJAPlayer3.Tx.Puchichara[pos].tx.vc拡大縮小倍率.Y = puchiScale; + } + TJAPlayer3.Tx.Puchichara[pos].tx?.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, scroll.Item1 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Item_Offset[0], scroll.Item2 + TJAPlayer3.Skin.Heya_Center_Menu_Box_Item_Offset[1] + (int)(PuchiChara.sineY), new Rectangle((PuchiChara.Counter.n現在の値 + 2 * puriColumn) * TJAPlayer3.Skin.Game_PuchiChara[0], diff --git a/TJAPlayer3/Stages/12.OnlineLounge/CStageOnlineLounge.cs b/TJAPlayer3/Stages/12.OnlineLounge/CStageOnlineLounge.cs index 34364065..c6b08eee 100644 --- a/TJAPlayer3/Stages/12.OnlineLounge/CStageOnlineLounge.cs +++ b/TJAPlayer3/Stages/12.OnlineLounge/CStageOnlineLounge.cs @@ -48,13 +48,13 @@ namespace TJAPlayer3 if (!string.IsNullOrEmpty(TJAPlayer3.ConfigIni.FontName)) { - this.pfOLFont = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), 14); - this.pfOLFontLarge = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), 28); + this.pfOLFont = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), TJAPlayer3.Skin.OnlineLounge_Font_OLFont); + this.pfOLFontLarge = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), TJAPlayer3.Skin.OnlineLounge_Font_OLFontLarge); } else { - this.pfOLFont = new CPrivateFastFont(new FontFamily("MS UI Gothic"), 14); - this.pfOLFontLarge = new CPrivateFastFont(new FontFamily("MS UI Gothic"), 28); + this.pfOLFont = new CPrivateFastFont(new FontFamily("MS UI Gothic"), TJAPlayer3.Skin.OnlineLounge_Font_OLFont); + this.pfOLFontLarge = new CPrivateFastFont(new FontFamily("MS UI Gothic"), TJAPlayer3.Skin.OnlineLounge_Font_OLFontLarge); } @@ -164,7 +164,8 @@ namespace TJAPlayer3 || currentMenu == ECurrentMenu.CDN_SELECT || currentMenu == ECurrentMenu.CDN_OPTION) { - int baseY = 360 - _ref.Length * 40; + int baseX = TJAPlayer3.Skin.OnlineLounge_Side_Menu[0] - _ref.Length * (TJAPlayer3.Skin.OnlineLounge_Side_Menu_Move[0] / 2); + int baseY = TJAPlayer3.Skin.OnlineLounge_Side_Menu[1] - _ref.Length * (TJAPlayer3.Skin.OnlineLounge_Side_Menu_Move[1] / 2); for (int i = 0; i < _ref.Length; i++) { @@ -181,8 +182,11 @@ namespace TJAPlayer3 TJAPlayer3.Tx.OnlineLounge_Side_Menu?.tUpdateColor4(C変換.ColorToColor4(Color.White)); } - TJAPlayer3.Tx.OnlineLounge_Side_Menu?.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 640, baseY + 80 * i); - tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 640, baseY + 18 + 80 * i); + TJAPlayer3.Tx.OnlineLounge_Side_Menu?.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, baseX + TJAPlayer3.Skin.OnlineLounge_Side_Menu_Move[0] * i, + baseY + TJAPlayer3.Skin.OnlineLounge_Side_Menu_Move[1] * i); + tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, + baseX + TJAPlayer3.Skin.OnlineLounge_Side_Menu_Text_Offset[0] + TJAPlayer3.Skin.OnlineLounge_Side_Menu_Move[0] * i, + baseY + TJAPlayer3.Skin.OnlineLounge_Side_Menu_Text_Offset[1] + TJAPlayer3.Skin.OnlineLounge_Side_Menu_Move[1] * i); } } @@ -195,7 +199,8 @@ namespace TJAPlayer3 _ref = this.ttkCDNSongList; _selector = cdnSongListIndex; - int baseY = 360; + int baseX = TJAPlayer3.Skin.OnlineLounge_Song[0]; + int baseY = TJAPlayer3.Skin.OnlineLounge_Song[1]; for (int i = -4; i < 4; i++) { @@ -220,20 +225,23 @@ namespace TJAPlayer3 tmpTex.color4 = _color; tmpSubtitle.color4 = _color; + int x = baseX + TJAPlayer3.Skin.OnlineLounge_Song_Move[0] * i; + int y = baseY + TJAPlayer3.Skin.OnlineLounge_Song_Move[1] * i; + if (pos == 0) { TJAPlayer3.Tx.OnlineLounge_Return_Box?.tUpdateColor4(_color); - TJAPlayer3.Tx.OnlineLounge_Return_Box?.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 350, baseY + 100 * i); + TJAPlayer3.Tx.OnlineLounge_Return_Box?.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, x, y); } else { TJAPlayer3.Tx.OnlineLounge_Song_Box?.tUpdateColor4(_color); - TJAPlayer3.Tx.OnlineLounge_Song_Box?.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 350, baseY + 100 * i); + TJAPlayer3.Tx.OnlineLounge_Song_Box?.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, x, y); } - tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 350, baseY + 18 + 100 * i); - tmpSubtitle.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, 350, baseY + 46 + 100 * i); + tmpTex.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, x + TJAPlayer3.Skin.OnlineLounge_Song_Title_Offset[0], y + TJAPlayer3.Skin.OnlineLounge_Song_Title_Offset[1]); + tmpSubtitle.t2D拡大率考慮上中央基準描画(TJAPlayer3.app.Device, x + TJAPlayer3.Skin.OnlineLounge_Song_SubTitle_Offset[0], y + TJAPlayer3.Skin.OnlineLounge_Song_SubTitle_Offset[1]); if (pos != 0 && i == 0) { @@ -258,7 +266,7 @@ namespace TJAPlayer3 { var charter_ = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture( new TitleTextureKey("Charter : " + song_.charter.charter_name, this.pfOLFontLarge, Color.White, Color.Black, 1000)); - charter_?.t2D中心基準描画(TJAPlayer3.app.Device, 980, 300); + charter_?.t2D中心基準描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.OnlineLounge_Context_Charter[0], TJAPlayer3.Skin.OnlineLounge_Context_Charter[1]); } #endregion @@ -269,7 +277,7 @@ namespace TJAPlayer3 { var genre_ = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture( new TitleTextureKey(song_.Genre.genre, this.pfOLFontLarge, Color.White, Color.Black, 1000)); - genre_?.t2D中心基準描画(TJAPlayer3.app.Device, 980, 340); + genre_?.t2D中心基準描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.OnlineLounge_Context_Genre[0], TJAPlayer3.Skin.OnlineLounge_Context_Genre[1]); } #endregion @@ -280,16 +288,18 @@ namespace TJAPlayer3 { int diff = diffs[k]; - int column = (k >= 3) ? 240 : 0; - int row = 60 * (k % 3); + int column = (k >= 3) ? TJAPlayer3.Skin.OnlineLounge_Context_Couse_Move[0] : 0; + int row = TJAPlayer3.Skin.OnlineLounge_Context_Couse_Move[1] * (k % 3); if (diff > 0) { - TJAPlayer3.Tx.Couse_Symbol[k]?.t2D中心基準描画(TJAPlayer3.app.Device, 800 + column, 480 + row); + TJAPlayer3.Tx.Couse_Symbol[k]?.t2D中心基準描画(TJAPlayer3.app.Device, + TJAPlayer3.Skin.OnlineLounge_Context_Couse_Symbol[0] + column, + TJAPlayer3.Skin.OnlineLounge_Context_Couse_Symbol[1] + row); var difnb_ = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture( new TitleTextureKey(diff.ToString(), this.pfOLFontLarge, (diff > 10) ? Color.Red : Color.White, Color.Black, 1000)); - difnb_?.t2D中心基準描画(TJAPlayer3.app.Device, 900 + column, 480 + 14 + row); + difnb_?.t2D中心基準描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.OnlineLounge_Context_Level[0] + column, TJAPlayer3.Skin.OnlineLounge_Context_Level[1] + row); } } @@ -310,7 +320,7 @@ namespace TJAPlayer3 var text = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture( new TitleTextureKey("Downloading...", this.pfOLFontLarge, Color.White, Color.Black, 1000)); - text.t2D中心基準描画(TJAPlayer3.app.Device, 640, 605); + text.t2D中心基準描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.OnlineLounge_Downloading[0], TJAPlayer3.Skin.OnlineLounge_Downloading[1]); } #endregion diff --git a/TJAPlayer3/Stages/15.OpenEncyclopedia/CEncyclopediaControler.cs b/TJAPlayer3/Stages/15.OpenEncyclopedia/CEncyclopediaControler.cs index 94cbbb02..fbc9f148 100644 --- a/TJAPlayer3/Stages/15.OpenEncyclopedia/CEncyclopediaControler.cs +++ b/TJAPlayer3/Stages/15.OpenEncyclopedia/CEncyclopediaControler.cs @@ -34,11 +34,11 @@ namespace TJAPlayer3 _pfEncyclopediaMenu?.Dispose(); if (!string.IsNullOrEmpty(TJAPlayer3.ConfigIni.FontName)) { - _pfEncyclopediaMenu = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), 14); + _pfEncyclopediaMenu = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), TJAPlayer3.Skin.OpenEncyclopedia_Font_EncyclopediaMenu_Size); } else { - _pfEncyclopediaMenu = new CPrivateFastFont(new FontFamily("MS UI Gothic"), 14); + _pfEncyclopediaMenu = new CPrivateFastFont(new FontFamily("MS UI Gothic"), TJAPlayer3.Skin.OpenEncyclopedia_Font_EncyclopediaMenu_Size); } } diff --git a/TJAPlayer3/Stages/15.OpenEncyclopedia/COpenEncyclopedia.cs b/TJAPlayer3/Stages/15.OpenEncyclopedia/COpenEncyclopedia.cs index 155dcf26..8890beb1 100644 --- a/TJAPlayer3/Stages/15.OpenEncyclopedia/COpenEncyclopedia.cs +++ b/TJAPlayer3/Stages/15.OpenEncyclopedia/COpenEncyclopedia.cs @@ -82,9 +82,9 @@ namespace TJAPlayer3 { var _page = _controler.Pages[_controler.PageIndex]; - _page.Item2?.t2D中心基準描画(TJAPlayer3.app.Device, 960, 180); - _page.Item3?.t2D描画(TJAPlayer3.app.Device, 640, 360); - _controler.PageText?.t2D下中央基準描画(TJAPlayer3.app.Device, 960, 720); + _page.Item2?.t2D中心基準描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.OpenEncyclopedia_Context_Item2[0], TJAPlayer3.Skin.OpenEncyclopedia_Context_Item2[1]); + _page.Item3?.t2D描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.OpenEncyclopedia_Context_Item3[0], TJAPlayer3.Skin.OpenEncyclopedia_Context_Item3[1]); + _controler.PageText?.t2D下中央基準描画(TJAPlayer3.app.Device, TJAPlayer3.Skin.OpenEncyclopedia_Context_PageText[0], TJAPlayer3.Skin.OpenEncyclopedia_Context_PageText[1]); } } @@ -106,11 +106,16 @@ namespace TJAPlayer3 _menu.Item2?.tUpdateColor4(C変換.ColorToColor4(Color.White)); } + int x = TJAPlayer3.Skin.OpenEncyclopedia_Side_Menu[0] + TJAPlayer3.Skin.OpenEncyclopedia_Side_Menu_Move[0] * i; + int y = TJAPlayer3.Skin.OpenEncyclopedia_Side_Menu[1] + TJAPlayer3.Skin.OpenEncyclopedia_Side_Menu_Move[1] * i; + if (_pos == 0) - TJAPlayer3.Tx.OpenEncyclopedia_Return_Box?.t2D中心基準描画(TJAPlayer3.app.Device, 320, 360 + i * 90); + TJAPlayer3.Tx.OpenEncyclopedia_Return_Box?.t2D中心基準描画(TJAPlayer3.app.Device, x, y); else - TJAPlayer3.Tx.OpenEncyclopedia_Side_Menu?.t2D中心基準描画(TJAPlayer3.app.Device, 320, 360 + i * 90); - _menu.Item2?.t2D中心基準描画(TJAPlayer3.app.Device, 320, 360 + i * 90); + TJAPlayer3.Tx.OpenEncyclopedia_Side_Menu?.t2D中心基準描画(TJAPlayer3.app.Device, x, y); + _menu.Item2?.t2D中心基準描画(TJAPlayer3.app.Device, + x + TJAPlayer3.Skin.OpenEncyclopedia_Side_Menu_Text_Offset[0], + y + TJAPlayer3.Skin.OpenEncyclopedia_Side_Menu_Text_Offset[1]); } #endregion diff --git a/TJAPlayer3/Stages/CActFIFOBlack.cs b/TJAPlayer3/Stages/CActFIFOBlack.cs index e168a5c7..457100e2 100644 --- a/TJAPlayer3/Stages/CActFIFOBlack.cs +++ b/TJAPlayer3/Stages/CActFIFOBlack.cs @@ -52,11 +52,11 @@ namespace TJAPlayer3 if (TJAPlayer3.Tx.Tile_Black != null) { TJAPlayer3.Tx.Tile_Black.Opacity = ( this.mode == EFIFOモード.フェードイン ) ? ( ( ( 100 - this.counter.n現在の値 ) * 0xff ) / 100 ) : ( ( this.counter.n現在の値 * 0xff ) / 100 ); - for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / 64); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size + for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size { - for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / 64); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size + for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size { - TJAPlayer3.Tx.Tile_Black.t2D描画( TJAPlayer3.app.Device, i * 64, j * 64 ); + TJAPlayer3.Tx.Tile_Black.t2D描画( TJAPlayer3.app.Device, i * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width, j * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height); } } } diff --git a/TJAPlayer3/Stages/CActFIFOResult.cs b/TJAPlayer3/Stages/CActFIFOResult.cs index acde502d..a5d8dc6f 100644 --- a/TJAPlayer3/Stages/CActFIFOResult.cs +++ b/TJAPlayer3/Stages/CActFIFOResult.cs @@ -71,11 +71,11 @@ namespace TJAPlayer3 TJAPlayer3.Tx.Tile_Black.Opacity = (((this.counter.n現在の値) * 0xff) / 100); } - for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / 64); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size + for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size { - for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / 64); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size + for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size { - TJAPlayer3.Tx.Tile_Black.t2D描画(TJAPlayer3.app.Device, i * 64, j * 64); + TJAPlayer3.Tx.Tile_Black.t2D描画(TJAPlayer3.app.Device, i * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width, j * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height); } } } diff --git a/TJAPlayer3/Stages/CActFIFOWhite.cs b/TJAPlayer3/Stages/CActFIFOWhite.cs index edb386ca..30ec287b 100644 --- a/TJAPlayer3/Stages/CActFIFOWhite.cs +++ b/TJAPlayer3/Stages/CActFIFOWhite.cs @@ -55,11 +55,11 @@ namespace TJAPlayer3 if (TJAPlayer3.Tx.Tile_Black != null) { TJAPlayer3.Tx.Tile_Black.Opacity = ( this.mode == EFIFOモード.フェードイン ) ? ( ( ( 100 - this.counter.n現在の値 ) * 0xff ) / 100 ) : ( ( this.counter.n現在の値 * 0xff ) / 100 ); - for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / 64); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size + for (int i = 0; i <= (SampleFramework.GameWindowSize.Width / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width); i++) // #23510 2010.10.31 yyagi: change "clientSize.Width" to "640" to fix FIFO drawing size { - for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / 64); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size + for (int j = 0; j <= (SampleFramework.GameWindowSize.Height / TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height); j++) // #23510 2010.10.31 yyagi: change "clientSize.Height" to "480" to fix FIFO drawing size { - TJAPlayer3.Tx.Tile_Black.t2D描画( TJAPlayer3.app.Device, i * 64, j * 64 ); + TJAPlayer3.Tx.Tile_Black.t2D描画( TJAPlayer3.app.Device, i * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Width, j * TJAPlayer3.Tx.Tile_Black.szテクスチャサイズ.Height); } } } diff --git a/TJAPlayer3/Stages/CNamePlate.cs b/TJAPlayer3/Stages/CNamePlate.cs index 32a3e0a7..1a02bc3b 100644 --- a/TJAPlayer3/Stages/CNamePlate.cs +++ b/TJAPlayer3/Stages/CNamePlate.cs @@ -10,9 +10,48 @@ using static TJAPlayer3.CActSelect曲リスト; namespace TJAPlayer3 { class CNamePlate - { + { + public void RefleshSkin() + { + for (int player = 0; player < 2; player++) + { + this.pfName[player]?.Dispose(); + + if (!string.IsNullOrEmpty(TJAPlayer3.ConfigIni.FontName)) + { + if (TJAPlayer3.NamePlateConfig.data.Title[player] == "" || TJAPlayer3.NamePlateConfig.data.Title[player] == null) + this.pfName[player] = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), TJAPlayer3.Skin.NamePlate_Font_Name_Size_Normal); + else + this.pfName[player] = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), TJAPlayer3.Skin.NamePlate_Font_Name_Size_WithTitle); + } + else + { + if (TJAPlayer3.NamePlateConfig.data.Title[player] == "" || TJAPlayer3.NamePlateConfig.data.Title[player] == null) + this.pfName[player] = new CPrivateFastFont(new FontFamily("MS UI Gothic"), TJAPlayer3.Skin.NamePlate_Font_Name_Size_Normal); + else + this.pfName[player] = new CPrivateFastFont(new FontFamily("MS UI Gothic"), TJAPlayer3.Skin.NamePlate_Font_Name_Size_WithTitle); + } + } + + this.pfTitle?.Dispose(); + this.pfdan?.Dispose(); + + if (!string.IsNullOrEmpty(TJAPlayer3.ConfigIni.FontName)) + { + this.pfTitle = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), TJAPlayer3.Skin.NamePlate_Font_Title_Size); + this.pfdan = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), TJAPlayer3.Skin.NamePlate_Font_Dan_Size); + } + else + { + this.pfTitle = new CPrivateFastFont(new FontFamily("MS UI Gothic"), TJAPlayer3.Skin.NamePlate_Font_Title_Size); + this.pfdan = new CPrivateFastFont(new FontFamily("MS UI Gothic"), TJAPlayer3.Skin.NamePlate_Font_Dan_Size); + } + } + public CNamePlate() { + RefleshSkin(); + for (int player = 0; player < 2; player++) { if (TJAPlayer3.NamePlateConfig.data.DanType[player] < 0) TJAPlayer3.NamePlateConfig.data.DanType[player] = 0; @@ -20,29 +59,7 @@ namespace TJAPlayer3 if (TJAPlayer3.NamePlateConfig.data.TitleType[player] < 0) TJAPlayer3.NamePlateConfig.data.TitleType[player] = 0; - if (!string.IsNullOrEmpty(TJAPlayer3.ConfigIni.FontName)) - { - if (TJAPlayer3.NamePlateConfig.data.Title[player] == "" || TJAPlayer3.NamePlateConfig.data.Title[player] == null) - this.pfName = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), 15); - else - this.pfName = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), 12); - - this.pfTitle = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), 11); - this.pfdan = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), 12); - } - else - { - if (TJAPlayer3.NamePlateConfig.data.Title[player] == "" || TJAPlayer3.NamePlateConfig.data.Title[player] == null) - this.pfName = new CPrivateFastFont(new FontFamily("MS UI Gothic"), 15); - else - this.pfName = new CPrivateFastFont(new FontFamily("MS UI Gothic"), 12); - - this.pfTitle = new CPrivateFastFont(new FontFamily("MS UI Gothic"), 11); - this.pfdan = new CPrivateFastFont(new FontFamily("MS UI Gothic"), 12); - } - tNamePlateRefreshTitles(player); - } ctNamePlateEffect = new CCounter(0, 120, 16.6f, TJAPlayer3.Timer); @@ -76,7 +93,7 @@ namespace TJAPlayer3 } txTitle[player] = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(new TitleTextureKey(title, pfTitle, Color.Black, Color.Empty, 1000)); - txName[player] = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(new TitleTextureKey(name, pfName, Color.White, Color.Black, 1000)); + txName[player] = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(new TitleTextureKey(name, pfName[player], Color.White, Color.Black, 1000)); txdan[player] = TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(new TitleTextureKey(dan, pfdan, Color.White, Color.Black, 1000)); } @@ -155,7 +172,7 @@ namespace TJAPlayer3 // Dan text if (TJAPlayer3.NamePlateConfig.data.Dan[player] != "" && TJAPlayer3.NamePlateConfig.data.Dan[player] != null) { - this.txdan[player].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, x + 69, y + 44); + this.txdan[player].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, x + TJAPlayer3.Skin.NamePlate_Dan_Offset[0], y + TJAPlayer3.Skin.NamePlate_Dan_Offset[1]); if (TJAPlayer3.NamePlateConfig.data.DanGold[player]) { @@ -174,16 +191,16 @@ namespace TJAPlayer3 txTitle[player].vc拡大縮小倍率.Y = 160.0f / txTitle[player].szテクスチャサイズ.Width; } - txTitle[player].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, x + 124, y + 22); + txTitle[player].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, x + TJAPlayer3.Skin.NamePlate_Title_Offset[0], y + TJAPlayer3.Skin.NamePlate_Title_Offset[1]); // Name text if (TJAPlayer3.NamePlateConfig.data.Dan[player] == "" || TJAPlayer3.NamePlateConfig.data.Dan[player] == null) - this.txName[player].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, x + 121, y + 44); + this.txName[player].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, x + TJAPlayer3.Skin.NamePlate_Name_Offset_WithTitle[0], y + TJAPlayer3.Skin.NamePlate_Name_Offset_WithTitle[1]); else - this.txName[player].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, x + 144, y + 44); + this.txName[player].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, x + TJAPlayer3.Skin.NamePlate_Name_Offset_Full[0], y + TJAPlayer3.Skin.NamePlate_Name_Offset_Full[1]); } else - this.txName[player].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, x + 121, y + 36); + this.txName[player].t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, x + TJAPlayer3.Skin.NamePlate_Name_Offset_Normal[0], y + TJAPlayer3.Skin.NamePlate_Name_Offset_Normal[1]); // Overlap frame @@ -359,7 +376,7 @@ namespace TJAPlayer3 } - private CPrivateFastFont pfName; + private CPrivateFastFont[] pfName = new CPrivateFastFont[2]; private CPrivateFastFont pfTitle; private CPrivateFastFont pfdan; private CCounter ctNamePlateEffect; diff --git a/Test/System/SimpleStyle/ModalConfig.ini b/Test/System/SimpleStyle/ModalConfig.ini new file mode 100644 index 00000000..118f0216 --- /dev/null +++ b/Test/System/SimpleStyle/ModalConfig.ini @@ -0,0 +1,28 @@ +;Included file +;Ƃ͒ʏʂݒł܂ + +Modal_Title_Full=640,140 + +Modal_Title_Half_X=320,960 + +Modal_Title_Half_Y=290,290 + + +Modal_Text_Full=640,327 + +Modal_Text_Full_Move=0,118 + +Modal_Text_Half_X=320,960 + +Modal_Text_Half_Y=383,383 + +Modal_Text_Half_Move=0,59 + + +Modal_Font_ModalContentHalf_Size=28 + +Modal_Font_ModalTitleHalf_Size=28 + +Modal_Font_ModalContentFull_Size=56 + +Modal_Font_ModalTitleFull_Size=56 \ No newline at end of file diff --git a/Test/System/SimpleStyle/NamePlateConfig.ini b/Test/System/SimpleStyle/NamePlateConfig.ini new file mode 100644 index 00000000..452e439a --- /dev/null +++ b/Test/System/SimpleStyle/NamePlateConfig.ini @@ -0,0 +1,22 @@ +;Included file +;Ƃ͒ʏʂݒł܂ + + +NamePlate_Title_Offset=124,22 + +NamePlate_Dan_Offset=69,44 + +NamePlate_Name_Offset_Normal=121,36 + +NamePlate_Name_Offset_WithTitle=121,44 + +NamePlate_Name_Offset_Full=144,44 + + +NamePlate_Font_Name_Size_Normal=15 + +NamePlate_Font_Name_Size_WithTitle=12 + +NamePlate_Font_Title_Size=11 + +NamePlate_Font_Dan_Size=12 \ No newline at end of file diff --git a/Test/System/SimpleStyle/OnlineLoungeConfig.ini b/Test/System/SimpleStyle/OnlineLoungeConfig.ini new file mode 100644 index 00000000..51a53271 --- /dev/null +++ b/Test/System/SimpleStyle/OnlineLoungeConfig.ini @@ -0,0 +1,36 @@ +;Included file +;Ƃ͒ʏʂݒł܂ + +OnlineLounge_Side_Menu=640,360 + +OnlineLounge_Side_Menu_Text_Offset=0,18 + +OnlineLounge_Side_Menu_Move=0,80 + + +OnlineLounge_Song=350,360 + +OnlineLounge_Song_Title_Offset=0,18 + +OnlineLounge_Song_SubTitle_Offset=0,46 + +OnlineLounge_Song_Move=0,100 + + +OnlineLounge_Context_Charter=980,300 + +OnlineLounge_Context_Genre=980,340 + +OnlineLounge_Context_Couse_Symbol=800,480 + +OnlineLounge_Context_Level=900,494 + +OnlineLounge_Context_Couse_Move=240,60 + + +OnlineLounge_Downloading=640,605 + + +OnlineLounge_Font_OLFont=14 + +OnlineLounge_Font_OLFontLarge=28 diff --git a/Test/System/SimpleStyle/OpenEncyclopediaConfig.ini b/Test/System/SimpleStyle/OpenEncyclopediaConfig.ini new file mode 100644 index 00000000..b366e612 --- /dev/null +++ b/Test/System/SimpleStyle/OpenEncyclopediaConfig.ini @@ -0,0 +1,18 @@ +;Included file +;Ƃ͒ʏʂݒł܂ + + +OpenEncyclopedia_Context_Item2=960,180 + +OpenEncyclopedia_Context_Item3=640,360 + +OpenEncyclopedia_Context_PageText=960,720 + + +OpenEncyclopedia_Side_Menu=320,360 + +OpenEncyclopedia_Side_Menu_Move=0,90 + +OpenEncyclopedia_Side_Menu_Text_Offset=0,0 + +OpenEncyclopedia_Font_EncyclopediaMenu_Size=14 \ No newline at end of file diff --git a/Test/System/SimpleStyle/OtherConfig.ini b/Test/System/SimpleStyle/OtherConfig.ini index 9dde0c9d..7ae5a1f2 100644 --- a/Test/System/SimpleStyle/OtherConfig.ini +++ b/Test/System/SimpleStyle/OtherConfig.ini @@ -7,4 +7,20 @@ SongSelect_Title_X=0 SongSelect_Title_Y=0 SongSelect_BoxExplanation_Interval=30 + +PopupMenu_Menu_Title=460,40 + +PopupMenu_Title=540,44 + +PopupMenu_Menu_Highlight=480,46 + +PopupMenu_MenuItem_Name=480,77 + +PopupMenu_MenuItem_Value=630,77 + +PopupMenu_Move=0,32 + +PopupMenu_Font_Size=18 + + SongSelect_GenreName= diff --git a/Test/System/SimpleStyle/SkinConfig.ini b/Test/System/SimpleStyle/SkinConfig.ini index 8316e16d..1bff33fa 100644 --- a/Test/System/SimpleStyle/SkinConfig.ini +++ b/Test/System/SimpleStyle/SkinConfig.ini @@ -12,10 +12,14 @@ Creator=0AuBSQ #include ConfigConfig.ini #include SongSelectConfig.ini #include DaniSelectConfig.ini -#include HeyaConfig.ini #include SongLoadingConfig.ini #include GameConfig.ini #include ResultConfig.ini #include AIResultConfig.ini #include DanResultConfig.ini -#include TowerResultConfig.ini \ No newline at end of file +#include TowerResultConfig.ini +#include HeyaConfig.ini +#include OnlineLoungeConfig.ini +#include OpenEncyclopediaConfig.ini +#include NamePlateConfig.ini +#include ModalConfig.ini \ No newline at end of file