mirror of
https://github.com/ppy/osu.git
synced 2025-02-21 18:42:56 +08:00
Fix DrawableSwell not proxying its content in time/correctly
This commit is contained in:
parent
0eef398ca7
commit
dba3679817
@ -179,9 +179,13 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override double InitialLifetimeOffset => 100;
|
protected override void UpdateInitialTransforms()
|
||||||
|
{
|
||||||
|
base.UpdateInitialTransforms();
|
||||||
|
|
||||||
protected override void UpdateInitialTransforms() => targetRing.ScaleTo(target_ring_scale, InitialLifetimeOffset * 4, Easing.OutQuint);
|
using (BeginAbsoluteSequence(HitObject.StartTime - 100, true))
|
||||||
|
targetRing.ScaleTo(target_ring_scale, 400, Easing.OutQuint);
|
||||||
|
}
|
||||||
|
|
||||||
protected override void UpdateStateTransforms(ArmedState state)
|
protected override void UpdateStateTransforms(ArmedState state)
|
||||||
{
|
{
|
||||||
@ -190,7 +194,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
|
|||||||
switch (state)
|
switch (state)
|
||||||
{
|
{
|
||||||
case ArmedState.Idle:
|
case ArmedState.Idle:
|
||||||
UnproxyContent();
|
|
||||||
expandingRing.FadeTo(0);
|
expandingRing.FadeTo(0);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -217,9 +220,10 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
|
|||||||
// Make the swell stop at the hit target
|
// Make the swell stop at the hit target
|
||||||
X = Math.Max(0, X);
|
X = Math.Max(0, X);
|
||||||
|
|
||||||
double t = Math.Min(HitObject.StartTime, Time.Current);
|
if (Time.Current >= HitObject.StartTime - 100)
|
||||||
if (t == HitObject.StartTime)
|
|
||||||
ProxyContent();
|
ProxyContent();
|
||||||
|
else
|
||||||
|
UnproxyContent();
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool? lastWasCentre;
|
private bool? lastWasCentre;
|
||||||
|
Loading…
Reference in New Issue
Block a user