diff --git a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/RomajiTagConverter.cs b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/RomajiTagConverter.cs index ddbff740f..508d16f3a 100644 --- a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/RomajiTagConverter.cs +++ b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/RomajiTagConverter.cs @@ -20,7 +20,7 @@ public override RomajiTag ReadJson(JsonReader reader, Type objectType, RomajiTag if (string.IsNullOrEmpty(value)) return new RomajiTag(); - var regex = new Regex("\\[(?[-0-9]+)(?:,(?[-0-9]+))?\\]:(?.*$)"); + var regex = new Regex(@"\[(?[-0-9]+)(?:,(?[-0-9]+))?\]:(?.*$)"); var result = regex.Match(value); if (!result.Success) return new RomajiTag(); diff --git a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/RubyTagConverter.cs b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/RubyTagConverter.cs index 69fc0ec20..5d8f98606 100644 --- a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/RubyTagConverter.cs +++ b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/RubyTagConverter.cs @@ -20,7 +20,7 @@ public override RubyTag ReadJson(JsonReader reader, Type objectType, RubyTag? ex if (string.IsNullOrEmpty(value)) return new RubyTag(); - var regex = new Regex("\\[(?[-0-9]+)(?:,(?[-0-9]+))?\\]:(?.*$)"); + var regex = new Regex(@"\[(?[-0-9]+)(?:,(?[-0-9]+))?\]:(?.*$)"); var result = regex.Match(value); if (!result.Success) return new RubyTag(); diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/CaretLayer.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/CaretLayer.cs index fc423fab5..1c8655b6a 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/CaretLayer.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/CaretLayer.cs @@ -80,7 +80,7 @@ private void updateDrawableCaret(ICaretPosition? position, DrawableCaretType typ // typing TypingCaretPosition => new DrawableTypingCaret(type), // creat ruby-tag - CreateRubyTagCaretPosition => new DrawableCreateRubyTagCaretPosition(type), + CreateRubyTagCaretPosition => new DrawableCreateRubyTagCaret(type), // creat time-tag TimeTagIndexCaretPosition => new DrawableTimeTagIndexCaret(type), // record time-tag diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCreateRubyTagCaretPosition.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCreateRubyTagCaret.cs similarity index 94% rename from osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCreateRubyTagCaretPosition.cs rename to osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCreateRubyTagCaret.cs index 68f68bbf7..6e76ba1e5 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCreateRubyTagCaretPosition.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Components/Lyrics/Carets/DrawableCreateRubyTagCaret.cs @@ -7,7 +7,6 @@ using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Sprites; -using osu.Framework.Logging; using osu.Game.Graphics; using osu.Game.Graphics.UserInterface; using osu.Game.Rulesets.Karaoke.Edit.ChangeHandlers.Lyrics; @@ -18,7 +17,7 @@ namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Components.Lyrics.Carets; -public partial class DrawableCreateRubyTagCaretPosition : DrawableRangeCaret +public partial class DrawableCreateRubyTagCaret : DrawableRangeCaret { private const float border_spacing = 5; private const float caret_move_time = 60; @@ -32,7 +31,7 @@ public partial class DrawableCreateRubyTagCaretPosition : DrawableRangeCaret