diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Legacy/KaraokeLegacySkinTransformer.cs b/osu.Game.Rulesets.Karaoke/Skinning/Legacy/KaraokeLegacySkinTransformer.cs index dc98ce410..aa9fb310a 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/Legacy/KaraokeLegacySkinTransformer.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/Legacy/KaraokeLegacySkinTransformer.cs @@ -105,7 +105,8 @@ private class InternalSkinStorageResourceProvider : IStorageResourceProvider { public InternalSkinStorageResourceProvider(string skinName) { - Files = Resources = new NamespacedResourceStore(new DllResourceStore(GetType().Assembly), $"Resources/Skin/{skinName}"); + var store = new KaraokeRuleset().CreateResourceStore(); + Files = Resources = new NamespacedResourceStore(store, $"Skin/{skinName}"); } public IResourceStore CreateTextureLoaderStore(IResourceStore underlyingStore) diff --git a/osu.Game.Rulesets.Karaoke/Utils/AssemblyUtils.cs b/osu.Game.Rulesets.Karaoke/Utils/AssemblyUtils.cs index f39924539..369918d9f 100644 --- a/osu.Game.Rulesets.Karaoke/Utils/AssemblyUtils.cs +++ b/osu.Game.Rulesets.Karaoke/Utils/AssemblyUtils.cs @@ -9,9 +9,9 @@ namespace osu.Game.Rulesets.Karaoke.Utils { public static class AssemblyUtils { - public static Assembly GetAssemblyByName(string partialName) + public static Assembly GetAssemblyByName(string name) { - var defaultAssembly = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(x => x.FullName.Contains(partialName)); + var defaultAssembly = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(x => x.GetName().Name == name); if (defaultAssembly != null) return defaultAssembly;