h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 19:02:57 +08:00
Code Issues Releases Wiki Activity

Animate individual ModColumns during togle of oerlay

Browse Source
This commit is contained in:
Dean Herbert 2022-04-05 18:27:34 +09:00
parent 901032bfa2
commit 9fdeb20537
2 changed files with 91 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Overlays/Mods/ModColumn.cs
View File

@ -31,6 +31,8 @@ namespace osu.Game.Overlays.Mods
{ {
public class ModColumn : CompositeDrawable public class ModColumn : CompositeDrawable
{ {
public readonly Container TopLevelContent;
public readonly ModType ModType; public readonly ModType ModType;
private Func<Mod, bool>? filter; private Func<Mod, bool>? filter;
@ -78,11 +80,16 @@ namespace osu.Game.Overlays.Mods
Width = 320; Width = 320;
RelativeSizeAxes = Axes.Y; RelativeSizeAxes = Axes.Y;
Shear = new Vector2(ModPanel.SHEAR_X, 0); Shear = new Vector2(ModPanel.SHEAR_X, 0);
CornerRadius = ModPanel.CORNER_RADIUS;
Masking = true;
Container controlContainer; Container controlContainer;
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{
TopLevelContent = new Container
{
RelativeSizeAxes = Axes.Both,
CornerRadius = ModPanel.CORNER_RADIUS,
Masking = true,
Children = new Drawable[]
{ {
new Container new Container
{ {
@ -170,6 +177,8 @@ namespace osu.Game.Overlays.Mods
} }
} }
} }
}
}
}; };
createHeaderText(); createHeaderText();

15
osu.Game/Overlays/Mods/ModSelectScreen.cs
View File

@ -106,6 +106,7 @@ namespace osu.Game.Overlays.Mods
{ {
new Container new Container
{ {
Depth = float.MaxValue,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
RelativePositionAxes = Axes.Both, RelativePositionAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]
@ -296,6 +297,13 @@ namespace osu.Game.Overlays.Mods
.Delay(300) .Delay(300)
.FadeIn(200, Easing.OutQuint) .FadeIn(200, Easing.OutQuint)
.ScaleTo(1, fade_in_duration, Easing.OutElastic); .ScaleTo(1, fade_in_duration, Easing.OutElastic);
for (int i = 0; i < columnFlow.Count; i++)
{
columnFlow[i].TopLevelContent
.Delay(i * 30)
.MoveToY(0, fade_in_duration, Easing.OutQuint);
}
} }
protected override void PopOut() protected override void PopOut()
@ -312,6 +320,13 @@ namespace osu.Game.Overlays.Mods
footer.MoveToY(footer.DrawHeight, fade_out_duration, Easing.OutQuint); footer.MoveToY(footer.DrawHeight, fade_out_duration, Easing.OutQuint);
this.FadeOut(fade_out_duration, Easing.OutQuint); this.FadeOut(fade_out_duration, Easing.OutQuint);
for (int i = 0; i < columnFlow.Count; i++)
{
const float distance = 700;
columnFlow[i].TopLevelContent.MoveToY(i % 2 == 0 ? -distance : distance, fade_out_duration, Easing.OutQuint);
}
} }
private class ModColumnContainer : FillFlowContainer<ModColumn> private class ModColumnContainer : FillFlowContainer<ModColumn>