h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 18:23:04 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into netcoreapp2.1

Browse Source
This commit is contained in:
Dean Herbert 2018-06-03 03:55:33 +09:00 committed by GitHub
commit 652e2ccaf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
osu.Game/Screens/Multi/Components/ParticipantCount.cs
View File

@ -12,28 +12,23 @@ namespace osu.Game.Screens.Multi.Components
private const float text_size = 30; private const float text_size = 30;
private const float transition_duration = 100; private const float transition_duration = 100;
private readonly OsuSpriteText count, slash, max; private readonly OsuSpriteText count, slash, maxText;
public int Count public int Count
{ {
set => count.Text = value.ToString(); set => count.Text = value.ToString();
} }
private int? max;
public int? Max public int? Max
{ {
get => max;
set set
{ {
if (value == null) if (value == max) return;
{ max = value;
slash.FadeOut(transition_duration);
max.FadeOut(transition_duration); updateMax();
}
else
{
slash.FadeIn(transition_duration);
max.Text = value.ToString();
max.FadeIn(transition_duration);
}
} }
} }
@ -56,12 +51,29 @@ namespace osu.Game.Screens.Multi.Components
TextSize = text_size, TextSize = text_size,
Font = @"Exo2.0-Light" Font = @"Exo2.0-Light"
}, },
max = new OsuSpriteText maxText = new OsuSpriteText
{ {
TextSize = text_size, TextSize = text_size,
Font = @"Exo2.0-Light" Font = @"Exo2.0-Light"
}, },
}; };
updateMax();
}
private void updateMax()
{
if (Max == null)
{
slash.FadeOut(transition_duration);
maxText.FadeOut(transition_duration);
}
else
{
slash.FadeIn(transition_duration);
maxText.Text = Max.ToString();
maxText.FadeIn(transition_duration);
}
} }
} }
} }

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

@ -92,6 +92,6 @@ namespace osu.Game.Screens.Play
} }
} }
private string formatTime(TimeSpan timeSpan) => $"{(timeSpan < TimeSpan.Zero ? "-" : "")}{timeSpan.Duration().TotalMinutes:N0}:{timeSpan.Duration().Seconds:D2}"; private string formatTime(TimeSpan timeSpan) => $"{(timeSpan < TimeSpan.Zero ? "-" : "")}{Math.Floor(timeSpan.Duration().TotalMinutes)}:{timeSpan.Duration().Seconds:D2}";
} }
} }