h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 02:13:21 +08:00
Code Issues Releases Wiki Activity

CI fixes.

Browse Source
This commit is contained in:
Huo Yaoyuan 2017-06-16 16:48:46 +08:00
parent f00ee92143
commit 69270814d5
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Desktop.VisualTests/Tests/TestCaseUserProfile.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Testing;
using osu.Game.Overlays;
using osu.Game.Users;

3
osu.Game/Overlays/Profile/ProfileHeader.cs
View File

@ -378,6 +378,9 @@ namespace osu.Game.Overlays.Profile
gradeA.Count = user.Statistics.GradesCount.A;
gradeA.Show();
gradeSPlus.Count = 0;
gradeSSPlus.Count = 0;
chartContainer.Add(new RankChart(user) { RelativeSizeAxes = Axes.Both });
}
}

1
osu.Game/Overlays/Profile/ProfileSection.cs
View File

@ -7,7 +7,6 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Overlays;
namespace osu.Game.Overlays.Profile
{

9
osu.Game/Overlays/Profile/RankChart.cs
View File

@ -22,8 +22,8 @@ namespace osu.Game.Overlays.Profile
private readonly SpriteText rankText, performanceText, relativeText;
private readonly RankChartLineGraph graph;
private int[] ranks;
private decimal?[] performances;
private readonly int[] ranks;
private readonly decimal?[] performances;
private const float primary_textsize = 25, secondary_textsize = 13, padding = 10;
@ -70,7 +70,7 @@ namespace osu.Game.Overlays.Profile
}
};
ranks = new[] { user.Statistics.Rank };
performances = new decimal?[] { user.Statistics.PP };
performances = new [] { user.Statistics.PP };
}
private void updateRankTexts()
@ -78,13 +78,14 @@ namespace osu.Game.Overlays.Profile
rankText.Text = user.Statistics.Rank > 0 ? $"#{user.Statistics.Rank:#,0}" : "no rank";
performanceText.Text = user.Statistics.PP != null ? $"{user.Statistics.PP:#,0}pp" : string.Empty;
//relativeText.Text = $"{user.Country?.FullName} #{countryRank:#,0}";
relativeText.Text = string.Empty;
}
private void showHistoryRankTexts(int dayIndex)
{
rankText.Text = ranks[dayIndex] > 0 ? $"#{ranks[dayIndex]:#,0}" : "no rank";
performanceText.Text = performances[dayIndex] != null ? $"{performances[dayIndex]:#,0}pp" : string.Empty;
//relativeText.Text = dayIndex == ranks.Length ? "Now" : $"{ranks.Length - dayIndex} days ago";
relativeText.Text = dayIndex == ranks.Length ? "Now" : $"{ranks.Length - dayIndex} days ago";
//plural should be handled in a general way
}