sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-07 20:37:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup + AppVeyor fixes

Browse Source
This commit is contained in:
ColdVolcano 2017-04-14 13:10:59 -05:00
parent b5fc84087f
commit b7d61add45
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game/Screens/Menu/Intro.cs
View File

@ -63,8 +63,7 @@ namespace osu.Game.Screens.Menu
} }
private Bindable<bool> menuVoice; private Bindable<bool> menuVoice;
private Bindable<bool> osuBGM; private Bindable<bool> menuMusic;
private BeatmapDatabase beatmaps;
private TrackManager trackManager; private TrackManager trackManager;
private BeatmapInfo beatmap; private BeatmapInfo beatmap;
private WorkingBeatmap song; private WorkingBeatmap song;
@ -73,24 +72,19 @@ namespace osu.Game.Screens.Menu
private void load(OsuGameBase game, AudioManager audio, OsuConfigManager config, BeatmapDatabase beatmaps) private void load(OsuGameBase game, AudioManager audio, OsuConfigManager config, BeatmapDatabase beatmaps)
{ {
menuVoice = config.GetBindable<bool>(OsuConfig.MenuVoice); menuVoice = config.GetBindable<bool>(OsuConfig.MenuVoice);
osuBGM = config.GetBindable<bool>(OsuConfig.MenuMusic); menuMusic = config.GetBindable<bool>(OsuConfig.MenuMusic);
if (!menuMusic)
if (osuBGM)
{ {
bgm = audio.Track.Get(@"circles");
bgm.Looping = true;
}
else
{
this.beatmaps = beatmaps;
trackManager = game.Audio.Track; trackManager = game.Audio.Track;
beatmap = beatmaps.GetWithChildren<BeatmapSetInfo>(RNG.Next(0, beatmaps.Query<BeatmapSetInfo>().Count() - 1)).Beatmaps[0]; beatmap = beatmaps.GetWithChildren<BeatmapSetInfo>(RNG.Next(beatmaps.Query<BeatmapSetInfo>().Count() - 1)).Beatmaps[0];
song = beatmaps.GetWorkingBeatmap(beatmap, null); song = beatmaps.GetWorkingBeatmap(beatmap);
Beatmap = song; Beatmap = song;
} }
welcome = audio.Sample.Get(@"welcome"); bgm = audio.Track.Get(@"circles");
bgm.Looping = true;
welcome = audio.Sample.Get(@"welcome");
seeya = audio.Sample.Get(@"seeya"); seeya = audio.Sample.Get(@"seeya");
} }
@ -103,7 +97,7 @@ namespace osu.Game.Screens.Menu
welcome.Play(); welcome.Play();
Scheduler.AddDelayed(delegate Scheduler.AddDelayed(delegate
{ {
if(osuBGM) if(menuMusic)
bgm.Start(); bgm.Start();
else else
{ {
@ -120,7 +114,7 @@ namespace osu.Game.Screens.Menu
Scheduler.AddDelayed(delegate Scheduler.AddDelayed(delegate
{ {
if (!osuBGM) if (!menuMusic)
Task.Run(() => song.Track.Start()); Task.Run(() => song.Track.Start());
DidLoadMenu = true; DidLoadMenu = true;
Push(mainMenu); Push(mainMenu);