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

Merge branch 'master' into skin-components-list

Browse Source
This commit is contained in:
Dean Herbert
2021-05-06 14:17:30 +09:00
parent b145f46a0a bb496d05f7
commit aff32b0d19
57 changed files with 952 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
osu.Game/OsuGame.cs
View File

@ -80,6 +80,23 @@ namespace osu.Game
private BeatmapSetOverlay beatmapSetOverlay;
private SkinEditorOverlay skinEditor;
private Container overlayContent;
private Container rightFloatingOverlayContent;
private Container leftFloatingOverlayContent;
private Container topMostOverlayContent;
private ScalingContainer screenContainer;
private Container screenOffsetContainer;
[Resolved]
private FrameworkConfigManager frameworkConfig { get; set; }
[Cached]
private readonly DifficultyRecommender difficultyRecommender = new DifficultyRecommender();
@ -695,7 +712,7 @@ namespace osu.Game
var changelogOverlay = loadComponentSingleFile(new ChangelogOverlay(), overlayContent.Add, true);
loadComponentSingleFile(userProfile = new UserProfileOverlay(), overlayContent.Add, true);
loadComponentSingleFile(beatmapSetOverlay = new BeatmapSetOverlay(), overlayContent.Add, true);
loadComponentSingleFile(skinEditor = new SkinEditorContainer(screenContainer), overlayContent.Add);
loadComponentSingleFile(skinEditor = new SkinEditorOverlay(screenContainer), overlayContent.Add);
loadComponentSingleFile(new LoginOverlay
{
@ -940,23 +957,6 @@ namespace osu.Game
{
}
private Container overlayContent;
private Container rightFloatingOverlayContent;
private Container leftFloatingOverlayContent;
private Container topMostOverlayContent;
[Resolved]
private FrameworkConfigManager frameworkConfig { get; set; }
private ScalingContainer screenContainer;
private Container screenOffsetContainer;
private SkinEditorContainer skinEditor;
protected override bool OnExiting()
{
if (ScreenStack.CurrentScreen is Loader)