h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-05 11:43:01 +08:00
Code Issues Releases Wiki Activity

Move logic out of update (and simplify, hopefully)

Browse Source
This commit is contained in:
Dean Herbert 2019-06-19 13:15:58 +09:00
parent c1d2fff651
commit 6426983de0
1 changed files with 59 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Logging;
using osu.Framework.Screens;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.Containers;
@ -185,6 +186,28 @@ namespace osu.Game.Screens.Multi
{
this.FadeIn();
waves.Show();
beginHandlingTrack();
}
public override void OnResuming(IScreen last)
{
this.FadeIn(250);
this.ScaleTo(1, 250, Easing.OutSine);
base.OnResuming(last);
beginHandlingTrack();
}
public override void OnSuspending(IScreen next)
{
this.ScaleTo(1.1f, 250, Easing.InSine);
this.FadeOut(250);
endHandlingTrack();
roomManager.TimeBetweenPolls = 0;
}
public override bool OnExiting(IScreen next)
@ -193,12 +216,10 @@ namespace osu.Game.Screens.Multi
this.Delay(WaveContainer.DISAPPEAR_DURATION).FadeOut();
cancelLooping();
if (screenStack.CurrentScreen != null)
loungeSubScreen.MakeCurrent();
updatePollingRate(isIdle.Value);
endHandlingTrack();
base.OnExiting(next);
return false;
@ -212,42 +233,44 @@ namespace osu.Game.Screens.Multi
logo.Delay(WaveContainer.DISAPPEAR_DURATION / 2).FadeOut();
}
public override void OnResuming(IScreen last)
private void beginHandlingTrack()
{
this.FadeIn(250);
this.ScaleTo(1, 250, Easing.OutSine);
base.OnResuming(last);
updatePollingRate(isIdle.Value);
Beatmap.BindValueChanged(updateTrack, true);
}
public override void OnSuspending(IScreen next)
private void endHandlingTrack()
{
this.ScaleTo(1.1f, 250, Easing.InSine);
this.FadeOut(250);
cancelLooping();
roomManager.TimeBetweenPolls = 0;
Beatmap.ValueChanged -= updateTrack;
}
private void cancelLooping()
{
var track = Beatmap?.Value?.Track;
private void screenPushed(IScreen lastScreen, IScreen newScreen) => subScreenChanged(newScreen);
if (track != null)
track.Looping = false;
private void screenExited(IScreen lastScreen, IScreen newScreen)
{
subScreenChanged(newScreen);
if (screenStack.CurrentScreen == null && this.IsCurrentScreen())
this.Exit();
}
protected override void Update()
private void subScreenChanged(IScreen newScreen)
{
base.Update();
updatePollingRate(isIdle.Value);
createButton.FadeTo(newScreen is MatchSubScreen ? 0 : 1, 200);
if (!this.IsCurrentScreen()) return;
updateTrack();
}
if (screenStack.CurrentScreen is MatchSubScreen)
private void updateTrack(ValueChangedEvent<WorkingBeatmap> _ = null)
{
bool isMatch = screenStack.CurrentScreen is MatchSubScreen;
Beatmap.Disabled = isMatch;
if (isMatch)
{
var track = Beatmap.Value.Track;
var track = Beatmap.Value?.Track;
if (track != null)
{
@ -257,25 +280,22 @@ namespace osu.Game.Screens.Multi
if (!track.IsRunning)
track.Restart();
}
createButton.Hide();
}
else if (screenStack.CurrentScreen is LoungeSubScreen)
createButton.Show();
else
{
cancelLooping();
}
}
private void screenPushed(IScreen lastScreen, IScreen newScreen)
=> updatePollingRate(isIdle.Value);
private void screenExited(IScreen lastScreen, IScreen newScreen)
private void cancelLooping()
{
if (lastScreen is MatchSubScreen)
cancelLooping();
var track = Beatmap?.Value?.Track;
updatePollingRate(isIdle.Value);
if (screenStack.CurrentScreen == null && this.IsCurrentScreen())
this.Exit();
if (track != null)
{
track.Looping = false;
track.RestartPoint = 0;
}
}
protected override void Dispose(bool isDisposing)