h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 06:47:24 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into make_pause_menu_translatable

Browse Source
This commit is contained in:
Stéén 2023-05-24 12:13:34 +02:00 committed by GitHub
commit dcfc99a092
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
osu.Game/Screens/OsuScreen.cs
View File

@ -233,7 +233,13 @@ namespace osu.Game.Screens
/// </summary> /// </summary>
protected virtual void LogoArriving(OsuLogo logo, bool resuming) protected virtual void LogoArriving(OsuLogo logo, bool resuming)
{ {
ApplyLogoArrivingDefaults(logo); logo.Action = null;
logo.FadeOut(300, Easing.OutQuint);
logo.Anchor = Anchor.TopLeft;
logo.Origin = Anchor.Centre;
logo.RelativePositionAxes = Axes.Both;
logo.Triangles = true;
logo.Ripple = true;
} }
private void applyArrivingDefaults(bool isResuming) private void applyArrivingDefaults(bool isResuming)
@ -244,22 +250,6 @@ namespace osu.Game.Screens
}, true); }, true);
} }
/// <summary>
/// Applies default animations to an arriving logo.
/// Todo: This should not exist.
/// </summary>
/// <param name="logo">The logo to apply animations to.</param>
public static void ApplyLogoArrivingDefaults(OsuLogo logo)
{
logo.Action = null;
logo.FadeOut(300, Easing.OutQuint);
logo.Anchor = Anchor.TopLeft;
logo.Origin = Anchor.Centre;
logo.RelativePositionAxes = Axes.Both;
logo.Triangles = true;
logo.Ripple = true;
}
private void onExitingLogo() private void onExitingLogo()
{ {
logo?.AppendAnimatingAction(() => LogoExiting(logo), false); logo?.AppendAnimatingAction(() => LogoExiting(logo), false);