Merge pull request #929 from andy840119/update-package

update nuget package and fix compile error.
karaoke-dev · Nov 22, 2021 · 5de5bbe · 5de5bbe
2 parents 7cbf40b + 4a51aee
commit 5de5bbe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/osu.Game.Rulesets.Karaoke/Difficulty/KaraokeDifficultyCalculator.cs b/osu.Game.Rulesets.Karaoke/Difficulty/KaraokeDifficultyCalculator.cs
@@ -37,7 +37,7 @@ public KaraokeDifficultyCalculator(IRulesetInfo ruleset, IWorkingBeatmap beatmap
         protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
         {
             if (beatmap.HitObjects.Count == 0)
-                return new KaraokeDifficultyAttributes { Mods = mods, Skills = skills };
+                return new KaraokeDifficultyAttributes { Mods = mods };
 
             HitWindows hitWindows = new KaraokeHitWindows();
             hitWindows.SetDifficulty(beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty);
@@ -49,7 +49,6 @@ protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beat
                 // Todo: This int cast is temporary to achieve 1:1 results with osu!stable, and should be removed in the future
                 GreatHitWindow = (int)Math.Ceiling(getHitWindow300(mods) / clockRate),
                 MaxCombo = beatmap.HitObjects.Sum(h => h is Note ? 2 : 1),
-                Skills = skills
             };
         }
 

diff --git a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModAutoplayBySinger.cs b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModAutoplayBySinger.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
+using osu.Game.Extensions;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Karaoke.Beatmaps;
 using osu.Game.Rulesets.Karaoke.Graphics.Sprites;
@@ -54,7 +55,7 @@ private string getPathForFile(BeatmapInfo beatmapInfo)
 
             return beatmapSetInfo.Files
                                  .FirstOrDefault(f => string.Equals(f.Filename, audioFile, StringComparison.OrdinalIgnoreCase))
-                                 ?.FileInfo.StoragePath;
+                                 ?.FileInfo.GetStoragePath();
         }
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="Octokit" Version="0.50.0" />
     <PackageReference Include="osu.Framework.KaraokeFont" Version="2021.1121.0" />
     <PackageReference Include="osu.Framework.Microphone" Version="2021.1120.0" />
-    <PackageReference Include="ppy.osu.Game" Version="2021.1120.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2021.1122.0" />
     <PackageReference Include="LyricMaker" Version="1.1.1" />
     <PackageReference Include="NicoKaraParser" Version="1.1.0" />
     <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15" />