From 57a068c5d13b4e2cd08bd272a910a0a2e269b541 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 5 Apr 2017 15:11:51 +0900 Subject: [PATCH] Fix notes travelling backwards when hit. Also improves the gravity curve. --- .../Objects/Drawables/DrawableHit.cs | 14 +++++++++----- .../Objects/Drawables/DrawableTaikoHitObject.cs | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs index 40d625812a..f325026be9 100644 --- a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs +++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs @@ -75,12 +75,16 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables FadeOut(100); break; case ArmedState.Hit: - Content.ScaleTo(0.8f, 400, EasingTypes.OutQuad); - Content.MoveToY(-200, 250, EasingTypes.Out); - Content.Delay(250); - Content.MoveToY(0, 500, EasingTypes.In); - FadeOut(600); + + const float gravity_time = 300; + const float gravity_travel_height = 200; + + Content.ScaleTo(0.8f, gravity_time * 2, EasingTypes.OutQuad); + + MoveToY(-gravity_travel_height, gravity_time, EasingTypes.Out); + Delay(gravity_time, true); + MoveToY(gravity_travel_height * 2, gravity_time * 2, EasingTypes.In); break; } diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs index 5086ab8f81..0c9720b0bb 100644 --- a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs +++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs @@ -71,7 +71,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables /// a time value and the HitObject's StartTime. /// /// - protected virtual void UpdateScrollPosition(double time) => MoveToX((float)((HitObject.StartTime - time) / HitObject.ScrollTime)); + protected virtual void UpdateScrollPosition(double time) => X = (float)((HitObject.StartTime - time) / HitObject.ScrollTime); protected override void Update() {