sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +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

2
osu.Game.Mode.Osu/Objects/Drawables/DrawableOsuHitObject.cs
View File

@ -74,7 +74,5 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
Hit100,
[Description(@"300")]
Hit300,
[Description(@"500")]
Hit500
}
}

14
osu.Game.Mode.Osu/Objects/Drawables/DrawableSlider.cs
View File

@ -75,12 +75,24 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
ball.Position = slider.Curve.PositionAt(t);
}
protected override void CheckJudgement(bool userTriggered)
{
var j = Judgement as OsuJudgementInfo;
var sc = startCircle.Judgement as OsuJudgementInfo;
if (!userTriggered && Time.Current >= HitObject.EndTime)
{
j.Score = sc.Score;
j.Result = sc.Result;
}
}
protected override void UpdateState(ArmedState state)
{
base.UpdateState(state);
Delay(HitObject.Duration);
FadeOut(100);
FadeOut(300);
}
private class Ball : Container