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

Move IsCounting to KeyCounter.

Browse Source
This commit is contained in:
Huo Yaoyuan 2016-09-23 19:14:11 +08:00
parent 409bb0d068
commit ba19fe1b97
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Graphics/UserInterface/Counter.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Graphics.UserInterface
private SpriteText countSpriteText; private SpriteText countSpriteText;
public override string Name { get; } public override string Name { get; }
public bool IsCounting { get; set; } public KeyCounter ParentCounter { get; set; }
public int Counts { get; private set; } public int Counts { get; private set; }
private bool isLit; private bool isLit;
@ -26,7 +26,7 @@ namespace osu.Game.Graphics.UserInterface
get { return isLit; } get { return isLit; }
set set
{ {
if (value && !isLit && IsCounting) if (value && !isLit && ParentCounter.IsCounting)
IncreaseCount(); IncreaseCount();
if (isLit != value) if (isLit != value)
{ {

8
osu.Game/Graphics/UserInterface/KeyCounter.cs
View File

@ -13,8 +13,14 @@ namespace osu.Game.Graphics.UserInterface
Direction = FlowDirection.HorizontalOnly; Direction = FlowDirection.HorizontalOnly;
} }
public void AddKey(Count key) => base.Add(key); public void AddKey(Count key)
{
key.ParentCounter = this;
base.Add(key);
}
public override bool Contains(Vector2 screenSpacePos) => true; public override bool Contains(Vector2 screenSpacePos) => true;
public bool IsCounting { get; set; }
} }
} }