RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-03-18 17:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #500 from smoogipooo/explicit_expires

Browse Source 
Make DrawableHitObject expires explicit.
This commit is contained in:
Dean Herbert 2017-03-19 12:47:43 +09:00 committed by GitHub
commit af85bcaf1d
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
View File

@ -128,9 +128,11 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
case ArmedState.Idle:
Delay(duration + TIME_PREEMPT);
FadeOut(TIME_FADEOUT);
Expire(true);
break;
case ArmedState.Miss:
FadeOut(TIME_FADEOUT / 5);
Expire();
break;
case ArmedState.Hit:
const double flash_in = 40;
@ -150,6 +152,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
FadeOut(800);
ScaleTo(Scale * 1.5f, 400, EasingTypes.OutQuad);
Expire();
break;
}
}

2
osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
View File

@ -168,6 +168,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
ball.FadeOut(160);
FadeOut(800);
Expire();
}
public Drawable ProxiedLayer => initialCircle.ApproachCircle;

2
osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
View File

@ -146,9 +146,11 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
{
case ArmedState.Hit:
ScaleTo(Scale * 1.2f, 320, EasingTypes.Out);
Expire();
break;
case ArmedState.Miss:
ScaleTo(Scale * 0.8f, 320, EasingTypes.In);
Expire();
break;
}
}

7
osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
View File

@ -34,12 +34,11 @@ namespace osu.Game.Modes.Objects.Drawables
set
{
if (state == value) return;
if (state == value)
return;
state = value;
UpdateState(state);
if (IsLoaded)
Expire();
if (State == ArmedState.Hit)
PlaySample();
@ -63,8 +62,6 @@ namespace osu.Game.Modes.Objects.Drawables
//force application of the state that was set before we loaded.
UpdateState(State);
Expire(true);
}
}