1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-28 04:03:06 +08:00

Ensure side flashes are not visible during moving transitions

This commit is contained in:
Dean Herbert 2017-07-19 16:13:01 +09:00
parent 2b1e19814c
commit 2a2f4e2a8b

View File

@ -28,6 +28,8 @@ namespace osu.Game.Screens.Menu
private readonly BackgroundScreenDefault background; private readonly BackgroundScreenDefault background;
private Screen songSelect; private Screen songSelect;
private MenuSideFlashes sideFlashes;
protected override BackgroundScreen CreateBackground() => background; protected override BackgroundScreen CreateBackground() => background;
public MainMenu() public MainMenu()
@ -52,7 +54,7 @@ namespace osu.Game.Screens.Menu
} }
} }
}, },
new MenuSideFlashes(), sideFlashes = new MenuSideFlashes(),
}; };
} }
@ -112,6 +114,8 @@ namespace osu.Game.Screens.Menu
Content.FadeOut(length, EasingTypes.InSine); Content.FadeOut(length, EasingTypes.InSine);
Content.MoveTo(new Vector2(-800, 0), length, EasingTypes.InSine); Content.MoveTo(new Vector2(-800, 0), length, EasingTypes.InSine);
sideFlashes.FadeOut(length / 4, EasingTypes.OutQuint);
} }
protected override void OnResuming(Screen last) protected override void OnResuming(Screen last)
@ -129,6 +133,8 @@ namespace osu.Game.Screens.Menu
Content.FadeIn(length, EasingTypes.OutQuint); Content.FadeIn(length, EasingTypes.OutQuint);
Content.MoveTo(new Vector2(0, 0), length, EasingTypes.OutQuint); Content.MoveTo(new Vector2(0, 0), length, EasingTypes.OutQuint);
sideFlashes.FadeIn(length / 4, EasingTypes.InQuint);
} }
protected override bool OnExiting(Screen next) protected override bool OnExiting(Screen next)