h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-10 22:17:20 +08:00
Code Issues Releases Wiki Activity

Populate playlists results screen with online beatmaps

Browse Source
This commit is contained in:
Dan Balasescu 2025-02-25 22:37:12 +09:00
parent 13ca8c20f6
commit dfae11101f
No known key found for this signature in database
4 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Online/Rooms/MultiplayerScore.cs
View File

@ -80,6 +80,9 @@ namespace osu.Game.Online.Rooms
[JsonProperty("ruleset_id")]
public int RulesetId { get; set; }
[JsonProperty("beatmap_id")]
public int BeatmapId { get; set; }
public ScoreInfo CreateScoreInfo(ScoreManager scoreManager, RulesetStore rulesets, [NotNull] BeatmapInfo beatmap)
{
var ruleset = rulesets.GetRuleset(RulesetId);

26
osu.Game/Screens/OnlinePlay/Playlists/PlaylistItemResultsScreen.cs
View File

@ -9,8 +9,11 @@ using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps;
using osu.Game.Database;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Rooms;
using osu.Game.Rulesets;
using osu.Game.Scoring;
@ -39,6 +42,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
[Resolved]
protected RulesetStore Rulesets { get; private set; } = null!;
[Resolved]
private BeatmapLookupCache beatmapLookupCache { get; set; } = null!;
protected PlaylistItemResultsScreen(ScoreInfo? score, long roomId, PlaylistItem playlistItem)
: base(score)
{
@ -119,7 +125,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
setPositions(lowerScores, userScore.Position.Value, 1);
}
return TransformScores(allScores);
return await TransformScores(allScores);
}
catch (OperationCanceledException)
{
@ -184,7 +190,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
setPositions(index, pivot, -1);
}
return TransformScores(index.Scores, index);
return await TransformScores(index.Scores, index);
}
catch (OperationCanceledException)
{
@ -201,12 +207,24 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
/// </summary>
/// <param name="scores">The <see cref="MultiplayerScore"/>s that were retrieved from <see cref="APIRequest"/>s.</param>
/// <param name="pivot">An optional pivot around which the scores were retrieved.</param>
protected virtual ScoreInfo[] TransformScores(List<MultiplayerScore> scores, MultiplayerScores? pivot = null)
protected virtual async Task<ScoreInfo[]> TransformScores(List<MultiplayerScore> scores, MultiplayerScores? pivot = null)
{
APIBeatmap?[] beatmaps = await beatmapLookupCache.GetBeatmapsAsync(scores.Select(s => s.BeatmapId).Distinct().ToArray());
// Minimal data required to get various components in this screen to display correctly.
Dictionary<int, BeatmapInfo> beatmapsById = beatmaps.Where(b => b != null).ToDictionary(b => b!.OnlineID, b => new BeatmapInfo
{
Difficulty = new BeatmapDifficulty(b!.Difficulty),
DifficultyName = b.DifficultyName,
StarRating = b.StarRating,
Length = b.Length,
BPM = b.BPM
});
// Exclude the score provided to this screen since it's added already.
return scores
.Where(s => s.ID != Score?.OnlineID)
.Select(s => s.CreateScoreInfo(ScoreManager, Rulesets, Beatmap.Value.BeatmapInfo))
.Select(s => s.CreateScoreInfo(ScoreManager, Rulesets, beatmapsById.GetValueOrDefault(s.BeatmapId) ?? Beatmap.Value.BeatmapInfo))
.OrderByTotalScore()
.ToArray();
}

5
osu.Game/Screens/OnlinePlay/Playlists/PlaylistItemScoreResultsScreen.cs
View File

@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using osu.Game.Online.API;
using osu.Game.Online.Rooms;
using osu.Game.Scoring;
@ -30,9 +31,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
protected override APIRequest<MultiplayerScore> CreateScoreRequest() => new ShowPlaylistScoreRequest(RoomId, PlaylistItem.ID, scoreId);
protected override ScoreInfo[] TransformScores(List<MultiplayerScore> scores, MultiplayerScores? pivot = null)
protected override async Task<ScoreInfo[]> TransformScores(List<MultiplayerScore> scores, MultiplayerScores? pivot = null)
{
var scoreInfos = base.TransformScores(scores, pivot);
var scoreInfos = await base.TransformScores(scores, pivot);
Schedule(() => SelectedScore.Value ??= scoreInfos.SingleOrDefault(s => s.OnlineID == scoreId));
return scoreInfos;
}

5
osu.Game/Screens/OnlinePlay/Playlists/PlaylistItemUserBestResultsScreen.cs
View File

@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using osu.Game.Online.API;
using osu.Game.Online.Rooms;
using osu.Game.Scoring;
@ -24,9 +25,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
protected override APIRequest<MultiplayerScore> CreateScoreRequest() => new ShowPlaylistUserScoreRequest(RoomId, PlaylistItem.ID, userId);
protected override ScoreInfo[] TransformScores(List<MultiplayerScore> scores, MultiplayerScores? pivot = null)
protected override async Task<ScoreInfo[]> TransformScores(List<MultiplayerScore> scores, MultiplayerScores? pivot = null)
{
var scoreInfos = base.TransformScores(scores, pivot);
var scoreInfos = await base.TransformScores(scores, pivot);
Schedule(() =>
{