Merge branch 'master' into fix-quit-user-showing-in-leaderboard

This commit is contained in:
Bartłomiej Dach
2020-12-27 13:02:40 +01:00
12 changed files with 180 additions and 112 deletions

View File

@ -79,6 +79,8 @@ namespace osu.Game.Screens.Play.HUD
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
Container avatarContainer;
InternalChildren = new Drawable[]
{
mainFillContainer = new Container
@ -153,7 +155,7 @@ namespace osu.Game.Screens.Play.HUD
Spacing = new Vector2(4f, 0f),
Children = new Drawable[]
{
new CircularContainer
avatarContainer = new CircularContainer
{
Masking = true,
Anchor = Anchor.CentreLeft,
@ -167,11 +169,7 @@ namespace osu.Game.Screens.Play.HUD
Alpha = 0.3f,
RelativeSizeAxes = Axes.Both,
Colour = colours.Gray4,
},
new UpdateableAvatar(User)
{
RelativeSizeAxes = Axes.Both,
},
}
}
},
usernameText = new OsuSpriteText
@ -228,6 +226,8 @@ namespace osu.Game.Screens.Play.HUD
}
};
LoadComponentAsync(new DrawableAvatar(User), avatarContainer.Add);
TotalScore.BindValueChanged(v => scoreText.Text = v.NewValue.ToString("N0"), true);
Accuracy.BindValueChanged(v => accuracyText.Text = v.NewValue.FormatAccuracy(), true);
Combo.BindValueChanged(v => comboText.Text = $"{v.NewValue}x", true);