sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 07:33:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove remaining usages of AddDelay

Browse Source
This commit is contained in:
Thomas Müller
2017-07-17 18:16:15 +03:00
parent 546efc0181
commit 440878945e
6 changed files with 47 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
View File

@ -64,8 +64,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
protected override void LoadComplete()
{
base.LoadComplete();
AddDelay(BarLine.StartTime - Time.Current);
this.FadeOut(base_fadeout_time * BarLine.ScrollTime / 1000);
this.Delay(BarLine.StartTime - Time.Current).FadeOut(base_fadeout_time * BarLine.ScrollTime / 1000);
}
private void updateScrollPosition(double time) => this.MoveToX((float)((BarLine.StartTime - time) / BarLine.ScrollTime));

57
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
View File

@ -65,45 +65,42 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
protected override void UpdateState(ArmedState state)
{
AddDelay(HitObject.StartTime - Time.Current + Judgement.TimeOffset, true);
var circlePiece = MainPiece as CirclePiece;
circlePiece?.FlashBox.Flush();
switch (State)
using (BeginDelayedSequence(HitObject.StartTime - Time.Current + Judgement.TimeOffset, true))
{
case ArmedState.Idle:
AddDelay(HitObject.HitWindowMiss);
break;
case ArmedState.Miss:
this.FadeOut(100);
break;
case ArmedState.Hit:
this.FadeOut(600);
switch (State)
{
case ArmedState.Idle:
this.Delay(HitObject.HitWindowMiss).Expire();
break;
case ArmedState.Miss:
this.FadeOut(100)
.Expire();
break;
case ArmedState.Hit:
var flash = circlePiece?.FlashBox;
if (flash != null)
{
flash.FadeTo(0.9f);
flash.FadeOut(300);
}
var flash = circlePiece?.FlashBox;
if (flash != null)
{
flash.FadeTo(0.9f);
flash.FadeOut(300);
}
const float gravity_time = 300;
const float gravity_travel_height = 200;
Content.ScaleTo(0.8f, gravity_time * 2, EasingTypes.OutQuad);
this.FadeOut(800);
this.FadeOut(800)
.MoveToY(-gravity_travel_height, gravity_time, EasingTypes.Out)
.Then()
.MoveToY(gravity_travel_height * 2, gravity_time * 2, EasingTypes.In);
const float gravity_time = 300;
const float gravity_travel_height = 200;
Content.ScaleTo(0.8f, gravity_time * 2, EasingTypes.OutQuad);
this.MoveToY(-gravity_travel_height, gravity_time, EasingTypes.Out);
AddDelay(gravity_time, true);
this.MoveToY(gravity_travel_height * 2, gravity_time * 2, EasingTypes.In);
break;
Expire();
break;
}
}
Expire();
}
}
}

19
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
View File

@ -181,26 +181,21 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
protected override void UpdateState(ArmedState state)
{
const float preempt = 100;
AddDelay(HitObject.StartTime - Time.Current - preempt, true);
targetRing.ScaleTo(target_ring_scale, preempt * 4, EasingTypes.OutQuint);
AddDelay(preempt, true);
AddDelay(Judgement.TimeOffset + HitObject.Duration, true);
const float out_transition_time = 300;
double untilStartTime = HitObject.StartTime - Time.Current;
double untilJudgement = untilStartTime + Judgement.TimeOffset + HitObject.Duration;
targetRing.Delay(untilStartTime - preempt).ScaleTo(target_ring_scale, preempt * 4, EasingTypes.OutQuint);
this.Delay(untilJudgement).FadeOut(out_transition_time, EasingTypes.Out);
switch (state)
{
case ArmedState.Hit:
bodyContainer.ScaleTo(1.4f, out_transition_time);
bodyContainer.Delay(untilJudgement).ScaleTo(1.4f, out_transition_time);
break;
}
this.FadeOut(out_transition_time, EasingTypes.Out);
Expire();
}