h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 14:47:25 +08:00
Code Issues Releases Wiki Activity

Rename conflicting resources

Browse Source
This commit is contained in:
Dean Herbert 2021-05-31 18:55:47 +09:00
parent 65709ec7d7
commit ebfc24a499
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Mania.Tests/TestSceneManiaHitObjectSamples.cs
View File

@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Mania.Tests
public class TestSceneManiaHitObjectSamples : HitObjectSampleTest public class TestSceneManiaHitObjectSamples : HitObjectSampleTest
{ {
protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset(); protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
public override IResourceStore<byte[]> Resources => new DllResourceStore(Assembly.GetAssembly(typeof(TestSceneManiaHitObjectSamples))); protected override IResourceStore<byte[]> RulesetResources => new DllResourceStore(Assembly.GetAssembly(typeof(TestSceneManiaHitObjectSamples)));
/// <summary> /// <summary>
/// Tests that when a normal sample bank is used, the normal hitsound will be looked up. /// Tests that when a normal sample bank is used, the normal hitsound will be looked up.

2
osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoHitObjectSamples.cs
View File

@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
{ {
protected override Ruleset CreatePlayerRuleset() => new TaikoRuleset(); protected override Ruleset CreatePlayerRuleset() => new TaikoRuleset();
public override IResourceStore<byte[]> Resources => new DllResourceStore(Assembly.GetAssembly(typeof(TestSceneTaikoHitObjectSamples))); protected override IResourceStore<byte[]> RulesetResources => new DllResourceStore(Assembly.GetAssembly(typeof(TestSceneTaikoHitObjectSamples)));
[TestCase("taiko-normal-hitnormal")] [TestCase("taiko-normal-hitnormal")]
[TestCase("normal-hitnormal")] [TestCase("normal-hitnormal")]

2
osu.Game.Tests/Gameplay/TestSceneHitObjectSamples.cs
View File

@ -14,7 +14,7 @@ namespace osu.Game.Tests.Gameplay
public class TestSceneHitObjectSamples : HitObjectSampleTest public class TestSceneHitObjectSamples : HitObjectSampleTest
{ {
protected override Ruleset CreatePlayerRuleset() => new OsuRuleset(); protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
public override IResourceStore<byte[]> Resources => TestResources.GetStore(); protected override IResourceStore<byte[]> RulesetResources => TestResources.GetStore();
/// <summary> /// <summary>
/// Tests that a hitobject which provides no custom sample set retrieves samples from the user skin. /// Tests that a hitobject which provides no custom sample set retrieves samples from the user skin.

3
osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
View File

@ -29,7 +29,6 @@ namespace osu.Game.Tests.Beatmaps
public abstract class HitObjectSampleTest : PlayerTestScene, IStorageResourceProvider public abstract class HitObjectSampleTest : PlayerTestScene, IStorageResourceProvider
{ {
protected abstract IResourceStore<byte[]> RulesetResources { get; } protected abstract IResourceStore<byte[]> RulesetResources { get; }
protected LegacySkin Skin { get; private set; } protected LegacySkin Skin { get; private set; }
[Resolved] [Resolved]
@ -76,7 +75,7 @@ namespace osu.Game.Tests.Beatmaps
AddStep($"load {filename}", () => AddStep($"load {filename}", () =>
{ {
using (var reader = new LineBufferedReader(Resources.GetStream($"Resources/SampleLookups/{filename}"))) using (var reader = new LineBufferedReader(RulesetResources.GetStream($"Resources/SampleLookups/{filename}")))
currentTestBeatmap = Decoder.GetDecoder<Beatmap>(reader).Decode(reader); currentTestBeatmap = Decoder.GetDecoder<Beatmap>(reader).Decode(reader);
// populate ruleset for beatmap converters that require it to be present. // populate ruleset for beatmap converters that require it to be present.