From e1c1833ece80f6df65b26c711eda95d9665ce3a3 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Fri, 11 Sep 2020 10:22:37 +0900 Subject: [PATCH] Update package and fix compile error. --- .../osu.Game.Rulesets.Karaoke.Tests.csproj | 2 +- osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PitchSettings.cs | 3 +-- .../UI/PlayerSettings/PlaybackSettings.cs | 3 +-- .../UI/PlayerSettings/PracticeSettings.cs | 3 +-- .../UI/PlayerSettings/RubyRomajiSettings.cs | 3 +-- .../UI/PlayerSettings/TranslateSettings.cs | 3 +-- osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj | 2 +- 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/osu.Game.Rulesets.Karaoke.Tests/osu.Game.Rulesets.Karaoke.Tests.csproj b/osu.Game.Rulesets.Karaoke.Tests/osu.Game.Rulesets.Karaoke.Tests.csproj index 076eba9bd..b73b6f812 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/osu.Game.Rulesets.Karaoke.Tests.csproj +++ b/osu.Game.Rulesets.Karaoke.Tests/osu.Game.Rulesets.Karaoke.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PitchSettings.cs b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PitchSettings.cs index aef70a414..519b4f61f 100644 --- a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PitchSettings.cs +++ b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PitchSettings.cs @@ -11,13 +11,12 @@ namespace osu.Game.Rulesets.Karaoke.UI.PlayerSettings { public class PitchSettings : PlayerSettingsGroup { - protected override string Title => "Pitch"; - private readonly ClickablePlayerSliderBar pitchSliderBar; private readonly ClickablePlayerSliderBar vocalPitchSliderBar; private readonly ClickablePlayerSliderBar saitenPitchSliderBar; public PitchSettings() + : base("Pitch") { Children = new Drawable[] { diff --git a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PlaybackSettings.cs b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PlaybackSettings.cs index 577bb9d01..ad3946ca6 100644 --- a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PlaybackSettings.cs +++ b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PlaybackSettings.cs @@ -12,11 +12,10 @@ namespace osu.Game.Rulesets.Karaoke.UI.PlayerSettings { public class PlaybackSettings : PlayerSettingsGroup, IKeyBindingHandler { - protected override string Title => "Playback"; - private readonly ClickablePlayerSliderBar playBackSliderBar; public PlaybackSettings() + : base("Playback") { Children = new Drawable[] { diff --git a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PracticeSettings.cs b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PracticeSettings.cs index d82cfecc9..6dbb1428e 100644 --- a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PracticeSettings.cs +++ b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PracticeSettings.cs @@ -26,12 +26,11 @@ namespace osu.Game.Rulesets.Karaoke.UI.PlayerSettings { public class PracticeSettings : PlayerSettingsGroup, IKeyBindingHandler { - protected override string Title => "Practice"; - private readonly PlayerSliderBar preemptTimeSliderBar; private readonly LyricPreview lyricPreview; public PracticeSettings(IBeatmap beatmap) + : base("Practice") { var lyrics = beatmap.HitObjects.OfType().ToList(); diff --git a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/RubyRomajiSettings.cs b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/RubyRomajiSettings.cs index e9ae6058d..cd62a9b94 100644 --- a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/RubyRomajiSettings.cs +++ b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/RubyRomajiSettings.cs @@ -10,12 +10,11 @@ namespace osu.Game.Rulesets.Karaoke.UI.PlayerSettings { public class RubyRomajiSettings : PlayerSettingsGroup { - protected override string Title => "Ruby/Romaji"; - private readonly PlayerCheckbox displayRubyCheckBox; private readonly PlayerCheckbox displayRomajiCheckBox; public RubyRomajiSettings() + : base("Ruby/Romaji") { Children = new Drawable[] { diff --git a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/TranslateSettings.cs b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/TranslateSettings.cs index b5704ed47..41684959e 100644 --- a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/TranslateSettings.cs +++ b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/TranslateSettings.cs @@ -13,13 +13,12 @@ namespace osu.Game.Rulesets.Karaoke.UI.PlayerSettings { public class TranslateSettings : PlayerSettingsGroup { - protected override string Title => "Translate"; - private readonly PlayerCheckbox translateCheckBox; private readonly OsuSpriteText translateText; private readonly OsuDropdown translateDropDown; public TranslateSettings(PropertyDictionary dictionary) + : base("Translate") { Children = new Drawable[] { diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj index 7ab2d3564..9750f2b5a 100644 --- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj +++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj @@ -13,7 +13,7 @@ - +