sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Pool caught objects and dropped objects

Browse Source
This commit is contained in:
ekrctb
2020-12-08 22:38:10 +09:00
parent a32dac00dd
commit 749d5380ca
4 changed files with 53 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Rulesets.Catch/Objects/Drawables/CaughtObject.cs
View File

@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
[Cached(typeof(IHasCatchObjectState))]
public abstract class CaughtObject : SkinnableDrawable, IHasCatchObjectState
{
public CatchHitObject HitObject { get; private set; }
public PalpableCatchHitObject HitObject { get; private set; }
public Bindable<Color4> AccentColour { get; } = new Bindable<Color4>();
public Bindable<bool> HyperDash { get; } = new Bindable<bool>();
@ -29,7 +29,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
protected CaughtObject(CatchSkinComponents skinComponent, Func<ISkinComponent, Drawable> defaultImplementation)
: base(new CatchSkinComponent(skinComponent), defaultImplementation)
{
Anchor = Anchor.TopCentre;
Origin = Anchor.Centre;
RelativeSizeAxes = Axes.None;
@ -44,6 +43,17 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
AccentColour.Value = objectState.AccentColour.Value;
HyperDash.Value = objectState.HyperDash.Value;
}
protected override void FreeAfterUse()
{
ClearTransforms();
Alpha = 1;
LifetimeStart = double.MinValue;
LifetimeEnd = double.MaxValue;
base.FreeAfterUse();
}
}
public class CaughtFruit : CaughtObject, IHasFruitState