sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 22:56:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Delay -> ApplyDelay; DelayReset -> ResetDelay

Browse Source
This commit is contained in:
Thomas Müller
2017-07-16 14:06:46 +03:00
parent 6063219b72
commit 71105bb9ee
28 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/UserInterface/DialogButton.cs
View File

@ -99,7 +99,7 @@ namespace osu.Game.Graphics.UserInterface
colourContainer.ResizeTo(new Vector2(1.5f, 1f), click_duration, EasingTypes.In);
flash();
Delay(click_duration);
ApplyDelay(click_duration);
Schedule(delegate {
colourContainer.ResizeTo(new Vector2(0.8f, 1f));
spriteText.Spacing = Vector2.Zero;

2
osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
View File

@ -106,7 +106,7 @@ namespace osu.Game.Graphics.UserInterface.Volume
private void schedulePopOut()
{
popOutDelegate?.Cancel();
Delay(1000);
ApplyDelay(1000);
popOutDelegate = Schedule(Hide);
}
}

2
osu.Game/OsuGame.cs
View File

@ -119,7 +119,7 @@ namespace osu.Game
if (!menu.IsCurrentScreen)
{
menu.MakeCurrent();
Delay(500);
ApplyDelay(500);
scoreLoad = Schedule(() => LoadScore(s));
return;
}

2
osu.Game/Overlays/DialogOverlay.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.Overlays
if (v != Visibility.Hidden) return;
//handle the dialog being dismissed.
dialog.Delay(PopupDialog.EXIT_DURATION);
dialog.ApplyDelay(PopupDialog.EXIT_DURATION);
dialog.Expire();
if (dialog == currentDialog)

2
osu.Game/Overlays/Notifications/ProgressNotification.cs
View File

@ -80,7 +80,7 @@ namespace osu.Game.Overlays.Notifications
NotificationContent.MoveToY(-DrawSize.Y / 2, 200, EasingTypes.OutQuint);
this.FadeTo(0.01f, 200); //don't completely fade out or our scheduled task won't run.
Delay(100);
ApplyDelay(100);
Schedule(Completed);
break;
}

4
osu.Game/Rulesets/Judgements/DrawableJudgement.cs
View File

@ -75,14 +75,14 @@ namespace osu.Game.Rulesets.Judgements
this.MoveToOffset(new Vector2(0, 100), 800, EasingTypes.InQuint);
this.RotateTo(40, 800, EasingTypes.InQuint);
Delay(600);
ApplyDelay(600);
this.FadeOut(200);
break;
case HitResult.Hit:
this.ScaleTo(0.9f);
this.ScaleTo(1, 500, EasingTypes.OutElastic);
Delay(100);
ApplyDelay(100);
this.FadeOut(400);
break;
}

6
osu.Game/Screens/Menu/Disclaimer.cs
View File

@ -100,14 +100,14 @@ namespace osu.Game.Screens.Menu
Content.FadeInFromZero(500);
icon.Delay(1500);
icon.ApplyDelay(1500);
icon.FadeColour(iconColour, 200);
Delay(6000, true);
ApplyDelay(6000, true);
Content.FadeOut(250);
Delay(250);
ApplyDelay(250);
Schedule(() => Push(intro));
}

2
osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
View File

@ -98,7 +98,7 @@ namespace osu.Game.Screens.Play.HUD
return;
fill.FadeEdgeEffectTo(Math.Min(1, fill.EdgeEffect.Colour.Linear.A + (1f - base_glow_opacity) / glow_max_hits), 50, EasingTypes.OutQuint);
fill.Delay(glow_fade_delay);
fill.ApplyDelay(glow_fade_delay);
fill.FadeEdgeEffectTo(base_glow_opacity, glow_fade_time, EasingTypes.OutQuint);
}

2
osu.Game/Screens/Play/PauseContainer.cs
View File

@ -58,7 +58,7 @@ namespace osu.Game.Screens.Play
{
OnResume = delegate
{
Delay(400);
ApplyDelay(400);
Schedule(Resume);
},
OnRetry = () => OnRetry(),

10
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -77,7 +77,7 @@ namespace osu.Game.Screens.Play
Beatmap = player.Beatmap,
});
Delay(400);
ApplyDelay(400);
Schedule(pushWhenLoaded);
}
@ -104,14 +104,14 @@ namespace osu.Game.Screens.Play
contentIn();
Delay(500, true);
ApplyDelay(500, true);
logo.MoveToOffset(new Vector2(0, -180), 500, EasingTypes.InOutExpo);
Delay(250, true);
ApplyDelay(250, true);
info.FadeIn(500);
Delay(1400, true);
ApplyDelay(1400, true);
Schedule(pushWhenLoaded);
}
@ -123,7 +123,7 @@ namespace osu.Game.Screens.Play
contentOut();
Delay(250);
ApplyDelay(250);
Schedule(() =>
{

2
osu.Game/Screens/Ranking/ResultsPage.cs
View File

@ -33,7 +33,7 @@ namespace osu.Game.Screens.Ranking
protected override void LoadComplete()
{
base.LoadComplete();
fill.Delay(400);
fill.ApplyDelay(400);
fill.FadeInFromZero(600);
}

2
osu.Game/Screens/Ranking/ResultsPageScore.cs
View File

@ -179,7 +179,7 @@ namespace osu.Game.Screens.Ranking
foreach (var s in statisticsContainer.Children)
{
s.FadeOut();
s.Delay(delay += 200);
s.ApplyDelay(delay += 200);
s.FadeIn(300 + delay, EasingTypes.Out);
}
});

2
osu.Game/Screens/ScreenWhiteBox.cs
View File

@ -44,7 +44,7 @@ namespace osu.Game.Screens
boxContainer.ScaleTo(0.2f);
boxContainer.RotateTo(-20);
Content.Delay(300, true);
Content.ApplyDelay(300, true);
boxContainer.ScaleTo(1, transition_time, EasingTypes.OutElastic);
boxContainer.RotateTo(0, transition_time / 2, EasingTypes.OutQuint);

2
osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
View File

@ -63,7 +63,7 @@ namespace osu.Game.Screens.Select.Leaderboards
};
scrollFlow.Add(ls);
ls.Delay(i++ * 50, true);
ls.ApplyDelay(i++ * 50, true);
ls.Show();
}

6
osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
View File

@ -64,18 +64,18 @@ namespace osu.Game.Screens.Select.Leaderboards
this.FadeIn(200);
content.MoveToY(0, 800, EasingTypes.OutQuint);
Delay(100, true);
ApplyDelay(100, true);
avatar.FadeIn(300, EasingTypes.OutQuint);
nameLabel.FadeIn(350, EasingTypes.OutQuint);
avatar.MoveToX(0, 300, EasingTypes.OutQuint);
nameLabel.MoveToX(0, 350, EasingTypes.OutQuint);
Delay(250, true);
ApplyDelay(250, true);
scoreLabel.FadeIn(200);
scoreRank.FadeIn(200);
Delay(50, true);
ApplyDelay(50, true);
var drawables = new Drawable[] { flagBadgeContainer, maxCombo, accuracy, modsContainer, };
for (int i = 0; i < drawables.Length; i++)