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

Comply to formatting style

Browse Source
This commit is contained in:
DrabWeb 2017-02-22 13:12:39 -04:00
parent 8cd7ebcb43
commit bf1d13e734
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Overlays/Mods/ModSelectOverlay.cs
View File

@ -27,8 +27,7 @@ namespace osu.Game.Overlays.Mods
private const int ranked_multiplier_duration = 700; private const int ranked_multiplier_duration = 700;
private const float content_width = 0.8f; private const float content_width = 0.8f;
private Color4 low_multiplier_colour; private Color4 lowMultiplierColour, highMultiplierColour;
private Color4 high_multiplier_colour;
private OsuSpriteText rankedLabel, multiplierLabel; private OsuSpriteText rankedLabel, multiplierLabel;
private FlowContainer rankedMultiplerContainer; private FlowContainer rankedMultiplerContainer;
@ -100,7 +99,7 @@ namespace osu.Game.Overlays.Mods
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
low_multiplier_colour = colours.Red; lowMultiplierColour = colours.Red;
high_multiplier_colour = colours.Green; high_multiplier_colour = colours.Green;
} }
@ -131,14 +130,14 @@ namespace osu.Game.Overlays.Mods
protected override void TransitionOut() protected override void TransitionOut()
{ {
rankedMultiplerContainer.MoveToX(rankedMultiplerContainer.DrawSize.X, content_exit_duration, EasingTypes.InSine); rankedMultiplerContainer.MoveToX(rankedMultiplerContainer.DrawSize.X, CONTENT_EXIT_DURATION, EasingTypes.InSine);
rankedMultiplerContainer.FadeOut(content_exit_duration, EasingTypes.InSine); rankedMultiplerContainer.FadeOut(CONTENT_EXIT_DURATION, EasingTypes.InSine);
foreach (ModSection section in sections) foreach (ModSection section in sections)
{ {
section.ButtonsContainer.TransformSpacingTo(new Vector2(100f, 0f), content_exit_duration, EasingTypes.InSine); section.ButtonsContainer.TransformSpacingTo(new Vector2(100f, 0f), CONTENT_EXIT_DURATION, EasingTypes.InSine);
section.ButtonsContainer.MoveToX(100f, content_exit_duration, EasingTypes.InSine); section.ButtonsContainer.MoveToX(100f, CONTENT_EXIT_DURATION, EasingTypes.InSine);
section.ButtonsContainer.FadeOut(content_exit_duration, EasingTypes.InSine); section.ButtonsContainer.FadeOut(CONTENT_EXIT_DURATION, EasingTypes.InSine);
} }
} }
@ -190,7 +189,7 @@ namespace osu.Game.Overlays.Mods
} }
else if (multiplier < 1.0) else if (multiplier < 1.0)
{ {
multiplierLabel.FadeColour(low_multiplier_colour, 200); multiplierLabel.FadeColour(lowMultiplierColour, 200);
} }
else else
{ {

12
osu.Game/Overlays/WaveOverlayContainer.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Overlays
private const float third_wave_position = 70; private const float third_wave_position = 70;
private const float fourth_wave_position = 100; private const float fourth_wave_position = 100;
private const float waves_container_position = -150; private const float waves_container_position = -150;
private float[] wave_positions private float[] wavePositions
{ {
get get
{ {
@ -34,8 +34,8 @@ namespace osu.Game.Overlays
private const float waves_container_duration = 400; private const float waves_container_duration = 400;
private const float content_duration = 700; private const float content_duration = 700;
private const float content_transition_wait = 100; private const float content_transition_wait = 100;
internal const float content_exit_duration = 600; internal const float CONTENT_EXIT_DURATION = 600;
private float [] wave_durations private float [] waveDurations
{ {
get get
{ {
@ -130,7 +130,7 @@ namespace osu.Game.Overlays
for (int i = 0; i < waves.Length; i++) for (int i = 0; i < waves.Length; i++)
{ {
waves[i].MoveToY(wave_positions[i], wave_durations[i], EasingTypes.OutQuint); waves[i].MoveToY(wave_positions[i], waveDurations[i], EasingTypes.OutQuint);
} }
DelayReset(); DelayReset();
@ -155,8 +155,8 @@ namespace osu.Game.Overlays
{ {
base.Hide(); base.Hide();
contentContainer.FadeOut(content_exit_duration, EasingTypes.InSine); contentContainer.FadeOut(CONTENT_EXIT_DURATION, EasingTypes.InSine);
contentContainer.MoveToY(DrawHeight, content_exit_duration, EasingTypes.InSine); contentContainer.MoveToY(DrawHeight, CONTENT_EXIT_DURATION, EasingTypes.InSine);
TransitionOut(); TransitionOut();
for (int i = 0; i < waves.Length; i++) for (int i = 0; i < waves.Length; i++)