h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 18:42:56 +08:00
Code Issues Releases Wiki Activity

Add the option to loop the intro in the main menu

Browse Source
This commit is contained in:
Shivam 2020-06-29 00:39:49 +02:00
parent 6547e07e56
commit ffbce61ca8
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Configuration/OsuConfigManager.cs
View File

@ -55,6 +55,7 @@ namespace osu.Game.Configuration
Set(OsuSetting.VolumeInactive, 0.25, 0, 1, 0.01); Set(OsuSetting.VolumeInactive, 0.25, 0, 1, 0.01);
Set(OsuSetting.MenuVoice, true); Set(OsuSetting.MenuVoice, true);
Set(OsuSetting.MenuMusicLoop, true);
Set(OsuSetting.MenuMusic, true); Set(OsuSetting.MenuMusic, true);
Set(OsuSetting.AudioOffset, 0, -500.0, 500.0, 1); Set(OsuSetting.AudioOffset, 0, -500.0, 500.0, 1);
@ -191,6 +192,7 @@ namespace osu.Game.Configuration
AudioOffset, AudioOffset,
VolumeInactive, VolumeInactive,
MenuMusic, MenuMusic,
MenuMusicLoop,
MenuVoice, MenuVoice,
CursorRotation, CursorRotation,
MenuParallax, MenuParallax,

5
osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs
View File

@ -28,6 +28,11 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
LabelText = "osu! music theme", LabelText = "osu! music theme",
Bindable = config.GetBindable<bool>(OsuSetting.MenuMusic) Bindable = config.GetBindable<bool>(OsuSetting.MenuMusic)
}, },
new SettingsCheckbox
{
LabelText = "loop the music theme",
Bindable = config.GetBindable<bool>(OsuSetting.MenuMusicLoop)
},
new SettingsDropdown<IntroSequence> new SettingsDropdown<IntroSequence>
{ {
LabelText = "Intro sequence", LabelText = "Intro sequence",

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

@ -40,6 +40,7 @@ namespace osu.Game.Screens.Menu
protected IBindable<bool> MenuVoice { get; private set; } protected IBindable<bool> MenuVoice { get; private set; }
protected IBindable<bool> MenuMusic { get; private set; } protected IBindable<bool> MenuMusic { get; private set; }
private IBindable<bool> menuMusicLoop { get; set; }
private WorkingBeatmap initialBeatmap; private WorkingBeatmap initialBeatmap;
@ -73,6 +74,7 @@ namespace osu.Game.Screens.Menu
MenuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice); MenuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
MenuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic); MenuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
menuMusicLoop = config.GetBindable<bool>(OsuSetting.MenuMusicLoop);
seeya = audio.Samples.Get(SeeyaSampleName); seeya = audio.Samples.Get(SeeyaSampleName);
@ -152,6 +154,8 @@ namespace osu.Game.Screens.Menu
// Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu. // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
if (UsingThemedIntro) if (UsingThemedIntro)
Track.Restart(); Track.Restart();
if (menuMusicLoop.Value)
Track.Looping = true;
} }
protected override void LogoArriving(OsuLogo logo, bool resuming) protected override void LogoArriving(OsuLogo logo, bool resuming)