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

Remove argon combo wedge and update combo counter position

Browse Source
This commit is contained in:
Salman Ahmed 2023-11-07 01:58:26 +03:00
parent ce36884ef0
commit 7c1c62ba8a
2 changed files with 7 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Game/Screens/Play/HUD/ArgonComboWedge.cs
View File

@ -1,27 +0,0 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Skinning;
namespace osu.Game.Screens.Play.HUD
{
public partial class ArgonComboWedge : CompositeDrawable, ISerialisableDrawable
{
public bool UsesFixedAnchor { get; set; }
[BackgroundDependencyLoader]
private void load()
{
AutoSizeAxes = Axes.Both;
InternalChild = new ArgonWedgePiece
{
WedgeWidth = { Value = 186 },
WedgeHeight = { Value = 33 },
};
}
}
}

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

@ -118,7 +118,6 @@ namespace osu.Game.Skinning
var scoreWedge = container.OfType<ArgonScoreWedge>().FirstOrDefault();
var score = container.OfType<ArgonScoreCounter>().FirstOrDefault();
var accuracy = container.OfType<ArgonAccuracyCounter>().FirstOrDefault();
var comboWedge = container.OfType<ArgonComboWedge>().FirstOrDefault();
var combo = container.OfType<ArgonComboCounter>().FirstOrDefault();
var songProgress = container.OfType<ArgonSongProgress>().FirstOrDefault();
var keyCounter = container.OfType<ArgonKeyCounterDisplay>().FirstOrDefault();
@ -153,18 +152,6 @@ namespace osu.Game.Skinning
}
}
if (comboWedge != null)
{
comboWedge.Position = new Vector2(-12, 130);
if (combo != null)
{
combo.Anchor = Anchor.TopLeft;
combo.Origin = Anchor.TopLeft;
combo.Position = new Vector2(components_x_offset, comboWedge.Y - 2);
}
}
var hitError = container.OfType<HitErrorMeter>().FirstOrDefault();
if (hitError != null)
@ -199,6 +186,13 @@ namespace osu.Game.Skinning
keyCounter.Origin = Anchor.BottomRight;
keyCounter.Position = new Vector2(-(hitError.Width + padding), -(padding * 2 + song_progress_offset_height));
}
if (combo != null && hitError != null)
{
combo.Anchor = Anchor.BottomLeft;
combo.Origin = Anchor.BottomLeft;
combo.Position = new Vector2(hitError.Width + padding, -50);
}
}
}
})
@ -209,7 +203,6 @@ namespace osu.Game.Skinning
new ArgonScoreWedge(),
new ArgonScoreCounter(),
new ArgonAccuracyCounter(),
new ArgonComboWedge(),
new ArgonComboCounter(),
new BarHitErrorMeter(),
new BarHitErrorMeter(),