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

Fix alignment and fonts of tem intro screen

Browse Source
This commit is contained in:
Dean Herbert 2018-11-22 16:23:44 +09:00
parent 4e8c7a4dc0
commit fb05ea3de3
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
View File

@ -105,8 +105,9 @@ namespace osu.Game.Tournament.Screens.TeamIntro
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Colour = col, Colour = col,
Font = "Exo2.0-Black",
Text = "COMING UP NEXT", Text = "COMING UP NEXT",
Font = "Aquatico-Regular", Spacing = new Vector2(2, 0),
TextSize = 15, TextSize = 15,
}, },
new OsuSpriteText new OsuSpriteText
@ -115,7 +116,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Colour = col, Colour = col,
Text = pairing.Grouping.Value?.Name.Value ?? "Unknown Grouping", Text = pairing.Grouping.Value?.Name.Value ?? "Unknown Grouping",
Font = "Aquatico-Light", Font = "Exo2.0-Light",
Spacing = new Vector2(10, 0), Spacing = new Vector2(10, 0),
TextSize = 50, TextSize = 50,
}, },
@ -123,7 +124,6 @@ namespace osu.Game.Tournament.Screens.TeamIntro
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Font = "Aquatico-Light",
Colour = col, Colour = col,
Text = pairing.Date.Value.ToUniversalTime().ToString("dd MMMM HH:mm UTC"), Text = pairing.Date.Value.ToUniversalTime().ToString("dd MMMM HH:mm UTC"),
TextSize = 20, TextSize = 20,
@ -158,11 +158,10 @@ namespace osu.Game.Tournament.Screens.TeamIntro
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Spacing = new Vector2(0, 5), Spacing = new Vector2(0, 5),
Padding = new MarginPadding(20), Padding = new MarginPadding(20),
Anchor = left ? Anchor.CentreRight : Anchor.CentreLeft,
Origin = left ? Anchor.CentreRight : Anchor.CentreLeft,
Anchor = !left ? Anchor.CentreRight : Anchor.CentreLeft,
Origin = !left ? Anchor.CentreRight : Anchor.CentreLeft,
RelativePositionAxes = Axes.Both, RelativePositionAxes = Axes.Both,
X = (left ? -1 : 1) * 0.66f,
}, },
}; };
@ -172,7 +171,6 @@ namespace osu.Game.Tournament.Screens.TeamIntro
players.Add(new OsuSpriteText players.Add(new OsuSpriteText
{ {
Text = p.Username, Text = p.Username,
Font = "Aquatico-Regular",
TextSize = 24, TextSize = 24,
Colour = colour, Colour = colour,
Anchor = left ? Anchor.CentreRight : Anchor.CentreLeft, Anchor = left ? Anchor.CentreRight : Anchor.CentreLeft,
@ -215,6 +213,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
{ {
Text = teamName.ToUpper(), Text = teamName.ToUpper(),
TextSize = 20, TextSize = 20,
Font = "Aquatico-Regular",
Colour = colour, Colour = colour,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,