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

Merge branch 'master' into sharpen

Browse Source
This commit is contained in:
Huo Yaoyuan
2019-11-21 23:42:46 +08:00
parent 374ef6ff83 0d4854ac09
commit 818553027b
77 changed files with 752 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
View File

@ -102,8 +102,8 @@ namespace osu.Game.Screens.Play.HUD
else
{
Alpha = Interpolation.ValueAt(
MathHelper.Clamp(Clock.ElapsedFrameTime, 0, 200),
Alpha, MathHelper.Clamp(1 - positionalAdjust, 0.04f, 1), 0, 200, Easing.OutQuint);
Math.Clamp(Clock.ElapsedFrameTime, 0, 200),
Alpha, Math.Clamp(1 - positionalAdjust, 0.04f, 1), 0, 200, Easing.OutQuint);
}
}

2
osu.Game/Screens/Play/SongProgressBar.cs
View File

@ -116,7 +116,7 @@ namespace osu.Game.Screens.Play
{
base.Update();
float newX = (float)Interpolation.Lerp(handleBase.X, NormalizedValue * UsableWidth, MathHelper.Clamp(Time.Elapsed / 40, 0, 1));
float newX = (float)Interpolation.Lerp(handleBase.X, NormalizedValue * UsableWidth, Math.Clamp(Time.Elapsed / 40, 0, 1));
fill.Width = newX;
handleBase.X = newX;

2
osu.Game/Screens/Play/SquareGraph.cs
View File

@ -256,7 +256,7 @@ namespace osu.Game.Screens.Play
{
Color4 colour = State == ColumnState.Lit ? LitColour : DimmedColour;
int countFilled = (int)MathHelper.Clamp(filled * drawableRows.Count, 0, drawableRows.Count);
int countFilled = (int)Math.Clamp(filled * drawableRows.Count, 0, drawableRows.Count);
for (int i = 0; i < drawableRows.Count; i++)
drawableRows[i].Colour = i < countFilled ? colour : EmptyColour;