sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-09 05:19:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add better sample fallback logic

Browse Source 
Also adds support for null channels at InputDrum level.
This commit is contained in:
Dean Herbert 2017-12-27 21:44:04 +09:00
parent 46ef17354e
commit 3f73a9a693
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Taiko/UI/InputDrum.cs
View File

@ -152,14 +152,14 @@ namespace osu.Game.Rulesets.Taiko.UI
target = centreHit; target = centreHit;
back = centre; back = centre;
drumSample.Centre.Play(); drumSample.Centre?.Play();
} }
else if (action == RimAction) else if (action == RimAction)
{ {
target = rimHit; target = rimHit;
back = rim; back = rim;
drumSample.Rim.Play(); drumSample.Rim?.Play();
} }
if (target != null) if (target != null)

14
osu.Game/Audio/SampleInfo.cs
View File

@ -17,8 +17,18 @@ namespace osu.Game.Audio
public SampleChannel GetChannel(SampleManager manager, string resourceNamespace = null) public SampleChannel GetChannel(SampleManager manager, string resourceNamespace = null)
{ {
SampleChannel channel = manager.Get(Path.Combine("Gameplay", resourceNamespace ?? string.Empty, $"{Bank}-{Name}")); SampleChannel channel = null;
channel.Volume.Value = Volume / 100.0;
if (resourceNamespace != null)
channel = manager.Get(Path.Combine("Gameplay", resourceNamespace, $"{Bank}-{Name}"));
// try without namespace as a fallback.
if (channel == null)
channel = manager.Get(Path.Combine("Gameplay", $"{Bank}-{Name}"));
if (channel != null)
channel.Volume.Value = Volume / 100.0;
return channel; return channel;
} }