From aa9a65d69c8b8b40bcd966af485f721b43cfdc1d Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Fri, 24 Mar 2017 15:42:48 +0900 Subject: [PATCH] Move load below CreateIcon(). --- .../Objects/Drawable/Pieces/BashCirclePiece.cs | 16 ++++++++-------- .../Drawable/Pieces/CentreHitCirclePiece.cs | 12 ++++++------ .../Objects/Drawable/Pieces/RimHitCirclePiece.cs | 12 ++++++------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/BashCirclePiece.cs b/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/BashCirclePiece.cs index 8298c5a871..db58ab9f25 100644 --- a/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/BashCirclePiece.cs +++ b/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/BashCirclePiece.cs @@ -16,14 +16,6 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces { private Sprite icon; - [BackgroundDependencyLoader] - private void load(OsuColour colours, TextureStore textures) - { - AccentColour = colours.YellowDark; - - icon.Texture = textures.Get(@"Play/Taiko/bash-hit-inner"); - } - protected override Framework.Graphics.Drawable CreateIcon() { return icon = new Sprite @@ -32,5 +24,13 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces Origin = Anchor.Centre, }; } + + [BackgroundDependencyLoader] + private void load(OsuColour colours, TextureStore textures) + { + AccentColour = colours.YellowDark; + + icon.Texture = textures.Get(@"Play/Taiko/bash-hit-inner"); + } } } \ No newline at end of file diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/CentreHitCirclePiece.cs b/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/CentreHitCirclePiece.cs index 47a366d194..a5aea77121 100644 --- a/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/CentreHitCirclePiece.cs +++ b/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/CentreHitCirclePiece.cs @@ -15,12 +15,6 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces /// public class CentreHitCirclePiece : CirclePiece { - [BackgroundDependencyLoader] - private void load(OsuColour colours) - { - AccentColour = colours.PinkDarker; - } - protected override Framework.Graphics.Drawable CreateIcon() { return new CircularContainer @@ -39,5 +33,11 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces } }; } + + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { + AccentColour = colours.PinkDarker; + } } } \ No newline at end of file diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/RimHitCirclePiece.cs b/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/RimHitCirclePiece.cs index 2dfdf3e3b8..96563c5350 100644 --- a/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/RimHitCirclePiece.cs +++ b/osu.Game.Modes.Taiko/Objects/Drawable/Pieces/RimHitCirclePiece.cs @@ -16,12 +16,6 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces /// public class RimHitCirclePiece : CirclePiece { - [BackgroundDependencyLoader] - private void load(OsuColour colours) - { - AccentColour = colours.BlueDarker; - } - protected override Framework.Graphics.Drawable CreateIcon() { return new CircularContainer @@ -43,5 +37,11 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable.Pieces } }; } + + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { + AccentColour = colours.BlueDarker; + } } } \ No newline at end of file