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

Merge remote-tracking branch 'refs/remotes/ppy/master' into intro

Browse Source
This commit is contained in:
EVAST9919
2017-10-26 14:40:40 +03:00
parent e3ce641ea0 f91a820278
commit 189b51551d
181 changed files with 3045 additions and 1146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ namespace osu.Game.Screens.Menu
{
private readonly IntroSequence introSequence;
private const string menu_music_beatmap_hash = "715a09144f885d746644c1983e285044";
private const string menu_music_beatmap_hash = "3c8b1fcc9434dbb29e2fb613d3b9eada9d7bb6c125ceb32396c3b53437280c83";
/// <summary>
/// Whether we have loaded the menu previously.
@ -67,7 +67,7 @@ namespace osu.Game.Screens.Menu
if (!menuMusic)
{
var sets = beatmaps.GetAllUsableBeatmapSets(false);
var sets = beatmaps.GetAllUsableBeatmapSets();
if (sets.Count > 0)
setInfo = beatmaps.QueryBeatmapSet(s => s.ID == sets[RNG.Next(0, sets.Count - 1)].ID);
}
@ -80,9 +80,7 @@ namespace osu.Game.Screens.Menu
{
// we need to import the default menu background beatmap
setInfo = beatmaps.Import(new OszArchiveReader(game.Resources.GetStream(@"Tracks/circles.osz")));
setInfo.Protected = true;
beatmaps.Delete(setInfo);
}
}
@ -92,6 +90,7 @@ namespace osu.Game.Screens.Menu
welcome = audio.Sample.Get(@"welcome");
seeya = audio.Sample.Get(@"seeya");
beatmaps.Delete(setInfo);
}
protected override void OnEntering(Screen last)