1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 22:22:55 +08:00

Revert reduced wait time commit

This commit is contained in:
BlauFx 2022-08-06 15:12:36 +02:00
parent 445f921756
commit e411a2d187
No known key found for this signature in database
GPG Key ID: BB73374479D2AA97

View File

@ -384,10 +384,9 @@ namespace osu.Game.Screens.Play
private void contentIn() private void contentIn()
{ {
MetadataInfo.Loading = true; MetadataInfo.Loading = true;
int scaleContentTime = restartCount > 0 ? 65 : 650;
content.FadeInFromZero(400); content.FadeInFromZero(400);
content.ScaleTo(1, scaleContentTime, Easing.OutQuint).Then().Schedule(prepareNewPlayer); content.ScaleTo(1, 650, Easing.OutQuint).Then().Schedule(prepareNewPlayer);
lowPassFilter.CutoffTo(1000, 650, Easing.OutQuint); lowPassFilter.CutoffTo(1000, 650, Easing.OutQuint);
highPassFilter.CutoffTo(300).Then().CutoffTo(0, 1250); // 1250 is to line up with the appearance of MetadataInfo (750 delay + 500 fade-in) highPassFilter.CutoffTo(300).Then().CutoffTo(0, 1250); // 1250 is to line up with the appearance of MetadataInfo (750 delay + 500 fade-in)
@ -469,7 +468,7 @@ namespace osu.Game.Screens.Play
else else
this.Exit(); this.Exit();
}); });
}, CurrentPlayer?.RestartCount > 0 ? 50 : 500); }, 500);
} }
private void cancelLoad() private void cancelLoad()