sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 15:44:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add torus font

Browse Source
This commit is contained in:
Dean Herbert
2020-03-03 18:04:12 +09:00
parent 655b1a9e9d
commit f1f4f1ffbd
12 changed files with 22 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
View File

@ -175,7 +175,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
X = (flip ? -1 : 1) * 90,
Y = -10,
Colour = colour,
Font = TournamentFont.GetFont(typeface: TournamentTypeface.Aquatico, weight: FontWeight.Regular, size: 20),
Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: 20),
Origin = anchor,
Anchor = anchor,
},
@ -211,7 +211,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
Origin = Anchor.Centre,
Colour = Color4.White,
Text = match.NewValue.Round.Value?.Name.Value ?? "Unknown Round",
Font = TournamentFont.GetFont(typeface: TournamentTypeface.Aquatico, weight: FontWeight.Regular, size: 18),
Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: 18),
},
};
}

4
osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
View File

@ -123,8 +123,8 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
public bool Winning
{
set => DisplayedCountSpriteText.Font = value
? TournamentFont.GetFont(typeface: TournamentTypeface.Aquatico, weight: FontWeight.Regular, size: 60)
: TournamentFont.GetFont(typeface: TournamentTypeface.Aquatico, weight: FontWeight.Light, size: 40);
? OsuFont.Torus.With(weight: FontWeight.Regular, size: 60)
: OsuFont.Torus.With(weight: FontWeight.Light, size: 40);
}
}
}

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

@ -201,7 +201,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
new OsuSpriteText
{
Text = team?.FullName.Value.ToUpper() ?? "???",
Font = TournamentFont.GetFont(TournamentTypeface.Aquatico, 40, FontWeight.Light),
Font = OsuFont.Torus.With(size: 40, weight: FontWeight.Light),
Colour = Color4.Black,
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
@ -209,7 +209,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
new OsuSpriteText
{
Text = teamName.ToUpper(),
Font = TournamentFont.GetFont(TournamentTypeface.Aquatico, 20, FontWeight.Regular),
Font = OsuFont.Torus.With(size: 20, weight: FontWeight.Regular),
Colour = colour,
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,

8
osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
View File

@ -126,7 +126,7 @@ namespace osu.Game.Tournament.Screens.TeamWin
Origin = Anchor.TopCentre,
Colour = col,
Text = "WINNER",
Font = TournamentFont.GetFont(TournamentTypeface.Aquatico, 15, FontWeight.Regular),
Font = OsuFont.Torus.With(size: 15, weight: FontWeight.Regular),
},
new OsuSpriteText
{
@ -134,7 +134,7 @@ namespace osu.Game.Tournament.Screens.TeamWin
Origin = Anchor.TopCentre,
Colour = col,
Text = match.Round.Value?.Name.Value ?? "Unknown Round",
Font = TournamentFont.GetFont(TournamentTypeface.Aquatico, 50, FontWeight.Light),
Font = OsuFont.Torus.With(size: 50, weight: FontWeight.Light),
Spacing = new Vector2(10, 0),
},
new OsuSpriteText
@ -143,7 +143,7 @@ namespace osu.Game.Tournament.Screens.TeamWin
Origin = Anchor.TopCentre,
Colour = col,
Text = match.Date.Value.ToUniversalTime().ToString("dd MMMM HH:mm UTC"),
Font = TournamentFont.GetFont(TournamentTypeface.Aquatico, 20, FontWeight.Light),
Font = OsuFont.Torus.With(size: 20, weight: FontWeight.Light),
},
}
}
@ -203,7 +203,7 @@ namespace osu.Game.Tournament.Screens.TeamWin
new OsuSpriteText
{
Text = team?.FullName.Value.ToUpper() ?? "???",
Font = TournamentFont.GetFont(TournamentTypeface.Aquatico, 40, FontWeight.Light),
Font = OsuFont.Torus.With(size: 40, weight: FontWeight.Light),
Colour = Color4.Black,
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,