mirror of
https://github.com/ppy/osu.git
synced 2024-12-15 02:42:54 +08:00
Remove PP wedge and logic for gameplay layout
This commit is contained in:
parent
a23dfbeab5
commit
6c3169a0ed
@ -1,29 +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 ArgonRightWedge : CompositeDrawable, ISerialisableDrawable
|
|
||||||
{
|
|
||||||
public bool UsesFixedAnchor { get; set; }
|
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
|
||||||
private void load()
|
|
||||||
{
|
|
||||||
AutoSizeAxes = Axes.Both;
|
|
||||||
|
|
||||||
InternalChild = new ArgonWedgePiece
|
|
||||||
{
|
|
||||||
WedgeWidth = { Value = 274 },
|
|
||||||
WedgeHeight = { Value = 40 },
|
|
||||||
InvertShear = { Value = true },
|
|
||||||
EndOpacity = 0.5f,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -120,8 +120,6 @@ namespace osu.Game.Skinning
|
|||||||
var accuracy = container.OfType<ArgonAccuracyCounter>().FirstOrDefault();
|
var accuracy = container.OfType<ArgonAccuracyCounter>().FirstOrDefault();
|
||||||
var comboWedge = container.OfType<ArgonComboWedge>().FirstOrDefault();
|
var comboWedge = container.OfType<ArgonComboWedge>().FirstOrDefault();
|
||||||
var combo = container.OfType<ArgonComboCounter>().FirstOrDefault();
|
var combo = container.OfType<ArgonComboCounter>().FirstOrDefault();
|
||||||
var rightWedge = container.OfType<ArgonRightWedge>().FirstOrDefault();
|
|
||||||
var ppCounter = container.OfType<ArgonPerformancePointsCounter>().FirstOrDefault();
|
|
||||||
var songProgress = container.OfType<ArgonSongProgress>().FirstOrDefault();
|
var songProgress = container.OfType<ArgonSongProgress>().FirstOrDefault();
|
||||||
var keyCounter = container.OfType<ArgonKeyCounterDisplay>().FirstOrDefault();
|
var keyCounter = container.OfType<ArgonKeyCounterDisplay>().FirstOrDefault();
|
||||||
|
|
||||||
@ -162,20 +160,6 @@ namespace osu.Game.Skinning
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rightWedge != null)
|
|
||||||
{
|
|
||||||
rightWedge.Anchor = Anchor.TopRight;
|
|
||||||
rightWedge.Origin = Anchor.TopRight;
|
|
||||||
rightWedge.Position = new Vector2(180, 20);
|
|
||||||
|
|
||||||
if (ppCounter != null)
|
|
||||||
{
|
|
||||||
ppCounter.Anchor = Anchor.TopRight;
|
|
||||||
ppCounter.Origin = Anchor.TopRight;
|
|
||||||
ppCounter.Position = new Vector2(rightWedge.X - 240, rightWedge.Y + 8);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var hitError = container.OfType<HitErrorMeter>().FirstOrDefault();
|
var hitError = container.OfType<HitErrorMeter>().FirstOrDefault();
|
||||||
|
|
||||||
if (hitError != null)
|
if (hitError != null)
|
||||||
@ -222,8 +206,6 @@ namespace osu.Game.Skinning
|
|||||||
new ArgonAccuracyCounter(),
|
new ArgonAccuracyCounter(),
|
||||||
new ArgonComboWedge(),
|
new ArgonComboWedge(),
|
||||||
new ArgonComboCounter(),
|
new ArgonComboCounter(),
|
||||||
new ArgonRightWedge(),
|
|
||||||
new ArgonPerformancePointsCounter(),
|
|
||||||
new BarHitErrorMeter(),
|
new BarHitErrorMeter(),
|
||||||
new BarHitErrorMeter(),
|
new BarHitErrorMeter(),
|
||||||
new ArgonSongProgress(),
|
new ArgonSongProgress(),
|
||||||
|
Loading…
Reference in New Issue
Block a user