h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 10:33:30 +08:00
Code Issues Releases Wiki Activity

Rename countdown object

Browse Source
This commit is contained in:
Dan Balasescu 2022-04-28 20:00:38 +09:00
parent b293d3923c
commit fe0fcc7e9e
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Online/Multiplayer/ForceGameplayStartCountdown.cs Normal file
View File

@ -0,0 +1,17 @@
// 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.
using MessagePack;
namespace osu.Game.Online.Multiplayer
{
/// <summary>
/// A <see cref="MultiplayerCountdown"/> started by the server when clients being to load.
/// Indicates how long until gameplay will forcefully start, excluding any users which have not completed loading,
/// and forcing progression of any clients that are blocking load due to user interaction.
/// </summary>
[MessagePackObject]
public class ForceGameplayStartCountdown : MultiplayerCountdown
{
}
}

15
osu.Game/Online/Multiplayer/GameplayStartCountdown.cs
View File

@ -1,15 +0,0 @@
// 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.
using MessagePack;
namespace osu.Game.Online.Multiplayer
{
/// <summary>
/// A <see cref="MultiplayerCountdown"/> indicating that gameplay will start after a given period of time.
/// </summary>
[MessagePackObject]
public class GameplayStartCountdown : MultiplayerCountdown
{
}
}

2
osu.Game/Online/Multiplayer/MultiplayerCountdown.cs
View File

@ -14,7 +14,7 @@ namespace osu.Game.Online.Multiplayer
/// </summary>
[MessagePackObject]
[Union(0, typeof(MatchStartCountdown))] // IMPORTANT: Add rules to SignalRUnionWorkaroundResolver for new derived types.
[Union(1, typeof(GameplayStartCountdown))]
[Union(1, typeof(ForceGameplayStartCountdown))]
public abstract class MultiplayerCountdown
{
/// <summary>

2
osu.Game/Online/SignalRWorkaroundTypes.cs
View File

@ -25,7 +25,7 @@ namespace osu.Game.Online
(typeof(TeamVersusRoomState), typeof(MatchRoomState)),
(typeof(TeamVersusUserState), typeof(MatchUserState)),
(typeof(MatchStartCountdown), typeof(MultiplayerCountdown)),
(typeof(GameplayStartCountdown), typeof(MultiplayerCountdown))
(typeof(ForceGameplayStartCountdown), typeof(MultiplayerCountdown))
};
}
}