From cb03d9d17d2079dd0716adeab0ee4a67f2cfb338 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Wed, 8 Jul 2020 00:08:05 +0900 Subject: [PATCH 1/3] Update ppy.game and mocriphone package. Mocriphone has update framework and tested. --- osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj index 0f99a7653..736807d07 100644 --- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj +++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj @@ -11,8 +11,8 @@ - - + + From f142d339e35d7c3db344c649bd2fbc754a829d4f Mon Sep 17 00:00:00 2001 From: andy840119 Date: Thu, 9 Jul 2020 22:16:57 +0900 Subject: [PATCH 2/3] Fix crash isseu. --- osu.Game.Rulesets.Karaoke/KaraokeInputManager.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/osu.Game.Rulesets.Karaoke/KaraokeInputManager.cs b/osu.Game.Rulesets.Karaoke/KaraokeInputManager.cs index 08d2c514c..614c199dc 100644 --- a/osu.Game.Rulesets.Karaoke/KaraokeInputManager.cs +++ b/osu.Game.Rulesets.Karaoke/KaraokeInputManager.cs @@ -58,7 +58,7 @@ private void load(KaraokeRulesetConfigManager config, IBindable new KaraokeRulesetInputManagerInputState(new MicrophoneState()); + => new KaraokeRulesetInputManagerInputState(new MicrophoneInputState(new MicrophoneState())); public override void HandleInputStateChange(InputStateChangeEvent inputStateChange) { @@ -119,9 +119,10 @@ public class KaraokeRulesetInputManagerInputState : RulesetInputManagerInputS { public MicrophoneState Microphone { get; } - public KaraokeRulesetInputManagerInputState(MicrophoneState microphone) + public KaraokeRulesetInputManagerInputState(MicrophoneInputState state) + : base(state) { - Microphone = microphone; + Microphone = state.Microphone; } } From bed3ea8db156d268140169fd7a75543b5fe87507 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Thu, 9 Jul 2020 22:31:50 +0900 Subject: [PATCH 3/3] Fixed. --- osu.Game.Rulesets.Karaoke/KaraokeInputManager.cs | 6 +++--- osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/osu.Game.Rulesets.Karaoke/KaraokeInputManager.cs b/osu.Game.Rulesets.Karaoke/KaraokeInputManager.cs index 614c199dc..42ed0428c 100644 --- a/osu.Game.Rulesets.Karaoke/KaraokeInputManager.cs +++ b/osu.Game.Rulesets.Karaoke/KaraokeInputManager.cs @@ -58,7 +58,7 @@ private void load(KaraokeRulesetConfigManager config, IBindable new KaraokeRulesetInputManagerInputState(new MicrophoneInputState(new MicrophoneState())); + => new KaraokeRulesetInputManagerInputState(base.CreateInitialState()); public override void HandleInputStateChange(InputStateChangeEvent inputStateChange) { @@ -119,10 +119,10 @@ public class KaraokeRulesetInputManagerInputState : RulesetInputManagerInputS { public MicrophoneState Microphone { get; } - public KaraokeRulesetInputManagerInputState(MicrophoneInputState state) + public KaraokeRulesetInputManagerInputState(InputState state) : base(state) { - Microphone = state.Microphone; + Microphone = new MicrophoneState(); } } diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj index 736807d07..4a7e6f0c2 100644 --- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj +++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj @@ -11,7 +11,7 @@ - +