This commit is contained in:
Dean Herbert
2019-02-02 17:11:25 +09:00
parent ca5c8d37d1
commit e01f342ab0
4 changed files with 71 additions and 69 deletions

View File

@ -61,13 +61,19 @@ namespace osu.Game.Screens.Multi
[Resolved(CanBeNull = true)]
private OsuLogo logo { get; set; }
public Bindable<WorkingBeatmap> Beatmap => screenDependencies.Beatmap;
public Bindable<WorkingBeatmap> Beatmap { get; set; }
public Bindable<RulesetInfo> Ruleset => screenDependencies.Ruleset;
public Bindable<RulesetInfo> Ruleset { get; set; }
private OsuScreenDependencies screenDependencies;
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
{
var deps = new OsuScreenDependencies(DisallowExternalBeatmapRulesetChanges, base.CreateChildDependencies(parent));
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) => screenDependencies = new OsuScreenDependencies(DisallowExternalBeatmapRulesetChanges, base.CreateChildDependencies(parent));
Beatmap = deps.Beatmap;
Ruleset = deps.Ruleset;
return deps;
}
public Multiplayer()
{
@ -188,8 +194,6 @@ namespace osu.Game.Screens.Multi
{
waves.Hide();
screenDependencies.Dispose();
this.Delay(WaveContainer.DISAPPEAR_DURATION).FadeOut();
cancelLooping();