mirror of
https://github.com/osukey/osukey.git
synced 2025-05-30 09:57:21 +09:00
Fix merge fail.
This commit is contained in:
parent
4783d17d94
commit
1942ef9e8f
@ -250,7 +250,7 @@ namespace osu.Game.Beatmaps.Formats
|
|||||||
{
|
{
|
||||||
Time = time,
|
Time = time,
|
||||||
BeatLength = beatLength,
|
BeatLength = beatLength,
|
||||||
VelocityAdjustment = beatLength < 0 ? -beatLength / 100.0 : 1,
|
SpeedMultiplier = beatLength < 0 ? -beatLength / 100.0 : 1,
|
||||||
TimingChange = timingChange,
|
TimingChange = timingChange,
|
||||||
TimeSignature = timeSignature,
|
TimeSignature = timeSignature,
|
||||||
SampleBank = stringSampleSet,
|
SampleBank = stringSampleSet,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user