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

ScoreInfo scoreInfo -> ScoreInfo score

Browse Source
This commit is contained in:
Dean Herbert
2018-11-30 15:18:52 +09:00
parent 271dcded3c
commit 831cd3ed59
25 changed files with 135 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
private readonly Box background;
public DrawableScore(int index, APIScoreInfo scoreInfo)
public DrawableScore(int index, APIScoreInfo score)
{
ScoreModsContainer modsContainer;
@ -49,7 +49,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
Font = @"Exo2.0-RegularItalic",
Margin = new MarginPadding { Left = side_margin }
},
new DrawableFlag(scoreInfo.User.Country)
new DrawableFlag(score.User.Country)
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
@ -60,7 +60,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
User = scoreInfo.User,
User = score.User,
Margin = new MarginPadding { Left = 100 }
},
modsContainer = new ScoreModsContainer
@ -73,7 +73,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
RelativePositionAxes = Axes.X,
X = 0.42f
},
new DrawableRank(scoreInfo.Rank)
new DrawableRank(score.Rank)
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
@ -86,7 +86,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreRight,
Text = $@"{scoreInfo.TotalScore:N0}",
Text = $@"{score.TotalScore:N0}",
Font = @"Venera",
RelativePositionAxes = Axes.X,
X = 0.75f,
@ -96,7 +96,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreRight,
Text = $@"{scoreInfo.Accuracy:P2}",
Text = $@"{score.Accuracy:P2}",
Font = @"Exo2.0-RegularItalic",
RelativePositionAxes = Axes.X,
X = 0.85f
@ -105,13 +105,13 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
{
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Text = $"{scoreInfo.Statistics[HitResult.Great]}/{scoreInfo.Statistics[HitResult.Good]}/{scoreInfo.Statistics[HitResult.Meh]}",
Text = $"{score.Statistics[HitResult.Great]}/{score.Statistics[HitResult.Good]}/{score.Statistics[HitResult.Meh]}",
Font = @"Exo2.0-RegularItalic",
Margin = new MarginPadding { Right = side_margin }
},
};
foreach (Mod mod in scoreInfo.Mods)
foreach (Mod mod in score.Mods)
modsContainer.Add(new ModIcon(mod)
{
AutoSizeAxes = Axes.Both,

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

@ -43,26 +43,26 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
private readonly InfoColumn statistics;
private readonly ScoreModsContainer modsContainer;
private APIScoreInfo scoreInfo;
public APIScoreInfo ScoreInfo
private APIScoreInfo score;
public APIScoreInfo Score
{
get { return scoreInfo; }
get { return score; }
set
{
if (scoreInfo == value) return;
scoreInfo = value;
if (score == value) return;
score = value;
avatar.User = username.User = scoreInfo.User;
flag.Country = scoreInfo.User.Country;
date.Text = $@"achieved {scoreInfo.Date:MMM d, yyyy}";
rank.UpdateRank(scoreInfo.Rank);
avatar.User = username.User = score.User;
flag.Country = score.User.Country;
date.Text = $@"achieved {score.Date:MMM d, yyyy}";
rank.UpdateRank(score.Rank);
totalScore.Value = $@"{scoreInfo.TotalScore:N0}";
accuracy.Value = $@"{scoreInfo.Accuracy:P2}";
statistics.Value = $"{scoreInfo.Statistics[HitResult.Great]}/{scoreInfo.Statistics[HitResult.Good]}/{scoreInfo.Statistics[HitResult.Meh]}";
totalScore.Value = $@"{score.TotalScore:N0}";
accuracy.Value = $@"{score.Accuracy:P2}";
statistics.Value = $"{score.Statistics[HitResult.Great]}/{score.Statistics[HitResult.Good]}/{score.Statistics[HitResult.Meh]}";
modsContainer.Clear();
foreach (Mod mod in scoreInfo.Mods)
foreach (Mod mod in score.Mods)
modsContainer.Add(new ModIcon(mod)
{
AutoSizeAxes = Axes.Both,

2
osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
View File

@ -80,7 +80,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
return;
}
topScore.ScoreInfo = scores.FirstOrDefault();
topScore.Score = scores.FirstOrDefault();
topScore.Show();
flow.Clear();