diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs index 490b2b3346..311e453a65 100644 --- a/osu.Game/Screens/Menu/Intro.cs +++ b/osu.Game/Screens/Menu/Intro.cs @@ -117,8 +117,8 @@ namespace osu.Game.Screens.Menu logo.RelativePositionAxes = Axes.Both; - logo.Triangles = false; - logo.Colour = Color4.DarkGray; + logo.Triangles = true; + logo.Colour = Color4.White; logo.Ripple = false; const int quick_appear = 350; @@ -129,11 +129,9 @@ namespace osu.Game.Screens.Menu if (!resuming) { - logo.ScaleTo(0.4f); - logo.FadeOut(); - - logo.ScaleTo(1, delay_step_one + delay_step_two, Easing.OutQuint); - logo.FadeIn(delay_step_one + delay_step_two, Easing.OutQuint); + logo.ScaleTo(1); + logo.FadeIn(); + logo.PlayIntro(); } else { diff --git a/osu.Game/Screens/Menu/IntroSequence.cs b/osu.Game/Screens/Menu/IntroSequence.cs index 0c68410c92..25265eed76 100644 --- a/osu.Game/Screens/Menu/IntroSequence.cs +++ b/osu.Game/Screens/Menu/IntroSequence.cs @@ -210,12 +210,12 @@ namespace osu.Game.Screens.Menu lineBottomLeft.MoveTo(new Vector2(-line_end_offset, line_end_offset), line_duration, Easing.OutQuint); lineBottomRight.MoveTo(new Vector2(line_end_offset, line_end_offset), line_duration, Easing.OutQuint); - using (BeginDelayedSequence(1640, true)) // 2000 + using (BeginDelayedSequence(length * 0.56, true)) { bigRing.ResizeTo(logo_size * 0.86f, 500, Easing.InOutQuint); bigRing.Foreground.Delay(250).ResizeTo(1, 450, Easing.OutExpo); - using (BeginDelayedSequence(250, true)) // 2250 + using (BeginDelayedSequence(250, true)) { backgroundFill.ResizeHeightTo(1, remainingTime(), Easing.InOutQuart); backgroundFill.RotateTo(-90, remainingTime(), Easing.InOutQuart); diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs index 6215cb5660..f7c485cf19 100644 --- a/osu.Game/Screens/Menu/OsuLogo.cs +++ b/osu.Game/Screens/Menu/OsuLogo.cs @@ -297,8 +297,8 @@ namespace osu.Game.Screens.Menu public void PlayIntro() { - const double length = 2950; - const double fade = 300; + const double length = 3150; + const double fade = 200; logoHoverContainer.FadeOut().Delay(length).FadeIn(fade); intro.Show();