sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 00:53:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add leaderboard to multiplayer spectate screen

Browse Source
This commit is contained in:
smoogipoo
2021-04-09 18:41:48 +09:00
parent 8005f146a9
commit 4fa51d5ec8
1 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Allocation;
using osu.Framework.Audio; using osu.Framework.Audio;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Framework.Utils; using osu.Framework.Utils;
using osu.Game.Online.Spectator; using osu.Game.Online.Spectator;
@ -30,6 +31,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
private readonly PlayerInstance[] instances; private readonly PlayerInstance[] instances;
private PlayerGrid grid; private PlayerGrid grid;
private MultiplayerSpectatorLeaderboard leaderboard;
public MultiplayerSpectator(int[] userIds) public MultiplayerSpectator(int[] userIds)
: base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray()) : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
@ -40,10 +42,35 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
InternalChild = grid = new PlayerGrid Container leaderboardContainer;
InternalChild = new GridContainer
{ {
RelativeSizeAxes = Axes.Both RelativeSizeAxes = Axes.Both,
ColumnDimensions = new[]
{
new Dimension(GridSizeMode.AutoSize)
},
Content = new[]
{
new Drawable[]
{
leaderboardContainer = new Container
{
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X
},
grid = new PlayerGrid { RelativeSizeAxes = Axes.Both }
}
}
}; };
// Todo: This is not quite correct - it should be per-user to adjust for other mod combinations.
var playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
var scoreProcessor = Ruleset.Value.CreateInstance().CreateScoreProcessor();
scoreProcessor.ApplyBeatmap(playableBeatmap);
LoadComponentAsync(leaderboard = new MultiplayerSpectatorLeaderboard(scoreProcessor, UserIds) { Expanded = { Value = true } }, leaderboardContainer.Add);
} }
protected override void Update() protected override void Update()
@ -118,18 +145,25 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
var existingInstance = instances[userIndex]; var existingInstance = instances[userIndex];
if (existingInstance != null) if (existingInstance != null)
{
grid.Remove(existingInstance); grid.Remove(existingInstance);
leaderboard.RemoveClock(existingInstance.User.Id);
}
LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score), d => LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score), d =>
{ {
if (instances[userIndex] == d) if (instances[userIndex] == d)
{
grid.Add(d); grid.Add(d);
leaderboard.AddClock(d.User.Id, d.Beatmap.Track);
}
}); });
} }
protected override void EndGameplay(int userId) protected override void EndGameplay(int userId)
{ {
spectatorClient.StopWatchingUser(userId); spectatorClient.StopWatchingUser(userId);
leaderboard.RemoveClock(userId);
} }
private int getIndexForUser(int userId) => Array.IndexOf(UserIds, userId); private int getIndexForUser(int userId) => Array.IndexOf(UserIds, userId);