1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 20:22:55 +08:00

Merge branch 'master' into channelselection-minimum-size

This commit is contained in:
Dean Herbert 2017-09-13 15:40:22 +09:00 committed by GitHub
commit f4f7ae12b3
2 changed files with 3 additions and 3 deletions

View File

@ -414,8 +414,8 @@ namespace osu.Game.Overlays.Profile
scoreNumberText.Add(createScoreNumberText(user.Statistics.TotalHits.ToString(@"#,0")));
scoreText.Add(createScoreText("Max Combo"));
scoreNumberText.Add(createScoreNumberText(user.Statistics.MaxCombo.ToString(@"#,0")));
scoreText.Add(createScoreText("Replay Watched by Others"));
scoreNumberText.Add(createScoreNumberText(user.Statistics.ReplayWatched.ToString(@"#,0")));
scoreText.Add(createScoreText("Replays Watched by Others"));
scoreNumberText.Add(createScoreNumberText(user.Statistics.ReplaysWatched.ToString(@"#,0")));
gradeSS.DisplayCount = user.Statistics.GradesCount.SS;
gradeSS.Show();

View File

@ -44,7 +44,7 @@ namespace osu.Game.Users
public int MaxCombo;
[JsonProperty(@"replays_watched_by_others")]
public int ReplayWatched;
public int ReplaysWatched;
[JsonProperty(@"grade_counts")]
public Grades GradesCount;