mirror of
https://github.com/ppy/osu
synced 2024-12-28 09:52:56 +00:00
Fix taiko proxies not receiving the correct lifetimes
This commit is contained in:
parent
3e2e2a7000
commit
e207dd728b
@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
|
|||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
Child = Content = new Container { 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 abstract bool OnPressed(TaikoAction action);
|
||||||
public virtual bool OnReleased(TaikoAction action) => false;
|
public virtual bool OnReleased(TaikoAction action) => false;
|
||||||
|
|
||||||
|
private class ProxiedContentContainer : Container
|
||||||
|
{
|
||||||
|
public override double LifetimeStart => Parent.LifetimeStart;
|
||||||
|
public override double LifetimeEnd => Parent.LifetimeEnd;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract class DrawableTaikoHitObject<TaikoHitType> : DrawableTaikoHitObject
|
public abstract class DrawableTaikoHitObject<TaikoHitType> : DrawableTaikoHitObject
|
||||||
|
@ -31,6 +31,8 @@ namespace osu.Game.Skinning
|
|||||||
|
|
||||||
public void Play() => channels?.ForEach(c => c.Play());
|
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)
|
protected override void SkinChanged(ISkinSource skin, bool allowFallback)
|
||||||
{
|
{
|
||||||
channels = samples.Select(s =>
|
channels = samples.Select(s =>
|
||||||
|
Loading…
Reference in New Issue
Block a user