sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-09 23:57:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Renaming + use IEnumerable.

Browse Source
This commit is contained in:
smoogipooo 2017-03-10 13:40:44 +09:00
parent 4015b87965
commit 2d6e667c7c
7 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Modes.Catch/CatchRuleset.cs
View File

@ -80,7 +80,8 @@ namespace osu.Game.Modes.Catch
public override FontAwesome Icon => FontAwesome.fa_osu_fruits_o; public override FontAwesome Icon => FontAwesome.fa_osu_fruits_o;
public override KeyCounter[] GameplayKeys => new KeyCounter[]
public override KeyCounter[] CreateGameplayKeys => new KeyCounter[]
{ {
new KeyCounterKeyboard(Key.ShiftLeft), new KeyCounterKeyboard(Key.ShiftLeft),
new KeyCounterMouse(MouseButton.Left), new KeyCounterMouse(MouseButton.Left),

2
osu.Game.Modes.Mania/ManiaRuleset.cs
View File

@ -100,7 +100,7 @@ namespace osu.Game.Modes.Mania
public override FontAwesome Icon => FontAwesome.fa_osu_mania_o; public override FontAwesome Icon => FontAwesome.fa_osu_mania_o;
public override KeyCounter[] GameplayKeys => new KeyCounter[] { /* Todo: Should be keymod specific */ }; public override KeyCounter[] CreateGameplayKeys => new KeyCounter[] { /* Todo: Should be keymod specific */ };
public override ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0) => null; public override ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0) => null;

2
osu.Game.Modes.Osu/OsuRuleset.cs
View File

@ -112,7 +112,7 @@ namespace osu.Game.Modes.Osu
protected override PlayMode PlayMode => PlayMode.Osu; protected override PlayMode PlayMode => PlayMode.Osu;
public override KeyCounter[] GameplayKeys => new KeyCounter[] public override KeyCounter[] CreateGameplayKeys => new KeyCounter[]
{ {
new KeyCounterKeyboard(Key.Z), new KeyCounterKeyboard(Key.Z),
new KeyCounterKeyboard(Key.X), new KeyCounterKeyboard(Key.X),

2
osu.Game.Modes.Taiko/TaikoRuleset.cs
View File

@ -80,7 +80,7 @@ namespace osu.Game.Modes.Taiko
public override FontAwesome Icon => FontAwesome.fa_osu_taiko_o; public override FontAwesome Icon => FontAwesome.fa_osu_taiko_o;
public override KeyCounter[] GameplayKeys => new KeyCounter[] public override KeyCounter[] CreateGameplayKeys => new KeyCounter[]
{ {
new KeyCounterKeyboard(Key.D), new KeyCounterKeyboard(Key.D),
new KeyCounterKeyboard(Key.F), new KeyCounterKeyboard(Key.F),

2
osu.Game/Modes/Ruleset.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Modes
public abstract class Ruleset public abstract class Ruleset
{ {
public abstract KeyCounter[] GameplayKeys { get; } public abstract KeyCounter[] CreateGameplayKeys { get; }
private static ConcurrentDictionary<PlayMode, Type> availableRulesets = new ConcurrentDictionary<PlayMode, Type>(); private static ConcurrentDictionary<PlayMode, Type> availableRulesets = new ConcurrentDictionary<PlayMode, Type>();

5
osu.Game/Modes/UI/HUDOverlay.cs
View File

@ -10,6 +10,7 @@ using osu.Game.Graphics.UserInterface;
using osu.Game.Modes.Objects; using osu.Game.Modes.Objects;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
using System; using System;
using System.Collections.Generic;
namespace osu.Game.Modes.UI namespace osu.Game.Modes.UI
{ {
@ -23,7 +24,7 @@ namespace osu.Game.Modes.UI
private Bindable<bool> showKeyCounter; private Bindable<bool> showKeyCounter;
protected abstract KeyCounterCollection CreateKeyCounter(KeyCounter[] keyCounters); protected abstract KeyCounterCollection CreateKeyCounter(IEnumerable<KeyCounter> keyCounters);
protected abstract ComboCounter CreateComboCounter(); protected abstract ComboCounter CreateComboCounter();
protected abstract PercentageCounter CreateAccuracyCounter(); protected abstract PercentageCounter CreateAccuracyCounter();
protected abstract ScoreCounter CreateScoreCounter(); protected abstract ScoreCounter CreateScoreCounter();
@ -48,7 +49,7 @@ namespace osu.Game.Modes.UI
Children = new Drawable[] Children = new Drawable[]
{ {
KeyCounter = CreateKeyCounter(ruleset.GameplayKeys), KeyCounter = CreateKeyCounter(ruleset.CreateGameplayKeys),
ComboCounter = CreateComboCounter(), ComboCounter = CreateComboCounter(),
ScoreCounter = CreateScoreCounter(), ScoreCounter = CreateScoreCounter(),
AccuracyCounter = CreateAccuracyCounter(), AccuracyCounter = CreateAccuracyCounter(),

3
osu.Game/Modes/UI/StandardHUDOverlay.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Primitives;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
using System.Collections.Generic;
namespace osu.Game.Modes.UI namespace osu.Game.Modes.UI
{ {
@ -39,7 +40,7 @@ namespace osu.Game.Modes.UI
Margin = new MarginPadding { Top = 20 } Margin = new MarginPadding { Top = 20 }
}; };
protected override KeyCounterCollection CreateKeyCounter(KeyCounter[] keyCounters) => new KeyCounterCollection protected override KeyCounterCollection CreateKeyCounter(IEnumerable<KeyCounter> keyCounters) => new KeyCounterCollection
{ {
IsCounting = true, IsCounting = true,
FadeTime = 50, FadeTime = 50,