Merge pull request #1340 from andy840119/update-osu-game-to-the-latest

Update osu game to the latest.
karaoke-dev · May 28, 2022 · 566cf14 · 566cf14
2 parents 8bfa6c3 + f49b2c8
commit 566cf14
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 18 deletions.
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneEditorMenuBar.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneEditorMenuBar.cs
@@ -8,6 +8,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
 using osu.Game.Rulesets.Karaoke.Configuration;
 using osu.Game.Rulesets.Karaoke.Edit.Components.Menus;
 using osu.Game.Rulesets.Karaoke.Edit.Lyrics;
@@ -19,6 +20,9 @@ namespace osu.Game.Rulesets.Karaoke.Tests.Editor
     [TestFixture]
     public class TestSceneEditorMenuBar : OsuTestScene
     {
+        [Cached]
+        private readonly OverlayColourProvider overlayColour = new(OverlayColourScheme.Aquamarine);
+
         [BackgroundDependencyLoader]
         private void load()
         {

diff --git a/osu.Game.Rulesets.Karaoke/Edit/KaraokeEditorRoundedScreen.cs b/osu.Game.Rulesets.Karaoke/Edit/KaraokeEditorRoundedScreen.cs
@@ -6,12 +6,12 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Overlays;
-using osu.Game.Screens.Edit;
 
 namespace osu.Game.Rulesets.Karaoke.Edit
 {
     /// <summary>
-    /// Copied from <see cref="EditorRoundedScreen"/>
+    /// Copied from EditorRoundedScreen
+    /// todo: will remove this screen eventually because new editor design not have round screen style.
     /// </summary>
     public class KaraokeEditorRoundedScreen : KaraokeEditorScreen
     {

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Menus/GenericScreenSelectionTabControl.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Components/Menus/GenericScreenSelectionTabControl.cs
@@ -2,20 +2,19 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
 using osu.Game.Screens.Edit.Components.Menus;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Components.Menus
 {
     /// <summary>
-    /// Copied from <see cref="ScreenSelectionTabControl"/>
+    /// Copied from <see cref="EditorScreenSwitcherControl"/>
     /// </summary>
     /// <typeparam name="TScreenMode"></typeparam>
     public class GenericScreenSelectionTabControl<TScreenMode> : OsuTabControl<TScreenMode>
@@ -27,22 +26,19 @@ public GenericScreenSelectionTabControl()
 
             TabContainer.RelativeSizeAxes &= ~Axes.X;
             TabContainer.AutoSizeAxes = Axes.X;
-            TabContainer.Padding = new MarginPadding();
-
-            AddInternal(new Box
-            {
-                Anchor = Anchor.BottomLeft,
-                Origin = Anchor.BottomLeft,
-                RelativeSizeAxes = Axes.X,
-                Height = 1,
-                Colour = Color4.White.Opacity(0.2f),
-            });
+            TabContainer.Padding = new MarginPadding(10);
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            AccentColour = colours.Yellow;
+            AccentColour = colourProvider.Light3;
+
+            AddInternal(new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                Colour = colourProvider.Background2,
+            });
         }
 
         protected override Dropdown<TScreenMode> CreateDropdown() => null;
@@ -59,6 +55,15 @@ public TabItem(TScreenMode value)
                 Text.Margin = new MarginPadding();
                 Text.Anchor = Anchor.CentreLeft;
                 Text.Origin = Anchor.CentreLeft;
+
+                Text.Font = OsuFont.TorusAlternate;
+
+                Bar.Expire();
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
             }
 
             protected override void OnActivated()

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Octokit" Version="0.51.0" />
     <PackageReference Include="osu.Framework.KaraokeFont" Version="2022.522.0" />
     <PackageReference Include="osu.Framework.Microphone" Version="2022.522.0" />
-    <PackageReference Include="ppy.osu.Game" Version="2022.523.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2022.528.0" />
     <PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
     <PackageReference Include="Lucene.Net.Analysis.Kuromoji" Version="4.8.0-beta00016" />
     <PackageReference Include="NicoKaraParser" Version="1.1.0" />