h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-21 23:23:52 +08:00
Code Issues Releases Wiki Activity

Fix :

Browse Source 
This (along with OnJudgement above) should be done in the following three steps:
.
i'm not sure does it means the code i write
This commit is contained in:
ANDY840119-PC\andy840119 2018-01-14 12:08:09 +09:00
parent 4f0e1f03d2
commit f7a908fbfa
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,14 +4,11 @@
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Rulesets.Mania.Objects; using osu.Game.Rulesets.Mania.Objects;
using OpenTK; using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Configuration; using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Mania.Beatmaps; using osu.Game.Rulesets.Mania.Beatmaps;
using osu.Game.Rulesets.Mania.Objects.Drawables; using osu.Game.Rulesets.Mania.Objects.Drawables;
@ -79,12 +76,14 @@ namespace osu.Game.Rulesets.Mania.UI
var currentAction = ManiaAction.Key1; var currentAction = ManiaAction.Key1;
int stageIndex = 0;
foreach (var stage in stageDefinition) foreach (var stage in stageDefinition)
{ {
var drawableStage = new ManiaStage(); var drawableStage = new ManiaStage();
drawableStage.VisibleTimeRange.BindTo(VisibleTimeRange); drawableStage.VisibleTimeRange.BindTo(VisibleTimeRange);
drawableStage.ColumnStartIndex = stageIndex;
this.stages.Add(drawableStage);
stages.Add(drawableStage);
AddNested(drawableStage); AddNested(drawableStage);
for (int i = 0; i < stage.Columns; i++) for (int i = 0; i < stage.Columns; i++)
@ -98,6 +97,8 @@ namespace osu.Game.Rulesets.Mania.UI
drawableStage.AddColumn(c); drawableStage.AddColumn(c);
AddNested(c); AddNested(c);
} }
stageIndex = stageIndex + stage.Columns;
} }
Inverted.ValueChanged += invertedChanged; Inverted.ValueChanged += invertedChanged;
@ -118,12 +119,16 @@ namespace osu.Game.Rulesets.Mania.UI
{ {
var maniaObject = (ManiaHitObject)judgedObject.HitObject; var maniaObject = (ManiaHitObject)judgedObject.HitObject;
int column = maniaObject.Column; int column = maniaObject.Column;
Columns[column].OnJudgement(judgedObject, judgement); getStageByColumn(column).AddJudgement(judgedObject,judgement);
getStageByColumn(column).AddJudgement(judgement);
} }
public override void Add(DrawableHitObject h) => Columns.ElementAt(((ManiaHitObject)h.HitObject).Column).Add(h); 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);
}
public void Add(BarLine barline) public void Add(BarLine barline)
{ {

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

@ -10,6 +10,8 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.UI.Scrolling; using osu.Game.Rulesets.UI.Scrolling;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
@ -53,6 +55,8 @@ namespace osu.Game.Rulesets.Mania.UI
private List<Color4> normalColumnColours = new List<Color4>(); private List<Color4> normalColumnColours = new List<Color4>();
private Color4 specialColumnColour; private Color4 specialColumnColour;
public int ColumnStartIndex;
public ManiaStage() public ManiaStage()
: base(ScrollingDirection.Up) : base(ScrollingDirection.Up)
{ {
@ -160,8 +164,18 @@ namespace osu.Game.Rulesets.Mania.UI
}; };
} }
public void AddJudgement(Judgement judgement) public override void Add(DrawableHitObject h)
{ {
int index = ((ManiaHitObject)h.HitObject).Column - ColumnStartIndex;
Columns.ElementAt(index).Add(h);
}
public void AddJudgement(DrawableHitObject judgedObject, Judgement judgement)
{
var maniaObject = (ManiaHitObject)judgedObject.HitObject;
int column = maniaObject.Column - ColumnStartIndex;
columns[column].OnJudgement(judgedObject, judgement);
judgements.Clear(); judgements.Clear();
judgements.Add(new DrawableManiaJudgement(judgement) judgements.Add(new DrawableManiaJudgement(judgement)
{ {