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

Fixes

Browse Source
This commit is contained in:
Andrey Zavadskiy 2017-03-28 11:33:56 +03:00
parent 62693a6a59
commit 85c2184170
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
osu.Game/Screens/Play/FailOverlay.cs
View File

@ -14,6 +14,7 @@ using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using OpenTK.Input; using OpenTK.Input;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Framework.Allocation;
namespace osu.Game.Screens.Play namespace osu.Game.Screens.Play
{ {
@ -43,7 +44,7 @@ namespace osu.Game.Screens.Play
set { description = value; } set { description = value; }
} }
private readonly FillFlowContainer buttons; private FillFlowContainer buttons;
public int Retries public int Retries
{ {
@ -83,7 +84,7 @@ namespace osu.Game.Screens.Play
} }
} }
private readonly FillFlowContainer retryCounterContainer; private FillFlowContainer retryCounterContainer;
public override bool HandleInput => State == Visibility.Visible; public override bool HandleInput => State == Visibility.Visible;
@ -123,11 +124,9 @@ namespace osu.Game.Screens.Play
}); });
} }
public FailOverlay() [BackgroundDependencyLoader]
private void load(OsuColour colours)
{ {
AlwaysReceiveInput = true;
RelativeSizeAxes = Axes.Both;
Children = new Drawable[] Children = new Drawable[]
{ {
new Box new Box
@ -211,8 +210,19 @@ namespace osu.Game.Screens.Play
Retries = 0; Retries = 0;
AddButton(@"Retry", Color4.Yellow, OnRetry); AddButtons(colours);
}
protected virtual void AddButtons(OsuColour colours)
{
AddButton(@"Retry", colours.YellowDark, OnRetry);
AddButton(@"Quit to Main Menu", new Color4(170, 27, 39, 255), OnQuit); AddButton(@"Quit to Main Menu", new Color4(170, 27, 39, 255), OnQuit);
} }
public FailOverlay()
{
AlwaysReceiveInput = true;
RelativeSizeAxes = Axes.Both;
}
} }
} }

6
osu.Game/Screens/Play/PauseOverlay.cs
View File

@ -26,9 +26,11 @@ namespace osu.Game.Screens.Play
return base.OnKeyDown(state, args); return base.OnKeyDown(state, args);
} }
public PauseOverlay() protected override void AddButtons(OsuColour colours)
{ {
AddButton(@"Continue", Color4.Green, OnResume); AddButton(@"Continue", colours.Green, OnResume);
AddButton(@"Retry", colours.YellowDark, OnRetry);
AddButton(@"Quit to Main Menu", new Color4(170, 27, 39, 255), OnQuit);
} }
} }
} }