Merge branch 'master' into PlayerSettigsOverlay_InputHandle

This commit is contained in:
Dan Balasescu 2018-02-02 11:12:33 +09:00 committed by GitHub
commit 2c45fc67a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions

View File

@ -396,16 +396,17 @@ namespace osu.Game.Overlays.Profile
scoreText.Add(createScoreText("Replays Watched by Others")); scoreText.Add(createScoreText("Replays Watched by Others"));
scoreNumberText.Add(createScoreNumberText(user.Statistics.ReplaysWatched.ToString(@"#,0"))); scoreNumberText.Add(createScoreNumberText(user.Statistics.ReplaysWatched.ToString(@"#,0")));
gradeSSPlus.DisplayCount = user.Statistics.GradesCount.SSPlus;
gradeSSPlus.Show();
gradeSS.DisplayCount = user.Statistics.GradesCount.SS; gradeSS.DisplayCount = user.Statistics.GradesCount.SS;
gradeSS.Show(); gradeSS.Show();
gradeSPlus.DisplayCount = user.Statistics.GradesCount.SPlus;
gradeSPlus.Show();
gradeS.DisplayCount = user.Statistics.GradesCount.S; gradeS.DisplayCount = user.Statistics.GradesCount.S;
gradeS.Show(); gradeS.Show();
gradeA.DisplayCount = user.Statistics.GradesCount.A; gradeA.DisplayCount = user.Statistics.GradesCount.A;
gradeA.Show(); gradeA.Show();
gradeSPlus.DisplayCount = 0;
gradeSSPlus.DisplayCount = 0;
rankGraph.User.Value = user; rankGraph.User.Value = user;
} }
} }

View File

@ -51,9 +51,15 @@ namespace osu.Game.Users
public struct Grades public struct Grades
{ {
[JsonProperty(@"ssh")]
public int SSPlus;
[JsonProperty(@"ss")] [JsonProperty(@"ss")]
public int SS; public int SS;
[JsonProperty(@"sh")]
public int SPlus;
[JsonProperty(@"s")] [JsonProperty(@"s")]
public int S; public int S;