h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-23 02:57:25 +08:00
Code Issues Releases Wiki Activity

Fix post-merge errors.

Browse Source
This commit is contained in:
smoogipooo 2017-03-24 14:59:59 +09:00
parent bf3846eedb
commit 45b013c85f
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game.Modes.Taiko/Objects/Drawable/DrawableHit.cs
View File

@ -21,38 +21,41 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
/// A list of keys which this hit object will accept. These are the standard Taiko keys for now.
/// These should be moved to bindings later.
/// </summary>
private List<Key> validKeys = new List<Key>(new[] { Key.D, Key.F, Key.J, Key.K });
private readonly List<Key> validKeys = new List<Key>(new[] { Key.D, Key.F, Key.J, Key.K });
private readonly Hit hit;
/// <summary>
/// Whether the last key pressed is a valid hit key.
/// </summary>
private bool validKeyPressed;
protected DrawableHit(TaikoHitObject hitObject)
: base(hitObject)
protected DrawableHit(Hit hit)
: base(hit)
{
this.hit = hit;
}
protected override void CheckJudgement(bool userTriggered)
{
if (!userTriggered)
{
if (Judgement.TimeOffset > HitObject.HitWindowGood)
if (Judgement.TimeOffset > hit.HitWindowGood)
Judgement.Result = HitResult.Miss;
return;
}
double hitOffset = Math.Abs(Judgement.TimeOffset);
if (hitOffset > HitObject.HitWindowMiss)
if (hitOffset > hit.HitWindowMiss)
return;
if (!validKeyPressed)
Judgement.Result = HitResult.Miss;
else if (hitOffset < HitObject.HitWindowGood)
else if (hitOffset < hit.HitWindowGood)
{
Judgement.Result = HitResult.Hit;
Judgement.TaikoResult = hitOffset < HitObject.HitWindowGreat ? TaikoHitResult.Great : TaikoHitResult.Good;
Judgement.TaikoResult = hitOffset < hit.HitWindowGreat ? TaikoHitResult.Great : TaikoHitResult.Good;
}
else
Judgement.Result = HitResult.Miss;

4
osu.Game.Modes.Taiko/Objects/Drawable/DrawableHitFinisher.cs
View File

@ -19,8 +19,8 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
private double firstHitTime;
private Key firstHitKey;
protected DrawableHitFinisher(TaikoHitObject hitObject)
: base(hitObject)
protected DrawableHitFinisher(Hit hit)
: base(hit)
{
}