h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-25 03:09:54 +08:00
Code Issues Releases Wiki Activity

Rename methods back

Browse Source
This commit is contained in:
Dean Herbert
2017-11-09 17:38:20 +09:00
Unverified
parent e2005c4431
commit 4874371dbf
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/Loader.cs
+2 -2
View File
@@ -17,9 +17,9 @@ namespace osu.Game.Screens
ValidForResume = false;
}
protected override void OnArrivedLogo(OsuLogo logo, bool resuming)
protected override void LogoArriving(OsuLogo logo, bool resuming)
{
base.OnArrivedLogo(logo, resuming);
base.LogoArriving(logo, resuming);
logo.RelativePositionAxes = Axes.Both;
logo.Triangles = false;
osu.Game/Screens/Menu/Intro.cs
+2 -2
View File
@@ -109,9 +109,9 @@ namespace osu.Game.Screens.Menu
public const int EXIT_DELAY = 3000;
protected override void OnArrivedLogo(OsuLogo logo, bool resuming)
protected override void LogoArriving(OsuLogo logo, bool resuming)
{
base.OnArrivedLogo(logo, resuming);
base.LogoArriving(logo, resuming);
logo.RelativePositionAxes = Axes.Both;
osu.Game/Screens/Menu/MainMenu.cs
+3 -3
View File
@@ -103,9 +103,9 @@ namespace osu.Game.Screens.Menu
Beatmap.ValueChanged += beatmap_ValueChanged;
}
protected override void OnArrivedLogo(OsuLogo logo, bool resuming)
protected override void LogoArriving(OsuLogo logo, bool resuming)
{
base.OnArrivedLogo(logo, resuming);
base.LogoArriving(logo, resuming);
buttons.SetOsuLogo(logo);
@@ -119,7 +119,7 @@ namespace osu.Game.Screens.Menu
buttons.State = MenuState.TopLevel;
}
protected override void OnSuspendingLogo(OsuLogo logo)
protected override void LogoSuspending(OsuLogo logo)
{
logo.FadeOut(300, Easing.InSine)
.ScaleTo(0.2f, 300, Easing.InSine)
osu.Game/Screens/OsuScreen.cs
+7 -7
View File
@@ -76,7 +76,7 @@ namespace osu.Game.Screens
protected override void OnResuming(Screen last)
{
base.OnResuming(last);
logo.DelayUntilTransformsFinished().Schedule(() => OnArrivedLogo(logo, true));
logo.DelayUntilTransformsFinished().Schedule(() => LogoArriving(logo, true));
sampleExit?.Play();
}
@@ -122,7 +122,7 @@ namespace osu.Game.Screens
base.OnEntering(last);
logo.DelayUntilTransformsFinished().Schedule(() => OnArrivedLogo(logo, false));
logo.DelayUntilTransformsFinished().Schedule(() => LogoArriving(logo, false));
}
protected override bool OnExiting(Screen next)
@@ -151,7 +151,7 @@ namespace osu.Game.Screens
/// <summary>
/// Fired when this screen was entered or resumed and the logo state is required to be adjusted.
/// </summary>
protected virtual void OnArrivedLogo(OsuLogo logo, bool resuming)
protected virtual void LogoArriving(OsuLogo logo, bool resuming)
{
logo.Action = null;
logo.FadeOut(300, Easing.OutQuint);
@@ -160,26 +160,26 @@ namespace osu.Game.Screens
private void onExitingLogo()
{
logo.ClearTransforms();
OnExitingLogo(logo);
LogoExiting(logo);
}
/// <summary>
/// Fired when this screen was exited to add any outwards transition to the logo.
/// </summary>
protected virtual void OnExitingLogo(OsuLogo logo)
protected virtual void LogoExiting(OsuLogo logo)
{
}
private void onSuspendingLogo()
{
logo.ClearTransforms();
OnSuspendingLogo(logo);
LogoSuspending(logo);
}
/// <summary>
/// Fired when this screen was suspended to add any outwards transition to the logo.
/// </summary>
protected virtual void OnSuspendingLogo(OsuLogo logo)
protected virtual void LogoSuspending(OsuLogo logo)
{
}
}
osu.Game/Screens/Play/PlayerLoader.cs
+2 -2
View File
@@ -95,9 +95,9 @@ namespace osu.Game.Screens.Play
this.Delay(2150).Schedule(pushWhenLoaded);
}
protected override void OnArrivedLogo(OsuLogo logo, bool resuming)
protected override void LogoArriving(OsuLogo logo, bool resuming)
{
base.OnArrivedLogo(logo, resuming);
base.LogoArriving(logo, resuming);
logo.ClearTransforms(targetMember: nameof(Position));
logo.RelativePositionAxes = Axes.Both;
osu.Game/Screens/Select/SongSelect.cs
+4 -4
View File
@@ -311,9 +311,9 @@ namespace osu.Game.Screens.Select
private const double logo_transition = 250;
protected override void OnArrivedLogo(OsuLogo logo, bool resuming)
protected override void LogoArriving(OsuLogo logo, bool resuming)
{
base.OnArrivedLogo(logo, resuming);
base.LogoArriving(logo, resuming);
logo.ClearTransforms();
logo.RelativePositionAxes = Axes.Both;
@@ -337,9 +337,9 @@ namespace osu.Game.Screens.Select
logo.Action = () => carouselRaisedStart();
}
protected override void OnExitingLogo(OsuLogo logo)
protected override void LogoExiting(OsuLogo logo)
{
base.OnExitingLogo(logo);
base.LogoExiting(logo);
logo.ScaleTo(0.2f, logo_transition, Easing.OutQuint);
logo.FadeOut(logo_transition, Easing.OutQuint);
}