h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-30 01:32:55 +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)
},
} }
} }
}; };

45
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,26 +42,39 @@ 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
}, },
keyNameText = new OsuSpriteText new Container
{ {
Anchor = Anchor.BottomLeft, RelativeSizeAxes = Axes.X,
Origin = Anchor.BottomLeft, Height = 40,
Position = new Vector2(0, -13) * scale_factor, Children = new Drawable[]
Font = OsuFont.Torus.With(size: name_font_size * scale_factor, weight: FontWeight.Bold), {
Colour = colours.Blue0, new UprightAspectMaintainingContainer
Text = Trigger.Name {
}, RelativeSizeAxes = Axes.Both,
countText = new OsuSpriteText Children = new Drawable[]
{ {
Anchor = Anchor.BottomLeft, keyNameText = new OsuSpriteText
Origin = Anchor.BottomLeft, {
Font = OsuFont.Torus.With(size: count_font_size * scale_factor, weight: FontWeight.Bold), Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Font = OsuFont.Torus.With(size: name_font_size * scale_factor, weight: FontWeight.Bold),
Colour = colours.Blue0,
Text = Trigger.Name
},
countText = new OsuSpriteText
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Position = new Vector2(0, 13) * scale_factor,
Font = OsuFont.Torus.With(size: count_font_size * scale_factor, weight: FontWeight.Bold),
},
}
}
}
}, },
}; };