Merge pull request #885 from andy840119/update-font-package

Update font package
karaoke-dev · Oct 31, 2021 · 0b62220 · 0b62220
2 parents 45efe7e + b54fcc1
commit 0b62220
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/osu.Game.Rulesets.Karaoke.Tests/KaraokeTestBrowser.cs b/osu.Game.Rulesets.Karaoke.Tests/KaraokeTestBrowser.cs
@@ -13,7 +13,7 @@ public class KaraokeTestBrowser : OsuTestBrowser
         private void load()
         {
             // add shader resource from font package.
-            Resources.AddStore(new NamespacedResourceStore<byte[]>(new FontResourceStore(), "Resources"));
+            Resources.AddStore(new NamespacedResourceStore<byte[]>(new ShaderResourceStore(), "Resources"));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/Components/EditorLyricPiece.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/Rows/Components/EditorLyricPiece.cs
@@ -166,7 +166,7 @@ public RectangleF GetRubyTagPosition(RubyTag rubyTag)
 
                 var startCharacterIndex = Text.Length + skinIndex(Rubies, rubyIndex);
                 var count = matchedRuby.Text.Length;
-                var rectangles = Characters.GetRange(startCharacterIndex, count).Select(x => x.DrawRectangle).ToArray();
+                var rectangles = Characters.ToList().GetRange(startCharacterIndex, count).Select(x => x.DrawRectangle).ToArray();
                 return RectangleFUtils.Union(rectangles);
             }
 
@@ -179,7 +179,7 @@ public RectangleF GetRomajiTagPosition(RomajiTag romajiTag)
 
                 var startCharacterIndex = Text.Length + skinIndex(Rubies, Rubies.Length) + skinIndex(Romajies, romajiIndex);
                 var count = matchedRomaji.Text.Length;
-                var rectangles = Characters.GetRange(startCharacterIndex, count).Select(x => x.DrawRectangle).ToArray();
+                var rectangles = Characters.ToList().GetRange(startCharacterIndex, count).Select(x => x.DrawRectangle).ToArray();
                 return RectangleFUtils.Union(rectangles);
             }
 

diff --git a/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs b/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs
@@ -169,7 +169,7 @@ public override IResourceStore<byte[]> CreateResourceStore()
             store.AddStore(getRulesetStore());
 
             // add shader resource from font package.
-            store.AddStore(new NamespacedResourceStore<byte[]>(new FontResourceStore(), "Resources"));
+            store.AddStore(new NamespacedResourceStore<byte[]>(new ShaderResourceStore(), "Resources"));
 
             return store;
 

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="ILRepack.MSBuild.Task" Version="2.0.13" />
     <PackageReference Include="LanguageDetection.karaoke-dev" Version="1.3.3-alpha" />
     <PackageReference Include="Octokit" Version="0.50.0" />
-    <PackageReference Include="osu.Framework.KaraokeFont" Version="2021.1027.0" />
+    <PackageReference Include="osu.Framework.KaraokeFont" Version="2021.1031.0" />
     <PackageReference Include="osu.Framework.Microphone" Version="2021.1027.0" />
     <PackageReference Include="ppy.osu.Game" Version="2021.1028.0" />
     <PackageReference Include="LyricMaker" Version="1.1.1" />