1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-21 23:23:52 +08:00

Update reference

This commit is contained in:
PC 2023-02-07 11:52:47 +03:00
parent 957c9e7e27
commit 7e127dafe2
9 changed files with 19 additions and 19 deletions

View File

@ -176,7 +176,7 @@ namespace osu.Game.Tests.Resources
CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg", CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
}, },
BeatmapInfo = beatmap, BeatmapInfo = beatmap,
OriginalBeatmapHash = beatmap.Hash, BeatmapHash = beatmap.Hash,
Ruleset = beatmap.Ruleset, Ruleset = beatmap.Ruleset,
Mods = new Mod[] { new TestModHardRock(), new TestModDoubleTime() }, Mods = new Mod[] { new TestModHardRock(), new TestModDoubleTime() },
TotalScore = 2845370, TotalScore = 2845370,

View File

@ -210,7 +210,7 @@ namespace osu.Game.Tests.Visual.SongSelect
}, },
Ruleset = new OsuRuleset().RulesetInfo, Ruleset = new OsuRuleset().RulesetInfo,
BeatmapInfo = beatmapInfo, BeatmapInfo = beatmapInfo,
OriginalBeatmapHash = beatmapInfo.Hash, BeatmapHash = beatmapInfo.Hash,
User = new APIUser User = new APIUser
{ {
Id = 6602580, Id = 6602580,
@ -227,7 +227,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Date = DateTime.Now.AddSeconds(-30), Date = DateTime.Now.AddSeconds(-30),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo, BeatmapInfo = beatmapInfo,
OriginalBeatmapHash = beatmapInfo.Hash, BeatmapHash = beatmapInfo.Hash,
Ruleset = new OsuRuleset().RulesetInfo, Ruleset = new OsuRuleset().RulesetInfo,
User = new APIUser User = new APIUser
{ {
@ -245,7 +245,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Date = DateTime.Now.AddSeconds(-70), Date = DateTime.Now.AddSeconds(-70),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo, BeatmapInfo = beatmapInfo,
OriginalBeatmapHash = beatmapInfo.Hash, BeatmapHash = beatmapInfo.Hash,
Ruleset = new OsuRuleset().RulesetInfo, Ruleset = new OsuRuleset().RulesetInfo,
User = new APIUser User = new APIUser
@ -264,7 +264,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Date = DateTime.Now.AddMinutes(-40), Date = DateTime.Now.AddMinutes(-40),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo, BeatmapInfo = beatmapInfo,
OriginalBeatmapHash = beatmapInfo.Hash, BeatmapHash = beatmapInfo.Hash,
Ruleset = new OsuRuleset().RulesetInfo, Ruleset = new OsuRuleset().RulesetInfo,
User = new APIUser User = new APIUser
@ -283,7 +283,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Date = DateTime.Now.AddHours(-2), Date = DateTime.Now.AddHours(-2),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo, BeatmapInfo = beatmapInfo,
OriginalBeatmapHash = beatmapInfo.Hash, BeatmapHash = beatmapInfo.Hash,
Ruleset = new OsuRuleset().RulesetInfo, Ruleset = new OsuRuleset().RulesetInfo,
User = new APIUser User = new APIUser
@ -302,7 +302,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Date = DateTime.Now.AddHours(-25), Date = DateTime.Now.AddHours(-25),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo, BeatmapInfo = beatmapInfo,
OriginalBeatmapHash = beatmapInfo.Hash, BeatmapHash = beatmapInfo.Hash,
Ruleset = new OsuRuleset().RulesetInfo, Ruleset = new OsuRuleset().RulesetInfo,
User = new APIUser User = new APIUser
@ -321,7 +321,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Date = DateTime.Now.AddHours(-50), Date = DateTime.Now.AddHours(-50),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo, BeatmapInfo = beatmapInfo,
OriginalBeatmapHash = beatmapInfo.Hash, BeatmapHash = beatmapInfo.Hash,
Ruleset = new OsuRuleset().RulesetInfo, Ruleset = new OsuRuleset().RulesetInfo,
User = new APIUser User = new APIUser
@ -340,7 +340,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Date = DateTime.Now.AddHours(-72), Date = DateTime.Now.AddHours(-72),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo, BeatmapInfo = beatmapInfo,
OriginalBeatmapHash = beatmapInfo.Hash, BeatmapHash = beatmapInfo.Hash,
Ruleset = new OsuRuleset().RulesetInfo, Ruleset = new OsuRuleset().RulesetInfo,
User = new APIUser User = new APIUser
@ -359,7 +359,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Date = DateTime.Now.AddMonths(-3), Date = DateTime.Now.AddMonths(-3),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo, BeatmapInfo = beatmapInfo,
OriginalBeatmapHash = beatmapInfo.Hash, BeatmapHash = beatmapInfo.Hash,
Ruleset = new OsuRuleset().RulesetInfo, Ruleset = new OsuRuleset().RulesetInfo,
User = new APIUser User = new APIUser
@ -378,7 +378,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Date = DateTime.Now.AddYears(-2), Date = DateTime.Now.AddYears(-2),
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
BeatmapInfo = beatmapInfo, BeatmapInfo = beatmapInfo,
OriginalBeatmapHash = beatmapInfo.Hash, BeatmapHash = beatmapInfo.Hash,
Ruleset = new OsuRuleset().RulesetInfo, Ruleset = new OsuRuleset().RulesetInfo,
User = new APIUser User = new APIUser

View File

@ -94,7 +94,7 @@ namespace osu.Game.Tests.Visual.UserInterface
{ {
OnlineID = i, OnlineID = i,
BeatmapInfo = beatmapInfo, BeatmapInfo = beatmapInfo,
OriginalBeatmapHash = beatmapInfo.Hash, BeatmapHash = beatmapInfo.Hash,
Accuracy = RNG.NextDouble(), Accuracy = RNG.NextDouble(),
TotalScore = RNG.Next(1, 1000000), TotalScore = RNG.Next(1, 1000000),
MaxCombo = RNG.Next(1, 1000), MaxCombo = RNG.Next(1, 1000),

View File

@ -70,7 +70,7 @@ namespace osu.Game.Database
/// 23 2022-08-01 Added LastLocalUpdate to BeatmapInfo. /// 23 2022-08-01 Added LastLocalUpdate to BeatmapInfo.
/// 24 2022-08-22 Added MaximumStatistics to ScoreInfo. /// 24 2022-08-22 Added MaximumStatistics to ScoreInfo.
/// 25 2022-09-18 Remove skins to add with new naming. /// 25 2022-09-18 Remove skins to add with new naming.
/// 26 2023-02-05 Added OriginalBeatmapHash to ScoreInfo. /// 26 2023-02-05 Added BeatmapHash to ScoreInfo.
/// </summary> /// </summary>
private const int schema_version = 26; private const int schema_version = 26;
@ -878,7 +878,7 @@ namespace osu.Game.Database
for (int i = 0; i < newScoreInfos.Count(); i++) for (int i = 0; i < newScoreInfos.Count(); i++)
{ {
newScoreInfos.ElementAt(i).OriginalBeatmapHash = oldScoreInfos.ElementAt(i).BeatmapInfo.Hash; newScoreInfos.ElementAt(i).BeatmapHash = oldScoreInfos.ElementAt(i).BeatmapInfo.Hash;
} }
break; break;

View File

@ -123,7 +123,7 @@ namespace osu.Game.Scoring.Legacy
// before returning for database import, we must restore the database-sourced BeatmapInfo. // before returning for database import, we must restore the database-sourced BeatmapInfo.
// if not, the clone operation in GetPlayableBeatmap will cause a dereference and subsequent database exception. // if not, the clone operation in GetPlayableBeatmap will cause a dereference and subsequent database exception.
score.ScoreInfo.BeatmapInfo = workingBeatmap.BeatmapInfo; score.ScoreInfo.BeatmapInfo = workingBeatmap.BeatmapInfo;
score.ScoreInfo.OriginalBeatmapHash = workingBeatmap.BeatmapInfo.Hash; score.ScoreInfo.BeatmapHash = workingBeatmap.BeatmapInfo.Hash;
return score; return score;
} }

View File

@ -67,7 +67,7 @@ namespace osu.Game.Scoring
public string MaximumStatisticsJson { get; set; } = string.Empty; public string MaximumStatisticsJson { get; set; } = string.Empty;
/// <summary> /// <summary>
/// The beatmap's <see cref="BeatmapInfo.Hash"> at the point in time when the score was set. /// The <see cref="BeatmapInfo.Hash"/> at the point in time when the score was set.
/// </summary> /// </summary>
public string BeatmapHash { get; set; } = string.Empty; public string BeatmapHash { get; set; } = string.Empty;

View File

@ -248,7 +248,7 @@ namespace osu.Game.Screens.Play
// ensure the score is in a consistent state with the current player. // ensure the score is in a consistent state with the current player.
Score.ScoreInfo.BeatmapInfo = Beatmap.Value.BeatmapInfo; Score.ScoreInfo.BeatmapInfo = Beatmap.Value.BeatmapInfo;
Score.ScoreInfo.OriginalBeatmapHash = Beatmap.Value.BeatmapInfo.Hash; Score.ScoreInfo.BeatmapHash = Beatmap.Value.BeatmapInfo.Hash;
Score.ScoreInfo.Ruleset = ruleset.RulesetInfo; Score.ScoreInfo.Ruleset = ruleset.RulesetInfo;
Score.ScoreInfo.Mods = gameplayMods; Score.ScoreInfo.Mods = gameplayMods;

View File

@ -65,7 +65,7 @@ namespace osu.Game.Screens.Select.Carousel
r.All<ScoreInfo>() r.All<ScoreInfo>()
.Filter($"{nameof(ScoreInfo.User)}.{nameof(RealmUser.OnlineID)} == $0" .Filter($"{nameof(ScoreInfo.User)}.{nameof(RealmUser.OnlineID)} == $0"
+ $" && {nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.ID)} == $1" + $" && {nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.ID)} == $1"
+ $" && {nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.Hash)} == {nameof(ScoreInfo.OriginalBeatmapHash)}" + $" && {nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.Hash)} == {nameof(ScoreInfo.BeatmapHash)}"
+ $" && {nameof(ScoreInfo.Ruleset)}.{nameof(RulesetInfo.ShortName)} == $2" + $" && {nameof(ScoreInfo.Ruleset)}.{nameof(RulesetInfo.ShortName)} == $2"
+ $" && {nameof(ScoreInfo.DeletePending)} == false", api.LocalUser.Value.Id, beatmapInfo.ID, ruleset.Value.ShortName), + $" && {nameof(ScoreInfo.DeletePending)} == false", api.LocalUser.Value.Id, beatmapInfo.ID, ruleset.Value.ShortName),
localScoresChanged); localScoresChanged);

View File

@ -191,7 +191,7 @@ namespace osu.Game.Screens.Select.Leaderboards
scoreSubscription = realm.RegisterForNotifications(r => scoreSubscription = realm.RegisterForNotifications(r =>
r.All<ScoreInfo>().Filter($"{nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.ID)} == $0" r.All<ScoreInfo>().Filter($"{nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.ID)} == $0"
+ $" AND {nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.Hash)} == {nameof(ScoreInfo.OriginalBeatmapHash)}" + $" AND {nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.Hash)} == {nameof(ScoreInfo.BeatmapHash)}"
+ $" AND {nameof(ScoreInfo.Ruleset)}.{nameof(RulesetInfo.ShortName)} == $1" + $" AND {nameof(ScoreInfo.Ruleset)}.{nameof(RulesetInfo.ShortName)} == $1"
+ $" AND {nameof(ScoreInfo.DeletePending)} == false" + $" AND {nameof(ScoreInfo.DeletePending)} == false"
, beatmapInfo.ID, ruleset.Value.ShortName), localScoresChanged); , beatmapInfo.ID, ruleset.Value.ShortName), localScoresChanged);