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

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

Browse Source
This commit is contained in:
EVAST9919
2017-07-23 13:27:03 +03:00
parent 388fcfb295 65c26f9b24
commit d9e9ab22db
153 changed files with 797 additions and 1060 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -342,7 +342,7 @@ namespace osu.Game.Screens.Select
if (group.State == BeatmapGroupState.Expanded)
{
group.Header.MoveToX(-100, 500, EasingTypes.OutExpo);
group.Header.MoveToX(-100, 500, Easing.OutExpo);
var headerY = group.Header.Position.Y;
foreach (BeatmapPanel panel in group.BeatmapPanels)
@ -350,7 +350,7 @@ namespace osu.Game.Screens.Select
if (panel == selectedPanel)
selectedY = currentY + panel.DrawHeight / 2 - DrawHeight / 2;
panel.MoveToX(-50, 500, EasingTypes.OutExpo);
panel.MoveToX(-50, 500, Easing.OutExpo);
//on first display we want to begin hidden under our group's header.
if (panel.Alpha == 0)
@ -361,11 +361,11 @@ namespace osu.Game.Screens.Select
}
else
{
group.Header.MoveToX(0, 500, EasingTypes.OutExpo);
group.Header.MoveToX(0, 500, Easing.OutExpo);
foreach (BeatmapPanel panel in group.BeatmapPanels)
{
panel.MoveToX(0, 500, EasingTypes.OutExpo);
panel.MoveToX(0, 500, Easing.OutExpo);
movePanel(panel, false, animated, ref currentY);
}
}
@ -380,7 +380,7 @@ namespace osu.Game.Screens.Select
private void movePanel(Panel panel, bool advance, bool animated, ref float currentY)
{
yPositions.Add(currentY);
panel.MoveToY(currentY, animated ? 750 : 0, EasingTypes.OutExpo);
panel.MoveToY(currentY, animated ? 750 : 0, Easing.OutExpo);
if (advance)
currentY += panel.DrawHeight + 5;

10
osu.Game/Screens/Select/BeatmapDetails.cs
View File

@ -119,12 +119,12 @@ namespace osu.Game.Screens.Select
ratingsGraph.Values = ratings.Select(rating => (float)rating);
ratingsContainer.FadeColour(Color4.White, 500, EasingTypes.Out);
ratingsContainer.FadeColour(Color4.White, 500, Easing.Out);
}
else if (failOnMissing)
ratingsGraph.Values = new float[10];
else
ratingsContainer.FadeColour(Color4.Gray, 500, EasingTypes.Out);
ratingsContainer.FadeColour(Color4.Gray, 500, Easing.Out);
if (hasRetriesFails)
{
@ -139,7 +139,7 @@ namespace osu.Game.Screens.Select
failGraph.Values = fails.Select(fail => (float)fail);
retryGraph.Values = retries.Zip(fails, (retry, fail) => retry + MathHelper.Clamp(fail, 0, maxValue));
retryFailContainer.FadeColour(Color4.White, 500, EasingTypes.Out);
retryFailContainer.FadeColour(Color4.White, 500, Easing.Out);
}
else if (failOnMissing)
{
@ -147,7 +147,7 @@ namespace osu.Game.Screens.Select
retryGraph.Values = new float[100];
}
else
retryFailContainer.FadeColour(Color4.Gray, 500, EasingTypes.Out);
retryFailContainer.FadeColour(Color4.Gray, 500, Easing.Out);
}
public BeatmapDetails()
@ -169,7 +169,7 @@ namespace osu.Game.Screens.Select
Width = 0.4f,
Direction = FillDirection.Vertical,
LayoutDuration = 200,
LayoutEasing = EasingTypes.OutQuint,
LayoutEasing = Easing.OutQuint,
Children = new[]
{
description = new MetadataSegment("Description"),

10
osu.Game/Screens/Select/BeatmapInfoWedge.cs
View File

@ -57,14 +57,14 @@ namespace osu.Game.Screens.Select
protected override void PopIn()
{
MoveToX(0, 800, EasingTypes.OutQuint);
RotateTo(0, 800, EasingTypes.OutQuint);
this.MoveToX(0, 800, Easing.OutQuint);
this.RotateTo(0, 800, Easing.OutQuint);
}
protected override void PopOut()
{
MoveToX(-100, 800, EasingTypes.InQuint);
RotateTo(10, 800, EasingTypes.InQuint);
this.MoveToX(-100, 800, Easing.InQuint);
this.RotateTo(10, 800, Easing.InQuint);
}
public void UpdateBeatmap(WorkingBeatmap beatmap)
@ -78,7 +78,7 @@ namespace osu.Game.Screens.Select
Shear = -Shear,
OnLoadComplete = d =>
{
FadeIn(250);
this.FadeIn(250);
lastContainer?.FadeOut(250);
lastContainer?.Expire();

2
osu.Game/Screens/Select/Footer.cs
View File

@ -58,7 +58,7 @@ namespace osu.Game.Screens.Select
Action = action,
});
private void updateModeLight() => modeLight.FadeColour(buttons.FirstOrDefault(b => b.IsHovered)?.SelectedColour ?? Color4.Transparent, TRANSITION_LENGTH, EasingTypes.OutQuint);
private void updateModeLight() => modeLight.FadeColour(buttons.FirstOrDefault(b => b.IsHovered)?.SelectedColour ?? Color4.Transparent, TRANSITION_LENGTH, Easing.OutQuint);
public Footer()
{

14
osu.Game/Screens/Select/FooterButton.cs
View File

@ -89,27 +89,27 @@ namespace osu.Game.Screens.Select
protected override bool OnHover(InputState state)
{
Hovered?.Invoke();
light.ScaleTo(new Vector2(1, 2), Footer.TRANSITION_LENGTH, EasingTypes.OutQuint);
light.FadeColour(SelectedColour, Footer.TRANSITION_LENGTH, EasingTypes.OutQuint);
light.ScaleTo(new Vector2(1, 2), Footer.TRANSITION_LENGTH, Easing.OutQuint);
light.FadeColour(SelectedColour, Footer.TRANSITION_LENGTH, Easing.OutQuint);
return true;
}
protected override void OnHoverLost(InputState state)
{
HoverLost?.Invoke();
light.ScaleTo(new Vector2(1, 1), Footer.TRANSITION_LENGTH, EasingTypes.OutQuint);
light.FadeColour(DeselectedColour, Footer.TRANSITION_LENGTH, EasingTypes.OutQuint);
light.ScaleTo(new Vector2(1, 1), Footer.TRANSITION_LENGTH, Easing.OutQuint);
light.FadeColour(DeselectedColour, Footer.TRANSITION_LENGTH, Easing.OutQuint);
}
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
{
box.FadeTo(0.3f, Footer.TRANSITION_LENGTH * 2, EasingTypes.OutQuint);
box.FadeTo(0.3f, Footer.TRANSITION_LENGTH * 2, Easing.OutQuint);
return base.OnMouseDown(state, args);
}
protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
{
box.FadeOut(Footer.TRANSITION_LENGTH, EasingTypes.OutQuint);
box.FadeOut(Footer.TRANSITION_LENGTH, Easing.OutQuint);
return base.OnMouseUp(state, args);
}
@ -117,7 +117,7 @@ namespace osu.Game.Screens.Select
{
box.ClearTransforms();
box.Alpha = 1;
box.FadeOut(Footer.TRANSITION_LENGTH * 3, EasingTypes.OutQuint);
box.FadeOut(Footer.TRANSITION_LENGTH * 3, Easing.OutQuint);
return base.OnClick(state);
}

4
osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
View File

@ -63,8 +63,8 @@ namespace osu.Game.Screens.Select.Leaderboards
};
scrollFlow.Add(ls);
ls.Delay(i++ * 50, true);
ls.Show();
using (BeginDelayedSequence(i++ * 50, true))
ls.Show();
}
scrollContainer.ScrollTo(0f, false);

43
osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
View File

@ -61,26 +61,29 @@ namespace osu.Game.Screens.Select.Leaderboards
nameLabel.MoveToX(150);
break;
case Visibility.Visible:
FadeIn(200);
content.MoveToY(0, 800, EasingTypes.OutQuint);
this.FadeIn(200);
content.MoveToY(0, 800, Easing.OutQuint);
Delay(100, true);
avatar.FadeIn(300, EasingTypes.OutQuint);
nameLabel.FadeIn(350, EasingTypes.OutQuint);
avatar.MoveToX(0, 300, EasingTypes.OutQuint);
nameLabel.MoveToX(0, 350, EasingTypes.OutQuint);
Delay(250, true);
scoreLabel.FadeIn(200);
scoreRank.FadeIn(200);
Delay(50, true);
var drawables = new Drawable[] { flagBadgeContainer, maxCombo, accuracy, modsContainer, };
for (int i = 0; i < drawables.Length; i++)
using (BeginDelayedSequence(100, true))
{
drawables[i].FadeIn(100 + i * 50);
avatar.FadeIn(300, Easing.OutQuint);
nameLabel.FadeIn(350, Easing.OutQuint);
avatar.MoveToX(0, 300, Easing.OutQuint);
nameLabel.MoveToX(0, 350, Easing.OutQuint);
using (BeginDelayedSequence(250, true))
{
scoreLabel.FadeIn(200);
scoreRank.FadeIn(200);
using (BeginDelayedSequence(50, true))
{
var drawables = new Drawable[] { flagBadgeContainer, maxCombo, accuracy, modsContainer, };
for (int i = 0; i < drawables.Length; i++)
drawables[i].FadeIn(100 + i * 50);
}
}
}
break;
@ -266,13 +269,13 @@ namespace osu.Game.Screens.Select.Leaderboards
protected override bool OnHover(Framework.Input.InputState state)
{
background.FadeTo(0.5f, 300, EasingTypes.OutQuint);
background.FadeTo(0.5f, 300, Easing.OutQuint);
return base.OnHover(state);
}
protected override void OnHoverLost(Framework.Input.InputState state)
{
background.FadeTo(background_alpha, 200, EasingTypes.OutQuint);
background.FadeTo(background_alpha, 200, Easing.OutQuint);
base.OnHoverLost(state);
}

6
osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
View File

@ -54,13 +54,13 @@ namespace osu.Game.Screens.Select.Options
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
{
flash.FadeTo(0.1f, 1000, EasingTypes.OutQuint);
flash.FadeTo(0.1f, 1000, Easing.OutQuint);
return base.OnMouseDown(state, args);
}
protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
{
flash.FadeTo(0, 1000, EasingTypes.OutQuint);
flash.FadeTo(0, 1000, Easing.OutQuint);
return base.OnMouseUp(state, args);
}
@ -68,7 +68,7 @@ namespace osu.Game.Screens.Select.Options
{
flash.ClearTransforms();
flash.Alpha = 0.9f;
flash.FadeOut(800, EasingTypes.OutExpo);
flash.FadeOut(800, Easing.OutExpo);
return base.OnClick(state);
}

16
osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
View File

@ -29,27 +29,27 @@ namespace osu.Game.Screens.Select.Options
{
base.PopIn();
FadeIn(transition_duration, EasingTypes.OutQuint);
this.FadeIn(transition_duration, Easing.OutQuint);
if (buttonsContainer.Position.X == 1 || Alpha == 0)
buttonsContainer.MoveToX(x_position - x_movement);
holder.ScaleTo(new Vector2(1, 1), transition_duration / 2, EasingTypes.OutQuint);
holder.ScaleTo(new Vector2(1, 1), transition_duration / 2, Easing.OutQuint);
buttonsContainer.MoveToX(x_position, transition_duration, EasingTypes.OutQuint);
buttonsContainer.TransformSpacingTo(Vector2.Zero, transition_duration, EasingTypes.OutQuint);
buttonsContainer.MoveToX(x_position, transition_duration, Easing.OutQuint);
buttonsContainer.TransformSpacingTo(Vector2.Zero, transition_duration, Easing.OutQuint);
}
protected override void PopOut()
{
base.PopOut();
holder.ScaleTo(new Vector2(1, 0), transition_duration / 2, EasingTypes.InSine);
holder.ScaleTo(new Vector2(1, 0), transition_duration / 2, Easing.InSine);
buttonsContainer.MoveToX(x_position + x_movement, transition_duration, EasingTypes.InSine);
buttonsContainer.TransformSpacingTo(new Vector2(200f, 0f), transition_duration, EasingTypes.InSine);
buttonsContainer.MoveToX(x_position + x_movement, transition_duration, Easing.InSine);
buttonsContainer.TransformSpacingTo(new Vector2(200f, 0f), transition_duration, Easing.InSine);
FadeOut(transition_duration, EasingTypes.InQuint);
this.FadeOut(transition_duration, Easing.InQuint);
}
public BeatmapOptionsOverlay()

4
osu.Game/Screens/Select/SongSelect.cs
View File

@ -312,14 +312,14 @@ namespace osu.Game.Screens.Select
Content.FadeIn(250);
Content.ScaleTo(1, 250, EasingTypes.OutSine);
Content.ScaleTo(1, 250, Easing.OutSine);
FilterControl.Activate();
}
protected override void OnSuspending(Screen next)
{
Content.ScaleTo(1.1f, 250, EasingTypes.InSine);
Content.ScaleTo(1.1f, 250, Easing.InSine);
Content.FadeOut(250);