Merge branch 'master' into score-refactor/less-create-score-info

This commit is contained in:
Dean Herbert
2021-11-01 22:59:11 +09:00
46 changed files with 491 additions and 625 deletions

View File

@ -43,16 +43,16 @@ namespace osu.Game.Online.API.Requests.Responses
public double StarRating { get; set; }
[JsonProperty(@"drain")]
private float drainRate { get; set; }
public float DrainRate { get; set; }
[JsonProperty(@"cs")]
private float circleSize { get; set; }
public float CircleSize { get; set; }
[JsonProperty(@"ar")]
private float approachRate { get; set; }
public float ApproachRate { get; set; }
[JsonProperty(@"accuracy")]
private float overallDifficulty { get; set; }
public float OverallDifficulty { get; set; }
[JsonIgnore]
public double Length { get; set; }
@ -100,10 +100,10 @@ namespace osu.Game.Online.API.Requests.Responses
MaxCombo = MaxCombo,
BaseDifficulty = new BeatmapDifficulty
{
DrainRate = drainRate,
CircleSize = circleSize,
ApproachRate = approachRate,
OverallDifficulty = overallDifficulty,
DrainRate = DrainRate,
CircleSize = CircleSize,
ApproachRate = ApproachRate,
OverallDifficulty = OverallDifficulty,
},
OnlineInfo = this,
};
@ -115,10 +115,10 @@ namespace osu.Game.Online.API.Requests.Responses
public IBeatmapDifficultyInfo Difficulty => new BeatmapDifficulty
{
DrainRate = drainRate,
CircleSize = circleSize,
ApproachRate = approachRate,
OverallDifficulty = overallDifficulty,
DrainRate = DrainRate,
CircleSize = CircleSize,
ApproachRate = ApproachRate,
OverallDifficulty = OverallDifficulty,
};
IBeatmapSetInfo? IBeatmapInfo.BeatmapSet => BeatmapSet;