sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-selector-regression

Browse Source
This commit is contained in:
Dean Herbert
2018-12-03 18:01:12 +09:00
committed by GitHub
parent 814d401eb0 1d2626c94a
commit 9a8136ea4a
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -147,6 +147,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
/// <summary>
/// Plays all the hit sounds for this <see cref="DrawableHitObject"/>.
/// This is invoked automatically when this <see cref="DrawableHitObject"/> is hit.
/// </summary>
public void PlaySamples() => Samples?.Play();

9
osu.Game/Rulesets/Objects/HitObject.cs
View File

@ -69,6 +69,9 @@ namespace osu.Game.Rulesets.Objects
{
ApplyDefaultsToSelf(controlPointInfo, difficulty);
// This is done here since ApplyDefaultsToSelf may be used to determine the end time
SampleControlPoint = controlPointInfo.SamplePointAt((this as IHasEndTime)?.EndTime ?? StartTime);
nestedHitObjects.Clear();
CreateNestedHitObjects();
@ -84,11 +87,7 @@ namespace osu.Game.Rulesets.Objects
protected virtual void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
{
SampleControlPoint samplePoint = controlPointInfo.SamplePointAt(StartTime);
EffectControlPoint effectPoint = controlPointInfo.EffectPointAt(StartTime);
Kiai = effectPoint.KiaiMode;
SampleControlPoint = samplePoint;
Kiai = controlPointInfo.EffectPointAt(StartTime).KiaiMode;
if (HitWindows == null)
HitWindows = CreateHitWindows();