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

Apply review

Browse Source
This commit is contained in:
Dean Herbert 2018-02-24 23:07:02 +09:00
parent 768e0a4e2a
commit 4a52df2dd4
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game.Rulesets.Taiko/Audio/DrumSampleMapping.cs
View File

@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Taiko.Audio
private readonly ControlPointInfo controlPoints;
private readonly Dictionary<double, DrumSample> mappings = new Dictionary<double, DrumSample>();
public readonly List<SkinnableSound> Drawables = new List<SkinnableSound>();
public readonly List<SkinnableSound> Sounds = new List<SkinnableSound>();
public DrumSampleMapping(ControlPointInfo controlPoints)
{
@ -37,16 +37,16 @@ namespace osu.Game.Rulesets.Taiko.Audio
mappings[s.Time] = new DrumSample
{
Centre = addDrawableSound(centre),
Rim = addDrawableSound(rim)
Centre = addSound(centre),
Rim = addSound(rim)
};
}
}
private SkinnableSound addDrawableSound(SampleInfo rim)
private SkinnableSound addSound(SampleInfo sampleInfo)
{
var drawable = new SkinnableSound(rim);
Drawables.Add(drawable);
var drawable = new SkinnableSound(sampleInfo);
Sounds.Add(drawable);
return drawable;
}

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

@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Taiko.UI
}
};
AddRangeInternal(sampleMappings.Drawables);
AddRangeInternal(sampleMappings.Sounds);
}
/// <summary>

5
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -33,10 +33,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
protected SkinnableSound Samples;
protected virtual IEnumerable<SampleInfo> GetSamples()
{
return HitObject.Samples;
}
protected virtual IEnumerable<SampleInfo> GetSamples() => HitObject.Samples;
private List<DrawableHitObject> nestedHitObjects;
public IReadOnlyList<DrawableHitObject> NestedHitObjects => nestedHitObjects;

2
osu.Game/Skinning/SkinReloadableDrawable.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Skinning
private readonly bool allowDefaultFallback;
/// <summary>
/// Create a new
/// Create a new <see cref="SkinReloadableDrawable"/>
/// </summary>
/// <param name="fallback">Whether fallback to default skin should be allowed if the custom skin is missing this resource.</param>
protected SkinReloadableDrawable(bool fallback = true)