mirror of
https://github.com/ppy/osu.git
synced 2024-11-11 15:47:26 +08:00
Load nested hitobjects during map load
This commit is contained in:
parent
d2aaba3918
commit
5f98195144
@ -129,9 +129,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
|
|||||||
LoadSamples();
|
LoadSamples();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void LoadComplete()
|
protected override void LoadAsyncComplete()
|
||||||
{
|
{
|
||||||
base.LoadComplete();
|
base.LoadAsyncComplete();
|
||||||
|
|
||||||
HitObject.DefaultsApplied += onDefaultsApplied;
|
HitObject.DefaultsApplied += onDefaultsApplied;
|
||||||
|
|
||||||
@ -148,6 +148,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
|
|||||||
samplesBindable.CollectionChanged += (_, __) => LoadSamples();
|
samplesBindable.CollectionChanged += (_, __) => LoadSamples();
|
||||||
|
|
||||||
apply(HitObject);
|
apply(HitObject);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void LoadComplete()
|
||||||
|
{
|
||||||
|
base.LoadComplete();
|
||||||
|
|
||||||
updateState(ArmedState.Idle, true);
|
updateState(ArmedState.Idle, true);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user