RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8173 from peppy/tournament-design-mappool 

Implement 2020 map pool design
This commit is contained in:
Dean Herbert 2020-03-09 14:51:00 +09:00 committed by GitHub
parent 79153914fd fac5530cab
commit b4cb4100dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
View File

@ -27,7 +27,7 @@ public class TournamentBeatmapPanel : CompositeDrawable
private readonly string mods;
private const float horizontal_padding = 10;
private const float vertical_padding = 5;
private const float vertical_padding = 10;
public const float HEIGHT = 50;
@ -50,8 +50,6 @@ private void load(LadderInfo ladder, TextureStore textures)
currentMatch.BindValueChanged(matchChanged);
currentMatch.BindTo(ladder.CurrentMatch);
CornerRadius = HEIGHT / 2;
CornerExponent = 2;
Masking = true;
AddRangeInternal(new Drawable[]
@ -70,16 +68,12 @@ private void load(LadderInfo ladder, TextureStore textures)
new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Padding = new MarginPadding(vertical_padding),
Direction = FillDirection.Vertical,
Children = new Drawable[]
{
new TournamentSpriteText
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Text = new LocalisedString((
$"{Beatmap.Metadata.ArtistUnicode ?? Beatmap.Metadata.Artist} - {Beatmap.Metadata.TitleUnicode ?? Beatmap.Metadata.Title}",
$"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}")),
@ -88,9 +82,6 @@ private void load(LadderInfo ladder, TextureStore textures)
new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Padding = new MarginPadding(vertical_padding),
Direction = FillDirection.Horizontal,
Children = new Drawable[]
{
@ -170,16 +161,7 @@ private void updateState()
BorderThickness = 6;
switch (found.Team)
{
case TeamColour.Red:
BorderColour = Color4.Red;
break;
case TeamColour.Blue:
BorderColour = Color4.Blue;
break;
}
BorderColour = TournamentGame.GetTeamColour(found.Team);
switch (found.Type)
{

5
osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
View File

@ -42,6 +42,11 @@ public MapPoolScreen()
{
InternalChildren = new Drawable[]
{
new TourneyVideo("gameplay")
{
Loop = true,
RelativeSizeAxes = Axes.Both,
},
new MatchHeader(),
mapFlows = new FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>>
{