diff --git a/OpenTaiko/src/Common/CSkin.cs b/OpenTaiko/src/Common/CSkin.cs index 8ab41229..f19a7077 100644 --- a/OpenTaiko/src/Common/CSkin.cs +++ b/OpenTaiko/src/Common/CSkin.cs @@ -6261,6 +6261,10 @@ namespace TJAPlayer3 Result_Gauge_Rainbow_Y[i] = int.Parse(strSplit[i]); } } + else if (strCommand == "Result_Gauge_Rainbow_Interval") + { + Result_Gauge_Rainbow_Interval = int.Parse(strParam); + } else if (strCommand == "Result_Gauge_ClearText_X") { string[] strSplit = strParam.Split(','); @@ -9471,6 +9475,8 @@ namespace TJAPlayer3 public int[] Result_Gauge_Rainbow_X = new int[] { 57, 692 }; public int[] Result_Gauge_Rainbow_Y = new int[] { 144, 144 }; + public int Result_Gauge_Rainbow_Ptn; + public int Result_Gauge_Rainbow_Interval = 1000 / 60; public int[] Result_Gauge_ClearText_X = new int[] { 441, 1076 }; public int[] Result_Gauge_ClearText_Y = new int[] { 142, 142 }; diff --git a/OpenTaiko/src/Stages/01.StartUp/TextureLoader.cs b/OpenTaiko/src/Stages/01.StartUp/TextureLoader.cs index b81e2903..d635c49e 100644 --- a/OpenTaiko/src/Stages/01.StartUp/TextureLoader.cs +++ b/OpenTaiko/src/Stages/01.StartUp/TextureLoader.cs @@ -1098,9 +1098,15 @@ namespace TJAPlayer3 //for (int i = 0; i < 3; i++) //Result_Work[i] = TxC(RESULT + @$"Work{Path.DirectorySeparatorChar}" + i.ToString() + ".png"); - - for (int i = 0; i < 41; i++) - Result_Rainbow[i] = TxC(RESULT + @$"Rainbow{Path.DirectorySeparatorChar}" + i.ToString() + ".png"); + TJAPlayer3.Skin.Result_Gauge_Rainbow_Ptn = TJAPlayer3.t連番画像の枚数を数える(CSkin.Path(BASE + RESULT + @$"Rainbow{Path.DirectorySeparatorChar}")); + if (TJAPlayer3.Skin.Result_Gauge_Rainbow_Ptn != 0) + { + Result_Rainbow = new CTexture[TJAPlayer3.Skin.Result_Gauge_Rainbow_Ptn]; + for (int i = 0; i < TJAPlayer3.Skin.Result_Gauge_Rainbow_Ptn; i++) + { + Result_Rainbow[i] = TxC(RESULT + @$"Rainbow{Path.DirectorySeparatorChar}" + i.ToString() + ".png"); + } + } //for (int i = 0; i < 6; i++) //Result_Background[i] = TxC(RESULT + @$"Background_" + i.ToString() + ".png"); diff --git a/OpenTaiko/src/Stages/07.Game/CAct演奏パネル文字列.cs b/OpenTaiko/src/Stages/07.Game/CAct演奏パネル文字列.cs index 336f7a25..c72cc8bd 100644 --- a/OpenTaiko/src/Stages/07.Game/CAct演奏パネル文字列.cs +++ b/OpenTaiko/src/Stages/07.Game/CAct演奏パネル文字列.cs @@ -207,13 +207,8 @@ namespace TJAPlayer3 public override void Activate() { - if( !string.IsNullOrEmpty( TJAPlayer3.ConfigIni.FontName ) ) - { - this.pfMusicName = new CCachedFontRenderer( TJAPlayer3.ConfigIni.FontName, TJAPlayer3.Skin.Game_MusicName_FontSize); - //this.pf縦書きテスト = new CPrivateFastFont( new FontFamily( CDTXMania.ConfigIni.strPrivateFontで使うフォント名 ), 22 ); - } - - this.txPanel = null; + this.pfMusicName = HPrivateFastFont.tInstantiateMainFont(TJAPlayer3.Skin.Game_MusicName_FontSize); + this.txPanel = null; this.ct進行用 = new CCounter(); this.Start(); this.bFirst = true; diff --git a/OpenTaiko/src/Stages/08.Result/CActResultParameterPanel.cs b/OpenTaiko/src/Stages/08.Result/CActResultParameterPanel.cs index 49bdfa0a..f593364e 100644 --- a/OpenTaiko/src/Stages/08.Result/CActResultParameterPanel.cs +++ b/OpenTaiko/src/Stages/08.Result/CActResultParameterPanel.cs @@ -451,7 +451,7 @@ namespace TJAPlayer3 } if (!ct虹ゲージアニメ.IsTicked) - ct虹ゲージアニメ.Start(0, 40, 1000 / 60, TJAPlayer3.Timer); + ct虹ゲージアニメ.Start(0, TJAPlayer3.Skin.Result_Gauge_Rainbow_Ptn - 1, TJAPlayer3.Skin.Result_Gauge_Rainbow_Interval, TJAPlayer3.Timer); if (!ctSoul.IsTicked) ctSoul.Start(0, 8, 33, TJAPlayer3.Timer);