Merge pull request #12912 from peppy/fix-legacy-combo-counter-positioning

Fix legacy combo counter not accounting for song progress bar
This commit is contained in:
Dan Balasescu 2021-05-24 17:26:25 +09:00 committed by GitHub
commit 91acf16e52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -338,6 +338,7 @@ namespace osu.Game.Skinning
{ {
var score = container.OfType<LegacyScoreCounter>().FirstOrDefault(); var score = container.OfType<LegacyScoreCounter>().FirstOrDefault();
var accuracy = container.OfType<GameplayAccuracyCounter>().FirstOrDefault(); var accuracy = container.OfType<GameplayAccuracyCounter>().FirstOrDefault();
var combo = container.OfType<LegacyComboCounter>().FirstOrDefault();
if (score != null && accuracy != null) if (score != null && accuracy != null)
{ {
@ -353,9 +354,12 @@ namespace osu.Game.Skinning
hitError.Anchor = Anchor.BottomCentre; hitError.Anchor = Anchor.BottomCentre;
hitError.Origin = Anchor.CentreLeft; hitError.Origin = Anchor.CentreLeft;
hitError.Rotation = -90; hitError.Rotation = -90;
}
if (songProgress != null) if (songProgress != null)
hitError.Y -= SongProgress.MAX_HEIGHT; {
if (hitError != null) hitError.Y -= SongProgress.MAX_HEIGHT;
if (combo != null) combo.Y -= SongProgress.MAX_HEIGHT;
} }
}) })
{ {