Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2025-02-06 22:34:26 +01:00
Code Releases Activity

Fix #225

Browse Source
This commit is contained in:
0aubsq 2022-06-18 09:06:54 +02:00
parent 52cd66d2b6
commit 9bc9b1d465
3 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TJAPlayer3/Songs/CDTX.cs
View File

@ -3322,13 +3322,9 @@ namespace TJAPlayer3
this.t入力_行解析譜面_V4(str); this.t入力_行解析譜面_V4(str);
/*
if (!String.IsNullOrEmpty(strSplit読み込むコース[i]))
this.tDanExamLoad(strSplit読み込むコース[i]);
*/
} }
// Retrieve all the global exams (non individual) at the end
if (DanSongs.Number > 0) if (DanSongs.Number > 0)
{ {
for (int i = 0; i < CExamInfo.cMaxExam; i++) for (int i = 0; i < CExamInfo.cMaxExam; i++)

1
TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs
View File

@ -3436,6 +3436,7 @@ namespace TJAPlayer3
this.actPanel.t歌詞テクスチャを削除する(); this.actPanel.t歌詞テクスチャを削除する();
if (pChip.nコース == this.n現在のコース[nPlayer]) if (pChip.nコース == this.n現在のコース[nPlayer])
{ {
this.actDan.Update();
if (ListDan_Number != 0 && actDan.FirstSectionAnime) if (ListDan_Number != 0 && actDan.FirstSectionAnime)
{ {
if (this.actDan.GetFailedAllChallenges()) if (this.actDan.GetFailedAllChallenges())

36
TJAPlayer3/Stages/07.Game/Taiko/Dan_Cert.cs
View File

@ -301,15 +301,13 @@ namespace TJAPlayer3
// 音源が終了したやつの分岐。 // 音源が終了したやつの分岐。
// ( CDTXMania.DTX.listChip.Count > 0 ) ? CDTXMania.DTX.listChip[ CDTXMania.DTX.listChip.Count - 1 ].n発声時刻ms : 0; // ( CDTXMania.DTX.listChip.Count > 0 ) ? CDTXMania.DTX.listChip[ CDTXMania.DTX.listChip.Count - 1 ].n発声時刻ms : 0;
// Bug here when charts have an extra roll ? // Check challenge fails at the end of each songs
// Challenges that are judged when the song stops if (TJAPlayer3.DTX.listChip.Count > 0)
if(!IsEnded[NowShowingNumber])
{ {
if (TJAPlayer3.DTX.listChip.Count <= 0) continue;
if (ExamChange[i] if (ExamChange[i]
? TJAPlayer3.DTX.pDan_LastChip[NowShowingNumber].n発声時刻ms <= TJAPlayer3.Timer.n現在時刻 ? TJAPlayer3.DTX.pDan_LastChip[NowShowingNumber].n発声時刻ms <= CSound管理.rc演奏用タイマ.n現在時刻//TJAPlayer3.Timer.n現在時刻
: TJAPlayer3.DTX.listChip[TJAPlayer3.DTX.listChip.Count - 1].n発声時刻ms <= TJAPlayer3.Timer.n現在時刻) : TJAPlayer3.DTX.listChip[TJAPlayer3.DTX.listChip.Count - 1].n発声時刻ms <= CSound管理.rc演奏用タイマ.n現在時刻)//TJAPlayer3.Timer.n現在時刻)
{ {
switch (Challenge[i].GetExamType()) switch (Challenge[i].GetExamType())
{ {
@ -320,21 +318,26 @@ namespace TJAPlayer3
// Should be checked in live "If no remaining ADLIB/Mine" // Should be checked in live "If no remaining ADLIB/Mine"
case Exam.Type.JudgeADLIB: case Exam.Type.JudgeADLIB:
case Exam.Type.JudgeMine: case Exam.Type.JudgeMine:
// Catch normaly already checked cases that would be forgotten before (ex : for charts with branches)
case Exam.Type.JudgePerfect:
case Exam.Type.JudgeGood:
case Exam.Type.JudgeBad:
case Exam.Type.Gauge:
case Exam.Type.Accuracy:
case Exam.Type.Combo:
if (Challenge[i].Amount < Challenge[i].Value[0]) Challenge[i].SetReached(true); if (Challenge[i].Amount < Challenge[i].Value[0]) Challenge[i].SetReached(true);
break; break;
default: default:
break; break;
} }
}
}
/*
if (!IsEnded[NowShowingNumber])
{
if (TJAPlayer3.DTX.listChip.Count <= 0) continue;
if (ExamChange[i]
? TJAPlayer3.DTX.pDan_LastChip[NowShowingNumber].n発声時刻ms <= CSound管理.rc演奏用タイマ.n現在時刻//TJAPlayer3.Timer.n現在時刻
: TJAPlayer3.DTX.listChip[TJAPlayer3.DTX.listChip.Count - 1].n発声時刻ms <= CSound管理.rc演奏用タイマ.n現在時刻)//TJAPlayer3.Timer.n現在時刻)
{
IsEnded[NowShowingNumber] = true; IsEnded[NowShowingNumber] = true;
} }
} }
*/
} }
if (oldReached == false && Challenge[i].GetReached() == true) if (oldReached == false && Challenge[i].GetReached() == true)
{ {
@ -540,8 +543,15 @@ namespace TJAPlayer3
#endregion #endregion
/*
TJAPlayer3.act文字コンソール.tPrint(0, 0, C文字コンソール.Eフォント種別.白, TJAPlayer3.DTX.pDan_LastChip[NowShowingNumber].n発声時刻ms + " / " + CSound管理.rc演奏用タイマ.n現在時刻); TJAPlayer3.act文字コンソール.tPrint(0, 0, C文字コンソール.Eフォント種別.白, TJAPlayer3.DTX.pDan_LastChip[NowShowingNumber].n発声時刻ms + " / " + CSound管理.rc演奏用タイマ.n現在時刻);
TJAPlayer3.act文字コンソール.tPrint(100, 20, C文字コンソール.Eフォント種別.白, TJAPlayer3.DTX.pDan_LastChip[NowShowingNumber].n発声時刻ms.ToString());
TJAPlayer3.act文字コンソール.tPrint(100, 40, C文字コンソール.Eフォント種別.白, TJAPlayer3.DTX.listChip[TJAPlayer3.DTX.listChip.Count - 1].n発声時刻ms.ToString());
TJAPlayer3.act文字コンソール.tPrint(100, 60, C文字コンソール.Eフォント種別.白, TJAPlayer3.Timer.n現在時刻.ToString());
*/
// Challenges that are judged when the song stops
return base.On進行描画(); return base.On進行描画();
} }