mirror of
https://github.com/ppy/osu.git
synced 2024-12-16 06:23:20 +08:00
Merge pull request #817 from peppy/spinner-colour-rehash
Update spinner colours
This commit is contained in:
commit
0ddf2cb454
@ -1 +1 @@
|
||||
Subproject commit d00a7df902074d0b3f1479904b7f322db9d39c1f
|
||||
Subproject commit 60e0a343d2bf590f736782e2bb2a01c132e6cac0
|
@ -158,7 +158,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
|
||||
|
||||
background.AccentColour = normalColour;
|
||||
|
||||
completeColour = colours.YellowLight.Opacity(0.6f);
|
||||
completeColour = colours.YellowLight.Opacity(0.75f);
|
||||
|
||||
disc.AccentColour = colours.SpinnerFill;
|
||||
circle.Colour = colours.BlueDark;
|
||||
|
@ -2,7 +2,6 @@
|
||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||
|
||||
using OpenTK.Graphics;
|
||||
using osu.Framework.Extensions.Color4Extensions;
|
||||
using osu.Framework.Graphics;
|
||||
using osu.Framework.Graphics.Containers;
|
||||
using osu.Framework.Graphics.Sprites;
|
||||
@ -28,9 +27,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
|
||||
|
||||
EdgeEffect = new EdgeEffect
|
||||
{
|
||||
Hollow = true,
|
||||
Type = EdgeEffectType.Glow,
|
||||
Radius = 14,
|
||||
Colour = value.Opacity(0.3f),
|
||||
Radius = 40,
|
||||
Colour = value,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
@ -127,7 +127,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
|
||||
if (Complete && updateCompleteTick())
|
||||
{
|
||||
background.Flush(flushType: typeof(TransformAlpha));
|
||||
background.FadeTo(tracking_alpha + 0.4f, 60, EasingTypes.OutExpo);
|
||||
background.FadeTo(tracking_alpha + 0.2f, 60, EasingTypes.OutExpo);
|
||||
background.Delay(60);
|
||||
background.FadeTo(tracking_alpha, 250, EasingTypes.OutQuint);
|
||||
}
|
||||
|
@ -2,12 +2,10 @@
|
||||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
|
||||
|
||||
using System;
|
||||
using osu.Framework.Allocation;
|
||||
using osu.Framework.Extensions.Color4Extensions;
|
||||
using osu.Framework.Graphics;
|
||||
using osu.Framework.Graphics.Containers;
|
||||
using osu.Framework.Graphics.Sprites;
|
||||
using osu.Game.Graphics;
|
||||
using OpenTK;
|
||||
using OpenTK.Graphics;
|
||||
|
||||
@ -15,24 +13,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
|
||||
{
|
||||
public class SpinnerTicks : Container
|
||||
{
|
||||
private Color4 glowColour;
|
||||
|
||||
public SpinnerTicks()
|
||||
{
|
||||
Origin = Anchor.Centre;
|
||||
Anchor = Anchor.Centre;
|
||||
RelativeSizeAxes = Axes.Both;
|
||||
}
|
||||
|
||||
[BackgroundDependencyLoader]
|
||||
private void load(OsuColour colours)
|
||||
{
|
||||
glowColour = colours.BlueDarker.Opacity(0.4f);
|
||||
layout();
|
||||
}
|
||||
|
||||
private void layout()
|
||||
{
|
||||
const int count = 18;
|
||||
|
||||
for (int i = 0; i < count; i++)
|
||||
@ -44,8 +30,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
|
||||
EdgeEffect = new EdgeEffect
|
||||
{
|
||||
Type = EdgeEffectType.Glow,
|
||||
Radius = 20,
|
||||
Colour = glowColour,
|
||||
Radius = 10,
|
||||
Colour = Color4.Gray.Opacity(0.2f),
|
||||
},
|
||||
RelativePositionAxes = Axes.Both,
|
||||
Masking = true,
|
||||
|
Loading…
Reference in New Issue
Block a user