sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3726 from smoogipoo/fix-taiko-lifetimes

Browse Source 
Fix taiko proxies not receiving the correct lifetimes
This commit is contained in:
Dean Herbert
2018-11-20 04:16:11 +09:00
committed by GitHub
parent 12e0d8761d ed26d8ebec
commit 6c9d1e6cf8
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
View File

@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
RelativeSizeAxes = Axes.Both,
Child = Content = new Container { RelativeSizeAxes = Axes.Both }
},
proxiedContent = new Container { RelativeSizeAxes = Axes.Both }
proxiedContent = new ProxiedContentContainer { RelativeSizeAxes = Axes.Both }
};
}
@ -75,6 +75,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
public abstract bool OnPressed(TaikoAction action);
public virtual bool OnReleased(TaikoAction action) => false;
private class ProxiedContentContainer : Container
{
public override double LifetimeStart => Parent?.LifetimeStart ?? base.LifetimeStart;
public override double LifetimeEnd => Parent?.LifetimeEnd ?? base.LifetimeEnd;
}
}
public abstract class DrawableTaikoHitObject<TaikoHitType> : DrawableTaikoHitObject

2
osu.Game/Skinning/SkinnableSound.cs
View File

@ -31,6 +31,8 @@ namespace osu.Game.Skinning
public void Play() => channels?.ForEach(c => c.Play());
public override bool IsPresent => false; // We don't need to receive updates.
protected override void SkinChanged(ISkinSource skin, bool allowFallback)
{
channels = samples.Select(s =>