diff --git a/OpenTaiko/System/SimpleStyle (1080p)/GameConfig.ini b/OpenTaiko/System/SimpleStyle (1080p)/GameConfig.ini index d25f6278..e07647ab 100644 --- a/OpenTaiko/System/SimpleStyle (1080p)/GameConfig.ini +++ b/OpenTaiko/System/SimpleStyle (1080p)/GameConfig.ini @@ -55,11 +55,11 @@ Game_Judge_Meter_GoodRate=309,798 Game_Judge_Meter_MissRate=309,855 -Game_MusicName_X=1740 +Game_MusicName_X=1890 Game_MusicName_Y=36 -Game_MusicName_MaxWidth=293 +Game_MusicName_MaxWidth=990 Game_MusicName_FontSize=41 @@ -145,7 +145,7 @@ Game_Taiko_ModIcons_Y=354,639 Game_Taiko_NamePlate_X=0,0 -Game_Taiko_NamePlate_Y=450,570 +Game_Taiko_NamePlate_Y=450,556 Game_Taiko_X=308,308 diff --git a/OpenTaiko/System/SimpleStyle (1080p)/Graphics/5_Game/9_End/ClearFailed/Script.lua b/OpenTaiko/System/SimpleStyle (1080p)/Graphics/5_Game/9_End/ClearFailed/Script.lua index c104b20e..769e13dd 100644 --- a/OpenTaiko/System/SimpleStyle (1080p)/Graphics/5_Game/9_End/ClearFailed/Script.lua +++ b/OpenTaiko/System/SimpleStyle (1080p)/Graphics/5_Game/9_End/ClearFailed/Script.lua @@ -14,7 +14,7 @@ local nowFrame = { 0, 0, 0, 0, 0 } local textureCount = 25 -local useExtraAnime = true +local useExtraAnime = false function clearIn(player) end diff --git a/OpenTaiko/System/SimpleStyle (1080p)/Graphics/5_Game/9_End/Dan_Fail/Script.lua b/OpenTaiko/System/SimpleStyle (1080p)/Graphics/5_Game/9_End/Dan_Fail/Script.lua index c104b20e..769e13dd 100644 --- a/OpenTaiko/System/SimpleStyle (1080p)/Graphics/5_Game/9_End/Dan_Fail/Script.lua +++ b/OpenTaiko/System/SimpleStyle (1080p)/Graphics/5_Game/9_End/Dan_Fail/Script.lua @@ -14,7 +14,7 @@ local nowFrame = { 0, 0, 0, 0, 0 } local textureCount = 25 -local useExtraAnime = true +local useExtraAnime = false function clearIn(player) end diff --git a/OpenTaiko/System/SimpleStyle (1080p)/SongLoadingConfig.ini b/OpenTaiko/System/SimpleStyle (1080p)/SongLoadingConfig.ini index e89f0db4..44581999 100644 --- a/OpenTaiko/System/SimpleStyle (1080p)/SongLoadingConfig.ini +++ b/OpenTaiko/System/SimpleStyle (1080p)/SongLoadingConfig.ini @@ -11,11 +11,15 @@ SongLoading_Title_X=960 SongLoading_Title_Y=420 +SongLoading_Title_MaxSize=1065 + SongLoading_SubTitle_X=960 SongLoading_SubTitle_Y=488 +SongLoading_SubTitle_MaxSize=1065 + SongLoading_Plate_X_AI=960 diff --git a/OpenTaiko/System/SimpleStyle (1080p)/SongSelectConfig.ini b/OpenTaiko/System/SimpleStyle (1080p)/SongSelectConfig.ini index 0369112b..9ce09f76 100644 --- a/OpenTaiko/System/SimpleStyle (1080p)/SongSelectConfig.ini +++ b/OpenTaiko/System/SimpleStyle (1080p)/SongSelectConfig.ini @@ -58,6 +58,12 @@ SongSelect_Subtitle_Scale=20 SongSelect_BoxText_Scale=21 +SongSelect_Title_MaxSize=825 + +SongSelect_SubTitle_MaxSize=765 + +SongSelect_VerticalText=0 + SongSelect_Bar_Center_Move=93 @@ -303,7 +309,7 @@ SongSelect_Option_Select_Offset=0,-429 SongSelect_Option_Font_Scale=20 -SongSelect_Option_OptionType_X=24,1664 +SongSelect_Option_OptionType_X=24,1506 SongSelect_Option_OptionType_Y=140,140 diff --git a/OpenTaiko/System/SimpleStyle/GameConfig.ini b/OpenTaiko/System/SimpleStyle/GameConfig.ini index 7444d020..19bd991f 100644 --- a/OpenTaiko/System/SimpleStyle/GameConfig.ini +++ b/OpenTaiko/System/SimpleStyle/GameConfig.ini @@ -55,11 +55,11 @@ Game_Judge_Meter_GoodRate=206,532 Game_Judge_Meter_MissRate=206,570 -Game_MusicName_X=1160 +Game_MusicName_X=1260 Game_MusicName_Y=24 -Game_MusicName_MaxWidth=195 +Game_MusicName_MaxWidth=660 Game_MusicName_FontSize=27 @@ -251,7 +251,7 @@ Game_Balloon_Combo_Number_X=257,257 Game_Balloon_Combo_Number_Y=54,603 -Game_Balloon_Combo_Number_Ex_X=297,297 +Game_Balloon_Combo_Number_Ex_X=257,257 Game_Balloon_Combo_Number_Ex_Y=54,603 diff --git a/OpenTaiko/System/SimpleStyle/Graphics/5_Game/9_End/ClearFailed/Script.lua b/OpenTaiko/System/SimpleStyle/Graphics/5_Game/9_End/ClearFailed/Script.lua index be128011..0ed7a104 100644 --- a/OpenTaiko/System/SimpleStyle/Graphics/5_Game/9_End/ClearFailed/Script.lua +++ b/OpenTaiko/System/SimpleStyle/Graphics/5_Game/9_End/ClearFailed/Script.lua @@ -18,7 +18,7 @@ local nowFrame = { 0, 0, 0, 0, 0 } local textureCount = 25 -local useExtraAnime = true +local useExtraAnime = false function clearIn(player) end diff --git a/OpenTaiko/System/SimpleStyle/Graphics/5_Game/9_End/Dan_Fail/Script.lua b/OpenTaiko/System/SimpleStyle/Graphics/5_Game/9_End/Dan_Fail/Script.lua index be128011..0ed7a104 100644 --- a/OpenTaiko/System/SimpleStyle/Graphics/5_Game/9_End/Dan_Fail/Script.lua +++ b/OpenTaiko/System/SimpleStyle/Graphics/5_Game/9_End/Dan_Fail/Script.lua @@ -18,7 +18,7 @@ local nowFrame = { 0, 0, 0, 0, 0 } local textureCount = 25 -local useExtraAnime = true +local useExtraAnime = false function clearIn(player) end diff --git a/OpenTaiko/System/SimpleStyle/ResultConfig.ini b/OpenTaiko/System/SimpleStyle/ResultConfig.ini index 2fe155fd..9f59bbb6 100644 --- a/OpenTaiko/System/SimpleStyle/ResultConfig.ini +++ b/OpenTaiko/System/SimpleStyle/ResultConfig.ini @@ -181,3 +181,4 @@ Result_MusicName_Y=30 Result_MusicName_FontSize=25 +Result_MusicName_MaxSize=660 \ No newline at end of file diff --git a/OpenTaiko/System/SimpleStyle/SongLoadingConfig.ini b/OpenTaiko/System/SimpleStyle/SongLoadingConfig.ini index 207cb0f7..445f533c 100644 --- a/OpenTaiko/System/SimpleStyle/SongLoadingConfig.ini +++ b/OpenTaiko/System/SimpleStyle/SongLoadingConfig.ini @@ -11,11 +11,15 @@ SongLoading_Title_X=640 SongLoading_Title_Y=280 +SongLoading_Title_MaxSize=710 + SongLoading_SubTitle_X=640 SongLoading_SubTitle_Y=325 +SongLoading_SubTitle_MaxSize=710 + SongLoading_Plate_X_AI=640 diff --git a/OpenTaiko/System/SimpleStyle/SongSelectConfig.ini b/OpenTaiko/System/SimpleStyle/SongSelectConfig.ini index 844c804f..d0e9f47f 100644 --- a/OpenTaiko/System/SimpleStyle/SongSelectConfig.ini +++ b/OpenTaiko/System/SimpleStyle/SongSelectConfig.ini @@ -310,7 +310,7 @@ SongSelect_Option_Select_Offset=0,-286 SongSelect_Option_Font_Scale=13 -SongSelect_Option_OptionType_X=16,1096 +SongSelect_Option_OptionType_X=16,1004 SongSelect_Option_OptionType_Y=93,93 diff --git a/OpenTaiko/src/Common/CConfigIni.cs b/OpenTaiko/src/Common/CConfigIni.cs index 9ce4904c..f8c6a329 100644 --- a/OpenTaiko/src/Common/CConfigIni.cs +++ b/OpenTaiko/src/Common/CConfigIni.cs @@ -1228,9 +1228,6 @@ namespace TJAPlayer3 public bool ShowMob; public bool ShowPuchiChara; // リザーブ - public EScrollMode eScrollMode = EScrollMode.Normal; - public bool bスクロールモードを上書き = false; - public bool bHispeedRandom; public Eステルスモード[] eSTEALTH; public bool bNoInfo; @@ -3395,10 +3392,12 @@ namespace TJAPlayer3 { this.eDark = (Eダークモード)CConversion.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 2, (int)this.eDark); } + /* else if (str3.Equals("ScrollMode")) { this.eScrollMode = (EScrollMode)CConversion.n値を文字列から取得して範囲内に丸めて返す(str4, 0, 2, 0); } + */ else if (str3.Equals("EnableCountDownTimer")) { this.bEnableCountdownTimer = CConversion.bONorOFF(str4[0]); diff --git a/OpenTaiko/src/Common/CSkin.cs b/OpenTaiko/src/Common/CSkin.cs index f19a7077..15ec7dd2 100644 --- a/OpenTaiko/src/Common/CSkin.cs +++ b/OpenTaiko/src/Common/CSkin.cs @@ -3538,6 +3538,10 @@ namespace TJAPlayer3 { SongLoading_Title_Y = int.Parse(strParam); } + else if (strCommand == nameof(SongLoading_Title_MaxSize)) + { + SongLoading_Title_MaxSize = int.Parse(strParam); + } else if (strCommand == nameof(SongLoading_SubTitle_X)) { SongLoading_SubTitle_X = int.Parse(strParam); @@ -3546,6 +3550,10 @@ namespace TJAPlayer3 { SongLoading_SubTitle_Y = int.Parse(strParam); } + else if (strCommand == nameof(SongLoading_SubTitle_MaxSize)) + { + SongLoading_SubTitle_MaxSize = int.Parse(strParam); + } else if (strCommand == nameof(SongLoading_Plate_X_AI)) { SongLoading_Plate_X_AI = int.Parse(strParam); @@ -6542,6 +6550,10 @@ namespace TJAPlayer3 if (int.Parse(strParam) > 0) Result_MusicName_FontSize = int.Parse(strParam); } + else if (strCommand == nameof(Result_MusicName_MaxSize)) + { + Result_MusicName_MaxSize = int.Parse(strParam); + } else if (strCommand == nameof(Result_MusicName_ReferencePoint)) { Result_MusicName_ReferencePoint = (ReferencePoint)int.Parse(strParam); @@ -8879,8 +8891,10 @@ namespace TJAPlayer3 public int SongLoading_Plate_Y = 360; public int SongLoading_Title_X = 640; public int SongLoading_Title_Y = 280; + public int SongLoading_Title_MaxSize = 710; public int SongLoading_SubTitle_X = 640; public int SongLoading_SubTitle_Y = 325; + public int SongLoading_SubTitle_MaxSize = 710; public int SongLoading_Plate_X_AI = 640; public int SongLoading_Plate_Y_AI = 360; @@ -9032,10 +9046,10 @@ namespace TJAPlayer3 public int[] Game_CourseSymbol_Back_Rect_5P = new int[] { 0, 140, 384, 105 }; #endregion #region PanelFont - public int Game_MusicName_X = 1160; + public int Game_MusicName_X = 1260; public int Game_MusicName_Y = 24; public int Game_MusicName_FontSize = 27; - public int Game_MusicName_MaxWidth = 195; + public int Game_MusicName_MaxWidth = 660; public ReferencePoint Game_MusicName_ReferencePoint = ReferencePoint.Center; public int Game_Genre_X = 1015; public int Game_Genre_Y = 70; @@ -9185,7 +9199,7 @@ namespace TJAPlayer3 public int[] Game_Balloon_Combo_Y = new int[] { -11, 538 }; public int[] Game_Balloon_Combo_Number_X = new int[] { 257, 257 }; public int[] Game_Balloon_Combo_Number_Y = new int[] { 54, 603 }; - public int[] Game_Balloon_Combo_Number_Ex_X = new int[] { 297, 297 }; + public int[] Game_Balloon_Combo_Number_Ex_X = new int[] { 257, 257 }; public int[] Game_Balloon_Combo_Number_Ex_Y = new int[] { 54, 603 }; public int[] Game_Balloon_Combo_Number_Size = new int[] { 53, 62 }; public int[] Game_Balloon_Combo_Number_Interval = new int[] { 45, 0 }; @@ -9558,6 +9572,7 @@ namespace TJAPlayer3 public int Result_MusicName_X = 640; public int Result_MusicName_Y = 30; public int Result_MusicName_FontSize = 25; + public int Result_MusicName_MaxSize = 660; public ReferencePoint Result_MusicName_ReferencePoint = ReferencePoint.Center; public int Result_StageText_X = 230; public int Result_StageText_Y = 6; diff --git a/OpenTaiko/src/Songs/CDTX.cs b/OpenTaiko/src/Songs/CDTX.cs index 364ca1e0..d7c64b5f 100644 --- a/OpenTaiko/src/Songs/CDTX.cs +++ b/OpenTaiko/src/Songs/CDTX.cs @@ -171,6 +171,7 @@ namespace TJAPlayer3 public class CChip : IComparable, ICloneable { + public EScrollMode eScrollMode; public bool bHit; public bool b可視 = true; public bool bHideBarLine = true; @@ -1118,12 +1119,15 @@ namespace TJAPlayer3 public Dictionary listSCROLL_Master; public Dictionary listJPOSSCROLL; public List List_DanSongs; + private EScrollMode eScrollMode; + private double[] dbNowSCROLL_Normal; private double[] dbNowSCROLL_Expert; private double[] dbNowSCROLL_Master; + private int nNextSongOffset; public Dictionary listDELAY; public Dictionary listBRANCH; @@ -3567,7 +3571,7 @@ namespace TJAPlayer3 MinBPM = dbBPM; } - this.listBPM.Add(this.n内部番号BPM1to - 1, new CBPM() { n内部番号 = this.n内部番号BPM1to - 1, n表記上の番号 = 0, dbBPM値 = dbBPM, bpm_change_time = this.dbNowTime, bpm_change_bmscroll_time = this.dbNowBMScollTime, bpm_change_course = this.n現在のコース }); + this.listBPM.Add(this.n内部番号BPM1to - 1, new CBPM() { n内部番号 = this.n内部番号BPM1to - 1, n表記上の番号 = 0, dbBPM値 = dbBPM, bpm_change_time = this.dbNowTime - nNextSongOffset, bpm_change_bmscroll_time = this.dbNowBMScollTime, bpm_change_course = this.n現在のコース }); //チップ追加して割り込んでみる。 @@ -6266,7 +6270,8 @@ namespace TJAPlayer3 } else if (command == "#NEXTSONG") { - var delayTime = 6200.0; // 6.2秒ディレイ + nNextSongOffset += nOFFSET; + var delayTime = 6200.0 + nOFFSET; // 6.2秒ディレイ //チップ追加して割り込んでみる。 var chip = new CChip(); @@ -6276,7 +6281,7 @@ namespace TJAPlayer3 chip.fNow_Measure_m = this.fNow_Measure_m; chip.fNow_Measure_s = this.fNow_Measure_s; this.dbNowTime += delayTime; - this.dbNowBMScollTime += delayTime * this.dbNowBPM / 15000; + this.dbNowBMScollTime += (delayTime - nOFFSET) * this.dbNowBPM / 15000; chip.n整数値_内部番号 = 0; chip.nコース = this.n現在のコース; @@ -6345,7 +6350,7 @@ namespace TJAPlayer3 nextSongnextSongChip.nチャンネル番号 = 0x01; nextSongnextSongChip.n発声位置 = 384; - nextSongnextSongChip.n発声時刻ms = (int)this.dbNowTime; + nextSongnextSongChip.n発声時刻ms = (int)this.dbNowTime - (bOFFSETの値がマイナスである ? -nOFFSET : nOFFSET); nextSongnextSongChip.fNow_Measure_m = this.fNow_Measure_m; nextSongnextSongChip.fNow_Measure_s = this.fNow_Measure_s; nextSongnextSongChip.n整数値 = 0x01; @@ -6359,6 +6364,60 @@ namespace TJAPlayer3 // チップを配置。 this.listChip.Add(nextSongnextSongChip); } + else if (command == "#NMSCROLL") + { + //チップ追加して割り込んでみる。 + var chip = new CChip(); + + chip.nチャンネル番号 = 0x09; + chip.n発声位置 = ((this.n現在の小節数) * 384) - 1; + chip.n発声時刻ms = (int)this.dbNowTime; + chip.fNow_Measure_m = this.fNow_Measure_m; + chip.fNow_Measure_s = this.fNow_Measure_s; + chip.n整数値_内部番号 = this.n内部番号SCROLL1to; + chip.nコース = this.n現在のコース; + + // チップを配置。 + eScrollMode = EScrollMode.Normal; + + this.listChip.Add(chip); + } + else if (command == "#BMSCROLL") + { + //チップ追加して割り込んでみる。 + var chip = new CChip(); + + chip.nチャンネル番号 = 0x0A; + chip.n発声位置 = ((this.n現在の小節数) * 384) - 1; + chip.n発声時刻ms = (int)this.dbNowTime; + chip.fNow_Measure_m = this.fNow_Measure_m; + chip.fNow_Measure_s = this.fNow_Measure_s; + chip.n整数値_内部番号 = this.n内部番号SCROLL1to; + chip.nコース = this.n現在のコース; + + // チップを配置。 + eScrollMode = EScrollMode.BMSCROLL; + + this.listChip.Add(chip); + } + else if (command == "#HBSCROLL") + { + //チップ追加して割り込んでみる。 + var chip = new CChip(); + + chip.nチャンネル番号 = 0x0B; + chip.n発声位置 = ((this.n現在の小節数) * 384) - 1; + chip.n発声時刻ms = (int)this.dbNowTime; + chip.fNow_Measure_m = this.fNow_Measure_m; + chip.fNow_Measure_s = this.fNow_Measure_s; + chip.n整数値_内部番号 = this.n内部番号SCROLL1to; + chip.nコース = this.n現在のコース; + + // チップを配置。 + eScrollMode = EScrollMode.HBSCROLL; + + this.listChip.Add(chip); + } } void t現在のチップ情報を記録する(bool bInPut) { @@ -6499,6 +6558,7 @@ namespace TJAPlayer3 chip.dbSCROLL = this.dbNowScroll; chip.dbSCROLL_Y = this.dbNowScrollY; chip.fBMSCROLLTime = (float)this.dbNowBMScollTime; + chip.eScrollMode = eScrollMode; if (IsEndedBranching) chip.nコース = (ECourse)i; @@ -6553,6 +6613,7 @@ namespace TJAPlayer3 hakusen.fNow_Measure_s = this.fNow_Measure_s; hakusen.dbSCROLL_Y = this.dbNowScrollY; hakusen.nコース = n現在のコース; + hakusen.eScrollMode = eScrollMode; this.listChip.Add(hakusen); //--全ての拍線の時間を出力する-- @@ -6626,6 +6687,7 @@ namespace TJAPlayer3 chip.dbSCROLL = this.dbNowScroll; chip.dbSCROLL_Y = this.dbNowScrollY; chip.nスクロール方向 = this.nスクロール方向; + chip.eScrollMode = eScrollMode; if (IsEndedBranching) chip.nコース = (ECourse)i; @@ -6895,13 +6957,17 @@ namespace TJAPlayer3 { if (TJAPlayer3.actEnumSongs != null && TJAPlayer3.actEnumSongs.IsDeActivated) { - if (InputText.Equals("#HBSCROLL") && TJAPlayer3.ConfigIni.bスクロールモードを上書き == false) + if (InputText.Equals("#NMSCROLL")) { - TJAPlayer3.ConfigIni.eScrollMode = EScrollMode.HBSCROLL; + eScrollMode = EScrollMode.Normal; } - if (InputText.Equals("#BMSCROLL") && TJAPlayer3.ConfigIni.bスクロールモードを上書き == false) + else if (InputText.Equals("#HBSCROLL")) { - TJAPlayer3.ConfigIni.eScrollMode = EScrollMode.BMSCROLL; + eScrollMode = EScrollMode.HBSCROLL; + } + if (InputText.Equals("#BMSCROLL")) + { + eScrollMode = EScrollMode.BMSCROLL; } } diff --git a/OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs b/OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs index 855a4aee..96bc5077 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CActSelect曲リスト.cs @@ -1016,7 +1016,7 @@ namespace TJAPlayer3 #region [ Songs not found画像 ] try { - this.txSongNotFound = new CTexture(ft曲リスト用フォント.DrawText_V("Songs not found.\nYou need to install songs.", Color.White)); + this.txSongNotFound = new CTexture(ft曲リスト用フォント.DrawText("Songs not found.\nYou need to install songs.", Color.White)); this.txSongNotFound.vc拡大縮小倍率 = new Vector3D( 0.5f, 0.5f, 1f ); // 半分のサイズで表示する。 /* @@ -1048,7 +1048,7 @@ namespace TJAPlayer3 #region [ "曲データを検索しています"画像 ] try { - this.txEnumeratingSongs = new CTexture(ft曲リスト用フォント.DrawText_V("Now enumerating songs.\nPlease wait...", Color.White)); + this.txEnumeratingSongs = new CTexture(ft曲リスト用フォント.DrawText("Now enumerating songs.\nPlease wait...", Color.White)); this.txEnumeratingSongs.vc拡大縮小倍率 = new Vector3D( 0.5f, 0.5f, 1f ); // 半分のサイズで表示する。 /* diff --git a/OpenTaiko/src/Stages/05.SongSelect/CStage選曲.cs b/OpenTaiko/src/Stages/05.SongSelect/CStage選曲.cs index 9f14b278..e0500a2a 100644 --- a/OpenTaiko/src/Stages/05.SongSelect/CStage選曲.cs +++ b/OpenTaiko/src/Stages/05.SongSelect/CStage選曲.cs @@ -379,8 +379,6 @@ namespace TJAPlayer3 } finally { - TJAPlayer3.ConfigIni.eScrollMode = EScrollMode.Normal; - TJAPlayer3.ConfigIni.bスクロールモードを上書き = false; Trace.TraceInformation("選曲ステージの活性化を完了しました。"); Trace.Unindent(); } @@ -597,10 +595,6 @@ namespace TJAPlayer3 TJAPlayer3.act文字コンソール.tPrint(0, 16, C文字コンソール.Eフォント種別.白, "GAME: SURVIVAL HARD"); if (TJAPlayer3.ConfigIni.bSuperHard) TJAPlayer3.act文字コンソール.tPrint(0, 32, C文字コンソール.Eフォント種別.赤, "SUPER HARD MODE : ON"); - if (TJAPlayer3.ConfigIni.eScrollMode == EScrollMode.BMSCROLL) - TJAPlayer3.act文字コンソール.tPrint(0, 48, C文字コンソール.Eフォント種別.赤, "BMSCROLL : ON"); - else if (TJAPlayer3.ConfigIni.eScrollMode == EScrollMode.HBSCROLL) - TJAPlayer3.act文字コンソール.tPrint(0, 48, C文字コンソール.Eフォント種別.赤, "HBSCROLL : ON"); #endregion @@ -944,6 +938,7 @@ namespace TJAPlayer3 #region [ F6 SCROLL ] if (TJAPlayer3.Input管理.Keyboard.KeyPressed((int)SlimDXKeys.Key.F6)) { + /* TJAPlayer3.Skin.sound変更音.t再生する(); TJAPlayer3.ConfigIni.bスクロールモードを上書き = true; switch ((int)TJAPlayer3.ConfigIni.eScrollMode) @@ -959,6 +954,7 @@ namespace TJAPlayer3 TJAPlayer3.ConfigIni.bスクロールモードを上書き = false; break; } + */ } #endregion #region [ F7 TokkunMode ] diff --git a/OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs b/OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs index bae6fe1b..5aa4a836 100644 --- a/OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs +++ b/OpenTaiko/src/Stages/06.SongLoading/CStage曲読み込み.cs @@ -127,7 +127,7 @@ namespace TJAPlayer3 { this.txタイトル = new CTexture( bmpSongTitle ); - txタイトル.vc拡大縮小倍率.X = TJAPlayer3.GetSongNameXScaling(ref txタイトル, 710); + txタイトル.vc拡大縮小倍率.X = TJAPlayer3.GetSongNameXScaling(ref txタイトル, TJAPlayer3.Skin.SongLoading_Title_MaxSize); } using (var bmpSongSubTitle = this.pfSUBTITLE.DrawText( サブタイトル, TJAPlayer3.Skin.SongLoading_SubTitle_ForeColor, TJAPlayer3.Skin.SongLoading_SubTitle_BackColor, null, 30 )) @@ -135,6 +135,7 @@ namespace TJAPlayer3 { this.txサブタイトル = new CTexture( bmpSongSubTitle ); + txサブタイトル.vc拡大縮小倍率.X = TJAPlayer3.GetSongNameXScaling(ref txサブタイトル, TJAPlayer3.Skin.SongLoading_SubTitle_MaxSize); } } else diff --git a/OpenTaiko/src/Stages/07.Game/CAct演奏パネル文字列.cs b/OpenTaiko/src/Stages/07.Game/CAct演奏パネル文字列.cs index c72cc8bd..ec48bb8e 100644 --- a/OpenTaiko/src/Stages/07.Game/CAct演奏パネル文字列.cs +++ b/OpenTaiko/src/Stages/07.Game/CAct演奏パネル文字列.cs @@ -258,16 +258,13 @@ namespace TJAPlayer3 { if( this.txMusicName != null ) { - float fRate = 660.0f / this.txMusicName.szテクスチャサイズ.Width; - if (this.txMusicName.szテクスチャサイズ.Width <= 660.0f) + float fRate = (float)TJAPlayer3.Skin.Game_MusicName_MaxWidth / this.txMusicName.szテクスチャサイズ.Width; + if (this.txMusicName.szテクスチャサイズ.Width <= TJAPlayer3.Skin.Game_MusicName_MaxWidth) fRate = 1.0f; this.txMusicName.vc拡大縮小倍率.X = fRate; - if (this.txMusicName.szテクスチャサイズ.Width >= TJAPlayer3.Skin.Game_MusicName_MaxWidth) - this.txMusicName.t2D描画(TJAPlayer3.Skin.Game_MusicName_X - ((this.txMusicName.szテクスチャサイズ.Width * fRate) / 2) - (this.txMusicName.szテクスチャサイズ.Width / 2), TJAPlayer3.Skin.Game_MusicName_Y); - else - this.txMusicName.t2D描画(TJAPlayer3.Skin.Game_MusicName_X - ((this.txMusicName.szテクスチャサイズ.Width * fRate) / 2), TJAPlayer3.Skin.Game_MusicName_Y); + this.txMusicName.t2D描画(TJAPlayer3.Skin.Game_MusicName_X - (this.txMusicName.szテクスチャサイズ.Width * fRate), TJAPlayer3.Skin.Game_MusicName_Y); } } else @@ -304,16 +301,13 @@ namespace TJAPlayer3 } if (this.txMusicName != null) { - float fRate = 660.0f / this.txMusicName.szテクスチャサイズ.Width; - if (this.txMusicName.szテクスチャサイズ.Width <= 660.0f) + float fRate = (float)TJAPlayer3.Skin.Game_MusicName_MaxWidth / this.txMusicName.szテクスチャサイズ.Width; + if (this.txMusicName.szテクスチャサイズ.Width <= TJAPlayer3.Skin.Game_MusicName_MaxWidth) fRate = 1.0f; this.txMusicName.vc拡大縮小倍率.X = fRate; - if (this.txMusicName.szテクスチャサイズ.Width >= TJAPlayer3.Skin.Game_MusicName_MaxWidth) - this.txMusicName.t2D描画(TJAPlayer3.Skin.Game_MusicName_X - ((this.txMusicName.szテクスチャサイズ.Width * fRate) / 2) - ((this.txMusicName.szテクスチャサイズ.Width - TJAPlayer3.Skin.Game_MusicName_MaxWidth) / 2), TJAPlayer3.Skin.Game_MusicName_Y); - else - this.txMusicName.t2D描画(TJAPlayer3.Skin.Game_MusicName_X - ((this.txMusicName.szテクスチャサイズ.Width * fRate) / 2), TJAPlayer3.Skin.Game_MusicName_Y); + this.txMusicName.t2D描画(TJAPlayer3.Skin.Game_MusicName_X - (this.txMusicName.szテクスチャサイズ.Width * fRate), TJAPlayer3.Skin.Game_MusicName_Y); } } } diff --git a/OpenTaiko/src/Stages/07.Game/CAct演奏演奏情報.cs b/OpenTaiko/src/Stages/07.Game/CAct演奏演奏情報.cs index 92041aea..f9c287cb 100644 --- a/OpenTaiko/src/Stages/07.Game/CAct演奏演奏情報.cs +++ b/OpenTaiko/src/Stages/07.Game/CAct演奏演奏情報.cs @@ -43,7 +43,6 @@ namespace TJAPlayer3 NotesTextM = string.Format( "NoteM: {0:####0}", TJAPlayer3.DTX.nノーツ数_Branch[2]); NotesTextC = string.Format( "NoteC: {0:####0}", TJAPlayer3.DTX.nノーツ数[3] ); ScoreModeText = string.Format( "SCOREMODE: {0:####0}", TJAPlayer3.DTX.nScoreModeTmp ); - ScrollModeText = string.Format( "SCROLLMODE: {0:####0}", Enum.GetName(typeof(EScrollMode), TJAPlayer3.ConfigIni.eScrollMode ) ); ListChipText = string.Format( "ListChip: {0:####0}", _chipCounts[0]); ListChipMText = string.Format( "ListChipM: {0:####0}", _chipCounts[1]); @@ -82,8 +81,6 @@ namespace TJAPlayer3 y -= 0x10; TJAPlayer3.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, ScoreModeText ); y -= 0x10; - TJAPlayer3.act文字コンソール.tPrint( x, y, C文字コンソール.Eフォント種別.白, ScrollModeText ); - y -= 0x10; TJAPlayer3.act文字コンソール.tPrint(x, y, C文字コンソール.Eフォント種別.白, ListChipText); y -= 0x10; TJAPlayer3.act文字コンソール.tPrint(x, y, C文字コンソール.Eフォント種別.白, ListChipMText); @@ -102,7 +99,6 @@ namespace TJAPlayer3 private string NotesTextM; private string NotesTextC; private string ScoreModeText; - private string ScrollModeText; private string ListChipText; private string ListChipMText; } diff --git a/OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs b/OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs index 95aaf25e..57bcd992 100644 --- a/OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs +++ b/OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs @@ -1762,7 +1762,7 @@ namespace TJAPlayer3 else this.nHand[nPlayer] = 0; - if (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer] < 0 && (TJAPlayer3.ConfigIni.eScrollMode == EScrollMode.HBSCROLL)) + if (TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer] < 0 && (pChip.eScrollMode == EScrollMode.HBSCROLL)) pChip.fBMSCROLLTime -= TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[nPlayer] * -0.05; TJAPlayer3.stage演奏ドラム画面.actTaikoLaneFlash.PlayerLane[nPlayer].Start(PlayerLane.FlashType.Red); @@ -3450,15 +3450,15 @@ namespace TJAPlayer3 double _scrollSpeed = pChip.dbSCROLL * (db現在の譜面スクロール速度[nPlayer] + 1.0) / 10.0; double _scrollSpeed_Y = pChip.dbSCROLL_Y * (db現在の譜面スクロール速度[nPlayer] + 1.0) / 10.0; - pChip.nバーからの距離dot.Taiko = NotesManager.GetNoteX(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, configIni.eScrollMode, false); + pChip.nバーからの距離dot.Taiko = NotesManager.GetNoteX(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, false); if ( pChip.nノーツ終了時刻ms != 0 ) { - pChip.nバーからのノーツ末端距離dot = NotesManager.GetNoteX(pChip, (pChip.nノーツ終了時刻ms - n現在時刻ms) * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, configIni.eScrollMode, true); - pChip.nバーからのノーツ末端距離dot_Y = NotesManager.GetNoteY(pChip, (pChip.nノーツ終了時刻ms - n現在時刻ms) * pChip.dbBPM, _scrollSpeed_Y, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, configIni.eScrollMode, true); + pChip.nバーからのノーツ末端距離dot = NotesManager.GetNoteX(pChip, (pChip.nノーツ終了時刻ms - n現在時刻ms) * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, true); + pChip.nバーからのノーツ末端距離dot_Y = NotesManager.GetNoteY(pChip, (pChip.nノーツ終了時刻ms - n現在時刻ms) * pChip.dbBPM, _scrollSpeed_Y, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, true); } - if ( configIni.eScrollMode == EScrollMode.BMSCROLL || configIni.eScrollMode == EScrollMode.HBSCROLL ) + if ( pChip.eScrollMode == EScrollMode.BMSCROLL || pChip.eScrollMode == EScrollMode.HBSCROLL ) { /* @@ -4536,6 +4536,27 @@ namespace TJAPlayer3 } this.t進行描画_チップ_小節線(configIni, ref dTX, ref pChip, nPlayer); break; + case 0x09: + if (!pChip.bHit && (pChip.nバーからの距離dot.Taiko < 0)) + { + + pChip.bHit = true; + } + break; + case 0x0A: + if (!pChip.bHit && (pChip.nバーからの距離dot.Taiko < 0)) + { + + pChip.bHit = true; + } + break; + case 0x0B: + if (!pChip.bHit && (pChip.nバーからの距離dot.Taiko < 0)) + { + + pChip.bHit = true; + } + break; #endregion #region [ その他(未定義) ] diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsキャラクター.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsキャラクター.cs index c5f75a65..1f4f77b2 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsキャラクター.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏Drumsキャラクター.cs @@ -160,7 +160,7 @@ namespace TJAPlayer3 { if (!TJAPlayer3.stage演奏ドラム画面.bPAUSE) { - nNowCharaCounter[i] += ((Math.Abs((float)TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[i]) / 60.0f) * (float)TJAPlayer3.FPS.DeltaTime) * nCharaFrameCount[i] / nCharaBeat[i]; + nNowCharaCounter[i] += ((Math.Abs((float)TJAPlayer3.stage演奏ドラム画面.actPlayInfo.dbBPM[i]) / 60.0f) * (float)TJAPlayer3.FPS.DeltaTime) * (nCharaFrameCount[i] + 1) / nCharaBeat[i]; } } void updateBalloon() diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsチップファイアD.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsチップファイアD.cs index f5d9f2a9..defc9a0e 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsチップファイアD.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CAct演奏DrumsチップファイアD.cs @@ -287,16 +287,10 @@ namespace TJAPlayer3 case E判定.Perfect: case E判定.Great: case E判定.Auto: - if (!this.st状態_大[i].ct進行.IsStoped && TJAPlayer3.Tx.Effects_Hit_Explosion_Big != null && this.st状態_大[i].nIsBig == 1) - TJAPlayer3.Tx.Effects_Hit_Explosion.t2D描画(nX, nY, new Rectangle(this.st状態[i].ct進行.CurrentValue * nWidth, n + nHeight, nWidth, nHeight)); - else - TJAPlayer3.Tx.Effects_Hit_Explosion.t2D描画(nX, nY, new Rectangle(this.st状態[i].ct進行.CurrentValue * nWidth, n, nWidth, nHeight)); + TJAPlayer3.Tx.Effects_Hit_Explosion.t2D描画(nX, nY, new Rectangle(this.st状態[i].ct進行.CurrentValue * nWidth, n, nWidth, nHeight)); break; case E判定.Good: - if (!this.st状態_大[i].ct進行.IsStoped && TJAPlayer3.Tx.Effects_Hit_Explosion_Big != null && this.st状態_大[i].nIsBig == 1) - TJAPlayer3.Tx.Effects_Hit_Explosion.t2D描画( nX, nY, new Rectangle( this.st状態[ i ].ct進行.CurrentValue * nWidth, n + (n * nHeight), nWidth, nHeight) ); - else - TJAPlayer3.Tx.Effects_Hit_Explosion.t2D描画(nX, nY, new Rectangle(this.st状態[i].ct進行.CurrentValue * nWidth, n + nHeight, nWidth, nHeight)); + TJAPlayer3.Tx.Effects_Hit_Explosion.t2D描画(nX, nY, new Rectangle(this.st状態[i].ct進行.CurrentValue * nWidth, n + nHeight, nWidth, nHeight)); break; case E判定.Mine: TJAPlayer3.Tx.Effects_Hit_Bomb?.t2D描画(nX, nY, new Rectangle(this.st状態[i].ct進行.CurrentValue * nBombWidth, 0, nBombWidth, nBombHeight)); diff --git a/OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs b/OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs index 66b92068..8e34cb45 100644 --- a/OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs +++ b/OpenTaiko/src/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs @@ -1975,7 +1975,7 @@ namespace TJAPlayer3 if( pChip.dbSCROLL_Y != 0.0 ) { - var dbSCROLL = configIni.eScrollMode == EScrollMode.BMSCROLL ? 1.0 : pChip.dbSCROLL; + var dbSCROLL = pChip.eScrollMode == EScrollMode.BMSCROLL ? 1.0 : pChip.dbSCROLL; y = NoteOriginY[nPlayer]; @@ -1985,7 +1985,7 @@ namespace TJAPlayer3 long time = pChip.n発声時刻ms - __dbt; float play_bpm_time = this.GetNowPBMTime(dTX, 0); - y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, configIni.eScrollMode, false); + y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, false); } if (bSplitLane[nPlayer] || TJAPlayer3.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(TJAPlayer3.GetActualPlayer(nPlayer))].effect.SplitLane) @@ -2250,7 +2250,7 @@ namespace TJAPlayer3 long __dbt = nowTime; long time = pChip.n発声時刻ms - __dbt; float play_bpm_time = this.GetNowPBMTime(dTX, 0); - y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, configIni.eScrollMode, false); + y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, false); } if (bSplitLane[nPlayer] || TJAPlayer3.Tx.Puchichara[PuchiChara.tGetPuchiCharaIndexByName(TJAPlayer3.GetActualPlayer(nPlayer))].effect.SplitLane) @@ -2513,7 +2513,7 @@ namespace TJAPlayer3 long __dbt = (long)(SoundManager.PlayTimer.NowTimeMs * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0)); long time = pChip.n発声時刻ms - __dbt; float play_bpm_time = this.GetNowPBMTime(dTX, 0); - y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, configIni.eScrollMode, false); + y += NotesManager.GetNoteY(pChip, time * pChip.dbBPM, _scrollSpeed, TJAPlayer3.Skin.Game_Notes_Interval, play_bpm_time, pChip.eScrollMode, false); //y += (int)(((pChip.n発声時刻ms - (CSound管理.rc演奏用タイマ.n現在時刻 * (((double)TJAPlayer3.ConfigIni.n演奏速度) / 20.0))) * pChip.dbBPM * pChip.dbSCROLL_Y * (this.act譜面スクロール速度.db現在の譜面スクロール速度[nPlayer] + 1.5)) / 628.7); } diff --git a/OpenTaiko/src/Stages/08.Result/CActResultSongBar.cs b/OpenTaiko/src/Stages/08.Result/CActResultSongBar.cs index de076c42..1d7d5699 100644 --- a/OpenTaiko/src/Stages/08.Result/CActResultSongBar.cs +++ b/OpenTaiko/src/Stages/08.Result/CActResultSongBar.cs @@ -43,7 +43,7 @@ namespace TJAPlayer3 { this.txMusicName = TJAPlayer3.tテクスチャの生成(bmpSongTitle, false); - txMusicName.vc拡大縮小倍率.X = TJAPlayer3.GetSongNameXScaling(ref txMusicName); + txMusicName.vc拡大縮小倍率.X = TJAPlayer3.GetSongNameXScaling(ref txMusicName, TJAPlayer3.Skin.Result_MusicName_MaxSize); } base.Activate(); diff --git a/OpenTaiko/src/Stages/CActNewHeya.cs b/OpenTaiko/src/Stages/CActNewHeya.cs index 2f4c2dae..ab181f61 100644 --- a/OpenTaiko/src/Stages/CActNewHeya.cs +++ b/OpenTaiko/src/Stages/CActNewHeya.cs @@ -560,7 +560,13 @@ namespace TJAPlayer3 if (TJAPlayer3.Tx.Puchichara[index].unlock != null && !TJAPlayer3.SaveFileInstances[CurrentPlayer].data.UnlockedPuchicharas.Contains(TJAPlayer3.Skin.Puchicharas_Name[index])) - TJAPlayer3.Tx.NewHeya_Lock?.t2D描画(x + TJAPlayer3.Skin.SongSelect_NewHeya_InfoSection_Offset[0], y + TJAPlayer3.Skin.SongSelect_NewHeya_InfoSection_Offset[1]); + { + TJAPlayer3.Tx.NewHeya_Lock?.t2D描画(x + TJAPlayer3.Skin.SongSelect_NewHeya_Lock_Offset[0], y + TJAPlayer3.Skin.SongSelect_NewHeya_Lock_Offset[1]); + + if (this.ttkInfoSection != null) + TJAPlayer3.stage選曲.act曲リスト.ResolveTitleTexture(this.ttkInfoSection) + .t2D拡大率考慮上中央基準描画(x + TJAPlayer3.Skin.SongSelect_NewHeya_InfoSection_Offset[0], y + TJAPlayer3.Skin.SongSelect_NewHeya_InfoSection_Offset[1]); + } } break; case ModeType.SubTitle: