h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 14:12:55 +08:00
Code Issues Releases Wiki Activity

Fix ladder manager not saving changes out correctly

Browse Source
This commit is contained in:
Dean Herbert 2018-11-09 17:39:46 +09:00
parent 8a917e4cc7
commit 9064f3fe0f
4 changed files with 46 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game.Tournament.Tests/TestCaseLadderManager.cs
View File

@ -10,28 +10,14 @@ namespace osu.Game.Tournament.Tests
{
public class TestCaseLadderManager : LadderTestCase
{
private LadderManager manager;
[BackgroundDependencyLoader]
private void load()
{
Add(new OsuContextMenuContainer
{
RelativeSizeAxes = Axes.Both,
Child = manager = new LadderManager()
Child = new LadderManager()
});
}
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
var newInfo = manager.CreateInfo();
Ladder.Teams = newInfo.Teams;
Ladder.Groupings = newInfo.Groupings;
Ladder.Pairings = newInfo.Pairings;
Ladder.Progressions = newInfo.Progressions;
}
}
}

4
osu.Game.Tournament/Screens/Ladder/Components/LadderEditorInfo.cs
View File

@ -1,17 +1,13 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using osu.Framework.Configuration;
using osu.Game.Tournament.Components;
namespace osu.Game.Tournament.Screens.Ladder.Components
{
public class LadderEditorInfo
{
public readonly BindableBool EditingEnabled = new BindableBool();
public List<TournamentTeam> Teams = new List<TournamentTeam>();
public List<TournamentGrouping> Groupings = new List<TournamentGrouping>();
public readonly Bindable<MatchPairing> Selected = new Bindable<MatchPairing>();
}
}

7
osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
View File

@ -28,12 +28,15 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
[Resolved]
private LadderEditorInfo editorInfo { get; set; }
[Resolved]
private LadderInfo ladderInfo { get; set; }
[BackgroundDependencyLoader]
private void load()
{
var teamEntries = editorInfo.Teams;
var teamEntries = ladderInfo.Teams;
var groupingOptions = editorInfo.Groupings.Select(g => new KeyValuePair<string, TournamentGrouping>(g.Name, g))
var groupingOptions = ladderInfo.Groupings.Select(g => new KeyValuePair<string, TournamentGrouping>(g.Name, g))
.Prepend(new KeyValuePair<string, TournamentGrouping>("None", new TournamentGrouping()));
Children = new Drawable[]

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

@ -1,7 +1,7 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using System;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Caching;
@ -15,7 +15,6 @@ using osu.Framework.Input.Events;
using osu.Framework.Input.States;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Screens.Ladder.Components;
using OpenTK;
using OpenTK.Graphics;
@ -26,28 +25,24 @@ namespace osu.Game.Tournament.Screens.Ladder
[Cached]
public class LadderManager : CompositeDrawable, IHasContextMenu
{
public List<TournamentTeam> Teams;
private Container<DrawableMatchPairing> pairingsContainer;
private Container<Path> paths;
private Container headings;
private LadderInfo info;
private ScrollableContainer scrollContent;
[Cached]
private LadderEditorInfo editorInfo = new LadderEditorInfo();
[Resolved]
private LadderInfo ladderInfo { get; set; }
[BackgroundDependencyLoader]
private void load(LadderInfo info, OsuColour colours)
private void load(OsuColour colours)
{
normalPathColour = colours.BlueDarker.Darken(2);
losersPathColour = colours.YellowDarker.Darken(2);
this.info = info;
editorInfo.Teams = Teams = info.Teams;
editorInfo.Groupings = info.Groupings;
RelativeSizeAxes = Axes.Both;
InternalChild = new Container
@ -74,32 +69,29 @@ namespace osu.Game.Tournament.Screens.Ladder
}
};
foreach (var pairing in info.Pairings)
foreach (var pairing in ladderInfo.Pairings)
addPairing(pairing);
// todo: fix this
Scheduler.AddDelayed(() => layout.Invalidate(), 100, true);
}
public LadderInfo CreateInfo()
private void updateInfo()
{
var pairings = pairingsContainer.Select(p => p.Pairing).ToList();
ladderInfo.Pairings = pairingsContainer.Select(p => p.Pairing).ToList();
foreach (var g in ladderInfo.Groupings)
g.Pairings = ladderInfo.Pairings.Where(p => p.Grouping.Value == g).Select(p => p.ID).ToList();
foreach (var g in editorInfo.Groupings)
g.Pairings = pairings.Where(p => p.Grouping.Value == g).Select(p => p.ID).ToList();
return new LadderInfo
{
Pairings = pairings,
Progressions = pairings.Where(p => p.Progression.Value != null).Select(p => new TournamentProgression(p.ID, p.Progression.Value.ID)).Concat(
pairings.Where(p => p.LosersProgression.Value != null).Select(p => new TournamentProgression(p.ID, p.LosersProgression.Value.ID, true)))
.ToList(),
Teams = editorInfo.Teams,
Groupings = editorInfo.Groupings
};
ladderInfo.Progressions = ladderInfo.Pairings.Where(p => p.Progression.Value != null).Select(p => new TournamentProgression(p.ID, p.Progression.Value.ID)).Concat(
ladderInfo.Pairings.Where(p => p.LosersProgression.Value != null).Select(p => new TournamentProgression(p.ID, p.LosersProgression.Value.ID, true)))
.ToList();
}
private void addPairing(MatchPairing pairing) => pairingsContainer.Add(new DrawableMatchPairing(pairing));
private void addPairing(MatchPairing pairing)
{
pairingsContainer.Add(new DrawableMatchPairing(pairing));
updateInfo();
}
public MenuItem[] ContextMenuItems
{
@ -154,7 +146,7 @@ namespace osu.Game.Tournament.Screens.Ladder
}
}
foreach (var group in editorInfo.Groupings)
foreach (var group in ladderInfo.Groupings)
{
var topPairing = pairingsContainer.Where(p => !p.Pairing.Losers && p.Pairing.Grouping.Value == group).OrderBy(p => p.Y).FirstOrDefault();
@ -168,7 +160,7 @@ namespace osu.Game.Tournament.Screens.Ladder
});
}
foreach (var group in editorInfo.Groupings)
foreach (var group in ladderInfo.Groupings)
{
var topPairing = pairingsContainer.Where(p => p.Pairing.Losers && p.Pairing.Grouping.Value == group).OrderBy(p => p.Y).FirstOrDefault();
@ -183,25 +175,42 @@ namespace osu.Game.Tournament.Screens.Ladder
}
layout.Validate();
updateInfo();
}
public void RequestJoin(MatchPairing pairing, bool losers) => scrollContent.Add(new JoinRequestHandler(pairingsContainer, pairing, losers));
public void RequestJoin(MatchPairing pairing, bool losers) => scrollContent.Add(new JoinRequestHandler(pairingsContainer, pairing, losers, updateInfo));
// todo: remove after ppy/osu-framework#1980 is merged.
public override bool HandlePositionalInput => true;
public void Remove(MatchPairing pairing) => pairingsContainer.FirstOrDefault(p => p.Pairing == pairing)?.Remove();
public void SetCurrent(MatchPairing pairing)
{
if (ladderInfo.CurrentMatch.Value != null)
ladderInfo.CurrentMatch.Value.Current.Value = false;
ladderInfo.CurrentMatch.Value = pairing;
ladderInfo.CurrentMatch.Value.Current.Value = true;
}
private class JoinRequestHandler : CompositeDrawable
{
private readonly Container<DrawableMatchPairing> pairingsContainer;
public readonly MatchPairing Source;
private readonly bool losers;
private readonly Action complete;
private ProgressionPath path;
public JoinRequestHandler(Container<DrawableMatchPairing> pairingsContainer, MatchPairing source, bool losers)
public JoinRequestHandler(Container<DrawableMatchPairing> pairingsContainer, MatchPairing source, bool losers, Action complete)
{
this.pairingsContainer = pairingsContainer;
RelativeSizeAxes = Axes.Both;
Source = source;
this.losers = losers;
this.complete = complete;
if (losers)
Source.LosersProgression.Value = null;
else
@ -247,6 +256,7 @@ namespace osu.Game.Tournament.Screens.Ladder
Source.Progression.Value = found.Pairing;
}
complete?.Invoke();
Expire();
return true;
}
@ -254,19 +264,5 @@ namespace osu.Game.Tournament.Screens.Ladder
return false;
}
}
// todo: remove after ppy/osu-framework#1980 is merged.
public override bool HandlePositionalInput => true;
public void Remove(MatchPairing pairing) => pairingsContainer.FirstOrDefault(p => p.Pairing == pairing)?.Remove();
public void SetCurrent(MatchPairing pairing)
{
if (info.CurrentMatch.Value != null)
info.CurrentMatch.Value.Current.Value = false;
info.CurrentMatch.Value = pairing;
info.CurrentMatch.Value.Current.Value = true;
}
}
}