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

Adjust animation to designer-san's liking

Browse Source
This commit is contained in:
Dean Herbert 2017-11-08 17:04:36 +09:00
parent cabb22b6d1
commit df6c808d28
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,20 +135,6 @@ namespace osu.Game.Screens.Menu
}, },
} }
}, },
yellowCircle = new Circle
{
Anchor = Anchor.Centre,
Origin = Anchor.BottomCentre,
Position = new Vector2(0, -circle_offset),
Colour = OsuColour.FromHex(@"FFD64C"),
},
pinkCircle = new Circle
{
Anchor = Anchor.Centre,
Origin = Anchor.CentreLeft,
Position = new Vector2(circle_offset, 0),
Colour = OsuColour.FromHex(@"e967a1"),
},
purpleCircle = new Circle purpleCircle = new Circle
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -163,6 +149,20 @@ namespace osu.Game.Screens.Menu
Position = new Vector2(-circle_offset, 0), Position = new Vector2(-circle_offset, 0),
Colour = OsuColour.FromHex(@"8FE5FE"), Colour = OsuColour.FromHex(@"8FE5FE"),
}, },
yellowCircle = new Circle
{
Anchor = Anchor.Centre,
Origin = Anchor.BottomCentre,
Position = new Vector2(0, -circle_offset),
Colour = OsuColour.FromHex(@"FFD64C"),
},
pinkCircle = new Circle
{
Anchor = Anchor.Centre,
Origin = Anchor.CentreLeft,
Position = new Vector2(circle_offset, 0),
Colour = OsuColour.FromHex(@"e967a1"),
},
}; };
foreach (var line in lines) foreach (var line in lines)
@ -170,6 +170,8 @@ namespace osu.Game.Screens.Menu
line.Size = new Vector2(105, 1.5f); line.Size = new Vector2(105, 1.5f);
line.Alpha = 0; line.Alpha = 0;
} }
Scale = new Vector2(0.5f);
} }
public void Start(double length) public void Start(double length)
@ -226,32 +228,34 @@ namespace osu.Game.Screens.Menu
foregroundFill.RotateTo(-90, remainingTime(), Easing.InOutQuart); foregroundFill.RotateTo(-90, remainingTime(), Easing.InOutQuart);
} }
this.ScaleTo(1, remainingTime(), Easing.InOutCubic);
const float circle_size = logo_size * 0.9f; const float circle_size = logo_size * 0.9f;
const int rotation_delay = 110; const int rotation_delay = 110;
const int appear_delay = 80; const int appear_delay = 80;
purpleCircle.MoveToY(circle_size / 2, remainingTime(), Easing.InOutQuad); purpleCircle.MoveToY(circle_size / 2, remainingTime(), Easing.InOutQuart);
purpleCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.OutQuad); purpleCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.InOutQuart);
purpleCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuad); purpleCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuart);
using (BeginDelayedSequence(appear_delay, true)) using (BeginDelayedSequence(appear_delay, true))
{ {
yellowCircle.MoveToY(-circle_size / 2, remainingTime(), Easing.InOutQuad); yellowCircle.MoveToY(-circle_size / 2, remainingTime(), Easing.InOutQuart);
yellowCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.OutQuad); yellowCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.InOutQuart);
yellowCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuad); yellowCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuart);
using (BeginDelayedSequence(appear_delay, true)) using (BeginDelayedSequence(appear_delay, true))
{ {
blueCircle.MoveToX(-circle_size / 2, remainingTime(), Easing.InOutQuad); blueCircle.MoveToX(-circle_size / 2, remainingTime(), Easing.InOutQuart);
blueCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.OutQuad); blueCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.InOutQuart);
blueCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuad); blueCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuart);
using (BeginDelayedSequence(appear_delay, true)) using (BeginDelayedSequence(appear_delay, true))
{ {
pinkCircle.MoveToX(circle_size / 2, remainingTime(), Easing.InOutQuad); pinkCircle.MoveToX(circle_size / 2, remainingTime(), Easing.InOutQuart);
pinkCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.OutQuad); pinkCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.InOutQuart);
pinkCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuad); pinkCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuart);
} }
} }
} }