diff --git a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LabelledRealTimeSliderBar.cs b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LabelledRealTimeSliderBar.cs index 8816d9fd7..0e5c6f7b0 100644 --- a/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LabelledRealTimeSliderBar.cs +++ b/osu.Game.Rulesets.Karaoke/Graphics/UserInterfaceV2/LabelledRealTimeSliderBar.cs @@ -1,7 +1,7 @@ // Copyright (c) andy840119 . Licensed under the GPL Licence. // See the LICENCE file in the repository root for full licence text. -using System; +using System.Numerics; using osu.Framework.Graphics; using osu.Game.Graphics.UserInterfaceV2; using osu.Game.Overlays.Settings; @@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Karaoke.Graphics.UserInterfaceV2; public partial class LabelledRealTimeSliderBar : LabelledSliderBar - where TNumber : struct, IEquatable, IComparable, IConvertible + where TNumber : struct, INumber, IMinMaxValue { protected override SettingsSlider CreateComponent() => base.CreateComponent().With(x => x.TransferValueOnCommit = false); diff --git a/osu.Game.Rulesets.Karaoke/KaraokeSkinComponentLookup.cs b/osu.Game.Rulesets.Karaoke/KaraokeSkinComponentLookup.cs index 5aa962a03..7dc31478f 100644 --- a/osu.Game.Rulesets.Karaoke/KaraokeSkinComponentLookup.cs +++ b/osu.Game.Rulesets.Karaoke/KaraokeSkinComponentLookup.cs @@ -11,8 +11,4 @@ public KaraokeSkinComponentLookup(KaraokeSkinComponents component) : base(component) { } - - protected override string RulesetPrefix => KaraokeRuleset.SHORT_NAME; - - protected override string ComponentName => Component.ToString().ToLower(); } diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/Playback/PlaybackSwitchButton.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/Playback/PlaybackSwitchButton.cs index 1d4049293..436636bf4 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/Playback/PlaybackSwitchButton.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/Playback/PlaybackSwitchButton.cs @@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Lyrics.Compose.Toolbar public partial class PlaybackSwitchButton : CompositeDrawable { - private readonly IBindable track = new Bindable(); + private readonly IBindable track = new Bindable(); private readonly BindableNumber freqAdjust = new BindableDouble(1); public PlaybackSwitchButton() diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorVerifier.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorVerifier.cs index 5c119bd68..7b1c81c6b 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorVerifier.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorVerifier.cs @@ -7,6 +7,7 @@ using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Caching; +using osu.Framework.Extensions.ObjectExtensions; using osu.Game.Beatmaps; using osu.Game.Rulesets.Edit; using osu.Game.Rulesets.Edit.Checks.Components; @@ -182,6 +183,10 @@ protected override void Dispose(bool isDisposing) { base.Dispose(isDisposing); + // todo: not very sure + if (!editorBeatmap.IsNull()) + return; + editorBeatmap.HitObjectAdded -= hitObjectAdded; editorBeatmap.HitObjectRemoved -= hitObjectRemoved; editorBeatmap.HitObjectUpdated -= hitObjectUpdated; diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj index c1fe80681..1ccf721e2 100644 --- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj +++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj @@ -10,18 +10,18 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - +