RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-27 01:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Perform mappings earlier in execution

Browse Source
This commit is contained in:
Dean Herbert 2018-11-06 20:18:11 +09:00
parent 968d39c0e6
commit 53ec01d51f
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tournament.Tests/TestCaseTeamIntro.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Tournament.Tests
pairing.Grouping.Value = Ladder.Groupings.FirstOrDefault(g => g.Name == "Finals"); pairing.Grouping.Value = Ladder.Groupings.FirstOrDefault(g => g.Name == "Finals");
currentMatch.Value = pairing; currentMatch.Value = pairing;
Add(new TeamIntroScreen() Add(new TeamIntroScreen
{ {
FillMode = FillMode.Fit, FillMode = FillMode.Fit,
FillAspectRatio = 16 / 9f FillAspectRatio = 16 / 9f

29
osu.Game.Tournament/Screens/Ladder/LadderManager.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
@ -67,37 +66,9 @@ namespace osu.Game.Tournament.Screens.Ladder
} }
}; };
// assign teams
foreach (var pairing in info.Pairings)
{
pairing.Team1.Value = info.Teams.FirstOrDefault(t => t.Acronym == pairing.Team1Acronym);
pairing.Team2.Value = info.Teams.FirstOrDefault(t => t.Acronym == pairing.Team2Acronym);
}
// assign progressions
foreach (var pair in info.Progressions)
{
var src = info.Pairings.FirstOrDefault(p => p.ID == pair.Item1);
var dest = info.Pairings.FirstOrDefault(p => p.ID == pair.Item2);
if (src == null) throw new InvalidOperationException();
if (dest != null)
{
if (pair.Losers)
src.LosersProgression.Value = dest;
else
src.Progression.Value = dest;
}
}
foreach (var pairing in info.Pairings) foreach (var pairing in info.Pairings)
addPairing(pairing); addPairing(pairing);
foreach (var group in info.Groupings)
foreach (var id in group.Pairings)
info.Pairings.Single(p => p.ID == id).Grouping.Value = group;
// todo: fix this // todo: fix this
Scheduler.AddDelayed(() => layout.Invalidate(), 100, true); Scheduler.AddDelayed(() => layout.Invalidate(), 100, true);
} }

35
osu.Game.Tournament/TournamentGameBase.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -56,13 +57,38 @@ namespace osu.Game.Tournament
Ladder = content != null ? JsonConvert.DeserializeObject<LadderInfo>(content) : new LadderInfo(); Ladder = content != null ? JsonConvert.DeserializeObject<LadderInfo>(content) : new LadderInfo();
//todo: temp
currentMatch.Value = Ladder.Pairings.FirstOrDefault();
dependencies.Cache(Ladder); dependencies.Cache(Ladder);
bool addedInfo = false; bool addedInfo = false;
// assign teams
foreach (var pairing in Ladder.Pairings)
{
pairing.Team1.Value = Ladder.Teams.FirstOrDefault(t => t.Acronym == pairing.Team1Acronym);
pairing.Team2.Value = Ladder.Teams.FirstOrDefault(t => t.Acronym == pairing.Team2Acronym);
}
// assign progressions
foreach (var pair in Ladder.Progressions)
{
var src = Ladder.Pairings.FirstOrDefault(p => p.ID == pair.Item1);
var dest = Ladder.Pairings.FirstOrDefault(p => p.ID == pair.Item2);
if (src == null) throw new InvalidOperationException();
if (dest != null)
{
if (pair.Losers)
src.LosersProgression.Value = dest;
else
src.Progression.Value = dest;
}
}
foreach (var group in Ladder.Groupings)
foreach (var id in group.Pairings)
Ladder.Pairings.Single(p => p.ID == id).Grouping.Value = group;
foreach (var g in Ladder.Groupings) foreach (var g in Ladder.Groupings)
foreach (var b in g.Beatmaps) foreach (var b in g.Beatmaps)
if (b.BeatmapInfo == null) if (b.BeatmapInfo == null)
@ -74,6 +100,9 @@ namespace osu.Game.Tournament
addedInfo = true; addedInfo = true;
} }
//todo: temp
currentMatch.Value = Ladder.Pairings.FirstOrDefault();
if (addedInfo) if (addedInfo)
SaveChanges(); SaveChanges();