diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs
index 08c7423c23..97228f610f 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
{
BlendingMode = BlendingMode.Additive,
RelativeSizeAxes = Axes.Both,
- Alpha = 0.1f,
+ Alpha = 0.2f,
}
};
}
diff --git a/osu.Game.Modes.Osu/UI/OsuScoreOverlay.cs b/osu.Game.Modes.Osu/UI/OsuScoreOverlay.cs
index ba996be326..eb5aaa97c9 100644
--- a/osu.Game.Modes.Osu/UI/OsuScoreOverlay.cs
+++ b/osu.Game.Modes.Osu/UI/OsuScoreOverlay.cs
@@ -15,17 +15,19 @@ namespace osu.Game.Modes.Osu.UI
{
protected override ScoreCounter CreateScoreCounter() => new ScoreCounter()
{
- Anchor = Anchor.TopRight,
- Origin = Anchor.TopRight,
- TextSize = 60,
+ Anchor = Anchor.TopCentre,
+ Origin = Anchor.TopCentre,
+ TextSize = 40,
+ Position = new Vector2(0, 30),
Margin = new MarginPadding { Right = 5 },
};
protected override PercentageCounter CreateAccuracyCounter() => new PercentageCounter()
{
- Anchor = Anchor.TopRight,
- Origin = Anchor.TopRight,
- Position = new Vector2(0, 55),
+ Anchor = Anchor.TopCentre,
+ Origin = Anchor.TopCentre,
+ Position = new Vector2(0, 65),
+ TextSize = 20,
Margin = new MarginPadding { Right = 5 },
};
diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs
index fd1022e546..e0a5d8ed2d 100644
--- a/osu.Game/Graphics/UserInterface/RollingCounter.cs
+++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs
@@ -107,7 +107,10 @@ namespace osu.Game.Graphics.UserInterface
{
Children = new Drawable[]
{
- DisplayedCountSpriteText = new OsuSpriteText(),
+ DisplayedCountSpriteText = new OsuSpriteText()
+ {
+ Font = @"Venera"
+ },
};
TextSize = 40;
diff --git a/osu.Game/Modes/UI/HealthDisplay.cs b/osu.Game/Modes/UI/HealthDisplay.cs
index 1771edb1d8..27734cea15 100644
--- a/osu.Game/Modes/UI/HealthDisplay.cs
+++ b/osu.Game/Modes/UI/HealthDisplay.cs
@@ -1,23 +1,29 @@
// Copyright (c) 2007-2017 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-framework/master/LICENCE
-using OpenTK;
-using OpenTK.Graphics;
+using System;
+using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transformations;
-using System;
+using osu.Game.Graphics;
+using OpenTK;
+using OpenTK.Graphics;
namespace osu.Game.Modes.UI
{
public class HealthDisplay : Container
{
private Box background;
- private Box fill;
+ private Container fill;
- public BindableDouble Current = new BindableDouble() { MinValue = 0, MaxValue = 1 };
+ public BindableDouble Current = new BindableDouble()
+ {
+ MinValue = 0,
+ MaxValue = 1
+ };
public HealthDisplay()
{
@@ -26,19 +32,38 @@ namespace osu.Game.Modes.UI
background = new Box
{
RelativeSizeAxes = Axes.Both,
- Colour = Color4.Gray,
+ Colour = Color4.Black,
},
- fill = new Box
+ fill = new Container
{
RelativeSizeAxes = Axes.Both,
- Colour = Color4.White,
Scale = new Vector2(0, 1),
- },
+ Masking = true,
+ Children = new[]
+ {
+ new Box
+ {
+ RelativeSizeAxes = Axes.Both,
+ }
+ }
+ },
};
Current.ValueChanged += current_ValueChanged;
}
+ [BackgroundDependencyLoader]
+ private void laod(OsuColour colours)
+ {
+ fill.Colour = colours.BlueLighter;
+ fill.EdgeEffect = new EdgeEffect
+ {
+ Colour = colours.BlueDarker.Opacity(0.6f),
+ Radius = 8,
+ Type= EdgeEffectType.Glow
+ };
+ }
+
private void current_ValueChanged(object sender, EventArgs e)
{
fill.ScaleTo(new Vector2((float)Current, 1), 200, EasingTypes.OutQuint);
diff --git a/osu.Game/Modes/UI/ScoreOverlay.cs b/osu.Game/Modes/UI/ScoreOverlay.cs
index 7268b5a3b5..7be6af5c6a 100644
--- a/osu.Game/Modes/UI/ScoreOverlay.cs
+++ b/osu.Game/Modes/UI/ScoreOverlay.cs
@@ -27,9 +27,9 @@ namespace osu.Game.Modes.UI
protected abstract ScoreCounter CreateScoreCounter();
protected virtual HealthDisplay CreateHealthDisplay() => new HealthDisplay
{
- Size = new Vector2(0.5f, 20),
+ Size = new Vector2(1, 5),
RelativeSizeAxes = Axes.X,
- Padding = new MarginPadding(5)
+ Margin = new MarginPadding { Top = 20 }
};
public virtual void OnHit(HitObject h)
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 225b15c57e..3a1a37fdcc 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -195,11 +195,12 @@ namespace osu.Game.Screens.Menu
protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
{
-
logoBounceContainer.ScaleTo(1f, 500, EasingTypes.OutElastic);
return true;
}
+ protected override bool OnDragStart(InputState state) => true;
+
protected override bool OnClick(InputState state)
{
if (!Interactive) return false;
diff --git a/osu.Game/Screens/Play/KeyCounter.cs b/osu.Game/Screens/Play/KeyCounter.cs
index cadc06f561..00dd2393d1 100644
--- a/osu.Game/Screens/Play/KeyCounter.cs
+++ b/osu.Game/Screens/Play/KeyCounter.cs
@@ -89,6 +89,8 @@ namespace osu.Game.Screens.Play
new OsuSpriteText
{
Text = Name,
+ Font = @"Venera",
+ TextSize = 12,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativePositionAxes = Axes.Both,
diff --git a/osu.Game/Screens/Select/Footer.cs b/osu.Game/Screens/Select/Footer.cs
index 55fb36f144..df926c0778 100644
--- a/osu.Game/Screens/Select/Footer.cs
+++ b/osu.Game/Screens/Select/Footer.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Screens.Select
private const float padding = 80;
+ public override bool Contains(Vector2 screenSpacePos) => true;
+
public Action OnBack;
public Action OnStart;