mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 07:42:57 +08:00
Merge branch 'master' into PlayerResumeHotfix
This commit is contained in:
commit
30581d03d2
@ -20,7 +20,15 @@ namespace osu.Game.Beatmaps
|
||||
public float DrainRate { get; set; } = DEFAULT_DIFFICULTY;
|
||||
public float CircleSize { 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 SliderTickRate { get; set; } = 1;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user