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

Rename IntroFallback classes to IntroLegacy

Browse Source 
This commit also renames files accordingly with https://github.com/ppy/osu-resources/pull/103
This commit is contained in:
Shivam 2020-06-02 13:14:50 +02:00
parent 19d73af90d
commit 888b90b426
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/Menus/TestSceneIntroFallback.cs → osu.Game.Tests/Visual/Menus/TestSceneIntroLegacy.cs
View File

@ -8,8 +8,8 @@ using osu.Game.Screens.Menu;
namespace osu.Game.Tests.Visual.Menus namespace osu.Game.Tests.Visual.Menus
{ {
[TestFixture] [TestFixture]
public class TestSceneIntroFallback : IntroTestScene public class TestSceneIntroLegacy : IntroTestScene
{ {
protected override IScreen CreateScreen() => new IntroFallback(); protected override IScreen CreateScreen() => new IntroLegacy();
} }
} }

2
osu.Game/Screens/Loader.cs
View File

@ -52,7 +52,7 @@ namespace osu.Game.Screens
return new IntroCircles(); return new IntroCircles();
case IntroSequence.Welcome: case IntroSequence.Welcome:
return new IntroFallback(); return new IntroLegacy();
default: default:
return new IntroTriangles(); return new IntroTriangles();

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

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

8
osu.Game/Screens/Menu/IntroFallback.cs → osu.Game/Screens/Menu/IntroLegacy.cs
View File

@ -14,7 +14,7 @@ using osu.Game.Graphics.Sprites;
namespace osu.Game.Screens.Menu namespace osu.Game.Screens.Menu
{ {
public class IntroFallback : IntroScreen public class IntroLegacy : IntroScreen
{ {
protected override string BeatmapHash => "64E00D7022195959BFA3109D09C2E2276C8F12F486B91FCF6175583E973B48F2"; protected override string BeatmapHash => "64E00D7022195959BFA3109D09C2E2276C8F12F486B91FCF6175583E973B48F2";
protected override string BeatmapFile => "welcome.osz"; protected override string BeatmapFile => "welcome.osz";
@ -27,12 +27,12 @@ namespace osu.Game.Screens.Menu
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio) private void load(AudioManager audio)
{ {
Seeya = audio.Samples.Get(@"Intro/seeya-fallback"); Seeya = audio.Samples.Get(@"Intro/legacy/seeya");
if (MenuVoice.Value) if (MenuVoice.Value)
{ {
welcome = audio.Samples.Get(@"Intro/welcome-fallback"); welcome = audio.Samples.Get(@"Intro/legacy/welcome");
pianoReverb = audio.Samples.Get(@"Intro/welcome_piano"); pianoReverb = audio.Samples.Get(@"Intro/legacy/welcome_piano");
} }
} }

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

@ -67,7 +67,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);
Seeya = audio.Samples.Get(@"Intro/seeya-lazer"); Seeya = audio.Samples.Get(@"Intro/lazer/seeya");
BeatmapSetInfo setInfo = null; BeatmapSetInfo setInfo = null;

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

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