RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve appearance

This commit is contained in:
Dean Herbert 2018-11-08 06:47:42 +09:00
parent 5da6f11a14
commit bd6d3f1473
2 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
View File

@ -132,19 +132,35 @@ private void updateState()
if (found != null)
{
BorderThickness = 6;
switch (found.Team)
{
case TeamColour.Red:
Colour = Color4.Red;
BorderColour = Color4.Red;
break;
case TeamColour.Blue:
Colour = Color4.Blue;
BorderColour = Color4.Blue;
break;
}
switch (found.Type)
{
case ChoiceType.Pick:
Colour = Color4.White;
Alpha = 1;
break;
case ChoiceType.Ban:
Colour = Color4.Gray;
Alpha = 0.5f;
break;
}
}
else
{
Colour = Color4.White;
BorderThickness = 0;
Alpha = 1;
}
}

26
osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
View File

@ -15,6 +15,7 @@
using osu.Game.Tournament.IPC;
using osu.Game.Tournament.Screens.Ladder.Components;
using OpenTK;
using OpenTK.Graphics;
using OpenTK.Input;
namespace osu.Game.Tournament.Screens.MapPool
@ -75,7 +76,14 @@ public MapPoolScreen()
RelativeSizeAxes = Axes.X,
Text = "Blue Pick",
Action = () => setMode(TeamColour.Blue, ChoiceType.Pick)
}
},
new ControlPanel.Spacer(),
new TriangleButton
{
RelativeSizeAxes = Axes.X,
Text = "Reset",
Action = reset
},
}
}
};
@ -101,12 +109,12 @@ private void setMode(TeamColour colour, ChoiceType choiceType)
pickColour = colour;
pickType = choiceType;
var enabled = currentMatch.Value.PicksBans.Count == 0;
Color4 setColour(bool active) => active ? Color4.White : Color4.Gray;
buttonRedBan.Enabled.Value = enabled || pickColour == TeamColour.Red && pickType == ChoiceType.Ban;
buttonBlueBan.Enabled.Value = enabled || pickColour == TeamColour.Blue && pickType == ChoiceType.Ban;
buttonRedPick.Enabled.Value = enabled || pickColour == TeamColour.Red && pickType == ChoiceType.Pick;
buttonBluePick.Enabled.Value = enabled || pickColour == TeamColour.Blue && pickType == ChoiceType.Pick;
buttonRedBan.Colour = setColour(pickColour == TeamColour.Red && pickType == ChoiceType.Ban);
buttonBlueBan.Colour = setColour(pickColour == TeamColour.Blue && pickType == ChoiceType.Ban);
buttonRedPick.Colour = setColour(pickColour == TeamColour.Red && pickType == ChoiceType.Pick);
buttonBluePick.Colour = setColour(pickColour == TeamColour.Blue && pickType == ChoiceType.Pick);
}
private void setNextMode()
@ -141,6 +149,12 @@ protected override bool OnMouseDown(MouseDownEvent e)
return base.OnMouseDown(e);
}
private void reset()
{
currentMatch.Value.PicksBans.Clear();
setNextMode();
}
private void addForBeatmap(int beatmapId)
{
if (currentMatch.Value.Grouping.Value.Beatmaps.All(b => b.BeatmapInfo.OnlineBeatmapID != beatmapId))