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

CI fixes

Browse Source
This commit is contained in:
EVAST9919 2017-11-11 07:07:41 +03:00
parent 5bf756c3c6
commit 944bdc1c25
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
View File

@ -21,13 +21,14 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
public class DrawableScore : Container public class DrawableScore : Container
{ {
private const int fade_duration = 100; private const int fade_duration = 100;
private const int height = 30; private const float height = 30;
private readonly Box background; private readonly Box background;
private readonly ScoreModsContainer modsContainer;
public DrawableScore(int index, OnlineScore score) public DrawableScore(int index, OnlineScore score)
{ {
ScoreModsContainer modsContainer;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
Height = height; Height = height;
CornerRadius = 3; CornerRadius = 3;
@ -88,7 +89,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreRight, Origin = Anchor.CentreRight,
Text = score.TotalScore.ToString(), Text = $@"{score.TotalScore}",
Font = @"Exo2.0-MediumItalic", Font = @"Exo2.0-MediumItalic",
RelativePositionAxes = Axes.X, RelativePositionAxes = Axes.X,
X = 0.7f X = 0.7f

12
osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
View File

@ -23,10 +23,10 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
{ {
public class DrawableTopScore : Container public class DrawableTopScore : Container
{ {
private const int fade_duration = 100; private const float fade_duration = 100;
private const int height = 200; private const float height = 200;
private const int avatar_size = 80; private const float avatar_size = 80;
private const int margin = 10; private const float margin = 10;
private readonly Box background; private readonly Box background;
private readonly Box bottomBackground; private readonly Box bottomBackground;
@ -179,10 +179,10 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
{ {
avatar.User = username.User = score.User; avatar.User = username.User = score.User;
flag.FlagName = score.User.Country?.FlagName; flag.FlagName = score.User.Country?.FlagName;
date.Text = $"achieved {score.Date:MMM d, yyyy}"; date.Text = $@"achieved {score.Date:MMM d, yyyy}";
rank.UpdateRank(score.Rank); rank.UpdateRank(score.Rank);
totalScore.Value = score.TotalScore.ToString(); totalScore.Value = $@"{score.TotalScore}";
accuracy.Value = $@"{score.Accuracy:P2}"; accuracy.Value = $@"{score.Accuracy:P2}";
statistics.Value = $"{score.Statistics["300"]}/{score.Statistics["100"]}/{score.Statistics["50"]}"; statistics.Value = $"{score.Statistics["300"]}/{score.Statistics["100"]}/{score.Statistics["50"]}";

3
osu.Game/Overlays/BeatmapSetOverlay.cs
View File

@ -27,7 +27,6 @@ namespace osu.Game.Overlays
private readonly Header header; private readonly Header header;
private readonly Info info; private readonly Info info;
private readonly ScoresContainer scores;
private APIAccess api; private APIAccess api;
private RulesetStore rulesets; private RulesetStore rulesets;
@ -37,6 +36,8 @@ namespace osu.Game.Overlays
public BeatmapSetOverlay() public BeatmapSetOverlay()
{ {
ScoresContainer scores;
FirstWaveColour = OsuColour.Gray(0.4f); FirstWaveColour = OsuColour.Gray(0.4f);
SecondWaveColour = OsuColour.Gray(0.3f); SecondWaveColour = OsuColour.Gray(0.3f);
ThirdWaveColour = OsuColour.Gray(0.2f); ThirdWaveColour = OsuColour.Gray(0.2f);