sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-05 21:07:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

ICatcherPiece -> ICatcherSprite

Browse Source
This commit is contained in:
ekrctb 2021-06-08 22:10:13 +09:00
parent 194c78f67a
commit 7df971a970
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Catch/Skinning/Default/DefaultCatcher.cs
View File

@ -12,7 +12,7 @@ using osu.Game.Rulesets.Catch.UI;
namespace osu.Game.Rulesets.Catch.Skinning.Default namespace osu.Game.Rulesets.Catch.Skinning.Default
{ {
public class DefaultCatcher : CompositeDrawable, ICatcherPiece public class DefaultCatcher : CompositeDrawable, ICatcherSprite
{ {
public Bindable<CatcherAnimationState> CurrentState { get; } = new Bindable<CatcherAnimationState>(); public Bindable<CatcherAnimationState> CurrentState { get; } = new Bindable<CatcherAnimationState>();

2
osu.Game.Rulesets.Catch/Skinning/ICatcherPiece.cs → osu.Game.Rulesets.Catch/Skinning/ICatcherSprite.cs
View File

@ -5,7 +5,7 @@ using osu.Framework.Graphics.Textures;
namespace osu.Game.Rulesets.Catch.Skinning namespace osu.Game.Rulesets.Catch.Skinning
{ {
public interface ICatcherPiece public interface ICatcherSprite
{ {
Texture CurrentTexture { get; } Texture CurrentTexture { get; }
} }

2
osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcherNew.cs
View File

@ -17,7 +17,7 @@ using osuTK;
namespace osu.Game.Rulesets.Catch.Skinning.Legacy namespace osu.Game.Rulesets.Catch.Skinning.Legacy
{ {
public class LegacyCatcherNew : CompositeDrawable, ICatcherPiece public class LegacyCatcherNew : CompositeDrawable, ICatcherSprite
{ {
public Bindable<CatcherAnimationState> CurrentState { get; } = new Bindable<CatcherAnimationState>(); public Bindable<CatcherAnimationState> CurrentState { get; } = new Bindable<CatcherAnimationState>();

2
osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatcherOld.cs
View File

@ -12,7 +12,7 @@ using osuTK;
namespace osu.Game.Rulesets.Catch.Skinning.Legacy namespace osu.Game.Rulesets.Catch.Skinning.Legacy
{ {
public class LegacyCatcherOld : CompositeDrawable, ICatcherPiece public class LegacyCatcherOld : CompositeDrawable, ICatcherSprite
{ {
public Texture CurrentTexture => (InternalChild as TextureAnimation)?.CurrentFrame ?? (InternalChild as Sprite)?.Texture; public Texture CurrentTexture => (InternalChild as TextureAnimation)?.CurrentFrame ?? (InternalChild as Sprite)?.Texture;

4
osu.Game.Rulesets.Catch/UI/Catcher.cs
View File

@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Catch.UI
/// </summary> /// </summary>
public const float ALLOWED_CATCH_RANGE = 0.8f; public const float ALLOWED_CATCH_RANGE = 0.8f;
internal Texture CurrentTexture => currentCatcherPiece.CurrentTexture; internal Texture CurrentTexture => ((ICatcherSprite)currentCatcher.Drawable).CurrentTexture;
private bool dashing; private bool dashing;
@ -113,8 +113,6 @@ namespace osu.Game.Rulesets.Catch.UI
private readonly SkinnableDrawable currentCatcher; private readonly SkinnableDrawable currentCatcher;
private ICatcherPiece currentCatcherPiece => (ICatcherPiece)currentCatcher.Drawable;
private Color4 hyperDashColour = DEFAULT_HYPER_DASH_COLOUR; private Color4 hyperDashColour = DEFAULT_HYPER_DASH_COLOUR;
private Color4 hyperDashEndGlowColour = DEFAULT_HYPER_DASH_COLOUR; private Color4 hyperDashEndGlowColour = DEFAULT_HYPER_DASH_COLOUR;