mirror of
https://github.com/ppy/osu.git
synced 2024-09-22 11:27:24 +08:00
Merge pull request #2049 from sunghwan2789/default-approachrate
Fix ApproachRate not inheriting OverallDifficulty when it is undefined
This commit is contained in:
commit
d8224809e6
@ -20,7 +20,15 @@ namespace osu.Game.Beatmaps
|
|||||||
public float DrainRate { get; set; } = DEFAULT_DIFFICULTY;
|
public float DrainRate { get; set; } = DEFAULT_DIFFICULTY;
|
||||||
public float CircleSize { get; set; } = DEFAULT_DIFFICULTY;
|
public float CircleSize { get; set; } = DEFAULT_DIFFICULTY;
|
||||||
public float OverallDifficulty { get; set; } = DEFAULT_DIFFICULTY;
|
public float OverallDifficulty { get; set; } = DEFAULT_DIFFICULTY;
|
||||||
public float ApproachRate { get; set; } = DEFAULT_DIFFICULTY;
|
|
||||||
|
private float? approachRate;
|
||||||
|
|
||||||
|
public float ApproachRate
|
||||||
|
{
|
||||||
|
get => approachRate ?? OverallDifficulty;
|
||||||
|
set => approachRate = value;
|
||||||
|
}
|
||||||
|
|
||||||
public float SliderMultiplier { get; set; } = 1;
|
public float SliderMultiplier { get; set; } = 1;
|
||||||
public float SliderTickRate { get; set; } = 1;
|
public float SliderTickRate { get; set; } = 1;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user