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

Rename {Multiplayer -> OnlinePlay}SubScreen

Browse Source
This commit is contained in:
Bartłomiej Dach 2020-12-25 17:02:35 +01:00
parent eb0f125fef
commit e5064ee930
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
View File

@ -19,7 +19,7 @@ using osu.Game.Users;
namespace osu.Game.Screens.OnlinePlay.Lounge namespace osu.Game.Screens.OnlinePlay.Lounge
{ {
[Cached] [Cached]
public abstract class LoungeSubScreen : MultiplayerSubScreen public abstract class LoungeSubScreen : OnlinePlaySubScreen
{ {
public override string Title => "Lounge"; public override string Title => "Lounge";

2
osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
View File

@ -18,7 +18,7 @@ using osu.Game.Screens.Play;
namespace osu.Game.Screens.OnlinePlay.Match namespace osu.Game.Screens.OnlinePlay.Match
{ {
[Cached(typeof(IPreviewTrackOwner))] [Cached(typeof(IPreviewTrackOwner))]
public abstract class RoomSubScreen : MultiplayerSubScreen, IPreviewTrackOwner public abstract class RoomSubScreen : OnlinePlaySubScreen, IPreviewTrackOwner
{ {
protected readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>(); protected readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();

8
osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
View File

@ -295,13 +295,13 @@ namespace osu.Game.Screens.OnlinePlay
switch (newScreen) switch (newScreen)
{ {
case LoungeSubScreen _: case LoungeSubScreen _:
header.Delay(MultiplayerSubScreen.RESUME_TRANSITION_DELAY).ResizeHeightTo(400, MultiplayerSubScreen.APPEAR_DURATION, Easing.OutQuint); header.Delay(OnlinePlaySubScreen.RESUME_TRANSITION_DELAY).ResizeHeightTo(400, OnlinePlaySubScreen.APPEAR_DURATION, Easing.OutQuint);
headerBackground.MoveToX(0, MultiplayerSubScreen.X_MOVE_DURATION, Easing.OutQuint); headerBackground.MoveToX(0, OnlinePlaySubScreen.X_MOVE_DURATION, Easing.OutQuint);
break; break;
case RoomSubScreen _: case RoomSubScreen _:
header.ResizeHeightTo(135, MultiplayerSubScreen.APPEAR_DURATION, Easing.OutQuint); header.ResizeHeightTo(135, OnlinePlaySubScreen.APPEAR_DURATION, Easing.OutQuint);
headerBackground.MoveToX(-MultiplayerSubScreen.X_SHIFT, MultiplayerSubScreen.X_MOVE_DURATION, Easing.OutQuint); headerBackground.MoveToX(-OnlinePlaySubScreen.X_SHIFT, OnlinePlaySubScreen.X_MOVE_DURATION, Easing.OutQuint);
break; break;
} }

4
osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs → osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
View File

@ -7,7 +7,7 @@ using osu.Framework.Screens;
namespace osu.Game.Screens.OnlinePlay namespace osu.Game.Screens.OnlinePlay
{ {
public abstract class MultiplayerSubScreen : OsuScreen, IMultiplayerSubScreen public abstract class OnlinePlaySubScreen : OsuScreen, IMultiplayerSubScreen
{ {
public override bool DisallowExternalBeatmapRulesetChanges => false; public override bool DisallowExternalBeatmapRulesetChanges => false;
@ -16,7 +16,7 @@ namespace osu.Game.Screens.OnlinePlay
[Resolved(CanBeNull = true)] [Resolved(CanBeNull = true)]
protected IRoomManager RoomManager { get; private set; } protected IRoomManager RoomManager { get; private set; }
protected MultiplayerSubScreen() protected OnlinePlaySubScreen()
{ {
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;