sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 01:47:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1028 from peppy/fix-flashy-sides

Browse Source 
Fix main menu flashy sides moving too much
This commit is contained in:
Dan Balasescu 2017-07-19 17:26:26 +09:30 committed by GitHub
commit 11eecdd281
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Screens/Menu/MainMenu.cs
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 readonly MenuSideFlashes sideFlashes;
protected override BackgroundScreen CreateBackground() => background; protected override BackgroundScreen CreateBackground() => background;
public MainMenu() public MainMenu()
@ -49,10 +51,10 @@ namespace osu.Game.Screens.Menu
OnSolo = delegate { Push(consumeSongSelect()); }, OnSolo = delegate { Push(consumeSongSelect()); },
OnMulti = delegate { Push(new Lobby()); }, OnMulti = delegate { Push(new Lobby()); },
OnExit = delegate { Exit(); }, OnExit = delegate { Exit(); },
}, }
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)