h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-06 07:02:54 +08:00
Code Issues Releases Wiki Activity

Merge pull request #116 from NeoAdonis/counters-b

Browse Source 
Minor improvements to combo counters
This commit is contained in:
Dean Herbert 2016-10-31 13:39:55 +09:00 committed by GitHub
commit f51fdb467a
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/GameModes/Play/Catch/CatchComboCounter.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.GameModes.Play.Catch
protected override bool CanPopOutWhileRolling => true; protected override bool CanPopOutWhileRolling => true;
protected virtual double FadeOutDelay => 1000; protected virtual double FadeOutDelay => 1000;
protected virtual double FadeOutDuration => 300; protected override double FadeOutDuration => 300;
protected override string FormatCount(ulong count) protected override string FormatCount(ulong count)
{ {

5
osu.Game/GameModes/Play/ComboCounter.cs
View File

@ -31,6 +31,8 @@ namespace osu.Game.GameModes.Play
protected virtual EasingTypes PopOutEasing => EasingTypes.None; protected virtual EasingTypes PopOutEasing => EasingTypes.None;
protected virtual float PopOutInitialAlpha => 0.75f; protected virtual float PopOutInitialAlpha => 0.75f;
protected virtual double FadeOutDuration => 100;
/// <summary> /// <summary>
/// Duration in milliseconds for the counter roll-up animation for each element. /// Duration in milliseconds for the counter roll-up animation for each element.
/// </summary> /// </summary>
@ -60,7 +62,6 @@ namespace osu.Game.GameModes.Play
} }
} }
protected ulong prevCount;
protected ulong count; protected ulong count;
/// <summary> /// <summary>
@ -204,7 +205,7 @@ namespace osu.Game.GameModes.Play
private void updateCount(ulong value, bool rolling = false) private void updateCount(ulong value, bool rolling = false)
{ {
prevCount = count; ulong prevCount = count;
count = value; count = value;
if (!rolling) if (!rolling)
{ {

11
osu.Game/GameModes/Play/Osu/OsuComboCounter.cs
View File

@ -92,6 +92,11 @@ namespace osu.Game.GameModes.Play.Osu
protected override void OnCountRolling(ulong currentValue, ulong newValue) protected override void OnCountRolling(ulong currentValue, ulong newValue)
{ {
ScheduledPopOutCurrentId++; ScheduledPopOutCurrentId++;
// Hides displayed count if was increasing from 0 to 1 but didn't finish
if (currentValue == 0 && newValue == 0)
DisplayedCountSpriteText.FadeOut(FadeOutDuration);
base.OnCountRolling(currentValue, newValue); base.OnCountRolling(currentValue, newValue);
} }
@ -116,13 +121,17 @@ namespace osu.Game.GameModes.Play.Osu
protected override void OnCountChange(ulong currentValue, ulong newValue) protected override void OnCountChange(ulong currentValue, ulong newValue)
{ {
ScheduledPopOutCurrentId++; ScheduledPopOutCurrentId++;
if (newValue == 0)
DisplayedCountSpriteText.FadeOut();
base.OnCountChange(currentValue, newValue); base.OnCountChange(currentValue, newValue);
} }
protected override void OnDisplayedCountRolling(ulong currentValue, ulong newValue) protected override void OnDisplayedCountRolling(ulong currentValue, ulong newValue)
{ {
if (newValue == 0) if (newValue == 0)
DisplayedCountSpriteText.FadeOut(PopOutDuration); DisplayedCountSpriteText.FadeOut(FadeOutDuration);
else else
DisplayedCountSpriteText.Show(); DisplayedCountSpriteText.Show();

2
osu.Game/GameModes/Play/Taiko/TaikoComboCounter.cs
View File

@ -43,7 +43,7 @@ namespace osu.Game.GameModes.Play.Taiko
protected override void OnDisplayedCountRolling(ulong currentValue, ulong newValue) protected override void OnDisplayedCountRolling(ulong currentValue, ulong newValue)
{ {
if (newValue == 0) if (newValue == 0)
DisplayedCountSpriteText.FadeOut(AnimationDuration); DisplayedCountSpriteText.FadeOut(FadeOutDuration);
else else
DisplayedCountSpriteText.Show(); DisplayedCountSpriteText.Show();