mirror of https://github.com/ppy/osu
Revert rename error
This commit is contained in:
parent
1212ffd24f
commit
b80204642e
|
@ -9,7 +9,7 @@
|
|||
|
||||
namespace osu.Game.Rulesets.Catch.Objects.Drawables
|
||||
{
|
||||
public class DrawableBanana : DrawablePalpableHasCatchHitObject
|
||||
public class DrawableBanana : DrawablePalpableCatchHitObject
|
||||
{
|
||||
public DrawableBanana()
|
||||
: this(null)
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
namespace osu.Game.Rulesets.Catch.Objects.Drawables
|
||||
{
|
||||
public class DrawableDroplet : DrawablePalpableHasCatchHitObject
|
||||
public class DrawableDroplet : DrawablePalpableCatchHitObject
|
||||
{
|
||||
public DrawableDroplet()
|
||||
: this(null)
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
namespace osu.Game.Rulesets.Catch.Objects.Drawables
|
||||
{
|
||||
public class DrawableFruit : DrawablePalpableHasCatchHitObject, IHasFruitState
|
||||
public class DrawableFruit : DrawablePalpableCatchHitObject, IHasFruitState
|
||||
{
|
||||
public Bindable<FruitVisualRepresentation> VisualRepresentation { get; } = new Bindable<FruitVisualRepresentation>();
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
namespace osu.Game.Rulesets.Catch.Objects.Drawables
|
||||
{
|
||||
[Cached(typeof(IHasCatchObjectState))]
|
||||
public abstract class DrawablePalpableHasCatchHitObject : DrawableCatchHitObject, IHasCatchObjectState
|
||||
public abstract class DrawablePalpableCatchHitObject : DrawableCatchHitObject, IHasCatchObjectState
|
||||
{
|
||||
public new PalpableCatchHitObject HitObject => (PalpableCatchHitObject)base.HitObject;
|
||||
|
||||
|
@ -30,7 +30,7 @@ public abstract class DrawablePalpableHasCatchHitObject : DrawableCatchHitObject
|
|||
|
||||
public float DisplayRadius => CatchHitObject.OBJECT_RADIUS * HitObject.Scale * ScaleFactor;
|
||||
|
||||
protected DrawablePalpableHasCatchHitObject([CanBeNull] CatchHitObject h)
|
||||
protected DrawablePalpableCatchHitObject([CanBeNull] CatchHitObject h)
|
||||
: base(h)
|
||||
{
|
||||
Origin = Anchor.Centre;
|
|
@ -223,7 +223,7 @@ public void OnNewResult(DrawableCatchHitObject drawableObject, JudgementResult r
|
|||
catchResult.CatcherAnimationState = CurrentState;
|
||||
catchResult.CatcherHyperDash = HyperDashing;
|
||||
|
||||
if (!(drawableObject is DrawablePalpableHasCatchHitObject palpableObject)) return;
|
||||
if (!(drawableObject is DrawablePalpableCatchHitObject palpableObject)) return;
|
||||
|
||||
var hitObject = palpableObject.HitObject;
|
||||
|
||||
|
@ -458,7 +458,7 @@ private void updateState(CatcherAnimationState state)
|
|||
updateCatcher();
|
||||
}
|
||||
|
||||
private void placeCaughtObject(DrawablePalpableHasCatchHitObject drawableObject, Vector2 position)
|
||||
private void placeCaughtObject(DrawablePalpableCatchHitObject drawableObject, Vector2 position)
|
||||
{
|
||||
var caughtObject = getCaughtObject(drawableObject.HitObject);
|
||||
|
||||
|
|
Loading…
Reference in New Issue