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

Tweak intro timings more and ensure non-theme tracks play from preview point

Browse Source
This commit is contained in:
Dean Herbert
2022-08-17 13:20:40 +09:00
parent 37799e3b31
commit d9346abb9c
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Screens/Menu/IntroCircles.cs
View File

@ -19,11 +19,9 @@ namespace osu.Game.Screens.Menu
protected override string BeatmapFile => "circles.osz";
public const double TRACK_START_DELAY_NON_THEMED = 1000;
private const double track_start_delay_themed = 600;
public const double TRACK_START_DELAY = 600;
private const double delay_for_menu = 2900;
private const double delay_step_one = 2300;
private Sample welcome;
@ -47,16 +45,14 @@ namespace osu.Game.Screens.Menu
{
welcome?.Play();
double trackStartDelay = UsingThemedIntro ? track_start_delay_themed : TRACK_START_DELAY_NON_THEMED;
Scheduler.AddDelayed(delegate
{
StartTrack();
PrepareMenuLoad();
Scheduler.AddDelayed(LoadMenu, delay_for_menu - trackStartDelay);
}, trackStartDelay);
Scheduler.AddDelayed(LoadMenu, delay_for_menu - TRACK_START_DELAY);
}, TRACK_START_DELAY);
logo.ScaleTo(1);
logo.FadeIn();

14
osu.Game/Screens/Menu/IntroScreen.cs
View File

@ -276,12 +276,18 @@ namespace osu.Game.Screens.Menu
{
var drawableTrack = musicController.CurrentTrack;
drawableTrack.Start();
if (!UsingThemedIntro)
{
drawableTrack.VolumeTo(0).Then()
.VolumeTo(1, 2000, Easing.OutQuint);
initialBeatmap.PrepareTrackForPreview(false);
drawableTrack.VolumeTo(0);
drawableTrack.Restart();
drawableTrack.VolumeTo(1, 2200, Easing.InCubic);
}
else
{
drawableTrack.Restart();
}
}

2
osu.Game/Screens/Menu/IntroTriangles.cs
View File

@ -88,7 +88,7 @@ namespace osu.Game.Screens.Menu
// If the user has requested no theme, fallback to the same intro voice and delay as IntroCircles.
// The triangles intro voice and theme are combined which makes it impossible to use.
welcome?.Play();
Scheduler.AddDelayed(StartTrack, IntroCircles.TRACK_START_DELAY_NON_THEMED);
Scheduler.AddDelayed(StartTrack, IntroCircles.TRACK_START_DELAY);
}
else
StartTrack();