diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs index 6d71934b81..533fb1229b 100644 --- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs +++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs @@ -43,11 +43,8 @@ namespace osu.Game.Screens.Select.Leaderboards }; scrollFlow.Add(ls); - ls.Delay(i * 50); - ls.Schedule(() => - { - ls.Show(); - }); + ls.Delay(i * 50, true); + ls.Show(); } scrollContainer.ScrollTo(0f, false); diff --git a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs index f4ee6f9d35..d02569247f 100644 --- a/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs +++ b/osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs @@ -72,33 +72,24 @@ namespace osu.Game.Screens.Select.Leaderboards FadeIn(200); content.MoveToY(0, 800, EasingTypes.OutQuint); - Delay(100); - Schedule(() => + Delay(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); + scoreLabel.FadeIn(200); + scoreRank.FadeIn(200); + + Delay(50, true); + var drawables = new Drawable[] { flagBadgeContainer, maxCombo, accuracy, modsContainer, }; + + for (int i = 0; i < drawables.Length; i++) { - avatar.FadeIn(300, EasingTypes.OutQuint); - nameLabel.FadeIn(350, EasingTypes.OutQuint); - - avatar.MoveToX(0, 300, EasingTypes.OutQuint); - nameLabel.MoveToX(0, 350, EasingTypes.OutQuint); - - Delay(250); - Schedule(() => - { - scoreLabel.FadeIn(200); - scoreRank.FadeIn(200); - - Delay(50); - Schedule(() => - { - var drawables = new Drawable[] { flagBadgeContainer, maxCombo, accuracy, modsContainer, }; - - for (int i = 0; i < drawables.Length; i++) - { - drawables[i].FadeIn(100 + i * 50); - } - }); - }); - }); + drawables[i].FadeIn(100 + i * 50); + } break; }