Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2024-11-15 03:17:36 +01:00
Code Releases Activity

Fix #59

Browse Source
This commit is contained in:
0aubsq 2021-11-29 04:53:37 +01:00
parent 9e350717e3
commit 0d642d70a1
3 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
TJAPlayer3/Songs/C曲リストノード.cs
View File

@ -95,12 +95,27 @@ namespace TJAPlayer3
return (C曲リストノード)MemberwiseClone();
}
public override bool Equals(object other)
{
if (other.GetType() == typeof(C曲リストノード))
{
C曲リストノード obj = (C曲リストノード)other;
return this.nID == obj.nID;
}
return this.GetHashCode() == other.GetHashCode();
}
// その他
public override int GetHashCode()
{
return base.GetHashCode();
}
#region [ private ]
//-----------------
private static int id;
// その他
#region [ private ]
//-----------------
private static int id;
//-----------------
#endregion
}

16
TJAPlayer3/Stages/08.Result/CStage結果.cs
View File

@ -2,6 +2,7 @@
using System.IO;
using System.Diagnostics;
using FDK;
using System.Linq;
using System.Drawing;
using System.Collections.Generic;
using static TJAPlayer3.CActSelect曲リスト;
@ -1130,7 +1131,17 @@ namespace TJAPlayer3
{
if (song.strジャンル == "最近遊んだ曲" && song.eノード種別 == C曲リストノード.Eノード種別.BOX)
{
song.list子リスト.Add(TJAPlayer3.stage選曲.r確定された曲.Clone());
int lastId = TJAPlayer3.stage選曲.r確定された曲.nID;
bool songExists = false;
foreach (var song2 in song.list子リスト)
{
if (song2.nID == lastId)
songExists = true;
}
if (songExists == false)
song.list子リスト.Add(TJAPlayer3.stage選曲.r確定された曲.Clone());
foreach (var song2 in song.list子リスト)
{
@ -1153,6 +1164,9 @@ namespace TJAPlayer3
}
// Remove duplicates
// song.list子リスト = song.list子リスト.Distinct().ToList();
if (song.list子リスト.Count >= 6)
{
song.list子リスト.RemoveAt(1);

10
TJAPlayer3/Stages/CNamePlate.cs
View File

@ -42,16 +42,6 @@ namespace TJAPlayer3
tNamePlateRefreshTitles(player);
/*
using (var tex = pfName.DrawPrivateFont(TJAPlayer3.NamePlateConfig.data.Name[player], Color.White, Color.Black, 25))
txName[player] = TJAPlayer3.tテクスチャの生成(tex);
using (var tex = pfTitle.DrawPrivateFont(TJAPlayer3.NamePlateConfig.data.Title[player], Color.Black, Color.Empty))
txTitle[player] = TJAPlayer3.tテクスチャの生成(tex);
using (var tex = pfdan.DrawPrivateFont(TJAPlayer3.NamePlateConfig.data.Dan[player], Color.White, Color.Black, 22))
txdan[player] = TJAPlayer3.tテクスチャの生成(tex);
*/
}
ctNamePlateEffect = new CCounter(0, 120, 16.6f, TJAPlayer3.Timer);