RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #221 from peppy/general-fixes 

Update framework.
This commit is contained in:
Dean Herbert 2016-12-05 23:22:16 +09:00 committed by GitHub
parent 8bc5729f5f 3cb9cb647d
commit d1cb9b90d5
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 7b2f4dfce7894ca7dea7626dcc34bcc32df651b9 Subproject commit 8dbc789266c1bc3e46e364be824d69bcfac74e83

4
osu.Game.Mode.Osu/Objects/Drawables/HitExplosion.cs
View File

@ -44,8 +44,8 @@ public HitExplosion(OsuJudgementInfo judgement)
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
line1.TransformSpacingTo(14, 1800, EasingTypes.OutQuint); line1.TransformSpacingTo(new Vector2(14, 0), 1800, EasingTypes.OutQuint);
line2.TransformSpacingTo(14, 1800, EasingTypes.OutQuint); line2.TransformSpacingTo(new Vector2(14, 0), 1800, EasingTypes.OutQuint);
} }
} }
} }

14
osu.Game/Graphics/UserInterface/BackButton.cs
View File

@ -16,13 +16,10 @@ public class BackButton : ClickableContainer
{ {
private TextAwesome icon; private TextAwesome icon;
private Container leftContainer;
private Container rightContainer;
private Box leftBox; private Box leftBox;
private Box rightBox; private Box rightBox;
private const double transform_time = 300.0; private const double transform_time = 600;
private const int pulse_length = 250; private const int pulse_length = 250;
private const float shear = 0.1f; private const float shear = 0.1f;
@ -36,7 +33,7 @@ public BackButton()
Children = new Drawable[] Children = new Drawable[]
{ {
leftContainer = new Container new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Width = 0.4f, Width = 0.4f,
@ -56,7 +53,7 @@ public BackButton()
}, },
} }
}, },
rightContainer = new Container new Container
{ {
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
@ -84,10 +81,7 @@ public BackButton()
}; };
} }
public override bool Contains(Vector2 screenSpacePos) public override bool Contains(Vector2 screenSpacePos) => leftBox.Contains(screenSpacePos) || rightBox.Contains(screenSpacePos);
{
return leftBox.Contains(screenSpacePos) || rightBox.Contains(screenSpacePos);
}
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)
{ {