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

Remove ring's background field and adjust some timings

Browse Source
This commit is contained in:
EVAST9919 2017-10-10 04:12:01 +03:00
parent e2d6659d48
commit 19723b82f7
1 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,29 +190,29 @@ namespace osu.Game.Screens.Menu
welcomeText.Delay(350).FadeIn(1000, Easing.Out); welcomeText.Delay(350).FadeIn(1000, Easing.Out);
welcomeText.Delay(350).TransformSpacingTo(new Vector2(20, 0), 1450, Easing.Out); welcomeText.Delay(350).TransformSpacingTo(new Vector2(20, 0), 1450, Easing.Out);
mediumRing.Background.ResizeTo(120, 500, Easing.InExpo); mediumRing.ResizeTo(120, 500, Easing.InExpo);
mediumRing.Foreground.ResizeTo(0.8f, 500, Easing.InQuint).Then().ResizeTo(1, 1000, Easing.OutQuint); mediumRing.Foreground.Delay(620).ResizeTo(1, 1000, Easing.OutQuint);
smallRing.Background.Delay(100).ResizeTo(45, 500, Easing.InExpo); smallRing.Delay(200).ResizeTo(45, 500, Easing.InExpo);
smallRing.Foreground.Delay(100).ResizeTo(0.8f, 500, Easing.InQuint).Then().ResizeTo(1, 2000, Easing.OutQuint); smallRing.Foreground.Delay(700).ResizeTo(1, 2000, Easing.OutQuint);
barTopLeft.Delay(500).FadeIn(); barTopLeft.Delay(700).FadeIn();
barTopLeft.Delay(500).MoveTo(new Vector2(-120, -120), 900, Easing.OutQuint); barTopLeft.Delay(700).MoveTo(new Vector2(-120, -120), 900, Easing.OutQuint);
barTopLeft.Delay(600).ResizeWidthTo(0, 900, Easing.OutExpo); barTopLeft.Delay(800).ResizeWidthTo(0, 900, Easing.OutExpo);
barTopRight.Delay(500).FadeIn(); barTopRight.Delay(700).FadeIn();
barTopRight.Delay(500).MoveTo(new Vector2(120, -120), 900, Easing.OutQuint); barTopRight.Delay(700).MoveTo(new Vector2(120, -120), 900, Easing.OutQuint);
barTopRight.Delay(600).ResizeWidthTo(0, 900, Easing.OutExpo); barTopRight.Delay(800).ResizeWidthTo(0, 900, Easing.OutExpo);
barBottomLeft.Delay(500).FadeIn(); barBottomLeft.Delay(700).FadeIn();
barBottomLeft.Delay(500).MoveTo(new Vector2(-120, 120), 900, Easing.OutQuint); barBottomLeft.Delay(700).MoveTo(new Vector2(-120, 120), 900, Easing.OutQuint);
barBottomLeft.Delay(600).ResizeWidthTo(0, 900, Easing.OutExpo); barBottomLeft.Delay(800).ResizeWidthTo(0, 900, Easing.OutExpo);
barBottomRight.Delay(500).FadeIn(); barBottomRight.Delay(700).FadeIn();
barBottomRight.Delay(500).MoveTo(new Vector2(120, 120), 900, Easing.OutQuint); barBottomRight.Delay(700).MoveTo(new Vector2(120, 120), 900, Easing.OutQuint);
barBottomRight.Delay(600).ResizeWidthTo(0, 900, Easing.OutExpo); barBottomRight.Delay(800).ResizeWidthTo(0, 900, Easing.OutExpo);
bigRing.Background.Delay(1950).ResizeTo(400, 550, Easing.InOutQuint); bigRing.Delay(1950).ResizeTo(400, 550, Easing.InOutQuint);
bigRing.Foreground.Delay(1950).ResizeTo(0.8f, 450, Easing.InExpo).Then().ResizeTo(1, 500, Easing.OutExpo); bigRing.Foreground.Delay(1950).ResizeTo(0.8f, 450, Easing.InExpo).Then().ResizeTo(1, 500, Easing.OutExpo);
backgroundFill.Delay(2317).ResizeHeightTo(1, 650, Easing.InOutQuint); backgroundFill.Delay(2317).ResizeHeightTo(1, 650, Easing.InOutQuint);
@ -251,9 +251,10 @@ namespace osu.Game.Screens.Menu
welcomeText.Spacing = Vector2.Zero; welcomeText.Spacing = Vector2.Zero;
welcomeText.Alpha = 0; welcomeText.Alpha = 0;
smallRing.Background.Size = smallRing.Foreground.Size = Vector2.Zero; smallRing.Size = mediumRing.Size = bigRing.Size = Vector2.Zero;
mediumRing.Background.Size = mediumRing.Foreground.Size = Vector2.Zero; mediumRing.Foreground.Size = new Vector2(0.8f);
bigRing.Background.Size = bigRing.Foreground.Size = Vector2.Zero; smallRing.Foreground.Size = new Vector2(0.7f);
bigRing.Foreground.Size = Vector2.Zero;
barTopLeft.Size = barTopRight.Size = barBottomLeft.Size = barBottomRight.Size = new Vector2(115, 1.5f); barTopLeft.Size = barTopRight.Size = barBottomLeft.Size = barBottomRight.Size = new Vector2(115, 1.5f);
barTopLeft.Alpha = barTopRight.Alpha = barBottomLeft.Alpha = barBottomRight.Alpha = 0; barTopLeft.Alpha = barTopRight.Alpha = barBottomLeft.Alpha = barBottomRight.Alpha = 0;
@ -283,26 +284,19 @@ namespace osu.Game.Screens.Menu
private class Ring : CircularContainer private class Ring : CircularContainer
{ {
public readonly Container Background;
public readonly CircularContainer Foreground; public readonly CircularContainer Foreground;
public Ring(Color4 ringColour) public Ring(Color4 ringColour)
{ {
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;
AutoSizeAxes = Axes.Both;
Masking = true; Masking = true;
Children = new[] Children = new Drawable[]
{ {
Background = new Container new Box
{ {
Anchor = Anchor.Centre, RelativeSizeAxes = Axes.Both,
Origin = Anchor.Centre, Colour = ringColour,
Child = new Box
{
RelativeSizeAxes = Axes.Both,
Colour = ringColour,
}
}, },
Foreground = new CircularContainer Foreground = new CircularContainer
{ {