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

Merge remote-tracking branch 'refs/remotes/upstream/master' into better-glow

Browse Source 
# Conflicts:
#	osu.Game/Beatmaps/Drawable/Panel.cs
This commit is contained in:
Dean Herbert 2016-11-02 16:43:35 +09:00
commit 54dbb0a355
7 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit dd9faf46095a761558abc6cb11ecd0e7498dba4e
Subproject commit 059520c91803855835c734bb6d9b56e90238fe78

2
osu.Game/Beatmaps/Drawable/Panel.cs
View File

@ -52,7 +52,7 @@ namespace osu.Game.Beatmaps.Drawable
protected virtual void Selected()
{
BorderColour = new Color4(BorderColour.R, BorderColour.G, BorderColour.B, 255);
BorderColour = new Color4(BorderColour.R, BorderColour.G, BorderColour.B, 1f);
BorderThickness = 2.5f;
EdgeEffect = new EdgeEffect

2
osu.Game/GameModes/Play/Catch/CatchComboCounter.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.GameModes.Play.Catch
protected override bool CanPopOutWhileRolling => true;
protected virtual double FadeOutDelay => 1000;
protected virtual double FadeOutDuration => 300;
protected override double FadeOutDuration => 300;
protected override string FormatCount(ulong count)
{

5
osu.Game/GameModes/Play/ComboCounter.cs
View File

@ -31,6 +31,8 @@ namespace osu.Game.GameModes.Play
protected virtual EasingTypes PopOutEasing => EasingTypes.None;
protected virtual float PopOutInitialAlpha => 0.75f;
protected virtual double FadeOutDuration => 100;
/// <summary>
/// Duration in milliseconds for the counter roll-up animation for each element.
/// </summary>
@ -60,7 +62,6 @@ namespace osu.Game.GameModes.Play
}
}
protected ulong prevCount;
protected ulong count;
/// <summary>
@ -204,7 +205,7 @@ namespace osu.Game.GameModes.Play
private void updateCount(ulong value, bool rolling = false)
{
prevCount = count;
ulong prevCount = count;
count = value;
if (!rolling)
{

11
osu.Game/GameModes/Play/Osu/OsuComboCounter.cs
View File

@ -92,6 +92,11 @@ namespace osu.Game.GameModes.Play.Osu
protected override void OnCountRolling(ulong currentValue, ulong newValue)
{
ScheduledPopOutCurrentId++;
// Hides displayed count if was increasing from 0 to 1 but didn't finish
if (currentValue == 0 && newValue == 0)
DisplayedCountSpriteText.FadeOut(FadeOutDuration);
base.OnCountRolling(currentValue, newValue);
}
@ -116,13 +121,17 @@ namespace osu.Game.GameModes.Play.Osu
protected override void OnCountChange(ulong currentValue, ulong newValue)
{
ScheduledPopOutCurrentId++;
if (newValue == 0)
DisplayedCountSpriteText.FadeOut();
base.OnCountChange(currentValue, newValue);
}
protected override void OnDisplayedCountRolling(ulong currentValue, ulong newValue)
{
if (newValue == 0)
DisplayedCountSpriteText.FadeOut(PopOutDuration);
DisplayedCountSpriteText.FadeOut(FadeOutDuration);
else
DisplayedCountSpriteText.Show();

4
osu.Game/GameModes/Play/PlaySongSelect.cs
View File

@ -35,6 +35,7 @@ namespace osu.Game.GameModes.Play
private ScrollContainer scrollContainer;
private FlowContainer beatmapSetFlow;
private TrackManager trackManager;
private Container wedgeContainer;
/// <param name="database">Optionally provide a database to use instead of the OsuGame one.</param>
public PlaySongSelect(BeatmapDatabase database = null)
@ -45,7 +46,7 @@ namespace osu.Game.GameModes.Play
const float bottomToolHeight = 50;
Children = new Drawable[]
{
new Container
wedgeContainer = new Container
{
RelativeSizeAxes = Axes.Both,
Size = Vector2.One,
@ -147,6 +148,7 @@ namespace osu.Game.GameModes.Play
{
base.OnEntering(last);
ensurePlayingSelected();
wedgeContainer.FadeInFromZero(250);
}
protected override void OnResuming(GameMode last)

2
osu.Game/GameModes/Play/Taiko/TaikoComboCounter.cs
View File

@ -43,7 +43,7 @@ namespace osu.Game.GameModes.Play.Taiko
protected override void OnDisplayedCountRolling(ulong currentValue, ulong newValue)
{
if (newValue == 0)
DisplayedCountSpriteText.FadeOut(AnimationDuration);
DisplayedCountSpriteText.FadeOut(FadeOutDuration);
else
DisplayedCountSpriteText.Show();