sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add interfaces to CatchBaseHit

Browse Source
This commit is contained in:
Dean Herbert
2017-09-19 21:40:38 +09:00
parent 4b68950428
commit 0aa152974a
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
{ {
StartTime = obj.StartTime, StartTime = obj.StartTime,
NewCombo = (obj as IHasCombo)?.NewCombo ?? false, NewCombo = (obj as IHasCombo)?.NewCombo ?? false,
Position = ((IHasXPosition)obj).X / OsuPlayfield.BASE_SIZE.X X = ((IHasXPosition)obj).X / OsuPlayfield.BASE_SIZE.X
}; };
} }
} }

5
osu.Game.Rulesets.Catch/Objects/CatchBaseHit.cs
View File

@ -2,13 +2,14 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Types;
using OpenTK.Graphics; using OpenTK.Graphics;
namespace osu.Game.Rulesets.Catch.Objects namespace osu.Game.Rulesets.Catch.Objects
{ {
public abstract class CatchBaseHit : HitObject public abstract class CatchBaseHit : HitObject, IHasXPosition, IHasCombo
{ {
public float Position { get; set; } public float X { get; set; }
public Color4 ComboColour { get; set; } = Color4.Gray; public Color4 ComboColour { get; set; } = Color4.Gray;
public int ComboIndex { get; set; } public int ComboIndex { get; set; }

2
osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
View File

@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
Size = new Vector2(pulp_size * 2.2f, pulp_size * 2.8f); Size = new Vector2(pulp_size * 2.2f, pulp_size * 2.8f);
RelativePositionAxes = Axes.Both; RelativePositionAxes = Axes.Both;
X = h.Position; X = h.X;
AccentColour = HitObject.ComboColour; AccentColour = HitObject.ComboColour;

2
osu.Game.Rulesets.Catch/UI/CatcherArea.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Catch.UI
public void Add(DrawableHitObject fruit, Vector2 screenPosition) => catcher.AddToStack(fruit, screenPosition); public void Add(DrawableHitObject fruit, Vector2 screenPosition) => catcher.AddToStack(fruit, screenPosition);
public bool CheckIfWeCanCatch(CatchBaseHit obj) => Math.Abs(catcher.Position.X - obj.Position) < catcher.DrawSize.X / DrawSize.X / 2; public bool CheckIfWeCanCatch(CatchBaseHit obj) => Math.Abs(catcher.Position.X - obj.X) < catcher.DrawSize.X / DrawSize.X / 2;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()