h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 19:52:55 +08:00
Code Issues Releases Wiki Activity

Add loading spinner

Browse Source
This commit is contained in:
smoogipoo 2021-04-16 13:28:32 +09:00
parent 5ac0eb02cd
commit 1c086d99de
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,13 +95,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
protected override void StartGameplay(int userId, GameplayState gameplayState) protected override void StartGameplay(int userId, GameplayState gameplayState)
{ {
int userIndex = getIndexForUser(userId); var instance = instances[getIndexForUser(userId)];
instance.LoadScore(gameplayState.Score);
var instance = instances[userIndex];
syncManager.RemoveSlave(instance.GameplayClock);
leaderboard.RemoveClock(instance.UserId);
instance.LoadPlayer(gameplayState.Score);
syncManager.AddSlave(instance.GameplayClock); syncManager.AddSlave(instance.GameplayClock);
leaderboard.AddClock(instance.UserId, instance.GameplayClock); leaderboard.AddClock(instance.UserId, instance.GameplayClock);
} }

24
osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
View File

@ -1,10 +1,12 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Graphics.UserInterface;
using osu.Game.Scoring; using osu.Game.Scoring;
using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync; using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
@ -23,6 +25,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
[Resolved] [Resolved]
private BeatmapManager beatmapManager { get; set; } private BeatmapManager beatmapManager { get; set; }
private readonly Container content;
private readonly LoadingLayer loadingLayer;
private OsuScreenStack stack; private OsuScreenStack stack;
public PlayerInstance(int userId, SpectatorCatchUpSlaveClock gameplayClock) public PlayerInstance(int userId, SpectatorCatchUpSlaveClock gameplayClock)
@ -32,23 +36,29 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
Masking = true; Masking = true;
InternalChildren = new Drawable[]
{
content = new DrawSizePreservingFillContainer { RelativeSizeAxes = Axes.Both },
loadingLayer = new LoadingLayer(true) { State = { Value = Visibility.Visible } }
};
} }
public void LoadPlayer(Score score) public void LoadScore(Score score)
{ {
if (Score != null)
throw new InvalidOperationException($"Cannot load a new score on a {nameof(PlayerInstance)} with an existing score.");
Score = score; Score = score;
InternalChild = new GameplayIsolationContainer(beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap, bypassCache: true), Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods) content.Child = new GameplayIsolationContainer(beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap, bypassCache: true), Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Child = new DrawSizePreservingFillContainer Child = stack = new OsuScreenStack()
{
RelativeSizeAxes = Axes.Both,
Child = stack = new OsuScreenStack()
}
}; };
stack.Push(new MultiplayerSpectatorPlayerLoader(Score, () => new MultiplayerSpectatorPlayer(Score, GameplayClock))); stack.Push(new MultiplayerSpectatorPlayerLoader(Score, () => new MultiplayerSpectatorPlayer(Score, GameplayClock)));
loadingLayer.Hide();
} }
// Player interferes with global input, so disable input for now. // Player interferes with global input, so disable input for now.