h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-26 18:03:11 +08:00
Code Issues Releases Wiki Activity

Adjust timings and delay disclaimers the same as settings

Browse Source
This commit is contained in:
Dean Herbert 2024-03-16 10:09:49 +08:00
parent a78210c88f
commit 0f8d526453
No known key found for this signature in database
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,12 +269,10 @@ namespace osu.Game.Screens.Play
content.ScaleTo(0.7f); content.ScaleTo(0.7f);
const double metadata_delay = 750; const double metadata_delay = 500;
contentIn();
MetadataInfo.Delay(metadata_delay).FadeIn(500, Easing.OutQuint); MetadataInfo.Delay(metadata_delay).FadeIn(500, Easing.OutQuint);
disclaimers.Delay(metadata_delay).FadeInFromZero(500, Easing.Out) contentIn(metadata_delay + 250);
.MoveToX(0, 500, Easing.OutQuint);
// after an initial delay, start the debounced load check. // after an initial delay, start the debounced load check.
// this will continue to execute even after resuming back on restart. // this will continue to execute even after resuming back on restart.
@ -352,7 +350,7 @@ namespace osu.Game.Screens.Play
{ {
if (this.IsCurrentScreen()) if (this.IsCurrentScreen())
content.StartTracking(logo, resuming ? 0 : 500, Easing.InOutExpo); content.StartTracking(logo, resuming ? 0 : 500, Easing.InOutExpo);
}, resuming ? 0 : 500); }, resuming ? 0 : 250);
} }
protected override void LogoExiting(OsuLogo logo) protected override void LogoExiting(OsuLogo logo)
@ -445,15 +443,21 @@ namespace osu.Game.Screens.Play
this.MakeCurrent(); this.MakeCurrent();
} }
private void contentIn() private void contentIn(double delayBeforeSideDisplays = 0)
{ {
MetadataInfo.Loading = true; MetadataInfo.Loading = true;
content.FadeInFromZero(500, Easing.OutQuint); content.FadeInFromZero(500, Easing.OutQuint);
content.ScaleTo(1, 650, Easing.OutQuint).Then().Schedule(prepareNewPlayer); content.ScaleTo(1, 650, Easing.OutQuint).Then().Schedule(prepareNewPlayer);
settingsScroll.FadeInFromZero(500, Easing.Out) using (BeginDelayedSequence(delayBeforeSideDisplays))
.MoveToX(0, 500, Easing.OutQuint); {
settingsScroll.FadeInFromZero(500, Easing.Out)
.MoveToX(0, 500, Easing.OutQuint);
disclaimers.FadeInFromZero(500, Easing.Out)
.MoveToX(0, 500, Easing.OutQuint);
}
AddRangeInternal(new[] AddRangeInternal(new[]
{ {