h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-23 02:57:25 +08:00
Code Issues Releases Wiki Activity

Apply refactorings according to reviews

Browse Source
This commit is contained in:
Dan Balasescu 2022-03-22 12:54:10 +09:00
parent 04f4e81852
commit 4630aa15cc
2 changed files with 13 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
View File

@ -282,12 +282,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
int countReady = room.Users.Count(u => u.State == MultiplayerUserState.Ready);
int countTotal = room.Users.Count(u => u.State != MultiplayerUserState.Spectating);
string countdownText = room.Countdown == null ? string.Empty : $"Starting in {room.Countdown.EndTime - DateTimeOffset.Now:mm\\:ss}";
string countText = $"({countReady} / {countTotal} ready)";
if (room.Countdown != null)
{
string countdownText = $"Starting in {room.Countdown.EndTime - DateTimeOffset.Now:mm\\:ss}";
switch (localUser?.State)
{
default:
@ -329,37 +329,20 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
var localUser = multiplayerClient.LocalUser;
if (room.Countdown != null)
switch (localUser?.State)
{
switch (localUser?.State)
{
default:
setGreen();
break;
default:
setGreen();
break;
case MultiplayerUserState.Spectating:
case MultiplayerUserState.Ready:
case MultiplayerUserState.Spectating:
case MultiplayerUserState.Ready:
if (room?.Host?.Equals(localUser) == true && room.Countdown == null)
setGreen();
else
setYellow();
break;
}
}
else
{
switch (localUser?.State)
{
default:
setGreen();
break;
case MultiplayerUserState.Spectating:
case MultiplayerUserState.Ready:
if (room?.Host?.Equals(localUser) == true)
setGreen();
else
setYellow();
break;
}
break;
}
void setYellow()

8
osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
View File

@ -322,13 +322,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
async Task start()
{
try
{
await lastCountdownTask;
}
catch (OperationCanceledException)
{
}
await lastCountdownTask;
Schedule(() =>
{