Fix backgrounds not quite working

This commit is contained in:
smoogipoo
2018-12-12 19:34:37 +09:00
parent 450e4cd223
commit bac4f42eac
8 changed files with 20 additions and 18 deletions

View File

@ -213,8 +213,6 @@ namespace osu.Game.Screens.Multi.Lounge.Components
d.FadeColour(s.GetAppropriateColour(colours), transition_duration);
};
background.Beatmap.BindTo(beatmap);
beatmapBind.BindValueChanged(b => beatmap.Value = beatmaps.GetWorkingBeatmap(b));
nameBind.BindValueChanged(n => name.Text = n);
@ -224,6 +222,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
typeBind.BindTo(Room.Type);
beatmapBind.BindTo(Room.Beatmap);
participantsBind.BindTo(Room.Participants);
background.Beatmap.BindTo(beatmapBind);
modeTypeInfo.Beatmap.BindTo(beatmapBind);
modeTypeInfo.Type.BindTo(typeBind);

View File

@ -180,7 +180,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
nameBind.BindValueChanged(n => name.Text = n);
background.Beatmap.BindTo(beatmap);
background.Beatmap.BindTo(beatmapBind);
participantInfo.Host.BindTo(hostBind);
participantInfo.Participants.BindTo(participantsBind);

View File

@ -23,7 +23,7 @@ namespace osu.Game.Screens.Multi.Match.Components
{
public const float HEIGHT = 200;
public readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
public readonly IBindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
private readonly Box tabStrip;

View File

@ -86,7 +86,7 @@ namespace osu.Game.Screens.Multi.Match
};
header.OnRequestSelectBeatmap = () => Push(new MatchSongSelect());
header.Beatmap.BindTo(Beatmap);
header.Beatmap.BindTo(beatmapBind);
header.Tabs.Current.ValueChanged += t =>
{

View File

@ -69,6 +69,9 @@ namespace osu.Game.Screens.Multi
pi.SetRulesets(rulesets);
}
// Temporarily
r.Beatmap.Value = r.Playlist.FirstOrDefault()?.Beatmap;
var existing = rooms.FirstOrDefault(e => e.RoomID.Value == r.RoomID.Value);
if (existing == null)
rooms.Add(r);