mirror of
https://github.com/ppy/osu.git
synced 2025-01-19 15:02:54 +08:00
Further adjustments to glow to be less bright on settings overlay
This commit is contained in:
parent
e1ac5fbed9
commit
f73e505ee6
@ -63,14 +63,14 @@ namespace osu.Game.Graphics.UserInterface
|
|||||||
{
|
{
|
||||||
AccentColour = colourProvider?.Highlight1 ?? colours.Pink;
|
AccentColour = colourProvider?.Highlight1 ?? colours.Pink;
|
||||||
GlowingAccentColour = colourProvider?.Highlight1.Lighten(0.2f) ?? colours.PinkLighter;
|
GlowingAccentColour = colourProvider?.Highlight1.Lighten(0.2f) ?? colours.PinkLighter;
|
||||||
GlowColour = colourProvider?.Light4 ?? colours.PinkDarker;
|
GlowColour = colourProvider?.Highlight1 ?? colours.PinkLighter;
|
||||||
|
|
||||||
main.EdgeEffect = new EdgeEffectParameters
|
main.EdgeEffect = new EdgeEffectParameters
|
||||||
{
|
{
|
||||||
Colour = GlowColour.Opacity(0),
|
Colour = GlowColour.Opacity(0),
|
||||||
Type = EdgeEffectType.Glow,
|
Type = EdgeEffectType.Glow,
|
||||||
Radius = 10,
|
Radius = 8,
|
||||||
Roundness = 10,
|
Roundness = 5,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -93,12 +93,12 @@ namespace osu.Game.Graphics.UserInterface
|
|||||||
if (value)
|
if (value)
|
||||||
{
|
{
|
||||||
main.FadeColour(GlowingAccentColour, animate_in_duration, Easing.OutQuint);
|
main.FadeColour(GlowingAccentColour, animate_in_duration, Easing.OutQuint);
|
||||||
main.FadeEdgeEffectTo(0.6f, animate_in_duration, Easing.OutQuint);
|
main.FadeEdgeEffectTo(0.2f, animate_in_duration, Easing.OutQuint);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
main.FadeEdgeEffectTo(0, animate_out_duration);
|
main.FadeEdgeEffectTo(0, animate_out_duration, Easing.OutQuint);
|
||||||
main.FadeColour(AccentColour, animate_out_duration);
|
main.FadeColour(AccentColour, animate_out_duration, Easing.OutQuint);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -153,7 +153,7 @@ namespace osu.Game.Graphics.UserInterface
|
|||||||
{
|
{
|
||||||
glowColour = value;
|
glowColour = value;
|
||||||
|
|
||||||
var effect = EdgeEffect;
|
var effect = main.EdgeEffect;
|
||||||
effect.Colour = Glowing ? value : value.Opacity(0);
|
effect.Colour = Glowing ? value : value.Opacity(0);
|
||||||
main.EdgeEffect = effect;
|
main.EdgeEffect = effect;
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
|
|||||||
{
|
{
|
||||||
Nub.AccentColour = colours.Yellow;
|
Nub.AccentColour = colours.Yellow;
|
||||||
Nub.GlowingAccentColour = colours.YellowLighter;
|
Nub.GlowingAccentColour = colours.YellowLighter;
|
||||||
Nub.GlowColour = colours.YellowDarker;
|
Nub.GlowColour = colours.YellowDark;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -29,7 +29,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
|
|||||||
AccentColour = colours.Yellow;
|
AccentColour = colours.Yellow;
|
||||||
Nub.AccentColour = colours.Yellow;
|
Nub.AccentColour = colours.Yellow;
|
||||||
Nub.GlowingAccentColour = colours.YellowLighter;
|
Nub.GlowingAccentColour = colours.YellowLighter;
|
||||||
Nub.GlowColour = colours.YellowDarker;
|
Nub.GlowColour = colours.YellowDark;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user