mirror of
https://github.com/ppy/osu.git
synced 2024-12-16 08:22:56 +08:00
Merge branch 'results-screen' into score-statistics
This commit is contained in:
commit
015eacb3b8
@ -1 +1 @@
|
|||||||
Subproject commit ce76f812d3e059233e1dea395b125352f638b2da
|
Subproject commit b90c4ed490f76f2995662b3a8af3a32b8756a012
|
@ -116,6 +116,7 @@ namespace osu.Game
|
|||||||
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-BlackItalic"));
|
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-BlackItalic"));
|
||||||
|
|
||||||
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Venera"));
|
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Venera"));
|
||||||
|
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Venera-Light"));
|
||||||
|
|
||||||
OszArchiveReader.Register();
|
OszArchiveReader.Register();
|
||||||
|
|
||||||
|
@ -95,8 +95,8 @@ namespace osu.Game.Screens.Ranking
|
|||||||
Anchor = Anchor.TopCentre,
|
Anchor = Anchor.TopCentre,
|
||||||
Origin = Anchor.TopCentre,
|
Origin = Anchor.TopCentre,
|
||||||
Colour = colours.PinkDarker,
|
Colour = colours.PinkDarker,
|
||||||
Y = 5,
|
Y = 10,
|
||||||
TextSize = 60,
|
TextSize = 56,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -370,7 +370,8 @@ namespace osu.Game.Screens.Ranking
|
|||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load(TextureStore textures)
|
private void load(TextureStore textures)
|
||||||
{
|
{
|
||||||
cover.Texture = textures.Get(user.CoverUrl);
|
if (user.Cover?.Url != null)
|
||||||
|
cover.Texture = textures.Get(user.Cover?.Url);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -383,6 +384,7 @@ namespace osu.Game.Screens.Ranking
|
|||||||
public SlowScoreCounter(uint leading = 0) : base(leading)
|
public SlowScoreCounter(uint leading = 0) : base(leading)
|
||||||
{
|
{
|
||||||
DisplayedCountSpriteText.Shadow = false;
|
DisplayedCountSpriteText.Shadow = false;
|
||||||
|
DisplayedCountSpriteText.Font = @"Venera-Light";
|
||||||
UseCommaSeparator = true;
|
UseCommaSeparator = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user