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

Implement maximum start delay

Browse Source
This commit is contained in:
smoogipoo 2021-04-09 20:17:57 +09:00
parent 49b7519c53
commit eccd269cce
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs
View File

@ -110,7 +110,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
loadSpectateScreen(); loadSpectateScreen();
// Send frames for one player only, both should remain paused. // Send frames for one player only, both should remain paused.
sendFrames(55, 20); sendFrames(55, 1000);
checkPausedInstant(55, true); checkPausedInstant(55, true);
checkPausedInstant(56, true); checkPausedInstant(56, true);

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

@ -2,6 +2,7 @@
// 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 System;
using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
@ -16,6 +17,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
public class MultiplayerSpectator : SpectatorScreen public class MultiplayerSpectator : SpectatorScreen
{ {
private const double min_duration_to_allow_playback = 50; private const double min_duration_to_allow_playback = 50;
private const double maximum_start_delay = 15000;
// Isolates beatmap/ruleset to this screen. // Isolates beatmap/ruleset to this screen.
public override bool DisallowExternalBeatmapRulesetChanges => true; public override bool DisallowExternalBeatmapRulesetChanges => true;
@ -28,6 +30,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; private MultiplayerSpectatorLeaderboard leaderboard;
private double? loadStartTime;
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())
@ -72,22 +75,39 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
protected override void UpdateAfterChildren() protected override void UpdateAfterChildren()
{ {
base.UpdateAfterChildren(); base.UpdateAfterChildren();
loadStartTime ??= Time.Current;
updateGameplayPlayingState(); updateGameplayPlayingState();
} }
private bool canStartGameplay =>
// All players must be loaded.
AllPlayersLoaded
&& (
// All players have frames...
instances.All(i => i.Score.Replay.Frames.Count > 0)
// Or any player has frames and the maximum start delay has been exceeded.
|| (Time.Current - loadStartTime > maximum_start_delay
&& instances.Any(i => i.Score.Replay.Frames.Count > 0))
);
private void updateGameplayPlayingState() private void updateGameplayPlayingState()
{ {
// Make sure all players are loaded and have frames before starting any. // Make sure all players are loaded and have frames before starting any.
if (!AllPlayersLoaded || !instances.All(i => i.Score.Replay.Frames.Count > 0)) if (!canStartGameplay)
{ {
foreach (var inst in instances) foreach (var inst in instances)
inst?.PauseGameplay(); inst?.PauseGameplay();
return; return;
} }
double targetTrackTime = instances.Select(i => i.GetCurrentGameplayTime()).Max(); // Not all instances may be in a valid gameplay state (see canStartGameplay). Only control the ones that are.
IEnumerable<PlayerInstance> validInstances = instances.Where(i => i.Score.Replay.Frames.Count > 0);
foreach (var inst in instances) double targetTrackTime = validInstances.Select(i => i.GetCurrentTrackTime()).Max();
foreach (var inst in validInstances)
{ {
Debug.Assert(inst != null); Debug.Assert(inst != null);