h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 22:34:09 +08:00
Code Issues Releases Wiki Activity

Warning fixes

Browse Source
This commit is contained in:
EVAST9919 2019-02-06 01:48:43 +03:00
parent c85dc1a236
commit 9cca11fb0d
4 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Overlays/BeatmapSet/Scores/ClickableUserContainer.cs
View File

@ -4,12 +4,8 @@
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Users; using osu.Game.Users;
using System.Collections.Generic;
namespace osu.Game.Overlays.BeatmapSet.Scores namespace osu.Game.Overlays.BeatmapSet.Scores
{ {
@ -30,7 +26,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
} }
} }
public ClickableUserContainer() protected ClickableUserContainer()
{ {
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
} }

9
osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs
View File

@ -8,17 +8,14 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Leaderboards; using osu.Game.Online.Leaderboards;
using osu.Game.Overlays.Profile.Sections.Ranks;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.UI; using osu.Game.Rulesets.UI;
using osu.Game.Users; using osu.Game.Users;
using osuTK; using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
using System.Collections.Generic;
namespace osu.Game.Overlays.BeatmapSet.Scores namespace osu.Game.Overlays.BeatmapSet.Scores
{ {
@ -27,7 +24,6 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
private const int fade_duration = 100; private const int fade_duration = 100;
private const float text_size = 14; private const float text_size = 14;
private readonly Box background;
private readonly Box hoveredBackground; private readonly Box hoveredBackground;
private readonly SpriteText rank; private readonly SpriteText rank;
private readonly SpriteText scoreText; private readonly SpriteText scoreText;
@ -42,11 +38,11 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
private readonly ClickableScoreUsername username; private readonly ClickableScoreUsername username;
private readonly APIScoreInfo score; private readonly APIScoreInfo score;
private Color4 backgroundColor;
public DrawableScore(int index, APIScoreInfo score) public DrawableScore(int index, APIScoreInfo score)
{ {
FillFlowContainer modsContainer; FillFlowContainer modsContainer;
Box background;
this.score = score; this.score = score;
@ -196,8 +192,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
hitMeh.Colour = (score.Statistics[HitResult.Meh] == 0) ? Color4.Gray : Color4.Black; hitMeh.Colour = (score.Statistics[HitResult.Meh] == 0) ? Color4.Gray : Color4.Black;
hitMiss.Colour = (score.Statistics[HitResult.Miss] == 0) ? Color4.Gray : Color4.Black; hitMiss.Colour = (score.Statistics[HitResult.Miss] == 0) ? Color4.Gray : Color4.Black;
background.Colour = backgroundColor = (index % 2 == 0) ? Color4.WhiteSmoke : Color4.White; background.Colour = (index % 2 == 0) ? Color4.WhiteSmoke : Color4.White;
foreach (Mod mod in score.Mods) foreach (Mod mod in score.Mods)
modsContainer.Add(new ModIcon(mod) modsContainer.Add(new ModIcon(mod)

12
osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
View File

@ -10,10 +10,8 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Leaderboards; using osu.Game.Online.Leaderboards;
using osu.Game.Overlays.Profile.Sections.Ranks;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.UI; using osu.Game.Rulesets.UI;
@ -264,7 +262,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
private class ClickableTopScoreUsername : ClickableUserContainer private class ClickableTopScoreUsername : ClickableUserContainer
{ {
private const float fade_duration = 500; private const float username_fade_duration = 500;
private readonly Box underscore; private readonly Box underscore;
private readonly Container underscoreContainer; private readonly Container underscoreContainer;
@ -317,15 +315,15 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)
{ {
text.FadeColour(hoverColour, fade_duration, Easing.OutQuint); text.FadeColour(hoverColour, username_fade_duration, Easing.OutQuint);
underscore.FadeIn(fade_duration, Easing.OutQuint); underscore.FadeIn(username_fade_duration, Easing.OutQuint);
return base.OnHover(e); return base.OnHover(e);
} }
protected override void OnHoverLost(HoverLostEvent e) protected override void OnHoverLost(HoverLostEvent e)
{ {
text.FadeColour(Color4.Black, fade_duration, Easing.OutQuint); text.FadeColour(Color4.Black, username_fade_duration, Easing.OutQuint);
underscore.FadeOut(fade_duration, Easing.OutQuint); underscore.FadeOut(username_fade_duration, Easing.OutQuint);
base.OnHoverLost(e); base.OnHoverLost(e);
} }
} }

1
osu.Game/Overlays/BeatmapSet/Scores/ScoreTextLine.cs
View File

@ -5,7 +5,6 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Localisation;
using osu.Game.Graphics; using osu.Game.Graphics;
namespace osu.Game.Overlays.BeatmapSet.Scores namespace osu.Game.Overlays.BeatmapSet.Scores