h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 06:47:24 +08:00
Code Issues Releases Wiki Activity

Implement welcome and seeya samples

Browse Source
This commit is contained in:
Shivam 2020-06-02 11:04:56 +02:00
parent 578c955658
commit 2aadb9deba
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ namespace osu.Game.Screens.Menu
private void load(AudioManager audio)
{
if (MenuVoice.Value)
welcome = audio.Samples.Get(@"welcome");
welcome = audio.Samples.Get(@"Intro/welcome-lazer");
}
protected override void LogoArriving(OsuLogo logo, bool resuming)

16
osu.Game/Screens/Menu/IntroFallback.cs
View File

@ -13,15 +13,22 @@ namespace osu.Game.Screens.Menu
{
protected override string BeatmapHash => "64E00D7022195959BFA3109D09C2E2276C8F12F486B91FCF6175583E973B48F2";
protected override string BeatmapFile => "welcome.osz";
private const double delay_step_two = 3000;
private const double delay_step_two = 2142;
private SampleChannel welcome;
private SampleChannel pianoReverb;
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
seeya = audio.Samples.Get(@"Intro/seeya-fallback");
if (MenuVoice.Value)
welcome = audio.Samples.Get(@"welcome");
{
welcome = audio.Samples.Get(@"Intro/welcome-fallback");
pianoReverb = audio.Samples.Get(@"Intro/welcome_piano");
}
}
protected override void LogoArriving(OsuLogo logo, bool resuming)
@ -31,14 +38,15 @@ namespace osu.Game.Screens.Menu
if (!resuming)
{
welcome?.Play();
pianoReverb?.Play();
Scheduler.AddDelayed(delegate
{
StartTrack();
PrepareMenuLoad();
Scheduler.AddDelayed(LoadMenu, 0);
Scheduler.Add(LoadMenu);
}, delay_step_two);
logo.ScaleTo(1);

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

@ -49,7 +49,7 @@ namespace osu.Game.Screens.Menu
private const int exit_delay = 3000;
private SampleChannel seeya;
protected SampleChannel seeya { get; set; }
private LeasedBindable<WorkingBeatmap> beatmap;
@ -67,7 +67,7 @@ namespace osu.Game.Screens.Menu
MenuVoice = config.GetBindable<bool>(OsuSetting.MenuVoice);
MenuMusic = config.GetBindable<bool>(OsuSetting.MenuMusic);
seeya = audio.Samples.Get(@"seeya");
seeya = audio.Samples.Get(@"Intro/seeya-lazer");
BeatmapSetInfo setInfo = null;

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

@ -47,7 +47,7 @@ namespace osu.Game.Screens.Menu
private void load()
{
if (MenuVoice.Value && !MenuMusic.Value)
welcome = audio.Samples.Get(@"welcome");
welcome = audio.Samples.Get(@"Intro/welcome-lazer");
}
protected override void LogoArriving(OsuLogo logo, bool resuming)