mirror of
https://github.com/ppy/osu.git
synced 2025-01-12 17:35:10 +08:00
XBindable -> EffectiveXBindable in catch DHO
This commit is contained in:
parent
96f3e0dad8
commit
cd2db59900
@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
|
|||||||
{
|
{
|
||||||
public abstract class DrawableCatchHitObject : DrawableHitObject<CatchHitObject>
|
public abstract class DrawableCatchHitObject : DrawableHitObject<CatchHitObject>
|
||||||
{
|
{
|
||||||
public readonly Bindable<float> XBindable = new Bindable<float>();
|
public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();
|
||||||
|
|
||||||
protected override double InitialLifetimeOffset => HitObject.TimePreempt;
|
protected override double InitialLifetimeOffset => HitObject.TimePreempt;
|
||||||
|
|
||||||
@ -38,14 +38,14 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
|
|||||||
{
|
{
|
||||||
base.OnApply();
|
base.OnApply();
|
||||||
|
|
||||||
XBindable.BindTo(HitObject.EffectiveXBindable);
|
EffectiveXBindable.BindTo(HitObject.EffectiveXBindable);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnFree()
|
protected override void OnFree()
|
||||||
{
|
{
|
||||||
base.OnFree();
|
base.OnFree();
|
||||||
|
|
||||||
XBindable.UnbindFrom(HitObject.EffectiveXBindable);
|
EffectiveXBindable.UnbindFrom(HitObject.EffectiveXBindable);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Func<CatchHitObject, bool> CheckPosition;
|
public Func<CatchHitObject, bool> CheckPosition;
|
||||||
|
@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
|
|||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load()
|
private void load()
|
||||||
{
|
{
|
||||||
XBindable.BindValueChanged(x =>
|
EffectiveXBindable.BindValueChanged(x =>
|
||||||
{
|
{
|
||||||
X = x.NewValue;
|
X = x.NewValue;
|
||||||
}, true);
|
}, true);
|
||||||
|
Loading…
Reference in New Issue
Block a user