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

Tidying

Browse Source
This commit is contained in:
Adonais Romero González
2016-10-15 15:03:51 -05:00
parent c268500f89
commit a15f4cda44
5 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ namespace osu.Game.GameModes.Play.Catch
protected override string FormatCount(ulong count) protected override string FormatCount(ulong count)
{ {
return count.ToString("#,0"); return $@"{count:#,0}x";
} }
public override void Roll(ulong newValue = 0) public override void Roll(ulong newValue = 0)

2
osu.Game/GameModes/Play/Mania/ManiaComboCounter.cs
View File

@ -14,7 +14,7 @@ using System.Threading.Tasks;
namespace osu.Game.GameModes.Play.Mania namespace osu.Game.GameModes.Play.Mania
{ {
/// <summary> /// <summary>
/// Allows tint and vertical scaling animation. Used in osu!taiko and osu!mania. /// Similar to osu!taiko, with a pop-out animation when failing (rolling). Used in osu!mania.
/// </summary> /// </summary>
public class ManiaComboCounter : TaikoComboCounter public class ManiaComboCounter : TaikoComboCounter
{ {

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

@ -47,7 +47,7 @@ namespace osu.Game.GameModes.Play.Osu
protected override string FormatCount(ulong count) protected override string FormatCount(ulong count)
{ {
return count.ToString("#,0") + "x"; return $@"{count:#,0}x";
} }
protected virtual void transformPopOut(ulong currentValue, ulong newValue) protected virtual void transformPopOut(ulong currentValue, ulong newValue)

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

@ -12,6 +12,9 @@ using System.Threading.Tasks;
namespace osu.Game.GameModes.Play.Taiko namespace osu.Game.GameModes.Play.Taiko
{ {
/// <summary>
/// Allows tint and scaling animations. Used in osu!taiko.
/// </summary>
public class TaikoComboCounter : ComboCounter public class TaikoComboCounter : ComboCounter
{ {
protected virtual int AnimationDuration => 300; protected virtual int AnimationDuration => 300;

6
osu.Game/Graphics/UserInterface/ScoreCounter.cs
View File

@ -1,7 +1,6 @@
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>. //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Transformations; using osu.Framework.Graphics.Transformations;
using osu.Framework.MathUtils; using osu.Framework.MathUtils;
@ -40,11 +39,6 @@ namespace osu.Game.Graphics.UserInterface
LeadingZeroes = leading; LeadingZeroes = leading;
} }
public override void Load(BaseGame game)
{
base.Load(game);
}
protected override double GetProportionalDuration(ulong currentValue, ulong newValue) protected override double GetProportionalDuration(ulong currentValue, ulong newValue)
{ {
return currentValue > newValue ? currentValue - newValue : newValue - currentValue; return currentValue > newValue ? currentValue - newValue : newValue - currentValue;