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

Merge branch 'master' into drawable-fruit-improvements

Browse Source
This commit is contained in:
Dan Balasescu
2018-01-09 22:06:16 +09:00
committed by GitHub
parent 5bd489863c 96226e1f27
commit 9c602f8770
952 changed files with 2421 additions and 1772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK;
@ -158,14 +158,23 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
protected override void UpdateCurrentState(ArmedState state)
{
Ball.FadeIn();
Ball.ScaleTo(HitObject.Scale);
using (BeginDelayedSequence(slider.Duration, true))
{
Body.FadeOut(160);
Ball.FadeOut(160);
const float fade_out_time = 450;
this.FadeOut(800)
.Expire();
// intentionally pile on an extra FadeOut to make it happen much faster.
Ball.FadeOut(fade_out_time / 4, Easing.Out);
switch (state)
{
case ArmedState.Hit:
Ball.ScaleTo(HitObject.Scale * 1.4f, fade_out_time, Easing.Out);
break;
}
this.FadeOut(fade_out_time, Easing.OutQuint).Expire();
}
}