mirror of
https://github.com/ppy/osu.git
synced 2024-11-11 10:18:22 +08:00
Revert no longer needed access modifier change
This commit is contained in:
parent
f47b74a938
commit
3497e966fd
@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
|
|||||||
/// The length (in milliseconds) between ticks of this drumroll.
|
/// The length (in milliseconds) between ticks of this drumroll.
|
||||||
/// <para>Half of this value is the hit window of the ticks.</para>
|
/// <para>Half of this value is the hit window of the ticks.</para>
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected double TickSpacing = 100;
|
private double tickSpacing = 100;
|
||||||
|
|
||||||
private float overallDifficulty = BeatmapDifficulty.DEFAULT_DIFFICULTY;
|
private float overallDifficulty = BeatmapDifficulty.DEFAULT_DIFFICULTY;
|
||||||
|
|
||||||
@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
|
|||||||
double scoringDistance = base_distance * difficulty.SliderMultiplier * DifficultyControlPoint.SliderVelocity;
|
double scoringDistance = base_distance * difficulty.SliderMultiplier * DifficultyControlPoint.SliderVelocity;
|
||||||
Velocity = scoringDistance / timingPoint.BeatLength;
|
Velocity = scoringDistance / timingPoint.BeatLength;
|
||||||
|
|
||||||
TickSpacing = timingPoint.BeatLength / TickRate;
|
tickSpacing = timingPoint.BeatLength / TickRate;
|
||||||
overallDifficulty = difficulty.OverallDifficulty;
|
overallDifficulty = difficulty.OverallDifficulty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -91,19 +91,19 @@ namespace osu.Game.Rulesets.Taiko.Objects
|
|||||||
{
|
{
|
||||||
List<TaikoHitObject> ticks = new List<TaikoHitObject>();
|
List<TaikoHitObject> ticks = new List<TaikoHitObject>();
|
||||||
|
|
||||||
if (TickSpacing == 0)
|
if (tickSpacing == 0)
|
||||||
return ticks;
|
return ticks;
|
||||||
|
|
||||||
bool first = true;
|
bool first = true;
|
||||||
|
|
||||||
for (double t = StartTime; t < EndTime + TickSpacing / 2; t += TickSpacing)
|
for (double t = StartTime; t < EndTime + tickSpacing / 2; t += tickSpacing)
|
||||||
{
|
{
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
ticks.Add(new DrumRollTick
|
ticks.Add(new DrumRollTick
|
||||||
{
|
{
|
||||||
FirstTick = first,
|
FirstTick = first,
|
||||||
TickSpacing = TickSpacing,
|
TickSpacing = tickSpacing,
|
||||||
StartTime = t,
|
StartTime = t,
|
||||||
IsStrong = IsStrong
|
IsStrong = IsStrong
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user