diff --git a/osu.Game.Modes.Catch/Objects/CatchBaseHit.cs b/osu.Game.Modes.Catch/Objects/CatchBaseHit.cs index 80e87f58c6..ee66894d31 100644 --- a/osu.Game.Modes.Catch/Objects/CatchBaseHit.cs +++ b/osu.Game.Modes.Catch/Objects/CatchBaseHit.cs @@ -1,14 +1,12 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using OpenTK; using osu.Game.Modes.Objects; -using osu.Game.Modes.Objects.Types; namespace osu.Game.Modes.Catch.Objects { - public abstract class CatchBaseHit : HitObject, IHasPosition + public abstract class CatchBaseHit : HitObject { - public Vector2 Position { get; set; } + public float Position { get; set; } } } diff --git a/osu.Game.Modes.Catch/Objects/Drawable/DrawableFruit.cs b/osu.Game.Modes.Catch/Objects/Drawable/DrawableFruit.cs index 216d65f1db..5d19d902b1 100644 --- a/osu.Game.Modes.Catch/Objects/Drawable/DrawableFruit.cs +++ b/osu.Game.Modes.Catch/Objects/Drawable/DrawableFruit.cs @@ -7,7 +7,6 @@ using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Transforms; using OpenTK; -using osu.Game.Modes.Objects.Types; namespace osu.Game.Modes.Catch.Objects.Drawable { @@ -22,7 +21,7 @@ namespace osu.Game.Modes.Catch.Objects.Drawable Origin = Anchor.Centre; Scale = new Vector2(0.1f); RelativePositionAxes = Axes.Y; - Position = new Vector2(h.Position.X, -0.1f); + Position = new Vector2(h.Position, -0.1f); } [BackgroundDependencyLoader] @@ -30,10 +29,9 @@ namespace osu.Game.Modes.Catch.Objects.Drawable { Texture = textures.Get(@"Menu/logo"); - double endTime = (h as IHasEndTime)?.EndTime ?? h.StartTime; - double duration = endTime - h.StartTime; + double duration = 0; - Transforms.Add(new TransformPosition { StartTime = h.StartTime - 200, EndTime = h.StartTime, StartValue = new Vector2(h.Position.X, -0.1f), EndValue = new Vector2(h.Position.X, 0.9f) }); + Transforms.Add(new TransformPosition { StartTime = h.StartTime - 200, EndTime = h.StartTime, StartValue = new Vector2(h.Position, -0.1f), EndValue = new Vector2(h.Position, 0.9f) }); Transforms.Add(new TransformAlpha { StartTime = h.StartTime + duration + 200, EndTime = h.StartTime + duration + 400, StartValue = 1, EndValue = 0 }); Expire(true); } diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs index 50ec094f3d..a54108afda 100644 --- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs +++ b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs @@ -7,7 +7,6 @@ using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Transforms; using OpenTK; -using osu.Game.Modes.Objects.Types; namespace osu.Game.Modes.Taiko.Objects.Drawable { @@ -30,8 +29,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable { Texture = textures.Get(@"Menu/logo"); - double endTime = (h as IHasEndTime)?.EndTime ?? h.StartTime; - double duration = endTime - h.StartTime; + double duration = 0; Transforms.Add(new TransformPositionX { StartTime = h.StartTime - 200, EndTime = h.StartTime, StartValue = 1.1f, EndValue = 0.1f }); Transforms.Add(new TransformAlpha { StartTime = h.StartTime + duration + 200, EndTime = h.StartTime + duration + 400, StartValue = 1, EndValue = 0 });