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

Move replay button to score card

Browse Source
This commit is contained in:
naoey 2019-06-29 10:55:30 +05:30
parent 53d6d74537
commit bc52f76556
No known key found for this signature in database
GPG Key ID: 670DA9BE3DF7EE60
6 changed files with 195 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs Normal file
View File

@ -0,0 +1,49 @@
using NUnit.Framework;
using osu.Framework.Graphics;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Rulesets.Osu;
using osu.Game.Scoring;
using osu.Game.Screens.Play;
using osu.Game.Users;
using osuTK;
using System;
using System.Collections.Generic;
namespace osu.Game.Tests.Visual.Gameplay
{
[TestFixture]
public class TestSceneReplayDownloadButton : OsuTestScene
{
public override IReadOnlyList<Type> RequiredTypes => new[]
{
typeof(ReplayDownloadButton)
};
private ReplayDownloadButton downloadButton;
public TestSceneReplayDownloadButton()
{
Add(new ReplayDownloadButton(getScoreInfo())
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
});
}
private ScoreInfo getScoreInfo()
{
return new APILegacyScoreInfo
{
ID = 1,
OnlineScoreID = 2553163309,
Ruleset = new OsuRuleset().RulesetInfo,
Replay = true,
User = new User
{
Id = 39828,
Username = @"WubWoofWolf",
}
};
}
}
}

9
osu.Game/Online/DownloadTrackingComposite.cs
View File

@ -54,6 +54,12 @@ namespace osu.Game.Online
attachDownload(download);
};
manager.DownloadFailed += download =>
{
if (download.Model.Equals(Model.Value))
attachDownload(null);
};
manager.ItemAdded += itemAdded;
manager.ItemRemoved += itemRemoved;
}
@ -109,6 +115,9 @@ namespace osu.Game.Online
if (!s.Equals(Model.Value))
return;
// when model states are being updated from manager, update the model being held by us also so that it will
// be up do date when being consumed for reading files etc.
Model.Value = s;
State.Value = state;
});

2
osu.Game/Scoring/ScoreManager.cs
View File

@ -64,5 +64,7 @@ namespace osu.Game.Scoring
public ScoreInfo Query(Expression<Func<ScoreInfo, bool>> query) => ModelStore.ConsumableItems.AsNoTracking().FirstOrDefault(query);
protected override ArchiveDownloadRequest<ScoreInfo> CreateDownloadRequest(ScoreInfo score, bool minimiseDownload) => new DownloadReplayRequest(score);
protected override bool CheckLocalAvailability(ScoreInfo model, IQueryable<ScoreInfo> items) => items.Any(s => s.OnlineScoreID == model.OnlineScoreID);
}
}

154
osu.Game/Screens/Play/ReplayDownloadButton.cs
View File

@ -1,55 +1,147 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Graphics.Containers;
using osu.Game.Online;
using osu.Game.Scoring;
using osuTK;
using osu.Framework.Graphics.Sprites;
using osu.Game.Online.API.Requests.Responses;
using osu.Framework.Graphics.Effects;
using osuTK.Graphics;
using osu.Framework.Extensions.Color4Extensions;
namespace osu.Game.Screens.Play
{
public class ReplayDownloadButton : DownloadTrackingComposite<ScoreInfo, ScoreManager>
public class ReplayDownloadButton : DownloadTrackingComposite<ScoreInfo, ScoreManager>, IHasTooltip
{
[Resolved]
private const int size = 40;
[Resolved(canBeNull: true)]
private OsuGame game { get; set; }
[Resolved]
private ScoreManager scores { get; set; }
[Resolved]
private OsuColour colours { get; set; }
private OsuClickableContainer button;
private SpriteIcon downloadIcon;
private SpriteIcon playIcon;
private ShakeContainer shakeContainer;
public string TooltipText
{
get
{
if (scores.IsAvailableLocally(Model.Value))
return @"Watch replay";
if (Model.Value is APILegacyScoreInfo apiScore && apiScore.Replay)
return @"Download replay";
return @"Replay unavailable";
}
}
public ReplayDownloadButton(ScoreInfo score)
: base(score)
{
Size = new Vector2(size);
CornerRadius = size / 2;
Masking = true;
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
private bool hasReplay => (Model.Value is APILegacyScoreInfo apiScore && apiScore.Replay) || scores.IsAvailableLocally(Model.Value);
[BackgroundDependencyLoader(true)]
private void load()
{
AddInternal(new TwoLayerButton
EdgeEffect = new EdgeEffectParameters
{
BackgroundColour = colours.Yellow,
Icon = FontAwesome.Solid.PlayCircle,
Text = @"Replay",
HoverColour = colours.YellowDark,
Action = onReplay,
});
}
private void onReplay()
{
if (scores.IsAvailableLocally(Model.Value))
{
game.PresentScore(Model.Value);
return;
}
scores.Download(Model.Value);
scores.ItemAdded += score =>
{
if (score.Equals(Model.Value))
// use the newly added score instead of ModelInfo.Score because that won't have the Files property populated
game.PresentScore(score);
//ReplayLoaded?.Invoke(scores.GetScore(score));
Colour = Color4.Black.Opacity(0.4f),
Type = EdgeEffectType.Shadow,
Radius = 5,
};
InternalChild = shakeContainer = new ShakeContainer
{
RelativeSizeAxes = Axes.Both,
Child = button = new OsuClickableContainer
{
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = colours.GrayF,
},
playIcon = new SpriteIcon
{
Icon = FontAwesome.Solid.Play,
Size = Vector2.Zero,
Colour = colours.Gray3,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
},
downloadIcon = new SpriteIcon
{
Icon = FontAwesome.Solid.FileDownload,
Size = Vector2.Zero,
Colour = colours.Gray3,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
},
},
}
};
button.Action = () =>
{
switch (State.Value)
{
case DownloadState.LocallyAvailable:
game.PresentScore(Model.Value);
break;
case DownloadState.NotDownloaded:
scores.Download(Model.Value);
break;
case DownloadState.Downloading:
shakeContainer.Shake();
break;
}
};
State.BindValueChanged(state =>
{
switch (state.NewValue)
{
case DownloadState.Downloading:
FadeEdgeEffectTo(colours.Yellow, 400, Easing.OutQuint);
button.Enabled.Value = false;
break;
case DownloadState.LocallyAvailable:
playIcon.ResizeTo(13, 300, Easing.OutQuint);
downloadIcon.ResizeTo(Vector2.Zero, 300, Easing.OutExpo);
FadeEdgeEffectTo(Color4.Black.Opacity(0.4f), 400, Easing.OutQuint);
button.Enabled.Value = true;
break;
case DownloadState.NotDownloaded:
playIcon.ResizeTo(Vector2.Zero, 300, Easing.OutQuint);
downloadIcon.ResizeTo(13, 300, Easing.OutExpo);
FadeEdgeEffectTo(Color4.Black.Opacity(0.4f), 400, Easing.OutQuint);
button.Enabled.Value = true;
break;
}
}, true);
}
}
}

17
osu.Game/Screens/Play/SoloResults.cs
View File

@ -20,23 +20,6 @@ namespace osu.Game.Screens.Play
{
}
[BackgroundDependencyLoader]
private void load()
{
if (scores.IsAvailableLocally(Score) || hasOnlineReplay)
{
AddInternal(new ReplayDownloadButton(Score)
{
Anchor = Framework.Graphics.Anchor.BottomRight,
Origin = Framework.Graphics.Anchor.BottomRight,
Height = 80,
Width = 100,
});
}
}
private bool hasOnlineReplay => Score is APILegacyScoreInfo apiScore && apiScore.OnlineScoreID != null && apiScore.Replay;
protected override IEnumerable<IResultPageInfo> CreateResultPages() => new IResultPageInfo[]
{
new ScoreOverviewPageInfo(Score, Beatmap.Value),

15
osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
View File

@ -33,9 +33,12 @@ namespace osu.Game.Screens.Ranking.Pages
private Container scoreContainer;
private ScoreCounter scoreCounter;
private readonly ScoreInfo score;
public ScoreResultsPage(ScoreInfo score, WorkingBeatmap beatmap)
: base(score, beatmap)
{
this.score = score;
}
private FillFlowContainer<DrawableScoreStatistic> statisticsContainer;
@ -163,9 +166,15 @@ namespace osu.Game.Screens.Ranking.Pages
Direction = FillDirection.Horizontal,
LayoutDuration = 200,
LayoutEasing = Easing.OutQuint
}
}
}
},
},
},
new ReplayDownloadButton(score)
{
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
Margin = new MarginPadding { Bottom = 10 },
},
};
statisticsContainer.ChildrenEnumerable = Score.Statistics.OrderByDescending(p => p.Key).Select(s => new DrawableScoreStatistic(s));