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

Review Changes

Browse Source
This commit is contained in:
John Neijzen
2017-06-07 22:00:14 +08:00
parent f9c466eee9
commit aa3a231763
7 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Screens/Menu/Button.cs
View File

@ -143,7 +143,7 @@ namespace osu.Game.Screens.Menu
StartValue = -10,
EndValue = 10,
StartTime = startTime,
EndTime = startTime + (duration * 2),
EndTime = startTime + duration * 2,
Easing = EasingTypes.InOutSine,
LoopCount = -1,
LoopDelay = duration * 2
@ -176,7 +176,7 @@ namespace osu.Game.Screens.Menu
StartValue = new Vector2(0, -10),
EndValue = Vector2.Zero,
StartTime = startTime + duration,
EndTime = startTime + (duration * 2),
EndTime = startTime + duration * 2,
Easing = EasingTypes.In,
LoopCount = -1,
LoopDelay = duration
@ -187,7 +187,7 @@ namespace osu.Game.Screens.Menu
StartValue = Vector2.One,
EndValue = new Vector2(1, 0.9f),
StartTime = startTime + duration,
EndTime = startTime + (duration * 2),
EndTime = startTime + duration * 2,
Easing = EasingTypes.In,
LoopCount = -1,
LoopDelay = duration
@ -197,8 +197,8 @@ namespace osu.Game.Screens.Menu
{
StartValue = 10,
EndValue = -10,
StartTime = startTime + (duration * 2),
EndTime = startTime + (duration * 4),
StartTime = startTime + duration * 2,
EndTime = startTime + duration * 4,
Easing = EasingTypes.InOutSine,
LoopCount = -1,
LoopDelay = duration * 2
@ -282,10 +282,7 @@ namespace osu.Game.Screens.Menu
public ButtonState State
{
get
{
return state;
}
get{ return state; }
set
{

4
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -231,7 +231,7 @@ namespace osu.Game.Screens.Menu
if (beatIndex < 0) return;
logoBeatContainer.ScaleTo(1 - (0.02f * amplitudeAdjust), beat_in_time, EasingTypes.Out);
logoBeatContainer.ScaleTo(1 - 0.02f * amplitudeAdjust, beat_in_time, EasingTypes.Out);
using (logoBeatContainer.BeginDelayedSequence(beat_in_time))
logoBeatContainer.ScaleTo(1, beatLength * 2, EasingTypes.OutQuint);
@ -240,7 +240,7 @@ namespace osu.Game.Screens.Menu
ripple.ScaleTo(logoAmplitudeContainer.Scale);
ripple.Alpha = 0.15f * amplitudeAdjust;
ripple.ScaleTo(logoAmplitudeContainer.Scale * (1 + (0.04f * amplitudeAdjust)), beatLength, EasingTypes.OutQuint);
ripple.ScaleTo(logoAmplitudeContainer.Scale * (1 + 0.04f * amplitudeAdjust), beatLength, EasingTypes.OutQuint);
ripple.FadeOut(beatLength, EasingTypes.OutQuint);
if (effectPoint.KiaiMode && flashLayer.Alpha < 0.4f)