mirror of
https://github.com/osukey/osukey.git
synced 2025-08-04 23:24:04 +09:00
Merge branch 'master' into more_context_menus
This commit is contained in:
@ -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()
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user