Merge branch 'master' into no-more-difficulty-control-points-info

This commit is contained in:
smoogipoo
2021-10-08 18:41:17 +09:00
334 changed files with 5475 additions and 2428 deletions

View File

@ -390,7 +390,7 @@ namespace osu.Game.Rulesets.Edit
public override float GetBeatSnapDistanceAt(HitObject referenceObject)
{
return (float)(100 * EditorBeatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier * referenceObject.DifficultyControlPoint.SliderVelocity / BeatSnapProvider.BeatDivisor);
return (float)(100 * EditorBeatmap.Difficulty.SliderMultiplier * referenceObject.DifficultyControlPoint.SliderVelocity / BeatSnapProvider.BeatDivisor);
}
public override float DurationToDistance(HitObject referenceObject, double duration)