1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 19:42:55 +08:00

Simplify more

This commit is contained in:
Dean Herbert 2017-11-08 12:10:32 +09:00
parent 89426e1c11
commit f83c095269

View File

@ -31,8 +31,8 @@ namespace osu.Game.Screens.Menu
private readonly Ring mediumRing; private readonly Ring mediumRing;
private readonly Ring bigRing; private readonly Ring bigRing;
private readonly Container backgroundFill; private readonly Box backgroundFill;
private readonly Container foregroundFill; private readonly Box foregroundFill;
private readonly CircularContainer pinkCircle; private readonly CircularContainer pinkCircle;
private readonly CircularContainer blueCircle; private readonly CircularContainer blueCircle;
@ -44,7 +44,6 @@ namespace osu.Game.Screens.Menu
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
Children = new Drawable[] Children = new Drawable[]
{ {
mediumRing = new Ring(Color4.White.Opacity(130)),
lines = new Container<Box> lines = new Container<Box>
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -82,8 +81,9 @@ namespace osu.Game.Screens.Menu
}, },
} }
}, },
smallRing = new Ring(Color4.White),
bigRing = new Ring(OsuColour.FromHex(@"B6C5E9")), bigRing = new Ring(OsuColour.FromHex(@"B6C5E9")),
mediumRing = new Ring(Color4.White.Opacity(130)),
smallRing = new Ring(Color4.White),
new CircularContainer new CircularContainer
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -92,16 +92,12 @@ namespace osu.Game.Screens.Menu
Masking = true, Masking = true,
Children = new Drawable[] Children = new Drawable[]
{ {
backgroundFill = new Container backgroundFill = new Box
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
Child = new Box
{
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = OsuColour.FromHex(@"C6D8FF").Opacity(160), Colour = OsuColour.FromHex(@"C6D8FF").Opacity(160),
}
}, },
welcomeText = new OsuSpriteText welcomeText = new OsuSpriteText
{ {
@ -111,16 +107,12 @@ namespace osu.Game.Screens.Menu
Font = @"Exo2.0-Light", Font = @"Exo2.0-Light",
TextSize = 42, TextSize = 42,
}, },
foregroundFill = new Container foregroundFill = new Box
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
Child = new Box
{
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = Color4.White, Colour = Color4.White,
}
}, },
} }
}, },