mirror of
https://github.com/ppy/osu.git
synced 2025-03-28 09:37:23 +08:00
Merge branch 'master' into mod-overlay-appear-sfx
This commit is contained in:
commit
9e30c1de3e
@ -113,12 +113,12 @@ namespace osu.Game.Skinning
|
|||||||
accuracy.Position = new Vector2(-accuracy.ScreenSpaceDeltaToParentSpace(score.ScreenSpaceDrawQuad.Size).X / 2 - horizontal_padding, vertical_offset + 5);
|
accuracy.Position = new Vector2(-accuracy.ScreenSpaceDeltaToParentSpace(score.ScreenSpaceDrawQuad.Size).X / 2 - horizontal_padding, vertical_offset + 5);
|
||||||
accuracy.Origin = Anchor.TopRight;
|
accuracy.Origin = Anchor.TopRight;
|
||||||
accuracy.Anchor = Anchor.TopCentre;
|
accuracy.Anchor = Anchor.TopCentre;
|
||||||
}
|
|
||||||
|
|
||||||
if (combo != null)
|
if (combo != null)
|
||||||
{
|
{
|
||||||
combo.Position = new Vector2(accuracy.ScreenSpaceDeltaToParentSpace(score.ScreenSpaceDrawQuad.Size).X / 2 + horizontal_padding, vertical_offset + 5);
|
combo.Position = new Vector2(accuracy.ScreenSpaceDeltaToParentSpace(score.ScreenSpaceDrawQuad.Size).X / 2 + horizontal_padding, vertical_offset + 5);
|
||||||
combo.Anchor = Anchor.TopCentre;
|
combo.Anchor = Anchor.TopCentre;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var hitError = container.OfType<HitErrorMeter>().FirstOrDefault();
|
var hitError = container.OfType<HitErrorMeter>().FirstOrDefault();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user