sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert some unnecessary complications in logo logic

Browse Source
This commit is contained in:
Dean Herbert
2019-02-12 13:29:41 +09:00
parent 272584eb79
commit d5cce850a8
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Screens/Multi/Match/MatchSubScreen.cs
View File

@ -179,6 +179,15 @@ namespace osu.Game.Screens.Multi.Match
CurrentItem.BindValueChanged(currentItemChanged, true); CurrentItem.BindValueChanged(currentItemChanged, true);
} }
public override bool OnExiting(IScreen next)
{
RoomManager?.PartRoom();
return base.OnExiting(next);
}
/// <summary>
/// Handles propagation of the current playlist item's content to game-wide mechanisms.
/// </summary>
private void currentItemChanged(PlaylistItem item) private void currentItemChanged(PlaylistItem item)
{ {
// Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info
@ -190,12 +199,6 @@ namespace osu.Game.Screens.Multi.Match
Ruleset.Value = item.Ruleset; Ruleset.Value = item.Ruleset;
} }
public override bool OnExiting(IScreen next)
{
RoomManager?.PartRoom();
return base.OnExiting(next);
}
/// <summary> /// <summary>
/// Handle the case where a beatmap is imported (and can be used by this match). /// Handle the case where a beatmap is imported (and can be used by this match).
/// </summary> /// </summary>

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

@ -184,7 +184,6 @@ namespace osu.Game.Screens.Multi
public override void OnEntering(IScreen last) public override void OnEntering(IScreen last)
{ {
this.FadeIn(); this.FadeIn();
waves.Show(); waves.Show();
} }
@ -201,18 +200,24 @@ namespace osu.Game.Screens.Multi
updatePollingRate(isIdle.Value); updatePollingRate(isIdle.Value);
// the wave overlay transition takes longer than expected to run. base.OnExiting(next);
logo?.AppendAnimatingAction(() => logo.Delay(WaveContainer.DISAPPEAR_DURATION / 2).FadeOut(), false);
return false; return false;
} }
protected override void LogoExiting(OsuLogo logo)
{
base.LogoExiting(logo);
// the wave overlay transition takes longer than expected to run.
logo.Delay(WaveContainer.DISAPPEAR_DURATION / 2).FadeOut();
}
public override void OnResuming(IScreen last) public override void OnResuming(IScreen last)
{ {
this.FadeIn(250); this.FadeIn(250);
this.ScaleTo(1, 250, Easing.OutSine); this.ScaleTo(1, 250, Easing.OutSine);
logo?.AppendAnimatingAction(() => ApplyLogoArrivingDefaults(logo), true); base.OnResuming(last);
updatePollingRate(isIdle.Value); updatePollingRate(isIdle.Value);
} }