1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-05 07:42:54 +08:00

Update "Argon" health display specifications to match design

Also adds a little white bar next to the display to match with the
components below it (score/accuracy/combo counters).
This commit is contained in:
Salman Ahmed 2023-10-26 09:11:27 +03:00
parent 50af1574cf
commit df80b4dcab
2 changed files with 40 additions and 30 deletions

View File

@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Gameplay
[Cached(typeof(HealthProcessor))]
private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
protected override Drawable CreateArgonImplementation() => new ArgonHealthDisplay { Scale = new Vector2(0.6f) };
protected override Drawable CreateArgonImplementation() => new ArgonHealthDisplay { Scale = new Vector2(0.6f), BarLength = { Value = 1f } };
protected override Drawable CreateDefaultImplementation() => new DefaultHealthDisplay { Scale = new Vector2(0.6f) };
protected override Drawable CreateLegacyImplementation() => new LegacyHealthDisplay { Scale = new Vector2(0.6f) };

View File

@ -11,6 +11,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Lines;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Layout;
using osu.Framework.Threading;
using osu.Framework.Utils;
@ -28,7 +29,7 @@ namespace osu.Game.Screens.Play.HUD
public bool UsesFixedAnchor { get; set; }
[SettingSource("Bar height")]
public BindableFloat BarHeight { get; } = new BindableFloat(20)
public BindableFloat BarHeight { get; } = new BindableFloat(30)
{
MinValue = 0,
MaxValue = 64,
@ -36,7 +37,7 @@ namespace osu.Game.Screens.Play.HUD
};
[SettingSource("Bar length")]
public BindableFloat BarLength { get; } = new BindableFloat(0.98f)
public BindableFloat BarLength { get; } = new BindableFloat(0.35f)
{
MinValue = 0.2f,
MaxValue = 1,
@ -100,9 +101,17 @@ namespace osu.Game.Screens.Play.HUD
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
InternalChild = new Container
InternalChildren = new[]
{
new Circle
{
Position = new Vector2(-4f, main_path_radius - 1.5f),
Size = new Vector2(50f, 3f),
},
new Container
{
AutoSizeAxes = Axes.Both,
Margin = new MarginPadding { Left = 50f },
Children = new Drawable[]
{
background = new BackgroundPath
@ -131,6 +140,7 @@ namespace osu.Game.Screens.Play.HUD
GlowPortion = 0.6f,
},
}
}
};
}