Merge pull request #1298 from andy840119/update-package-to-the-latest

Update package to the latest
karaoke-dev · May 9, 2022 · b5fa56a · b5fa56a
2 parents a555e98 + 76ba9dd
commit b5fa56a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/osu.Game.Rulesets.Karaoke/Edit/KaraokeHitObjectComposer.cs b/osu.Game.Rulesets.Karaoke/Edit/KaraokeHitObjectComposer.cs
@@ -111,9 +111,9 @@ protected override Playfield PlayfieldAtScreenSpacePosition(Vector2 screenSpaceP
             return null;
         }
 
-        public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
+        public override SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePosition)
         {
-            var result = base.SnapScreenSpacePositionToValidTime(screenSpacePosition);
+            var result = base.FindSnappedPositionAndTime(screenSpacePosition);
 
             // should not affect x position and time if dragging object in note playfield.
             return result.Playfield is EditorNotePlayfield

diff --git a/...lesets.Karaoke/Edit/Lyrics/Extends/Components/Description/DescriptionTextFlowContainer.cs b/...lesets.Karaoke/Edit/Lyrics/Extends/Components/Description/DescriptionTextFlowContainer.cs
@@ -6,7 +6,6 @@
 using Markdig;
 using Markdig.Syntax;
 using Markdig.Syntax.Inlines;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Containers.Markdown;
@@ -17,7 +16,6 @@
 
 namespace osu.Game.Rulesets.Karaoke.Edit.Lyrics.Extends.Components.Description
 {
-    [Cached(typeof(IMarkdownTextComponent))]
     public class DescriptionTextFlowContainer : Container, IMarkdownTextComponent
     {
         private readonly DescriptionMarkdownTextFlowContainer description;

diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/Extends/TimeTags/TimeTagEditor.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/Extends/TimeTags/TimeTagEditor.cs
@@ -98,10 +98,10 @@ protected override void OnUserScroll(float value, bool animated = true, double?
             base.OnUserScroll(value, animated, distanceDecay);
         }
 
-        public SnapResult SnapScreenSpacePositionToValidPosition(Vector2 screenSpacePosition) =>
+        public SnapResult FindSnappedPosition(Vector2 screenSpacePosition) =>
             new(screenSpacePosition, null);
 
-        public SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition) =>
+        public SnapResult FindSnappedPositionAndTime(Vector2 screenSpacePosition) =>
             new(screenSpacePosition, getTimeFromPosition(Content.ToLocalSpace(screenSpacePosition)));
 
         private double getTimeFromPosition(Vector2 localPosition) =>

diff --git a/...ame.Rulesets.Karaoke/Edit/Lyrics/Rows/Extends/TimeTags/TimeTagEditorBlueprintContainer.cs b/...ame.Rulesets.Karaoke/Edit/Lyrics/Rows/Extends/TimeTags/TimeTagEditorBlueprintContainer.cs
@@ -121,7 +121,7 @@ protected override bool OnClick(ClickEvent e)
                 return true;
 
             // navigation to target time.
-            var navigationTime = timeline.SnapScreenSpacePositionToValidTime(e.ScreenSpaceMousePosition);
+            var navigationTime = timeline.FindSnappedPositionAndTime(e.ScreenSpaceMousePosition);
             if (navigationTime.Time == null)
                 return false;
 

diff --git a/osu.Game.Rulesets.Karaoke/UI/Components/SaitenStatus.cs b/osu.Game.Rulesets.Karaoke/UI/Components/SaitenStatus.cs
@@ -5,7 +5,6 @@
 using System.Linq;
 using Markdig;
 using Markdig.Syntax;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Containers.Markdown;
@@ -17,7 +16,6 @@
 
 namespace osu.Game.Rulesets.Karaoke.UI.Components
 {
-    [Cached(typeof(IMarkdownTextComponent))]
     public class SaitenStatus : FillFlowContainer, IMarkdownTextComponent
     {
         private const float size = 22;

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="Octokit" Version="0.51.0" />
     <PackageReference Include="osu.Framework.KaraokeFont" Version="2022.507.1" />
     <PackageReference Include="osu.Framework.Microphone" Version="2022.327.0" />
-    <PackageReference Include="ppy.osu.Game" Version="2022.501.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2022.509.0" />
     <PackageReference Include="LyricMaker" Version="1.1.1" />
     <PackageReference Include="NicoKaraParser" Version="1.1.0" />
     <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15" />