RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-03 03:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compute combo for nested Objects. Display fruit depending on Combo for

Browse Source 
osu!catch
This commit is contained in:
Hanamuke 2018-09-13 21:52:15 +02:00
parent 40f7c1bd99
commit 1c2cc3837a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Catch.Objects
public int IndexInBeatmap { get; set; } public int IndexInBeatmap { get; set; }
public virtual FruitVisualRepresentation VisualRepresentation => (FruitVisualRepresentation)(IndexInBeatmap % 4); public virtual FruitVisualRepresentation VisualRepresentation => (FruitVisualRepresentation)(ComboIndex % 4);
public virtual bool NewCombo { get; set; } public virtual bool NewCombo { get; set; }

9
osu.Game/Beatmaps/BeatmapProcessor.cs
View File

@ -44,6 +44,15 @@ namespace osu.Game.Beatmaps
public virtual void PostProcess() public virtual void PostProcess()
{ {
foreach (var hitObject in Beatmap.HitObjects)
{
var objectComboInfo = (IHasComboInformation)hitObject;
foreach (var obj in hitObject.NestedHitObjects.OfType<IHasComboInformation>())
{
obj.IndexInCurrentCombo = objectComboInfo.IndexInCurrentCombo;
obj.ComboIndex = objectComboInfo.ComboIndex;
}
}
} }
} }
} }