h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-28 09:37:23 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info

Browse Source
This commit is contained in:
Andrei Zavatski 2019-08-22 16:33:25 +03:00
commit 67e0a2e35e
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Screens/Menu/IntroTriangles.cs
View File

@ -139,7 +139,7 @@ namespace osu.Game.Screens.Menu
private RulesetFlow rulesets; private RulesetFlow rulesets;
private Container rulesetsScale; private Container rulesetsScale;
private Drawable logoContainerSecondary; private Drawable logoContainerSecondary;
private Drawable logoContainer; private Drawable lazerLogo;
private GlitchingTriangles triangles; private GlitchingTriangles triangles;
@ -191,7 +191,7 @@ namespace osu.Game.Screens.Menu
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Child = logoContainer = new LazerLogo(textures.GetStream("Menu/logo-triangles.mp4")) Child = lazerLogo = new LazerLogo(textures.GetStream("Menu/logo-triangles.mp4"))
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
@ -222,7 +222,7 @@ namespace osu.Game.Screens.Menu
const float scale_adjust = 0.8f; const float scale_adjust = 0.8f;
rulesets.Hide(); rulesets.Hide();
logoContainer.Hide(); lazerLogo.Hide();
background.Hide(); background.Hide();
using (BeginAbsoluteSequence(0, true)) using (BeginAbsoluteSequence(0, true))
@ -269,14 +269,17 @@ namespace osu.Game.Screens.Menu
rulesets.FadeOut(); rulesets.FadeOut();
// matching flyte curve y = 0.25x^2 + (max(0, x - 0.7) / 0.3) ^ 5 // matching flyte curve y = 0.25x^2 + (max(0, x - 0.7) / 0.3) ^ 5
logoContainer.FadeIn().ScaleTo(scale_start).Then().Delay(logo_scale_duration * 0.7f).ScaleTo(scale_start - scale_adjust, logo_scale_duration * 0.3f, Easing.InQuint); lazerLogo.FadeIn().ScaleTo(scale_start).Then().Delay(logo_scale_duration * 0.7f).ScaleTo(scale_start - scale_adjust, logo_scale_duration * 0.3f, Easing.InQuint);
logoContainerSecondary.ScaleTo(scale_start).Then().ScaleTo(scale_start - scale_adjust * 0.25f, logo_scale_duration, Easing.InQuad); logoContainerSecondary.ScaleTo(scale_start).Then().ScaleTo(scale_start - scale_adjust * 0.25f, logo_scale_duration, Easing.InQuad);
} }
using (BeginDelayedSequence(logo_2, true)) using (BeginDelayedSequence(logo_2, true))
{ {
logoContainer.FadeOut().OnComplete(_ => lazerLogo.FadeOut().OnComplete(_ =>
{ {
lazerLogo.Expire();
lazerLogo.Dispose(); // explicit disposal as we are pushing a new screen and the expire may not get run.
logo.FadeIn(); logo.FadeIn();
background.FadeIn(); background.FadeIn();