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

Warnings, accuracy formatting

Browse Source
This commit is contained in:
DrabWeb
2017-03-14 11:55:19 -03:00
parent 4c03b62a75
commit 55187a8380
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs
View File

@ -10,9 +10,9 @@ using osu.Game.Modes.Osu.Mods;
using osu.Game.Screens.Select.Leaderboards; using osu.Game.Screens.Select.Leaderboards;
using osu.Game.Users; using osu.Game.Users;
namespace osu.Desktop.VisualTests namespace osu.Desktop.VisualTests.Tests
{ {
class TestCaseLeaderboard : TestCase internal class TestCaseLeaderboard : TestCase
{ {
public override string Description => @"From song select"; public override string Description => @"From song select";
@ -115,7 +115,7 @@ namespace osu.Desktop.VisualTests
new Score new Score
{ {
Rank = ScoreRank.B, Rank = ScoreRank.B,
Accuracy = 100, Accuracy = 98.26,
MaxCombo = 244, MaxCombo = 244,
TotalScore = 1707827, TotalScore = 1707827,
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
@ -133,7 +133,7 @@ namespace osu.Desktop.VisualTests
new Score new Score
{ {
Rank = ScoreRank.C, Rank = ScoreRank.C,
Accuracy = 100, Accuracy = 96.54,
MaxCombo = 244, MaxCombo = 244,
TotalScore = 1707827, TotalScore = 1707827,
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
@ -151,7 +151,7 @@ namespace osu.Desktop.VisualTests
new Score new Score
{ {
Rank = ScoreRank.F, Rank = ScoreRank.F,
Accuracy = 100, Accuracy = 60.25,
MaxCombo = 244, MaxCombo = 244,
TotalScore = 1707827, TotalScore = 1707827,
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
@ -169,7 +169,7 @@ namespace osu.Desktop.VisualTests
new Score new Score
{ {
Rank = ScoreRank.F, Rank = ScoreRank.F,
Accuracy = 100, Accuracy = 51.40,
MaxCombo = 244, MaxCombo = 244,
TotalScore = 1707827, TotalScore = 1707827,
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
@ -187,7 +187,7 @@ namespace osu.Desktop.VisualTests
new Score new Score
{ {
Rank = ScoreRank.F, Rank = ScoreRank.F,
Accuracy = 100, Accuracy = 42.22,
MaxCombo = 244, MaxCombo = 244,
TotalScore = 1707827, TotalScore = 1707827,
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), }, Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
@ -218,7 +218,7 @@ namespace osu.Desktop.VisualTests
Size = new Vector2(550f, 450f), Size = new Vector2(550f, 450f),
}); });
AddButton(@"New Scores", () => newScores()); AddButton(@"New Scores", newScores);
newScores(); newScores();
} }
} }

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

@ -100,7 +100,7 @@ namespace osu.Game.Screens.Select.Leaderboards
for (int i = 0; i < drawables.Length; i++) for (int i = 0; i < drawables.Length; i++)
{ {
drawables[i].FadeIn(100 + (i * 50)); drawables[i].FadeIn(100 + i * 50);
} }
}); });
}); });
@ -221,7 +221,7 @@ namespace osu.Game.Screens.Select.Leaderboards
Children = new Drawable[] Children = new Drawable[]
{ {
maxCombo = new ScoreComponentLabel(FontAwesome.fa_circle_o, Score.MaxCombo.ToString()), maxCombo = new ScoreComponentLabel(FontAwesome.fa_circle_o, Score.MaxCombo.ToString()),
accuracy = new ScoreComponentLabel(FontAwesome.fa_circle_o, Score.Accuracy.ToString()), accuracy = new ScoreComponentLabel(FontAwesome.fa_circle_o, string.Format(Score.Accuracy % 1 == 0 ? "{0:0}" : "{0:0.00}", Score.Accuracy)),
}, },
}, },
}, },
@ -263,7 +263,7 @@ namespace osu.Game.Screens.Select.Leaderboards
} }
} }
class GlowingSpriteText : Container private class GlowingSpriteText : Container
{ {
public GlowingSpriteText(string text, string font, int textSize, Color4 textColour, Color4 glowColour) public GlowingSpriteText(string text, string font, int textSize, Color4 textColour, Color4 glowColour)
{ {
@ -308,7 +308,7 @@ namespace osu.Game.Screens.Select.Leaderboards
} }
} }
class ScoreModIcon : Container private class ScoreModIcon : Container
{ {
public ScoreModIcon(FontAwesome icon, Color4 colour) public ScoreModIcon(FontAwesome icon, Color4 colour)
{ {
@ -337,7 +337,7 @@ namespace osu.Game.Screens.Select.Leaderboards
} }
} }
class ScoreComponentLabel : Container private class ScoreComponentLabel : Container
{ {
public ScoreComponentLabel(FontAwesome icon, string value) public ScoreComponentLabel(FontAwesome icon, string value)
{ {