h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 19:12:56 +08:00
Code Issues Releases Wiki Activity

Add new main menu backgrounds

Browse Source
This commit is contained in:
Dean Herbert 2017-06-26 19:06:08 +09:00
parent e6818a45be
commit cbf188c293
4 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-resources

@ -1 +1 @@
Subproject commit 10fda22522ffadbdbc43fa0f3683a065e536f7d1 Subproject commit 900f47563f5598eef7cbf203f0b3f2166508b6d5

25
osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
View File

@ -2,16 +2,39 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Graphics.Backgrounds; using osu.Game.Graphics.Backgrounds;
namespace osu.Game.Screens.Backgrounds namespace osu.Game.Screens.Backgrounds
{ {
public class BackgroundScreenDefault : BackgroundScreen public class BackgroundScreenDefault : BackgroundScreen
{ {
private int currentDisplay;
private const int background_count = 5;
private string backgroundName => $@"Menu/menu-background-{currentDisplay % background_count + 1}";
private Background current;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
Add(new Background(@"Backgrounds/bg1")); display(new Background(backgroundName));
}
private void display(Background b)
{
current?.FadeOut(800, EasingTypes.OutQuint);
current?.Expire();
Add(current = b);
}
public void Next()
{
currentDisplay++;
LoadComponentAsync(new Background(backgroundName) { Depth = currentDisplay }, display);
} }
} }
} }

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

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Screens;
using osu.Game.Screens.Menu; using osu.Game.Screens.Menu;
namespace osu.Game.Screens namespace osu.Game.Screens
@ -20,9 +19,9 @@ namespace osu.Game.Screens
private void load(OsuGame game) private void load(OsuGame game)
{ {
if (game.IsDeployedBuild) if (game.IsDeployedBuild)
LoadComponentAsync(new Disclaimer(), d => Push((Screen)d)); LoadComponentAsync(new Disclaimer(), d => Push(d));
else else
LoadComponentAsync(new Intro(), d => Push((Screen)d)); LoadComponentAsync(new Intro(), d => Push(d));
} }
} }
} }

11
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Framework.Screens; using osu.Framework.Screens;
using osu.Game.Beatmaps;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Screens.Backgrounds; using osu.Game.Screens.Backgrounds;
using osu.Game.Screens.Charts; using osu.Game.Screens.Charts;
@ -24,7 +25,7 @@ namespace osu.Game.Screens.Menu
internal override bool ShowOverlays => buttons.State != MenuState.Initial; internal override bool ShowOverlays => buttons.State != MenuState.Initial;
private readonly BackgroundScreen background; private readonly BackgroundScreenDefault background;
private Screen songSelect; private Screen songSelect;
protected override BackgroundScreen CreateBackground() => background; protected override BackgroundScreen CreateBackground() => background;
@ -66,6 +67,12 @@ namespace osu.Game.Screens.Menu
preloadSongSelect(); preloadSongSelect();
} }
protected override void OnBeatmapChanged(WorkingBeatmap beatmap)
{
base.OnBeatmapChanged(beatmap);
background.Next();
}
private void preloadSongSelect() private void preloadSongSelect()
{ {
if (songSelect == null) if (songSelect == null)
@ -111,6 +118,8 @@ namespace osu.Game.Screens.Menu
{ {
base.OnResuming(last); base.OnResuming(last);
background.Next();
//we may have consumed our preloaded instance, so let's make another. //we may have consumed our preloaded instance, so let's make another.
preloadSongSelect(); preloadSongSelect();