From d6c3f6616194d593b8c32ec4198a1b4c1ab86d5e Mon Sep 17 00:00:00 2001 From: sim1222 Date: Tue, 31 Jan 2023 23:40:46 +0900 Subject: [PATCH] fix: can build --- osu.Game/OsuGameBase.cs | 4 +--- osu.Game/Screens/Misskey/MisskeyInstanceSelect.cs | 3 ++- osu.Game/Screens/Misskey/MisskeyScreenSelector.cs | 13 +++++++------ osu.Game/Screens/Misskey/Welcome.cs | 5 +++-- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs index e08e609bde..8ec34e590a 100644 --- a/osu.Game/OsuGameBase.cs +++ b/osu.Game/OsuGameBase.cs @@ -362,9 +362,7 @@ namespace osu.Game base.Content.Add(metadataClient); base.Content.Add(soloStatisticsWatcher); - AddInternal(spectatorClient); - AddInternal(MultiplayerClient); - AddInternal(metadataClient); + base.Content.Add(rulesetConfigCache); PreviewTrackManager previewTrackManager; dependencies.Cache(previewTrackManager = new PreviewTrackManager(BeatmapManager.BeatmapTrackStore)); diff --git a/osu.Game/Screens/Misskey/MisskeyInstanceSelect.cs b/osu.Game/Screens/Misskey/MisskeyInstanceSelect.cs index d6802a458e..04ac680e09 100644 --- a/osu.Game/Screens/Misskey/MisskeyInstanceSelect.cs +++ b/osu.Game/Screens/Misskey/MisskeyInstanceSelect.cs @@ -20,6 +20,7 @@ using osu.Game.Online.MisskeyAPI.Requests; using osu.Game.Online.MisskeyAPI.Requests.Responses; using osu.Game.Overlays; using osu.Game.Overlays.Notifications; +using osu.Game.Overlays.Settings; using osuTK; using Meta = osu.Game.Online.MisskeyAPI.Requests.Meta; @@ -91,7 +92,7 @@ namespace osu.Game.Screens.Misskey Anchor = Anchor.TopCentre, Text = "misskey.io" }, - new OsuButton() + new SettingsButton() { Text = "Submit", Anchor = Anchor.Centre, diff --git a/osu.Game/Screens/Misskey/MisskeyScreenSelector.cs b/osu.Game/Screens/Misskey/MisskeyScreenSelector.cs index c1a9d5763c..b82f3f15d8 100644 --- a/osu.Game/Screens/Misskey/MisskeyScreenSelector.cs +++ b/osu.Game/Screens/Misskey/MisskeyScreenSelector.cs @@ -14,6 +14,7 @@ using osu.Game.Graphics; using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.Containers; using osu.Game.Overlays.Dashboard.Friends; +using osu.Game.Overlays.Settings; using osuTK; using osuTK.Graphics; @@ -66,7 +67,7 @@ namespace osu.Game.Screens.Misskey Size = new Vector2(1000f), Children = new Drawable[] { - new OsuButton() + new SettingsButton() { Anchor = Anchor.Centre, Origin = Anchor.Centre, @@ -74,7 +75,7 @@ namespace osu.Game.Screens.Misskey Text = "MisskeyInstanceSelect", Action = () => this.Push(new MisskeyInstanceSelect()) }, - new OsuButton() + new SettingsButton() { Anchor = Anchor.Centre, Origin = Anchor.Centre, @@ -82,7 +83,7 @@ namespace osu.Game.Screens.Misskey Text = "Welcome", Action = () => this.Push(new Welcome()) }, - new OsuButton() + new SettingsButton() { Anchor = Anchor.Centre, Origin = Anchor.Centre, @@ -90,7 +91,7 @@ namespace osu.Game.Screens.Misskey Text = "Components", Action = () => this.Push(new MisskeyComponents()) }, - new OsuButton() + new SettingsButton() { Anchor = Anchor.Centre, Origin = Anchor.Centre, @@ -98,7 +99,7 @@ namespace osu.Game.Screens.Misskey Text = "MisskeyLogin", Action = () => this.Push(new MisskeyLogin()) }, - new OsuButton() + new SettingsButton() { Anchor = Anchor.Centre, Origin = Anchor.Centre, @@ -106,7 +107,7 @@ namespace osu.Game.Screens.Misskey Text = "Timeline", Action = () => this.Push(new Timeline()) }, - new OsuButton() + new SettingsButton() { Anchor = Anchor.Centre, Origin = Anchor.Centre, diff --git a/osu.Game/Screens/Misskey/Welcome.cs b/osu.Game/Screens/Misskey/Welcome.cs index 1ef9426717..b8cdbd118e 100644 --- a/osu.Game/Screens/Misskey/Welcome.cs +++ b/osu.Game/Screens/Misskey/Welcome.cs @@ -18,6 +18,7 @@ using osu.Game.Graphics.Containers; using osu.Game.Graphics.Sprites; using osu.Game.Graphics.UserInterface; using osu.Game.Overlays; +using osu.Game.Overlays.Settings; using osu.Game.Screens.Misskey.Components; using osu.Game.Screens.Select; using osuTK; @@ -165,7 +166,7 @@ namespace osu.Game.Screens.Misskey { new Drawable[] { - new OsuButton() + new SettingsButton() { Name = "SignUpButton", Anchor = Anchor.TopCentre, @@ -173,7 +174,7 @@ namespace osu.Game.Screens.Misskey Width = 100f, Text = "新規登録" }, - new OsuButton() + new SettingsButton() { Name = "SignInButton", Anchor = Anchor.TopCentre,