1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 04:52:57 +08:00

Merge branch 'master' into spectator-start-at-end-2

This commit is contained in:
Dean Herbert 2021-06-30 15:06:28 +09:00
commit 741ecbb2df

View File

@ -258,8 +258,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
AddUntilStep("wait for screen load", () => spectatorScreen.LoadState == LoadState.Loaded && (!waitForPlayerLoad || spectatorScreen.AllPlayersLoaded));
}
private void start(int userId, int? beatmapId = null) => start(new[] { userId }, beatmapId);
private void start(int[] userIds, int? beatmapId = null)
{
AddStep("start play", () =>
@ -273,15 +271,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
});
}
private void finish(int userId)
{
AddStep("end play", () =>
{
SpectatorClient.EndPlay(userId);
playingUserIds.Remove(userId);
});
}
private void sendFrames(int userId, int count = 10) => sendFrames(new[] { userId }, count);
private void sendFrames(int[] userIds, int count = 10)