Merge branch 'master' into more_context_menus

This commit is contained in:
Dan Balasescu
2017-09-14 19:21:29 +09:00
committed by GitHub
5 changed files with 13 additions and 29 deletions

View File

@ -70,7 +70,7 @@ namespace osu.Game.Overlays.Profile
}
};
ranks = user.AllRankHistories?.Osu?.Data ?? new[] { user.Statistics.Rank };
ranks = user.RankHistory?.Data ?? new[] { user.Statistics.Rank };
}
private void updateRankTexts()

View File

@ -122,25 +122,10 @@ namespace osu.Game.Users
public int Available;
}
[JsonProperty(@"defaultStatistics")]
[JsonProperty(@"statistics")]
public UserStatistics Statistics;
public class RankHistories
{
[JsonProperty(@"osu")]
public RankHistory Osu;
[JsonProperty(@"taiko")]
public RankHistory Taiko;
[JsonProperty(@"fruits")]
public RankHistory Fruits;
[JsonProperty(@"mania")]
public RankHistory Mania;
}
public class RankHistory
public class RankHistoryData
{
[JsonProperty(@"mode")]
public string Mode;
@ -149,7 +134,7 @@ namespace osu.Game.Users
public int[] Data;
}
[JsonProperty(@"allRankHistories")]
public RankHistories AllRankHistories;
[JsonProperty(@"rankHistory")]
public RankHistoryData RankHistory;
}
}