Working on design

This commit is contained in:
DrabWeb
2017-01-27 14:18:57 -04:00
parent e115120543
commit 490feac030
2 changed files with 301 additions and 92 deletions

View File

@ -10,7 +10,8 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Transformations;
using osu.Game.Graphics.Backgrounds;
using osu.Game.Screens.Menu;
namespace osu.Game.Overlays.Pause
{
@ -25,71 +26,107 @@ namespace osu.Game.Overlays.Pause
private int fadeDuration = 100;
private double pauseCooldown = 1000;
private double lastActionTime = -1000;
private PauseButton resumeButton;
private PauseButton retryButton;
private PauseButton quitButton;
private double lastActionTime = 0;
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuColour colours)
{
var sampleHover = audio.Sample.Get(@"Menu/menuclick");
var sampleBack = audio.Sample.Get(@"Menu/menuback");
var samplePlayClick = audio.Sample.Get(@"Menu/menu-play-click");
private void load(OsuColour colours)
{
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black,
Alpha = 0.6f,
Alpha = 0.75f,
},
resumeButton = new PauseButton
new SpriteText
{
Text = @"Resume",
Text = @"paused",
Origin = Anchor.BottomCentre,
Anchor = Anchor.Centre,
Position = new Vector2(0, -175),
Font = @"Exo2.0-Medium",
Spacing = new Vector2(5, 0),
TextSize = 30,
Colour = colours.Yellow,
Shadow = true,
ShadowColour = new Color4(0, 0, 0, 0.25f),
},
new SpriteText
{
Text = @"you're not going to do what i think you're going to do, ain't ya?",
Origin = Anchor.BottomCentre,
Anchor = Anchor.Centre,
Width = 100,
Position = new Vector2(0, -125),
Shadow = true,
ShadowColour = new Color4(0, 0, 0, 0.25f),
},
new SpriteText
{
Text = @"You've retried 0 times in this session",
Origin = Anchor.TopCentre,
Anchor = Anchor.Centre,
Width = 100,
Position = new Vector2(0, 175),
Shadow = true,
ShadowColour = new Color4(0, 0, 0, 0.25f),
TextSize = 18,
},
new FlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
Position = new Vector2(0, -200),
Action = Resume,
},
retryButton = new PauseButton
{
Text = @"Retry",
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
Action = Retry,
},
quitButton = new PauseButton
{
Text = @"Quit",
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
Position = new Vector2(0, 200),
Action = Quit,
Position = new Vector2(0, 25),
Masking = true,
EdgeEffect = new EdgeEffect
{
Type = EdgeEffectType.Shadow,
Colour = new Color4(0, 0, 0, 150),
Radius = 50,
Offset = new Vector2(0, 0),
},
Children = new Drawable[]
{
new PauseButton
{
Type = PauseButtonType.Resume,
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
Action = Resume,
},
new PauseButton
{
Type = PauseButtonType.Retry,
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
Action = Retry,
},
new PauseButton
{
Type = PauseButtonType.Quit,
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
Action = Quit,
},
new Button(@"solo", @"freeplay", FontAwesome.fa_user, new Color4(102, 68, 204, 255), () => OnPause?.Invoke(), 300, Key.P),
}
},
};
resumeButton.sampleHover = sampleHover;
resumeButton.sampleClick = sampleBack;
retryButton.sampleHover = sampleHover;
retryButton.sampleClick = samplePlayClick;
quitButton.sampleHover = sampleHover;
quitButton.sampleClick = sampleBack;
};
}
protected override void PopIn()
{
FadeTo(1, fadeDuration, EasingTypes.In);
FadeTo(1, fadeDuration, EasingTypes.In);
isPaused = true;
}
protected override void PopOut()
{
FadeTo(0, fadeDuration, EasingTypes.In);
FadeTo(0, fadeDuration, EasingTypes.In);
isPaused = false;
}
@ -105,48 +142,48 @@ namespace osu.Game.Overlays.Pause
}
public void Pause()
{
{
if (Time.Current >= (lastActionTime + pauseCooldown))
{
lastActionTime = Time.Current;
Show();
OnPause?.Invoke();
}
else
{
isPaused = false;
lastActionTime = Time.Current;
Show();
OnPause?.Invoke();
}
else
{
isPaused = false;
}
}
public void Resume()
{
{
lastActionTime = Time.Current;
Hide();
Hide();
OnResume?.Invoke();
}
public void TogglePaused()
{
}
public void TogglePaused()
{
isPaused = !isPaused;
(isPaused ? (Action)Pause : Resume)?.Invoke();
}
private void Retry()
{
(isPaused ? (Action)Pause : Resume)?.Invoke();
}
private void Retry()
{
Hide();
OnRetry?.Invoke();
}
private void Quit()
{
OnRetry?.Invoke();
}
private void Quit()
{
Hide();
OnQuit?.Invoke();
OnQuit?.Invoke();
}
public PauseOverlay()
{
RelativeSizeAxes = Axes.Both;
AutoSizeAxes = Axes.Both;
AutoSizeAxes = Axes.Both;
Depth = -1;
}
}