RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move RoomManager to multiplayer screen

This commit is contained in:
smoogipoo 2018-12-22 12:45:36 +09:00
parent 7e9cc4e876
commit dd0c04ea36
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Game/Screens/Multi/Lounge/LoungeScreen.cs
View File

@ -22,8 +22,8 @@ public class LoungeScreen : MultiplayerScreen
private readonly RoomsContainer rooms;
private readonly Action<Screen> pushGameplayScreen;
[Cached]
private readonly RoomManager manager;
[Resolved]
private RoomManager roomManager { get; set; }
public override string Title => "Lounge";
@ -56,7 +56,7 @@ public LoungeScreen(Action<Screen> pushGameplayScreen)
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Child = rooms = new RoomsContainer { JoinRequested = r => manager?.JoinRoom(r) }
Child = rooms = new RoomsContainer { JoinRequested = r => roomManager?.JoinRoom(r) }
},
},
inspector = new RoomInspector
@ -68,7 +68,6 @@ public LoungeScreen(Action<Screen> pushGameplayScreen)
},
},
},
manager = new RoomManager { OpenRequested = Open }
};
inspector.Room.BindTo(rooms.SelectedRoom);
@ -78,6 +77,12 @@ public LoungeScreen(Action<Screen> pushGameplayScreen)
Filter.Search.Exit += Exit;
}
[BackgroundDependencyLoader]
private void load()
{
roomManager.OpenRequested += Open;
}
protected override void UpdateAfterChildren()
{
base.UpdateAfterChildren();
@ -103,7 +108,7 @@ protected override void OnEntering(Screen last)
protected override bool OnExiting(Screen next)
{
manager?.PartRoom();
roomManager?.PartRoom();
Filter.Search.HoldFocus = false;
return base.OnExiting(next);
@ -111,7 +116,7 @@ protected override bool OnExiting(Screen next)
protected override void OnResuming(Screen last)
{
manager?.PartRoom();
roomManager?.PartRoom();
base.OnResuming(last);
}
@ -125,7 +130,7 @@ protected override void OnSuspending(Screen next)
private void filterRooms()
{
rooms.Filter(Filter.CreateCriteria());
manager.Filter(Filter.CreateCriteria());
roomManager.Filter(Filter.CreateCriteria());
}
public void Open(Room room)
@ -136,5 +141,13 @@ public void Open(Room room)
Push(new MatchScreen(room, s => pushGameplayScreen?.Invoke(s)));
}
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
if (roomManager != null)
roomManager.OpenRequested -= Open;
}
}
}

6
osu.Game/Screens/Multi/Multiplayer.cs
View File

@ -31,6 +31,9 @@ public class Multiplayer : OsuScreen
private OsuScreen currentScreen;
[Cached]
private RoomManager roomManager;
public Multiplayer()
{
Child = waves = new MultiplayerWaveContainer
@ -80,7 +83,8 @@ public Multiplayer()
},
Text = "Create room",
Action = () => loungeScreen.Open(new Room())
}
},
roomManager = new RoomManager()
});
screenAdded(loungeScreen);

2
osu.Game/Screens/Multi/RoomManager.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Screens.Multi
{
public class RoomManager : PollingComponent
{
public Action<Room> OpenRequested;
public event Action<Room> OpenRequested;
public IBindableCollection<Room> Rooms => rooms;
private readonly BindableCollection<Room> rooms = new BindableCollection<Room>();