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

Merge remote-tracking branch 'refs/remotes/upstream/master' into fix-depth

Browse Source
This commit is contained in:
Dean Herbert
2016-11-30 12:21:12 +09:00
parent b12b82fdd3 e49f312f3f
commit 1e037b3eaa
23 changed files with 528 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
View File

@ -13,13 +13,11 @@ namespace osu.Game.Modes.Objects.Drawables
{
public abstract class DrawableHitObject : Container, IStateful<ArmedState>
{
//todo: move to a more central implementation. this logic should not be at a drawable level.
public Action<DrawableHitObject, JudgementInfo> OnHit;
public Action<DrawableHitObject, JudgementInfo> OnMiss;
public event Action<DrawableHitObject, JudgementInfo> OnJudgement;
public Container<DrawableHitObject> ChildObjects;
protected JudgementInfo Judgement;
public JudgementInfo Judgement;
public abstract JudgementInfo CreateJudgementInfo();
@ -73,20 +71,20 @@ namespace osu.Game.Modes.Objects.Drawables
{
default:
State = ArmedState.Hit;
OnHit?.Invoke(this, Judgement);
break;
case HitResult.Miss:
State = ArmedState.Miss;
OnMiss?.Invoke(this, Judgement);
break;
}
OnJudgement?.Invoke(this, Judgement);
return true;
}
protected virtual void CheckJudgement(bool userTriggered)
{
//todo: consider making abstract.
}
protected override void Update()
@ -113,6 +111,7 @@ namespace osu.Game.Modes.Objects.Drawables
public class JudgementInfo
{
public ulong? ComboAtHit;
public HitResult? Result;
public double TimeOffset;
}