h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 10:52:53 +08:00
Code Issues Releases Wiki Activity

Use similar method of consuming OnlineID as done in beatmap classes

Browse Source
This commit is contained in:
Dean Herbert 2021-12-10 18:32:32 +09:00
parent c9f6c5c673
commit f7c5a3f506
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Database/OsuDbContext.cs
View File

@ -147,7 +147,7 @@ namespace osu.Game.Database
modelBuilder.Entity<BeatmapInfo>().HasOne(b => b.BaseDifficulty); modelBuilder.Entity<BeatmapInfo>().HasOne(b => b.BaseDifficulty);
modelBuilder.Entity<ScoreInfo>().HasIndex(b => b.OnlineScoreID).IsUnique(); modelBuilder.Entity<ScoreInfo>().HasIndex(b => b.OnlineID).IsUnique();
} }
private class OsuDbLoggerFactory : ILoggerFactory private class OsuDbLoggerFactory : ILoggerFactory

16
osu.Game/Scoring/ScoreInfo.cs
View File

@ -137,7 +137,14 @@ namespace osu.Game.Scoring
[Column("Beatmap")] [Column("Beatmap")]
public BeatmapInfo BeatmapInfo { get; set; } public BeatmapInfo BeatmapInfo { get; set; }
public long? OnlineScoreID { get; set; } private long? onlineID;
[Column("OnlineScoreID")]
public long? OnlineID
{
get => onlineID;
set => onlineID = value > 0 ? value : null;
}
public DateTimeOffset Date { get; set; } public DateTimeOffset Date { get; set; }
@ -243,12 +250,7 @@ namespace osu.Game.Scoring
#region Implementation of IHasOnlineID #region Implementation of IHasOnlineID
[NotMapped] long IHasOnlineID<long>.OnlineID => OnlineID ?? -1;
public long OnlineID
{
get => OnlineScoreID ?? -1;
set => OnlineScoreID = value;
}
#endregion #endregion

2
osu.Game/Screens/Play/Player.cs
View File

@ -1031,7 +1031,7 @@ namespace osu.Game.Screens.Play
// //
// Until we better define the server-side logic behind this, let's not store the online ID to avoid potential unique constraint // Until we better define the server-side logic behind this, let's not store the online ID to avoid potential unique constraint
// conflicts across various systems (ie. solo and multiplayer). // conflicts across various systems (ie. solo and multiplayer).
long onlineScoreId = score.ScoreInfo.OnlineID; long? onlineScoreId = score.ScoreInfo.OnlineID;
score.ScoreInfo.OnlineID = -1; score.ScoreInfo.OnlineID = -1;
await scoreManager.Import(score.ScoreInfo, replayReader).ConfigureAwait(false); await scoreManager.Import(score.ScoreInfo, replayReader).ConfigureAwait(false);