h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 10:42:55 +08:00
Code Issues Releases Wiki Activity

Properly set starting lifetime for mania hit objects.

Browse Source
This commit is contained in:
smoogipooo 2017-06-03 18:18:12 +09:00
parent 43f73c298f
commit d66f114b5b
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
View File

@ -6,6 +6,7 @@ using OpenTK.Input;
using osu.Framework.Configuration; using osu.Framework.Configuration;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Rulesets.Mania.Judgements; using osu.Game.Rulesets.Mania.Judgements;
using osu.Game.Rulesets.Mania.UI;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
namespace osu.Game.Rulesets.Mania.Objects.Drawables namespace osu.Game.Rulesets.Mania.Objects.Drawables
@ -32,6 +33,13 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
Y = (float)HitObject.StartTime; Y = (float)HitObject.StartTime;
} }
protected override void LoadComplete()
{
base.LoadComplete();
LifetimeStart = HitObject.StartTime - ManiaPlayfield.TIME_SPAN_MAX;
}
public override Color4 AccentColour public override Color4 AccentColour
{ {
get { return base.AccentColour; } get { return base.AccentColour; }

8
osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
View File

@ -31,9 +31,9 @@ namespace osu.Game.Rulesets.Mania.UI
public const float HIT_TARGET_POSITION = 50; public const float HIT_TARGET_POSITION = 50;
private const float time_span_default = 1500; private const float time_span_default = 1500;
private const float time_span_min = 10; public const float TIME_SPAN_MIN = 50;
private const float time_span_max = 50000; public const float TIME_SPAN_MAX = 10000;
private const float time_span_step = 200; private const float time_span_step = 50;
/// <summary> /// <summary>
/// Default column keys, expanding outwards from the middle as more column are added. /// Default column keys, expanding outwards from the middle as more column are added.
@ -243,7 +243,7 @@ namespace osu.Game.Rulesets.Mania.UI
return; return;
timeSpan = value; timeSpan = value;
timeSpan = MathHelper.Clamp(timeSpan, time_span_min, time_span_max); timeSpan = MathHelper.Clamp(timeSpan, TIME_SPAN_MIN, TIME_SPAN_MAX);
barLineContainer.TimeSpan = new Vector2(1, value); barLineContainer.TimeSpan = new Vector2(1, value);
Columns.ForEach(c => c.TimeSpan = value); Columns.ForEach(c => c.TimeSpan = value);