mirror of
https://github.com/ppy/osu.git
synced 2025-03-18 23:57:22 +08:00
Fix strong drumrolls (again).
This commit is contained in:
parent
0e0ab6904d
commit
fcea52dd3a
@ -26,7 +26,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
|
||||
/// <summary>
|
||||
/// The amount to scale up the base circle to show it as a "strong" piece.
|
||||
/// </summary>
|
||||
private const float strong_scale = 1.5f;
|
||||
protected const float STRONG_SCALE = 1.5f;
|
||||
|
||||
/// <summary>
|
||||
/// The colour of the inner circle and outer glows.
|
||||
@ -117,7 +117,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
|
||||
content = new Container
|
||||
{
|
||||
RelativeSizeAxes = Axes.Both,
|
||||
Name = "Symbol",
|
||||
Name = "Content",
|
||||
Anchor = Anchor.Centre,
|
||||
Origin = Anchor.Centre,
|
||||
}
|
||||
@ -125,10 +125,10 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
|
||||
|
||||
if (isStrong)
|
||||
{
|
||||
Size *= strong_scale;
|
||||
Size *= STRONG_SCALE;
|
||||
|
||||
//for symbols etc.
|
||||
Content.Scale *= strong_scale;
|
||||
//default for symbols etc.
|
||||
Content.Scale *= STRONG_SCALE;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -21,18 +21,21 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
|
||||
|
||||
public ElongatedCirclePiece(bool isStrong = false) : base(isStrong)
|
||||
{
|
||||
if (isStrong)
|
||||
{
|
||||
//undo the strong scale provided in CirclePiece.
|
||||
Content.Scale /= STRONG_SCALE;
|
||||
}
|
||||
}
|
||||
|
||||
protected override void Update()
|
||||
{
|
||||
base.Update();
|
||||
|
||||
var contentPadding = DrawHeight / 2 * Content.Scale.X;
|
||||
|
||||
Content.Padding = new MarginPadding
|
||||
{
|
||||
Left = contentPadding,
|
||||
Right = contentPadding,
|
||||
Left = DrawHeight / 2,
|
||||
Right = DrawHeight / 2,
|
||||
};
|
||||
|
||||
Width = (PlayfieldLengthReference?.Invoke() ?? 0) * Length + DrawHeight;
|
||||
|
Loading…
x
Reference in New Issue
Block a user