sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into leased-bindables-dont-work

Browse Source
This commit is contained in:
Dean Herbert
2019-02-11 16:30:12 +09:00
committed by GitHub
parent e01f342ab0 e174fa2d3e
commit e2e615cc5c
70 changed files with 1103 additions and 992 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ using osu.Game.Overlays.BeatmapSet.Buttons;
using osu.Game.Rulesets;
using osu.Game.Screens.Menu;
using osu.Game.Screens.Multi.Lounge;
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.Multi.Match;
using osuTK;
@ -49,6 +50,14 @@ namespace osu.Game.Screens.Multi
private readonly LoungeSubScreen loungeSubScreen;
private readonly ScreenStack screenStack;
private readonly IBindable<bool> isIdle = new BindableBool();
[Cached]
private readonly Bindable<Room> currentRoom = new Bindable<Room>();
[Cached]
private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>();
[Cached(Type = typeof(IRoomManager))]
private RoomManager roomManager;
@ -86,7 +95,7 @@ namespace osu.Game.Screens.Multi
RelativeSizeAxes = Axes.Both,
};
screenStack = new ScreenStack(loungeSubScreen = new LoungeSubScreen(this.Push)) { RelativeSizeAxes = Axes.Both };
screenStack = new ScreenStack(loungeSubScreen = new LoungeSubScreen(pushGameplayScreen)) { RelativeSizeAxes = Axes.Both };
Padding = new MarginPadding { Horizontal = -OsuScreen.HORIZONTAL_OVERFLOW_PADDING };
waves.AddRange(new Drawable[]
@ -130,7 +139,7 @@ namespace osu.Game.Screens.Multi
Right = 10 + OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
},
Text = "Create room",
Action = () => loungeSubScreen.Push(new Room
Action = () => loungeSubScreen.Open(new Room
{
Name = { Value = $"{api.LocalUser}'s awesome room" }
}),
@ -142,8 +151,6 @@ namespace osu.Game.Screens.Multi
screenStack.ScreenExited += screenExited;
}
private readonly IBindable<bool> isIdle = new BindableBool();
[BackgroundDependencyLoader(true)]
private void load(IdleTracker idleTracker)
{
@ -159,12 +166,29 @@ namespace osu.Game.Screens.Multi
isIdle.BindValueChanged(updatePollingRate, true);
}
private CachedModelDependencyContainer<Room> dependencies;
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
{
dependencies = new CachedModelDependencyContainer<Room>(base.CreateChildDependencies(parent));
dependencies.Model.BindTo(currentRoom);
return dependencies;
}
private void updatePollingRate(bool idle)
{
roomManager.TimeBetweenPolls = !this.IsCurrentScreen() || !(screenStack.CurrentScreen is LoungeSubScreen) ? 0 : (idle ? 120000 : 15000);
Logger.Log($"Polling adjusted to {roomManager.TimeBetweenPolls}");
}
private void pushGameplayScreen(IScreen gameplayScreen)
{
if (!this.IsCurrentScreen())
return;
this.Push(gameplayScreen);
}
public void APIStateChanged(APIAccess api, APIState state)
{
if (state != APIState.Online)
@ -230,7 +254,8 @@ namespace osu.Game.Screens.Multi
private void cancelLooping()
{
var track = Beatmap.Value.Track;
var track = beatmap?.Value?.Track;
if (track != null)
track.Looping = false;
}