h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-19 21:02:55 +08:00
Code Issues Releases Wiki Activity

Rename and move skinnable line component to a more commomn place

Browse Source
This commit is contained in:
Dean Herbert 2023-11-10 12:58:07 +09:00
parent d3af3c615f
commit f31c1c9c79
No known key found for this signature in database
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Skinning/ArgonSkin.cs
View File

@ -16,6 +16,7 @@ using osu.Game.IO;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
using osu.Game.Screens.Play.HUD; using osu.Game.Screens.Play.HUD;
using osu.Game.Screens.Play.HUD.HitErrorMeters; using osu.Game.Screens.Play.HUD.HitErrorMeters;
using osu.Game.Skinning.Components;
using osuTK; using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
@ -115,7 +116,7 @@ namespace osu.Game.Skinning
var skinnableTargetWrapper = new DefaultSkinComponentsContainer(container => var skinnableTargetWrapper = new DefaultSkinComponentsContainer(container =>
{ {
var health = container.OfType<ArgonHealthDisplay>().FirstOrDefault(); var health = container.OfType<ArgonHealthDisplay>().FirstOrDefault();
var healthLine = container.OfType<ArgonHealthRightLine>().FirstOrDefault(); var healthLine = container.OfType<RoundedLine>().FirstOrDefault();
var scoreWedge = container.OfType<ArgonScoreWedge>().FirstOrDefault(); var scoreWedge = container.OfType<ArgonScoreWedge>().FirstOrDefault();
var score = container.OfType<ArgonScoreCounter>().FirstOrDefault(); var score = container.OfType<ArgonScoreCounter>().FirstOrDefault();
var accuracy = container.OfType<ArgonAccuracyCounter>().FirstOrDefault(); var accuracy = container.OfType<ArgonAccuracyCounter>().FirstOrDefault();
@ -207,7 +208,7 @@ namespace osu.Game.Skinning
new ArgonScoreWedge(), new ArgonScoreWedge(),
new ArgonScoreCounter(), new ArgonScoreCounter(),
new ArgonHealthDisplay(), new ArgonHealthDisplay(),
new ArgonHealthRightLine(), new RoundedLine(),
new ArgonAccuracyCounter(), new ArgonAccuracyCounter(),
new ArgonComboCounter(), new ArgonComboCounter(),
new BarHitErrorMeter(), new BarHitErrorMeter(),

9
osu.Game/Screens/Play/HUD/ArgonHealthRightLine.cs → osu.Game/Skinning/Components/RoundedLine.cs
View File

@ -5,19 +5,18 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Game.Skinning;
using osuTK;
namespace osu.Game.Screens.Play.HUD namespace osu.Game.Skinning.Components
{ {
public partial class ArgonHealthRightLine : CompositeDrawable, ISerialisableDrawable public partial class RoundedLine : CompositeDrawable, ISerialisableDrawable
{ {
public bool UsesFixedAnchor { get; set; } public bool UsesFixedAnchor { get; set; }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
Size = new Vector2(50f, ArgonHealthDisplay.MAIN_PATH_RADIUS * 2); AutoSizeAxes = Axes.Both;
InternalChild = new Circle InternalChild = new Circle
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,