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

Add intro in to actual game

Browse Source
This commit is contained in:
Dean Herbert 2017-11-08 14:31:11 +09:00
parent d8d7165164
commit 41fcecf759
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Screens/Menu/Intro.cs
View File

@ -117,8 +117,8 @@ namespace osu.Game.Screens.Menu
logo.RelativePositionAxes = Axes.Both; logo.RelativePositionAxes = Axes.Both;
logo.Triangles = false; logo.Triangles = true;
logo.Colour = Color4.DarkGray; logo.Colour = Color4.White;
logo.Ripple = false; logo.Ripple = false;
const int quick_appear = 350; const int quick_appear = 350;
@ -129,11 +129,9 @@ namespace osu.Game.Screens.Menu
if (!resuming) if (!resuming)
{ {
logo.ScaleTo(0.4f); logo.ScaleTo(1);
logo.FadeOut(); logo.FadeIn();
logo.PlayIntro();
logo.ScaleTo(1, delay_step_one + delay_step_two, Easing.OutQuint);
logo.FadeIn(delay_step_one + delay_step_two, Easing.OutQuint);
} }
else else
{ {

4
osu.Game/Screens/Menu/IntroSequence.cs
View File

@ -210,12 +210,12 @@ namespace osu.Game.Screens.Menu
lineBottomLeft.MoveTo(new Vector2(-line_end_offset, line_end_offset), line_duration, Easing.OutQuint); 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); 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.ResizeTo(logo_size * 0.86f, 500, Easing.InOutQuint);
bigRing.Foreground.Delay(250).ResizeTo(1, 450, Easing.OutExpo); 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.ResizeHeightTo(1, remainingTime(), Easing.InOutQuart);
backgroundFill.RotateTo(-90, remainingTime(), Easing.InOutQuart); backgroundFill.RotateTo(-90, remainingTime(), Easing.InOutQuart);

4
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -297,8 +297,8 @@ namespace osu.Game.Screens.Menu
public void PlayIntro() public void PlayIntro()
{ {
const double length = 2950; const double length = 3150;
const double fade = 300; const double fade = 200;
logoHoverContainer.FadeOut().Delay(length).FadeIn(fade); logoHoverContainer.FadeOut().Delay(length).FadeIn(fade);
intro.Show(); intro.Show();