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

bar -> line

Browse Source
This commit is contained in:
Dean Herbert 2017-11-08 11:21:50 +09:00
parent 97b238d084
commit a72e798b85
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,12 +20,12 @@ namespace osu.Game.Screens.Menu
private readonly OsuSpriteText welcomeText; private readonly OsuSpriteText welcomeText;
private readonly Container barsContainer; private readonly Container linesContainer;
private readonly Container barTopLeft; private readonly Container lineTopLeft;
private readonly Container barBottomLeft; private readonly Container lineBottomLeft;
private readonly Container barTopRight; private readonly Container lineTopRight;
private readonly Container barBottomRight; private readonly Container lineBottomRight;
private readonly Ring smallRing; private readonly Ring smallRing;
private readonly Ring mediumRing; private readonly Ring mediumRing;
@ -45,14 +45,14 @@ namespace osu.Game.Screens.Menu
Children = new Drawable[] Children = new Drawable[]
{ {
mediumRing = new Ring(Color4.White.Opacity(130)), mediumRing = new Ring(Color4.White.Opacity(130)),
barsContainer = new Container linesContainer = new Container
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]
{ {
barTopLeft = new Container lineTopLeft = new Container
{ {
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -63,7 +63,7 @@ namespace osu.Game.Screens.Menu
Colour = Color4.White.Opacity(180), Colour = Color4.White.Opacity(180),
} }
}, },
barTopRight = new Container lineTopRight = new Container
{ {
Origin = Anchor.CentreRight, Origin = Anchor.CentreRight,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -74,7 +74,7 @@ namespace osu.Game.Screens.Menu
Colour = Color4.White.Opacity(80), Colour = Color4.White.Opacity(80),
} }
}, },
barBottomLeft = new Container lineBottomLeft = new Container
{ {
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -85,7 +85,7 @@ namespace osu.Game.Screens.Menu
Colour = Color4.White.Opacity(230), Colour = Color4.White.Opacity(230),
} }
}, },
barBottomRight = new Container lineBottomRight = new Container
{ {
Origin = Anchor.CentreRight, Origin = Anchor.CentreRight,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -202,20 +202,20 @@ namespace osu.Game.Screens.Menu
welcomeText.FadeIn(700); welcomeText.FadeIn(700);
welcomeText.TransformSpacingTo(new Vector2(20, 0), remainingTime(), Easing.Out); welcomeText.TransformSpacingTo(new Vector2(20, 0), remainingTime(), Easing.Out);
const int bar_duration = 700; const int line_duration = 700;
const int bar_resize = 150; const int line_resize = 150;
foreach (var bar in barsContainer) foreach (var line in linesContainer)
{ {
bar.FadeIn(); line.FadeIn();
bar.Delay(bar_resize).ResizeWidthTo(0, bar_duration - bar_resize, Easing.OutQuint); line.Delay(line_resize).ResizeWidthTo(0, line_duration - line_resize, Easing.OutQuint);
} }
const int bar_end_offset = 120; const int line_end_offset = 120;
barTopLeft.MoveTo(new Vector2(-bar_end_offset, -bar_end_offset), bar_duration, Easing.OutQuint); lineTopLeft.MoveTo(new Vector2(-line_end_offset, -line_end_offset), line_duration, Easing.OutQuint);
barTopRight.MoveTo(new Vector2(bar_end_offset, -bar_end_offset), bar_duration, Easing.OutQuint); lineTopRight.MoveTo(new Vector2(line_end_offset, -line_end_offset), line_duration, Easing.OutQuint);
barBottomLeft.MoveTo(new Vector2(-bar_end_offset, bar_end_offset), bar_duration, Easing.OutQuint); lineBottomLeft.MoveTo(new Vector2(-line_end_offset, line_end_offset), line_duration, Easing.OutQuint);
barBottomRight.MoveTo(new Vector2(bar_end_offset, bar_end_offset), bar_duration, Easing.OutQuint); lineBottomRight.MoveTo(new Vector2(line_end_offset, line_end_offset), line_duration, Easing.OutQuint);
using (BeginDelayedSequence(1640, true)) // 2000 using (BeginDelayedSequence(1640, true)) // 2000
{ {
@ -278,14 +278,14 @@ namespace osu.Game.Screens.Menu
smallRing.Foreground.Size = Vector2.One - new Vector2(0.4f); smallRing.Foreground.Size = Vector2.One - new Vector2(0.4f);
bigRing.Foreground.Size = Vector2.One - new Vector2(0.15f); bigRing.Foreground.Size = Vector2.One - new Vector2(0.15f);
barTopLeft.Size = barTopRight.Size = barBottomLeft.Size = barBottomRight.Size = new Vector2(105, 1.5f); lineTopLeft.Size = lineTopRight.Size = lineBottomLeft.Size = lineBottomRight.Size = new Vector2(105, 1.5f);
barTopLeft.Alpha = barTopRight.Alpha = barBottomLeft.Alpha = barBottomRight.Alpha = 0; lineTopLeft.Alpha = lineTopRight.Alpha = lineBottomLeft.Alpha = lineBottomRight.Alpha = 0;
const int bar_offset = 80; const int line_offset = 80;
barTopLeft.Position = new Vector2(-bar_offset, -bar_offset); lineTopLeft.Position = new Vector2(-line_offset, -line_offset);
barTopRight.Position = new Vector2(bar_offset, -bar_offset); lineTopRight.Position = new Vector2(line_offset, -line_offset);
barBottomLeft.Position = new Vector2(-bar_offset, bar_offset); lineBottomLeft.Position = new Vector2(-line_offset, line_offset);
barBottomRight.Position = new Vector2(bar_offset, bar_offset); lineBottomRight.Position = new Vector2(line_offset, line_offset);
backgroundFill.Rotation = foregroundFill.Rotation = 0; backgroundFill.Rotation = foregroundFill.Rotation = 0;
backgroundFill.Alpha = foregroundFill.Alpha = 1; backgroundFill.Alpha = foregroundFill.Alpha = 1;