Merge pull request #12683 from frenzibyte/legacy-beatmap-combo-offset

Apply combo offsets "colour hax" only on beatmap skins
This commit is contained in:
Dean Herbert
2021-07-23 14:30:18 +09:00
committed by GitHub
12 changed files with 177 additions and 34 deletions

View File

@ -37,7 +37,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
private readonly Bindable<double> startTime;
private Bindable<int> indexInCurrentComboBindable;
private Bindable<int> comboIndexBindable;
private Bindable<int> comboIndexWithOffsetsBindable;
private Bindable<Color4> displayColourBindable;
private readonly ExtendableCircle circle;
@ -120,7 +123,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
indexInCurrentComboBindable.BindValueChanged(_ => updateComboIndex(), true);
comboIndexBindable = comboInfo.ComboIndexBindable.GetBoundCopy();
comboIndexBindable.BindValueChanged(_ => updateColour(), true);
comboIndexWithOffsetsBindable = comboInfo.ComboIndexWithOffsetsBindable.GetBoundCopy();
comboIndexBindable.BindValueChanged(_ => updateColour());
comboIndexWithOffsetsBindable.BindValueChanged(_ => updateColour(), true);
skin.SourceChanged += updateColour;
break;