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

Apply peppy's upright key counter attempt diff

Browse Source 
Co-Authored-By: Dean Herbert <pe@ppy.sh>
This commit is contained in:
Joseph Madamba 2023-11-02 18:12:39 -07:00
parent bc9cdb4ce0
commit 090601b485
No known key found for this signature in database
GPG Key ID: 8B746C7BDDF0BD76
2 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
View File

@ -43,7 +43,25 @@ namespace osu.Game.Tests.Visual.Gameplay
{ {
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
} },
new ArgonKeyCounterDisplay
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
Rotation = -90,
},
new ArgonKeyCounterDisplay
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
Rotation = 90,
},
new ArgonKeyCounterDisplay
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
Scale = new Vector2(1, -1)
},
} }
} }
}; };

29
osu.Game/Screens/Play/ArgonKeyCounter.cs
View File

@ -3,8 +3,10 @@
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Screens.Play.HUD; using osu.Game.Screens.Play.HUD;
using osuTK; using osuTK;
@ -40,27 +42,40 @@ namespace osu.Game.Screens.Play
{ {
inputIndicator = new Circle inputIndicator = new Circle
{ {
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = line_height * scale_factor, Height = line_height * scale_factor,
Alpha = 0.5f Alpha = 0.5f
}, },
new Container
{
RelativeSizeAxes = Axes.X,
Height = 40,
Children = new Drawable[]
{
new UprightAspectMaintainingContainer
{
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{
keyNameText = new OsuSpriteText keyNameText = new OsuSpriteText
{ {
Anchor = Anchor.BottomLeft, Anchor = Anchor.TopCentre,
Origin = Anchor.BottomLeft, Origin = Anchor.TopCentre,
Position = new Vector2(0, -13) * scale_factor,
Font = OsuFont.Torus.With(size: name_font_size * scale_factor, weight: FontWeight.Bold), Font = OsuFont.Torus.With(size: name_font_size * scale_factor, weight: FontWeight.Bold),
Colour = colours.Blue0, Colour = colours.Blue0,
Text = Trigger.Name Text = Trigger.Name
}, },
countText = new OsuSpriteText countText = new OsuSpriteText
{ {
Anchor = Anchor.BottomLeft, Anchor = Anchor.TopCentre,
Origin = Anchor.BottomLeft, Origin = Anchor.TopCentre,
Position = new Vector2(0, 13) * scale_factor,
Font = OsuFont.Torus.With(size: count_font_size * scale_factor, weight: FontWeight.Bold), Font = OsuFont.Torus.With(size: count_font_size * scale_factor, weight: FontWeight.Bold),
}, },
}
}
}
},
}; };
// Values from Figma didn't match visually // Values from Figma didn't match visually