diff --git a/TJAPlayer3/Stages/05.DaniSelect/CActSelect段位リスト.cs b/TJAPlayer3/Stages/05.DaniSelect/CActSelect段位リスト.cs index 2d11a8bf..78a98dd6 100644 --- a/TJAPlayer3/Stages/05.DaniSelect/CActSelect段位リスト.cs +++ b/TJAPlayer3/Stages/05.DaniSelect/CActSelect段位リスト.cs @@ -270,7 +270,7 @@ namespace TJAPlayer3 static CPrivateFastFont pfDanPlateTitle = null; - public static void tDisplayDanPlate(CTexture givenPlate, STバー情報 songNode, int x, int y) + public static void tDisplayDanPlate(CTexture givenPlate, STバー情報? songNode, int x, int y) { if (givenPlate != null) { @@ -280,8 +280,18 @@ namespace TJAPlayer3 else { // Default Dan Plate - int danTick = songNode.nDanTick; - Color danTickColor = songNode.cDanTickColor; + + int danTick = TJAPlayer3.stage選曲.r確定されたスコア.譜面情報.nDanTick; + Color danTickColor = TJAPlayer3.stage選曲.r確定されたスコア.譜面情報.cDanTickColor; + + if (songNode != null) + { + STバー情報 stNode = (STバー情報)songNode; + + danTick = stNode.nDanTick; + danTickColor = stNode.cDanTickColor; + } + int unit = TJAPlayer3.Tx.Dani_DanPlates.szテクスチャサイズ.Width / 6; @@ -300,7 +310,16 @@ namespace TJAPlayer3 if (pfDanPlateTitle == null) pfDanPlateTitle = new CPrivateFastFont(new FontFamily(TJAPlayer3.ConfigIni.FontName), 60); - TitleTextureKey ttkTmp = new TitleTextureKey(songNode.ttkタイトル[songNode.ttkタイトル.Length - 1].str文字, pfDanPlateTitle, Color.White, Color.Black, 1000); + string titleTmp = TJAPlayer3.stage選曲.r確定された曲.strタイトル; + + if (songNode != null) + { + STバー情報 stNode = (STバー情報)songNode; + + titleTmp = stNode.ttkタイトル[stNode.ttkタイトル.Length - 1].str文字; + } + + TitleTextureKey ttkTmp = new TitleTextureKey(titleTmp, pfDanPlateTitle, Color.White, Color.Black, 1000); TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTextureTate(ttkTmp).t2D中心基準描画(TJAPlayer3.app.Device, x, y - 50); } } diff --git a/TJAPlayer3/Stages/06.SongLoading/CStage曲読み込み.cs b/TJAPlayer3/Stages/06.SongLoading/CStage曲読み込み.cs index 44827369..b8563077 100644 --- a/TJAPlayer3/Stages/06.SongLoading/CStage曲読み込み.cs +++ b/TJAPlayer3/Stages/06.SongLoading/CStage曲読み込み.cs @@ -367,8 +367,12 @@ namespace TJAPlayer3 TJAPlayer3.Tx.SongLoading_Bg_Dan.t2D描画(TJAPlayer3.app.Device, 0, 0 - (ct待機.n現在の値 <= 600 ? ct待機.n現在の値 / 10f : 60)); - CActSelect段位リスト.tDisplayDanPlate(TJAPlayer3.stage段位選択.段位リスト.stバー情報[TJAPlayer3.stage段位選択.段位リスト.n現在の選択行].txDanPlate, - TJAPlayer3.stage段位選択.段位リスト.stバー情報[TJAPlayer3.stage段位選択.段位リスト.n現在の選択行], + CTexture dp = (TJAPlayer3.stage段位選択.段位リスト.stバー情報 != null) + ? TJAPlayer3.stage段位選択.段位リスト.stバー情報[TJAPlayer3.stage段位選択.段位リスト.n現在の選択行].txDanPlate + : null; + + CActSelect段位リスト.tDisplayDanPlate(dp, + null, 1121, 213); diff --git a/TJAPlayer3/Stages/07.Game/Taiko/Dan_Cert.cs b/TJAPlayer3/Stages/07.Game/Taiko/Dan_Cert.cs index 8fb7f152..33afb919 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/Dan_Cert.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/Dan_Cert.cs @@ -428,7 +428,7 @@ namespace TJAPlayer3 for (int i = 0; i < CExamInfo.cMaxExam; i++) ExamChange[i] = false; - for (int j = 0; j < CExamInfo.cMaxExam; j++) // EXAM1 check for individual conditions added back, so gauge can be EXAM2, 5, 7 whatever + for (int j = 0; j < CExamInfo.cMaxExam; j++) { if (TJAPlayer3.stage選曲.r確定された曲.DanSongs[0].Dan_C[j] != null) { @@ -491,7 +491,7 @@ namespace TJAPlayer3 #region [Dan Plate] CActSelect段位リスト.tDisplayDanPlate(Dan_Plate, - TJAPlayer3.stage段位選択.段位リスト.stバー情報[TJAPlayer3.stage段位選択.段位リスト.n現在の選択行], + null, TJAPlayer3.Skin.Game_DanC_Dan_Plate[0], TJAPlayer3.Skin.Game_DanC_Dan_Plate[1]); diff --git a/TJAPlayer3/Stages/08.Result/CStage結果.cs b/TJAPlayer3/Stages/08.Result/CStage結果.cs index 7268dfd6..48b20db5 100644 --- a/TJAPlayer3/Stages/08.Result/CStage結果.cs +++ b/TJAPlayer3/Stages/08.Result/CStage結果.cs @@ -1110,7 +1110,7 @@ namespace TJAPlayer3 int plateOffset = Math.Max(0, 1600 - ctPhase1.n現在の値) * 2; CActSelect段位リスト.tDisplayDanPlate(Dan_Plate, - TJAPlayer3.stage段位選択.段位リスト.stバー情報[TJAPlayer3.stage段位選択.段位リスト.n現在の選択行], + null, 138, 220 - plateOffset); @@ -1213,7 +1213,7 @@ namespace TJAPlayer3 #endregion - TJAPlayer3.Tx.DanResult_Rank.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, 130, 380 - (unitsBeforeAppearance / 3f), new Rectangle(0, 0, 334, 334)); + TJAPlayer3.Tx.DanResult_Rank.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, 130, 380 - (unitsBeforeAppearance / 10f), new Rectangle(0, 0, 334, 334)); #endregion }