1
0
mirror of synced 2024-11-28 09:20:53 +01:00

Fixing Dan Exam Result saving method (#321)

* Remove "???" on Dan clear + fix up Exam Result saving

* (W.I.P.)

* Revert W.I.P. Dan hidden song fix

A proper fix can't be made at this time. Will prioritize Dan exam result fix instead.
This commit is contained in:
DragonRatTiger 2022-10-12 03:32:38 -04:00 committed by GitHub
parent ce260d6996
commit b750729b47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 13 deletions

View File

@ -1359,7 +1359,7 @@ namespace TJAPlayer3
{ {
try try
{ {
if (stセクション[i].nExamResult[section][part] > -1) if (stセクション[i].nExamResult[section][part] != -1)
writer.WriteLine("ExamResult{0}_{1}={2}", section, part, this.stセクション[i].nExamResult[section][part]); writer.WriteLine("ExamResult{0}_{1}={2}", section, part, this.stセクション[i].nExamResult[section][part]);
} }
catch (NullReferenceException) catch (NullReferenceException)

View File

@ -340,21 +340,26 @@ namespace TJAPlayer3
#region [ Update Dan Dojo exam results ] #region [ Update Dan Dojo exam results ]
for (int i = 0; i < TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count; i++) for (int i = 0; i < TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count; i++)
{ {
if (ini[0].stセクション[0].nExamResult.Count < TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count)
{
ini[0].stセクション[0].nExamResult.Add(new int[CExamInfo.cMaxExam]);
for (int h = 0; h < ini[0].stセクション[0].nExamResult.Last().Length; h++)
{
ini[0].stセクション[0].nExamResult.Last()[h] = -1;
}
}
for (int j = 0; j < TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Dan_C.Length; j++) for (int j = 0; j < TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Dan_C.Length; j++)
{ {
if (TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Dan_C[j] != null && TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Dan_C[j].GetEnable()) if (TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Dan_C[j] != null && TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Dan_C[j].GetCleared()[0])
{ {
int amount = TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Dan_C[j].GetAmount(); int amount = TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Dan_C[j].GetAmount();
int current = ini[0].stセクション[0].nExamResult[i][j]; int current = -1;
try
{
current = ini[0].stセクション[0].nExamResult[i][j];
}
catch (ArgumentOutOfRangeException)
{
ini[0].stセクション[0].nExamResult.Insert(i, new int[CExamInfo.cMaxExam]);
for (int part = 0; part < ini[0].stセクション[0].nExamResult[i].Length; part++)
{
// Default all values to -1, will not be saved to ScoreIni if value is not changed.
ini[0].stセクション[0].nExamResult[i][part] = -1;
}
current = ini[0].stセクション[0].nExamResult[i][j];
}
if (ini[0].stセクション[0].nExamResult[i][j] == -1) if (ini[0].stセクション[0].nExamResult[i][j] == -1)
{ {
@ -726,7 +731,7 @@ namespace TJAPlayer3
for (int i = 0; i < TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count; i++) for (int i = 0; i < TJAPlayer3.stage選曲.r確定された曲.DanSongs.Count; i++)
{ {
this.ttkDanTitles[i] = new TitleTextureKey(TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].bTitleShow this.ttkDanTitles[i] = new TitleTextureKey(TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].bTitleShow
? "???" ? "???"
: TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Title, : TJAPlayer3.stage選曲.r確定された曲.DanSongs[i].Title,
pfDanTitles, pfDanTitles,