sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix regressions in combo counters and tidy up naming of SpriteTexts.

Browse Source
This commit is contained in:
Dean Herbert
2016-11-19 16:19:54 +09:00
parent 1242ae3f2a
commit acb85d0140
6 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Modes/UI/ComboCounter.cs
View File

@ -3,6 +3,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transformations;
using osu.Framework.MathUtils;
@ -16,7 +17,7 @@ namespace osu.Game.Modes.UI
get; protected set;
}
protected SpriteText PopOutSpriteText;
protected SpriteText PopOutCount;
protected virtual double PopOutDuration => 150;
protected virtual float PopOutScale => 2.0f;
@ -86,7 +87,7 @@ namespace osu.Game.Modes.UI
{
textSize = value;
DisplayedCountSpriteText.TextSize = TextSize;
PopOutSpriteText.TextSize = TextSize;
PopOutCount.TextSize = TextSize;
}
}
@ -103,13 +104,19 @@ namespace osu.Game.Modes.UI
{
Alpha = 0,
},
PopOutSpriteText = new SpriteText
PopOutCount = new SpriteText
{
Alpha = 0,
Margin = new MarginPadding(0.05f),
}
};
TextSize = 80;
}
protected override void LoadComplete()
{
base.LoadComplete();
DisplayedCountSpriteText.Text = FormatCount(Count);
DisplayedCountSpriteText.Anchor = Anchor;
@ -192,13 +199,12 @@ namespace osu.Game.Modes.UI
private void updateCount(ulong value, bool rolling = false)
{
ulong prevCount = count;
count = value;
if (!IsLoaded)
return;
ulong prevCount = count;
if (!rolling)
{
Flush(false, typeof(TransformComboRoll));