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

Update mania with legacy colour setters

Browse Source
This commit is contained in:
smoogipoo 2020-08-22 00:19:15 +09:00
parent eaba323353
commit 454564b189
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
View File

@ -58,28 +58,24 @@ namespace osu.Game.Rulesets.Mania.Skinning
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
new Box new Box { RelativeSizeAxes = Axes.Both }.WithInitialColour(backgroundColour),
{ new Container
RelativeSizeAxes = Axes.Both,
Colour = backgroundColour
},
new Box
{ {
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
Width = leftLineWidth, Width = leftLineWidth,
Scale = new Vector2(0.740f, 1), Scale = new Vector2(0.740f, 1),
Colour = lineColour, Alpha = hasLeftLine ? 1 : 0,
Alpha = hasLeftLine ? 1 : 0 Child = new Box { RelativeSizeAxes = Axes.Both }.WithInitialColour(lineColour)
}, },
new Box new Container
{ {
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
Width = rightLineWidth, Width = rightLineWidth,
Scale = new Vector2(0.740f, 1), Scale = new Vector2(0.740f, 1),
Colour = lineColour, Alpha = hasRightLine ? 1 : 0,
Alpha = hasRightLine ? 1 : 0 Child = new Box { RelativeSizeAxes = Axes.Both }.WithInitialColour(lineColour)
}, },
lightContainer = new Container lightContainer = new Container
{ {
@ -90,7 +86,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
{ {
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Colour = lightColour, Colour = lightColour.ToLegacyColour(),
Texture = skin.GetTexture(lightImage), Texture = skin.GetTexture(lightImage),
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Width = 1, Width = 1,

2
osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
View File

@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = 1, Height = 1,
Colour = lineColour, Colour = lineColour.ToLegacyColour(),
Alpha = showJudgementLine ? 0.9f : 0 Alpha = showJudgementLine ? 0.9f : 0
} }
} }