sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-23 14:37:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18595 from frenzibyte/fix-spinner-bonus-spin-sound-again

Browse Source 
Fix spinner bonus tick sample not balanced again
This commit is contained in:
Dan Balasescu 2022-06-07 10:31:46 +09:00 committed by GitHub
commit 5b4954aac1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
View File

@ -79,7 +79,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
{ {
Result = { BindTarget = SpinsPerMinute }, Result = { BindTarget = SpinsPerMinute },
}, },
ticks = new Container<DrawableSpinnerTick>(), ticks = new Container<DrawableSpinnerTick>
{
RelativeSizeAxes = Axes.Both,
},
new AspectContainer new AspectContainer
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,

6
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinnerTick.cs
View File

@ -1,6 +1,8 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Graphics;
namespace osu.Game.Rulesets.Osu.Objects.Drawables namespace osu.Game.Rulesets.Osu.Objects.Drawables
{ {
public class DrawableSpinnerTick : DrawableOsuHitObject public class DrawableSpinnerTick : DrawableOsuHitObject
@ -10,13 +12,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
protected DrawableSpinner DrawableSpinner => (DrawableSpinner)ParentHitObject; protected DrawableSpinner DrawableSpinner => (DrawableSpinner)ParentHitObject;
public DrawableSpinnerTick() public DrawableSpinnerTick()
: base(null) : this(null)
{ {
} }
public DrawableSpinnerTick(SpinnerTick spinnerTick) public DrawableSpinnerTick(SpinnerTick spinnerTick)
: base(spinnerTick) : base(spinnerTick)
{ {
Anchor = Anchor.Centre;
Origin = Anchor.Centre;
} }
protected override double MaximumJudgementOffset => DrawableSpinner.HitObject.Duration; protected override double MaximumJudgementOffset => DrawableSpinner.HitObject.Duration;

4
osu.Game.Rulesets.Osu/Objects/Spinner.cs
View File

@ -69,8 +69,8 @@ namespace osu.Game.Rulesets.Osu.Objects
double startTime = StartTime + (float)(i + 1) / totalSpins * Duration; double startTime = StartTime + (float)(i + 1) / totalSpins * Duration;
AddNested(i < SpinsRequired AddNested(i < SpinsRequired
? new SpinnerTick { StartTime = startTime, Position = Position } ? new SpinnerTick { StartTime = startTime }
: new SpinnerBonusTick { StartTime = startTime, Position = Position }); : new SpinnerBonusTick { StartTime = startTime });
} }
} }