1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-05 03:03:21 +08:00

Compare commits

...

6 Commits

Author SHA1 Message Date
Dean Herbert
37aac9c214
Merge pull request #8028 from smoogipoo/add-beatmap-cover-load-delay
Add delay for loading multiplayer beatmap covers
2020-02-28 16:42:21 +09:00
Dean Herbert
1ba9539d48
Merge pull request #8027 from smoogipoo/remove-multi-workarounds
Remove workarounds for CreateRoomRequest shortcomings
2020-02-28 16:40:33 +09:00
Dean Herbert
cd28208284
Merge pull request #8026 from smoogipoo/fix-triangles-logo-background
Hide logo background when exiting with the triangles intro
2020-02-28 16:40:01 +09:00
smoogipoo
dd2bd5c19d Add delay for loading multiplayer beatmap covers 2020-02-27 20:01:23 +09:00
smoogipoo
3f5c4633bc Remove workarounds for CreateRoomRequest shortcomings 2020-02-27 16:41:00 +09:00
smoogipoo
101a587641 Disable triangles in triangles intro 2020-02-27 15:51:55 +09:00
4 changed files with 3 additions and 14 deletions

View File

@ -16,6 +16,8 @@ namespace osu.Game.Beatmaps.Drawables
{
public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
protected override double LoadDelay => 500;
[Resolved]
private BeatmapManager beatmaps { get; set; }

View File

@ -65,9 +65,7 @@ namespace osu.Game.Online.Multiplayer
public void MapObjects(BeatmapManager beatmaps, RulesetStore rulesets)
{
// If we don't have an api beatmap, the request occurred as a result of room creation, so we can query the local beatmap instead
// Todo: Is this a bug? Room creation only returns the beatmap ID
Beatmap.Value = apiBeatmap == null ? beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == BeatmapID) : apiBeatmap.ToBeatmap(rulesets);
Beatmap.Value = apiBeatmap.ToBeatmap(rulesets);
Ruleset.Value = rulesets.GetRuleset(RulesetID);
Ruleset rulesetInstance = Ruleset.Value.CreateInstance();

View File

@ -118,15 +118,6 @@ namespace osu.Game.Online.Multiplayer
if (DateTimeOffset.Now >= EndDate.Value)
Status.Value = new RoomStatusEnded();
// transfer local beatmaps across to ensure we have Metadata available (CreateRoomRequest does not give us metadata as expected)
foreach (var item in other.Playlist)
{
var localItem = Playlist.FirstOrDefault(i => i.BeatmapID == item.BeatmapID);
if (localItem != null)
item.Beatmap.Value.Metadata = localItem.Beatmap.Value.Metadata;
}
if (!Playlist.SequenceEqual(other.Playlist))
{
Playlist.Clear();

View File

@ -54,8 +54,6 @@ namespace osu.Game.Screens.Menu
{
base.LogoArriving(logo, resuming);
logo.Triangles = true;
if (!resuming)
{
PrepareMenuLoad();