sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update osu! drawables to use TransformSequences.

Browse Source
This commit is contained in:
Dean Herbert
2017-04-27 17:37:38 +09:00
parent 5e76f02b4f
commit 4ab636cbb8
5 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
View File

@ -104,10 +104,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
ApproachCircle.ScaleTo(1.1f, TIME_PREEMPT); ApproachCircle.ScaleTo(1.1f, TIME_PREEMPT);
} }
protected override void UpdateState(ArmedState state) protected override void UpdateCurrentState(ArmedState state)
{ {
base.UpdateState(state);
ApproachCircle.FadeOut(); ApproachCircle.FadeOut();
double endTime = (HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime; double endTime = (HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime;

14
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
View File

@ -21,17 +21,23 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
protected override OsuJudgement CreateJudgement() => new OsuJudgement { MaxScore = OsuScoreResult.Hit300 }; protected override OsuJudgement CreateJudgement() => new OsuJudgement { MaxScore = OsuScoreResult.Hit300 };
protected override void UpdateState(ArmedState state) protected override sealed void UpdateState(ArmedState state)
{ {
Flush(); Flush();
UpdateInitialState(); UpdateInitialState();
Delay(HitObject.StartTime - Time.Current - TIME_PREEMPT + Judgement.TimeOffset, true); using (BeginAbsoluteSequence(HitObject.StartTime - TIME_PREEMPT, true))
{
UpdatePreemptState();
UpdatePreemptState(); using (BeginDelayedSequence(TIME_PREEMPT + Judgement.TimeOffset, true))
UpdateCurrentState(state);
}
}
Delay(TIME_PREEMPT, true); protected virtual void UpdateCurrentState(ArmedState state)
{
} }
protected virtual void UpdatePreemptState() protected virtual void UpdatePreemptState()

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

@ -158,10 +158,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
ball.Alpha = 0; ball.Alpha = 0;
} }
protected override void UpdateState(ArmedState state) protected override void UpdateCurrentState(ArmedState state)
{ {
base.UpdateState(state);
ball.FadeIn(); ball.FadeIn();
Delay(slider.Duration, true); Delay(slider.Duration, true);
@ -181,4 +179,4 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
{ {
void UpdateProgress(double progress, int repeat); void UpdateProgress(double progress, int repeat);
} }
} }

6
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
View File

@ -72,10 +72,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
Delay(-animIn); Delay(-animIn);
} }
protected override void UpdateState(ArmedState state) protected override void UpdateCurrentState(ArmedState state)
{ {
base.UpdateState(state);
switch (state) switch (state)
{ {
case ArmedState.Idle: case ArmedState.Idle:
@ -93,4 +91,4 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
} }
} }
} }
} }

4
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
View File

@ -132,10 +132,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
disc.FadeIn(200); disc.FadeIn(200);
} }
protected override void UpdateState(ArmedState state) protected override void UpdateCurrentState(ArmedState state)
{ {
base.UpdateState(state);
Delay(spinner.Duration, true); Delay(spinner.Duration, true);
FadeOut(160); FadeOut(160);