sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 22:56:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into osu-fontusage

Browse Source 
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
This commit is contained in:
smoogipoo
2019-02-20 15:04:08 +09:00
parent a2aa3ec5cb 5ac1288f9e
commit 0693ab8e7d
134 changed files with 2930 additions and 1557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Multi/Match/Components/Header.cs
View File

@ -108,7 +108,7 @@ namespace osu.Game.Screens.Multi.Match.Components
},
};
CurrentMods.BindValueChanged(m => modDisplay.Current.Value = m, true);
CurrentItem.BindValueChanged(i => modDisplay.Current.Value = i?.RequiredMods, true);
beatmapButton.Action = () => RequestBeatmapSelection?.Invoke();
}

8
osu.Game/Screens/Multi/Match/Components/Info.cs
View File

@ -92,8 +92,12 @@ namespace osu.Game.Screens.Multi.Match.Components
},
};
viewBeatmapButton.Beatmap.BindTo(CurrentBeatmap);
readyButton.Beatmap.BindTo(CurrentBeatmap);
CurrentItem.BindValueChanged(item =>
{
viewBeatmapButton.Beatmap.Value = item?.Beatmap;
readyButton.Beatmap.Value = item?.Beatmap;
}, true);
hostInfo.Host.BindTo(Host);
}
}

4
osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
View File

@ -14,13 +14,13 @@ namespace osu.Game.Screens.Multi.Match.Components
{
public class ReadyButton : HeaderButton
{
public readonly IBindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
[Resolved(typeof(Room), nameof(Room.EndDate))]
private Bindable<DateTimeOffset> endDate { get; set; }
[Resolved]
private IBindableBeatmap gameBeatmap { get; set; }
private IBindable<WorkingBeatmap> gameBeatmap { get; set; }
[Resolved]
private BeatmapManager beatmaps { get; set; }

2
osu.Game/Screens/Multi/Match/Components/ViewBeatmapButton.cs
View File

@ -11,7 +11,7 @@ namespace osu.Game.Screens.Multi.Match.Components
{
public class ViewBeatmapButton : HeaderButton
{
public readonly IBindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
[Resolved(CanBeNull = true)]
private OsuGame osuGame { get; set; }