mirror of
https://github.com/ppy/osu.git
synced 2025-01-13 13:32:54 +08:00
Simplify intro sequence a bit more
This commit is contained in:
parent
552a361a24
commit
97b238d084
@ -193,76 +193,72 @@ namespace osu.Game.Screens.Menu
|
|||||||
setDefaults();
|
setDefaults();
|
||||||
|
|
||||||
mediumRing.ResizeTo(130, 360, Easing.InExpo).OnComplete(r => r.Foreground.ResizeTo(1, 420, Easing.OutQuad));
|
mediumRing.ResizeTo(130, 360, Easing.InExpo).OnComplete(r => r.Foreground.ResizeTo(1, 420, Easing.OutQuad));
|
||||||
|
smallRing.ResizeTo(logo_size * 0.086f, 250, Easing.InExpo).OnComplete(r => r.Foreground.ResizeTo(1, 650, Easing.OutQuad));
|
||||||
|
|
||||||
Func<double> remainingTime = () => length - TransformDelay;
|
Func<double> remainingTime = () => length - TransformDelay;
|
||||||
|
|
||||||
using (BeginDelayedSequence(200, true))
|
using (BeginDelayedSequence(360, true))
|
||||||
{
|
{
|
||||||
welcomeText.FadeIn(700);
|
welcomeText.FadeIn(700);
|
||||||
welcomeText.TransformSpacingTo(new Vector2(20, 0), 1500, Easing.Out);
|
welcomeText.TransformSpacingTo(new Vector2(20, 0), remainingTime(), Easing.Out);
|
||||||
|
|
||||||
smallRing.ResizeTo(logo_size * 0.086f, 250, Easing.InExpo).OnComplete(r => r.Foreground.ResizeTo(1, 650, Easing.OutQuad));
|
const int bar_duration = 700;
|
||||||
|
const int bar_resize = 150;
|
||||||
|
|
||||||
using (BeginDelayedSequence(160, true))
|
foreach (var bar in barsContainer)
|
||||||
{
|
{
|
||||||
const int bar_duration = 700;
|
bar.FadeIn();
|
||||||
const int bar_resize = 150;
|
bar.Delay(bar_resize).ResizeWidthTo(0, bar_duration - bar_resize, Easing.OutQuint);
|
||||||
|
}
|
||||||
|
|
||||||
foreach (var bar in barsContainer)
|
const int bar_end_offset = 120;
|
||||||
|
barTopLeft.MoveTo(new Vector2(-bar_end_offset, -bar_end_offset), bar_duration, Easing.OutQuint);
|
||||||
|
barTopRight.MoveTo(new Vector2(bar_end_offset, -bar_end_offset), bar_duration, Easing.OutQuint);
|
||||||
|
barBottomLeft.MoveTo(new Vector2(-bar_end_offset, bar_end_offset), bar_duration, Easing.OutQuint);
|
||||||
|
barBottomRight.MoveTo(new Vector2(bar_end_offset, bar_end_offset), bar_duration, Easing.OutQuint);
|
||||||
|
|
||||||
|
using (BeginDelayedSequence(1640, true)) // 2000
|
||||||
|
{
|
||||||
|
bigRing.ResizeTo(logo_size * 0.86f, 500, Easing.InOutQuint);
|
||||||
|
bigRing.Foreground.Delay(250).ResizeTo(1, 450, Easing.OutExpo);
|
||||||
|
|
||||||
|
using (BeginDelayedSequence(250, true)) // 2250
|
||||||
{
|
{
|
||||||
bar.FadeIn();
|
backgroundFill.ResizeHeightTo(1, remainingTime(), Easing.InOutQuart);
|
||||||
bar.Delay(bar_resize).ResizeWidthTo(0, bar_duration - bar_resize, Easing.OutQuint);
|
backgroundFill.RotateTo(-90, remainingTime(), Easing.InOutQuart);
|
||||||
}
|
|
||||||
|
|
||||||
const int bar_end_offset = 120;
|
using (BeginDelayedSequence(50, true))
|
||||||
barTopLeft.MoveTo(new Vector2(-bar_end_offset, -bar_end_offset), bar_duration, Easing.OutQuint);
|
|
||||||
barTopRight.MoveTo(new Vector2(bar_end_offset, -bar_end_offset), bar_duration, Easing.OutQuint);
|
|
||||||
barBottomLeft.MoveTo(new Vector2(-bar_end_offset, bar_end_offset), bar_duration, Easing.OutQuint);
|
|
||||||
barBottomRight.MoveTo(new Vector2(bar_end_offset, bar_end_offset), bar_duration, Easing.OutQuint);
|
|
||||||
|
|
||||||
using (BeginDelayedSequence(1640, true)) // 2000
|
|
||||||
{
|
|
||||||
bigRing.ResizeTo(logo_size * 0.86f, 500, Easing.InOutQuint);
|
|
||||||
bigRing.Foreground.Delay(250).ResizeTo(1, 450, Easing.OutExpo);
|
|
||||||
|
|
||||||
using (BeginDelayedSequence(250, true)) // 2250
|
|
||||||
{
|
{
|
||||||
backgroundFill.ResizeHeightTo(1, remainingTime(), Easing.InOutQuart);
|
foregroundFill.ResizeWidthTo(1, remainingTime(), Easing.InOutQuart);
|
||||||
backgroundFill.RotateTo(-90, remainingTime(), Easing.InOutQuart);
|
foregroundFill.RotateTo(-90, remainingTime(), Easing.InOutQuart);
|
||||||
|
}
|
||||||
|
|
||||||
using (BeginDelayedSequence(50, true))
|
const float circle_size = logo_size * 0.9f;
|
||||||
{
|
|
||||||
foregroundFill.ResizeWidthTo(1, remainingTime(), Easing.InOutQuart);
|
|
||||||
foregroundFill.RotateTo(-90, remainingTime(), Easing.InOutQuart);
|
|
||||||
}
|
|
||||||
|
|
||||||
const float circle_size = logo_size * 0.9f;
|
const int rotation_delay = 110;
|
||||||
|
const int appear_delay = 80;
|
||||||
|
|
||||||
const int rotation_delay = 110;
|
purpleCircle.MoveToY(circle_size / 2, remainingTime(), Easing.InOutQuad);
|
||||||
const int appear_delay = 80;
|
purpleCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.OutQuad);
|
||||||
|
purpleCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuad);
|
||||||
|
|
||||||
purpleCircle.MoveToY(circle_size / 2, remainingTime(), Easing.InOutQuad);
|
using (BeginDelayedSequence(appear_delay, true))
|
||||||
purpleCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.OutQuad);
|
{
|
||||||
purpleCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuad);
|
yellowCircle.MoveToY(-circle_size / 2, remainingTime(), Easing.InOutQuad);
|
||||||
|
yellowCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.OutQuad);
|
||||||
|
yellowCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuad);
|
||||||
|
|
||||||
using (BeginDelayedSequence(appear_delay, true))
|
using (BeginDelayedSequence(appear_delay, true))
|
||||||
{
|
{
|
||||||
yellowCircle.MoveToY(-circle_size / 2, remainingTime(), Easing.InOutQuad);
|
blueCircle.MoveToX(-circle_size / 2, remainingTime(), Easing.InOutQuad);
|
||||||
yellowCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.OutQuad);
|
blueCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.OutQuad);
|
||||||
yellowCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuad);
|
blueCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuad);
|
||||||
|
|
||||||
using (BeginDelayedSequence(appear_delay, true))
|
using (BeginDelayedSequence(appear_delay, true))
|
||||||
{
|
{
|
||||||
blueCircle.MoveToX(-circle_size / 2, remainingTime(), Easing.InOutQuad);
|
pinkCircle.MoveToX(circle_size / 2, remainingTime(), Easing.InOutQuad);
|
||||||
blueCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.OutQuad);
|
pinkCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.OutQuad);
|
||||||
blueCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuad);
|
pinkCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuad);
|
||||||
|
|
||||||
using (BeginDelayedSequence(appear_delay, true))
|
|
||||||
{
|
|
||||||
pinkCircle.MoveToX(circle_size / 2, remainingTime(), Easing.InOutQuad);
|
|
||||||
pinkCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.OutQuad);
|
|
||||||
pinkCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuad);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user