h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 21:27:54 +08:00
Code Issues Releases Wiki Activity

Fix post-merge errors.

Browse Source
This commit is contained in:
smoogipooo 2017-04-01 23:59:44 +09:00
parent b4ed8aeb98
commit 38bbf2ac77
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
View File

@ -35,9 +35,9 @@ namespace osu.Desktop.VisualTests.Tests
AddStep("Swell", addSwell); AddStep("Swell", addSwell);
AddStep("Centre", () => addCentreHit(false)); AddStep("Centre", () => addCentreHit(false));
AddStep("Strong Centre", () => addCentreHit(true)); AddStep("Strong Centre", () => addCentreHit(true));
AddButton("Add bar line", addBarLine);
AddStep("Rim", () => addRimHit(false)); AddStep("Rim", () => addRimHit(false));
AddStep("Strong Rim", () => addRimHit(true)); AddStep("Strong Rim", () => addRimHit(true));
AddStep("Add bar line", addBarLine);
Add(new Container Add(new Container
{ {

4
osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
View File

@ -6,11 +6,13 @@ using osu.Framework.MathUtils;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Timing; using osu.Game.Beatmaps.Timing;
using osu.Game.Modes.Objects.Drawables; using osu.Game.Modes.Objects.Drawables;
using osu.Game.Modes.Objects.Types;
using osu.Game.Modes.Replays; using osu.Game.Modes.Replays;
using osu.Game.Modes.Scoring; using osu.Game.Modes.Scoring;
using osu.Game.Modes.Taiko.Beatmaps; using osu.Game.Modes.Taiko.Beatmaps;
using osu.Game.Modes.Taiko.Judgements; using osu.Game.Modes.Taiko.Judgements;
using osu.Game.Modes.Taiko.Objects; using osu.Game.Modes.Taiko.Objects;
using osu.Game.Modes.Taiko.Objects.Drawable;
using osu.Game.Modes.Taiko.Replays; using osu.Game.Modes.Taiko.Replays;
using osu.Game.Modes.Taiko.Scoring; using osu.Game.Modes.Taiko.Scoring;
using osu.Game.Modes.UI; using osu.Game.Modes.UI;
@ -70,7 +72,7 @@ namespace osu.Game.Modes.Taiko.UI
{ {
bool isMajor = currentBeat % (int)current.TimeSignature == 0; bool isMajor = currentBeat % (int)current.TimeSignature == 0;
BarLine barLine = new BarLine var barLine = new BarLine
{ {
StartTime = time, StartTime = time,
}; };

2
osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Modes.Taiko.UI
protected override Container<Drawable> Content => hitObjectContainer; protected override Container<Drawable> Content => hitObjectContainer;
private readonly Container<HitExplosion> hitExplosionContainer; private readonly Container<HitExplosion> hitExplosionContainer;
private Container<DrawableBarLine> barLineContainer; private readonly Container<DrawableBarLine> barLineContainer;
private readonly Container<DrawableTaikoJudgement> judgementContainer; private readonly Container<DrawableTaikoJudgement> judgementContainer;
private readonly Container hitObjectContainer; private readonly Container hitObjectContainer;