Merge pull request #242 from andy840119/andy840119/update-nuget

Update nuget package
karaoke-dev · Nov 9, 2020 · 82a0d2c · 82a0d2c
2 parents 0150177 + efa143c
commit 82a0d2c
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 21 deletions.
diff --git a/osu.Game.Rulesets.Karaoke/Edit/LyricEditor/Components/LyricControl.cs b/osu.Game.Rulesets.Karaoke/Edit/LyricEditor/Components/LyricControl.cs
@@ -50,7 +50,7 @@ protected override void ApplyLayout(KaraokeLayout layout)
                 Padding = new MarginPadding(0);
             }
 
-            protected override void UpdateStateTransforms(ArmedState state)
+            protected override void UpdateStartTimeStateTransforms()
             {
                 // Do not fade-in / fade-out while changing armed state.
             }

diff --git a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModHiddenNote.cs b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModHiddenNote.cs
@@ -36,7 +36,7 @@ public override void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> dr
             base.ApplyToDrawableHitObjects(drawables);
         }
 
-        protected override void ApplyHiddenState(DrawableHitObject hitObject, ArmedState state)
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
             if (!(hitObject is DrawableNote note))
                 return;

diff --git a/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableBarLine.cs b/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableBarLine.cs
@@ -71,7 +71,7 @@ protected override void UpdateInitialTransforms()
         {
         }
 
-        protected override void UpdateStateTransforms(ArmedState state)
+        protected override void UpdateStartTimeStateTransforms()
         {
         }
     }

diff --git a/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableKaraokeHitObject.cs b/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableKaraokeHitObject.cs
@@ -16,19 +16,6 @@ protected DrawableKaraokeHitObject(KaraokeHitObject hitObject)
 
         protected sealed override double InitialLifetimeOffset => HitObject.TimePreempt;
 
-        protected override void UpdateStateTransforms(ArmedState state)
-        {
-            base.UpdateStateTransforms(state);
-
-            switch (state)
-            {
-                case ArmedState.Idle:
-                    // Manually set to reduce the number of future alive objects to a bare minimum.
-                    LifetimeStart = HitObject.StartTime - HitObject.TimePreempt;
-                    break;
-            }
-        }
-
         protected override JudgementResult CreateResult(Judgement judgement) => new KaraokeJudgementResult(HitObject, judgement);
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableLyric.cs b/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableLyric.cs
@@ -178,9 +178,9 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
             }
         }
 
-        protected override void UpdateStateTransforms(ArmedState state)
+        protected override void UpdateStartTimeStateTransforms()
         {
-            base.UpdateStateTransforms(state);
+            base.UpdateStartTimeStateTransforms();
 
             using (BeginDelayedSequence(HitObject.Duration, true))
             {

diff --git a/osu.Game.Rulesets.Karaoke/Statistics/BeatmapInfoGraph.cs b/osu.Game.Rulesets.Karaoke/Statistics/BeatmapInfoGraph.cs
@@ -33,9 +33,9 @@ protected override bool OnClick(ClickEvent e)
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load([CanBeNull] IBindable<WorkingBeatmap> workingBeatmap, [CanBeNull] BeatmapDifficultyManager difficultyManager)
+        private void load([CanBeNull] IBindable<WorkingBeatmap> workingBeatmap, [CanBeNull] BeatmapDifficultyCache difficultyCache)
         {
-            var beatmapDifficulty = difficultyManager.GetDifficulty(beatmap.BeatmapInfo);
+            var beatmapDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo).Value;
             if (workingBeatmap != null)
             {
                 LoadComponentAsync(new BeatmapInfoWedge(workingBeatmap.Value, beatmapDifficulty), Add);

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Octokit" Version="0.48.0" />
     <PackageReference Include="osu.Framework.KaraokeFont" Version="1.0.0" />
     <PackageReference Include="osu.Framework.Microphone" Version="1.0.10" />
-    <PackageReference Include="ppy.osu.Game" Version="2020.1031.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2020.1109.0" />
     <PackageReference Include="LyricMaker" Version="1.1.1" />
     <PackageReference Include="NicoKaraParser" Version="1.1.0" />
   </ItemGroup>
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,7 @@ protected override void UpdateInitialTransforms() @@
             {
             }
-            protected override void UpdateStateTransforms(ArmedState state)
+            protected override void UpdateStartTimeStateTransforms()
             {
             }
         }
@@ Expand Down @@