From a322c15bbd5dac9bff9f89e86eda797e709f2c53 Mon Sep 17 00:00:00 2001 From: "ANDY840119-PC\\andy840119" Date: Thu, 28 Dec 2017 23:15:12 +0900 Subject: [PATCH] =?UTF-8?q?after=20resharper=20:=20(=20.=20=E8=A3=9D?= =?UTF-8?q?=E4=B8=8AResharper=EF=BC=8C=E5=BE=9E=E6=AD=A4VS=E7=9A=84?= =?UTF-8?q?=E9=80=9F=E5=BA=A6=E4=B8=80=E7=89=87=E9=BB=91=E6=9A=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/DrawableManiaJudgement.cs | 2 +- .../UI/ManiaColumnGroup.cs | 19 +++----- osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs | 46 ++++++++----------- .../UI/ManiaRulesetContainer.cs | 6 +-- 4 files changed, 29 insertions(+), 44 deletions(-) diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs index 08478cef33..6a8e904537 100644 --- a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs +++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs @@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Mania.UI internal class DrawableManiaJudgement : DrawableJudgement { public DrawableManiaJudgement(Judgement judgement) - : base(judgement) + : base(judgement) { JudgementText.TextSize = 25; } diff --git a/osu.Game.Rulesets.Mania/UI/ManiaColumnGroup.cs b/osu.Game.Rulesets.Mania/UI/ManiaColumnGroup.cs index fa4820f996..952deef6e8 100644 --- a/osu.Game.Rulesets.Mania/UI/ManiaColumnGroup.cs +++ b/osu.Game.Rulesets.Mania/UI/ManiaColumnGroup.cs @@ -3,21 +3,16 @@ using System; using System.Collections.Generic; -using OpenTK; -using OpenTK.Graphics; +using System.Linq; +using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Shapes; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using osu.Game.Graphics; -using osu.Framework.Allocation; using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.UI; -using osu.Game.Rulesets.Timing; +using OpenTK; +using OpenTK.Graphics; namespace osu.Game.Rulesets.Mania.UI { @@ -61,7 +56,8 @@ namespace osu.Game.Rulesets.Mania.UI public int ColumnCount { get; protected set; } - public ManiaColumnGroup(int columnCount) : base(Axes.Y) + public ManiaColumnGroup(int columnCount) + : base(Axes.Y) { ColumnCount = columnCount; Name = "Playfield elements"; @@ -91,7 +87,7 @@ namespace osu.Game.Rulesets.Mania.UI { Name = "Background", RelativeSizeAxes = Axes.Both, - Colour = new Color4(0,0,0,0.8f) + Colour = new Color4(0, 0, 0, 0.8f) }, columns = new FillFlowContainer { @@ -133,7 +129,6 @@ namespace osu.Game.Rulesets.Mania.UI topLevelContainer = new Container { RelativeSizeAxes = Axes.Both } } } - }; } diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs index 7658638b5a..d47d3b4299 100644 --- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs +++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs @@ -1,33 +1,23 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using System; +using System.Collections.Generic; +using System.Linq; +using osu.Framework.Configuration; using osu.Framework.Graphics; +using osu.Framework.Graphics.Containers; +using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Mania.Objects; +using osu.Game.Rulesets.Mania.Objects.Drawables; +using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.UI; using OpenTK; -using OpenTK.Graphics; -using osu.Framework.Graphics.Containers; -using System; -using osu.Game.Graphics; -using osu.Framework.Allocation; -using System.Linq; -using System.Collections.Generic; -using osu.Framework.Configuration; -using osu.Game.Rulesets.Objects.Drawables; -using osu.Game.Rulesets.Mania.Objects.Drawables; -using osu.Framework.Graphics.Shapes; -using osu.Game.Rulesets.Judgements; -using osu.Game.Beatmaps; -using osu.Game.Rulesets.Objects.Types; -using osu.Game.Beatmaps.ControlPoints; -using osu.Framework.MathUtils; -using osu.Framework.Extensions.IEnumerableExtensions; namespace osu.Game.Rulesets.Mania.UI { public class ManiaPlayfield : ScrollingPlayfield { - /// /// list mania column group /// @@ -53,7 +43,8 @@ namespace osu.Game.Rulesets.Mania.UI private readonly int columnCount; - public ManiaPlayfield(int columnCount,bool coop): base(Axes.Y) + public ManiaPlayfield(int columnCount, bool coop) + : base(Axes.Y) { this.columnCount = columnCount; @@ -64,13 +55,13 @@ namespace osu.Game.Rulesets.Mania.UI InternalChildren = new Drawable[] { - ListColumnGroup=new FillFlowContainer() + ListColumnGroup = new FillFlowContainer() { - Direction= FillDirection.Horizontal, + Direction = FillDirection.Horizontal, RelativeSizeAxes = Axes.Y, - Anchor= Anchor.Centre, - Origin= Anchor.Centre, - Spacing=new Vector2(400), + Anchor = Anchor.Centre, + Origin = Anchor.Centre, + Spacing = new Vector2(400), } }; @@ -78,7 +69,7 @@ namespace osu.Game.Rulesets.Mania.UI if (coop) numberOfGroup = 2; - for (int i = 0; i < numberOfGroup; i ++) + for (int i = 0; i < numberOfGroup; i++) { var group = new ManiaColumnGroup(columnCount / numberOfGroup); ListColumnGroup.Add(group); @@ -87,7 +78,7 @@ namespace osu.Game.Rulesets.Mania.UI foreach (var single in ListColumnGroup) { - single.VisibleTimeRange.BindTo(this.VisibleTimeRange); + single.VisibleTimeRange.BindTo(VisibleTimeRange); AddNested(single); } @@ -109,7 +100,6 @@ namespace osu.Game.Rulesets.Mania.UI Inverted.ValueChanged += invertedChanged; Inverted.TriggerChange(); - } private void invertedChanged(bool newValue) @@ -141,7 +131,7 @@ namespace osu.Game.Rulesets.Mania.UI { single.HitObjects.Add(new DrawableBarLine(barline)); } - } + } private ManiaColumnGroup getFallDownControlContainerByActualColumn(int actualColumn) { diff --git a/osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs b/osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs index 7ea9382314..4bed527cbc 100644 --- a/osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs +++ b/osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using System.Linq; -using OpenTK; using osu.Framework.Allocation; using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.Graphics; @@ -13,6 +12,7 @@ using osu.Framework.MathUtils; using osu.Game.Beatmaps; using osu.Game.Beatmaps.ControlPoints; using osu.Game.Rulesets.Mania.Beatmaps; +using osu.Game.Rulesets.Mania.Mods; using osu.Game.Rulesets.Mania.Objects; using osu.Game.Rulesets.Mania.Objects.Drawables; using osu.Game.Rulesets.Mania.Replays; @@ -24,7 +24,7 @@ using osu.Game.Rulesets.Replays; using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Timing; using osu.Game.Rulesets.UI; -using osu.Game.Rulesets.Mania.Mods; +using OpenTK; namespace osu.Game.Rulesets.Mania.UI { @@ -108,7 +108,7 @@ namespace osu.Game.Rulesets.Mania.UI } //get mods to change column and coop - foreach (var single in this.WorkingBeatmap.Mods.Value) + foreach (var single in WorkingBeatmap.Mods.Value) { if (single is ManiaKeyMod maniaKeyMod) {