RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

not sure is it a goodway to delete mania ManiaAction.Special or add more

This commit is contained in:
ANDY840119-PC\andy840119 2018-01-14 21:20:01 +09:00
parent 2d266a8604
commit cf0d9e4d9b
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Mania/ManiaInputManager.cs
View File

@ -19,6 +19,8 @@ public enum ManiaAction
{
[Description("Special")]
Special,
[Description("Special")]
Specia2,
[Description("Key 1")]
Key1 = 10,
[Description("Key 2")]

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

@ -148,7 +148,7 @@ public override IEnumerable<KeyBinding> GetDefaultKeyBindings(int variant = 0)
bindings.Add(new KeyBinding(rightKeys[i], currentKey++));
if (variant % 2 == 1)
bindings.Add(new KeyBinding(InputKey.Space, ManiaAction.Special));
bindings.Insert(variant / 2, new KeyBinding(InputKey.Space, ManiaAction.Special));
return bindings;
}

4
osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
View File

@ -32,7 +32,7 @@ public class ManiaPlayfield : ScrollingPlayfield
/// <summary>
/// The style to use for the special column.
/// </summary>
public Bindable<SpecialColumnPosition> SpecialColumnPosition = new Bindable<UI.SpecialColumnPosition>();
public Bindable<SpecialColumnPosition> SpecialColumnPosition = new Bindable<SpecialColumnPosition>();
public List<Column> Columns => stages.SelectMany(x => x.Columns).ToList();
@ -68,6 +68,7 @@ public ManiaPlayfield(List<StageDefinition> stageDefinition)
foreach (var stage in stageDefinition)
{
var drawableStage = new ManiaStage();
drawableStage.SpecialColumn.BindTo(SpecialColumnPosition);
drawableStage.VisibleTimeRange.BindTo(VisibleTimeRange);
drawableStage.Inverted.BindTo(Inverted);
drawableStage.ColumnStartIndex = stageIndex;
@ -99,7 +100,6 @@ public override void OnJudgement(DrawableHitObject judgedObject, Judgement judge
public override void Add(DrawableHitObject h)
{
// => Columns.ElementAt(((ManiaHitObject)h.HitObject).Column).Add(h)
int column = ((ManiaHitObject)h.HitObject).Column;
var stage = getStageByColumn(column);
stage.Add(h);

2
osu.Game.Rulesets.Mania/UI/ManiaStage.cs
View File

@ -55,8 +55,6 @@ public ManiaStage()
Name = "Playfield elements";
Anchor = Anchor.Centre;
Origin = Anchor.Centre;
//RelativeSizeAxes = Axes.Y;
//AutoSizeAxes = Axes.X;
InternalChildren = new Drawable[]
{
new Container