sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Try different formatting style

Browse Source
This commit is contained in:
Thomas Müller
2017-07-16 18:28:20 +03:00
parent e6916ec57b
commit 19fb03e737
15 changed files with 94 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Overlays/MedalOverlay.cs
View File

@ -204,7 +204,9 @@ namespace osu.Game.Overlays
using (BeginDelayedSequence(200, true))
{
disc.FadeIn(initial_duration).ScaleTo(1f, initial_duration * 2, EasingTypes.OutElastic);
disc.FadeIn(initial_duration)
.ScaleTo(1f, initial_duration * 2, EasingTypes.OutElastic);
particleContainer.FadeIn(initial_duration);
outerSpin.FadeTo(0.1f, initial_duration * 2);

12
osu.Game/Overlays/MedalSplash/DrawableMedal.cs
View File

@ -147,17 +147,23 @@ namespace osu.Game.Overlays.MedalSplash
medalContainer.ScaleTo(0);
break;
case DisplayState.Icon:
medalContainer.FadeIn(duration).ScaleTo(1, duration, EasingTypes.OutElastic);
medalContainer
.FadeIn(duration)
.ScaleTo(1, duration, EasingTypes.OutElastic);
break;
case DisplayState.MedalUnlocked:
medalContainer.FadeTo(1).ScaleTo(1);
medalContainer
.FadeTo(1)
.ScaleTo(1);
this.ScaleTo(scale_when_unlocked, duration, EasingTypes.OutExpo);
this.MoveToY(MedalOverlay.DISC_SIZE / 2 - 30, duration, EasingTypes.OutExpo);
unlocked.FadeInFromZero(duration);
break;
case DisplayState.Full:
medalContainer.FadeTo(1).ScaleTo(1);
medalContainer
.FadeTo(1)
.ScaleTo(1);
this.ScaleTo(scale_when_full, duration, EasingTypes.OutExpo);
this.MoveToY(MedalOverlay.DISC_SIZE / 2 - 60, duration, EasingTypes.OutExpo);

9
osu.Game/Overlays/Mods/ModButton.cs
View File

@ -81,8 +81,13 @@ namespace osu.Game.Overlays.Mods
backgroundIcon.Icon = modAfter.Icon;
using (BeginDelayedSequence(mod_switch_duration, true))
{
foregroundIcon.RotateTo(-rotate_angle * direction).RotateTo(0f, mod_switch_duration, mod_switch_easing);
backgroundIcon.RotateTo(rotate_angle * direction).RotateTo(0f, mod_switch_duration, mod_switch_easing);
foregroundIcon
.RotateTo(-rotate_angle * direction)
.RotateTo(0f, mod_switch_duration, mod_switch_easing);
backgroundIcon
.RotateTo(rotate_angle * direction)
.RotateTo(0f, mod_switch_duration, mod_switch_easing);
Schedule(() => displayMod(modAfter));
}

6
osu.Game/Overlays/OnScreenDisplay.cs
View File

@ -155,9 +155,11 @@ namespace osu.Game.Overlays
textLine3.Text = shortcut.ToUpper();
box.Animate(
b => b.FadeIn(500, EasingTypes.OutQuint).ResizeHeightTo(height, 500, EasingTypes.OutQuint)
b => b.FadeIn(500, EasingTypes.OutQuint),
b => b.ResizeHeightTo(height, 500, EasingTypes.OutQuint)
).Then(
b => b.FadeOutFromOne(1500, EasingTypes.InQuint).ResizeHeightTo(height_contracted, 1500, EasingTypes.InQuint)
b => b.FadeOutFromOne(1500, EasingTypes.InQuint),
b => b.ResizeHeightTo(height_contracted, 1500, EasingTypes.InQuint)
);
int optionCount = 0;