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

Merge pull request #3929 from peppy/fix-polling-rates

Browse Source 
Fix polling rates
This commit is contained in:
Dean Herbert 2018-12-27 20:28:15 +09:00 committed by GitHub
commit c818e1cd83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,7 @@ namespace osu.Game.Online
pollingActive = false;
if (scheduledPoll == null)
scheduleNextPoll();
pollIfNecessary();
}
private void scheduleNextPoll()

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

@ -2,14 +2,17 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Logging;
using osu.Framework.Screens;
using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Input;
using osu.Game.Online.API;
using osu.Game.Online.Multiplayer;
using osu.Game.Overlays.BeatmapSet.Buttons;
@ -25,12 +28,12 @@ namespace osu.Game.Screens.Multi
{
private readonly MultiplayerWaveContainer waves;
public override bool AllowBeatmapRulesetChange => currentScreen?.AllowBeatmapRulesetChange ?? base.AllowBeatmapRulesetChange;
public override bool AllowBeatmapRulesetChange => currentSubScreen?.AllowBeatmapRulesetChange ?? base.AllowBeatmapRulesetChange;
private readonly OsuButton createButton;
private readonly LoungeSubScreen loungeSubScreen;
private OsuScreen currentScreen;
private OsuScreen currentSubScreen;
[Cached(Type = typeof(IRoomManager))]
private RoomManager roomManager;
@ -98,10 +101,27 @@ namespace osu.Game.Screens.Multi
loungeSubScreen.Exited += _ => Exit();
}
[BackgroundDependencyLoader]
private void load()
private readonly IBindable<bool> isIdle = new BindableBool();
[BackgroundDependencyLoader(true)]
private void load(IdleTracker idleTracker)
{
api.Register(this);
if (idleTracker != null)
isIdle.BindTo(idleTracker.IsIdle);
}
protected override void LoadComplete()
{
base.LoadComplete();
isIdle.BindValueChanged(updatePollingRate, true);
}
private void updatePollingRate(bool idle)
{
roomManager.TimeBetweenPolls = !IsCurrentScreen || !(currentSubScreen is LoungeSubScreen) ? 0 : (idle ? 120000 : 15000);
Logger.Log($"Polling adjusted to {roomManager.TimeBetweenPolls}");
}
public void APIStateChanged(APIAccess api, APIState state)
@ -136,11 +156,9 @@ namespace osu.Game.Screens.Multi
Content.Delay(WaveContainer.DISAPPEAR_DURATION).FadeOut();
var track = Beatmap.Value.Track;
if (track != null)
track.Looping = false;
cancelLooping();
loungeSubScreen.MakeCurrent();
updatePollingRate(isIdle.Value);
return base.OnExiting(next);
}
@ -151,6 +169,8 @@ namespace osu.Game.Screens.Multi
Content.FadeIn(250);
Content.ScaleTo(1, 250, Easing.OutSine);
updatePollingRate(isIdle.Value);
}
protected override void OnSuspending(Screen next)
@ -159,6 +179,7 @@ namespace osu.Game.Screens.Multi
Content.FadeOut(250);
cancelLooping();
roomManager.TimeBetweenPolls = 0;
base.OnSuspending(next);
}
@ -183,7 +204,7 @@ namespace osu.Game.Screens.Multi
if (!IsCurrentScreen) return;
if (currentScreen is MatchSubScreen)
if (currentSubScreen is MatchSubScreen)
{
var track = Beatmap.Value.Track;
if (track != null)
@ -200,13 +221,14 @@ namespace osu.Game.Screens.Multi
createButton.Hide();
}
else if (currentScreen is LoungeSubScreen)
else if (currentSubScreen is LoungeSubScreen)
createButton.Show();
}
private void screenAdded(Screen newScreen)
{
currentScreen = (OsuScreen)newScreen;
currentSubScreen = (OsuScreen)newScreen;
updatePollingRate(isIdle.Value);
newScreen.ModePushed += screenAdded;
newScreen.Exited += screenRemoved;
@ -214,10 +236,11 @@ namespace osu.Game.Screens.Multi
private void screenRemoved(Screen newScreen)
{
if (currentScreen is MatchSubScreen)
if (currentSubScreen is MatchSubScreen)
cancelLooping();
currentScreen = (OsuScreen)newScreen;
currentSubScreen = (OsuScreen)newScreen;
updatePollingRate(isIdle.Value);
}
protected override void Dispose(bool isDisposing)

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

@ -35,11 +35,6 @@ namespace osu.Game.Screens.Multi
[Resolved]
private BeatmapManager beatmaps { get; set; }
public RoomManager()
{
TimeBetweenPolls = 5000;
}
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);