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

Merge pull request #13790 from PercyDan54/remove-redundant-arg

Browse Source 
Remove redundant arguments
This commit is contained in:
Dean Herbert 2021-07-06 14:00:59 +09:00 committed by GitHub
commit 2cd1bde2bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
51 changed files with 98 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs
View File

@ -138,7 +138,7 @@ namespace osu.Game.Rulesets.Catch.Tests
AddStep("finish hyper-dashing", () => AddStep("finish hyper-dashing", () =>
{ {
catcherArea.MovableCatcher.SetHyperDashState(1); catcherArea.MovableCatcher.SetHyperDashState();
catcherArea.MovableCatcher.FinishTransforms(); catcherArea.MovableCatcher.FinishTransforms();
}); });

2
osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
View File

@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Osu.Tests
{ {
case OsuSkinConfiguration osuLookup: case OsuSkinConfiguration osuLookup:
if (osuLookup == OsuSkinConfiguration.CursorCentre) if (osuLookup == OsuSkinConfiguration.CursorCentre)
return SkinUtils.As<TValue>(new BindableBool(false)); return SkinUtils.As<TValue>(new BindableBool());
break; break;
} }

6
osu.Game.Rulesets.Osu/Mods/OsuModBlinds.cs
View File

@ -158,17 +158,17 @@ namespace osu.Game.Rulesets.Osu.Mods
var firstObj = beatmap.HitObjects[0]; var firstObj = beatmap.HitObjects[0];
var startDelay = firstObj.StartTime - firstObj.TimePreempt; var startDelay = firstObj.StartTime - firstObj.TimePreempt;
using (BeginAbsoluteSequence(startDelay + break_close_late, true)) using (BeginAbsoluteSequence(startDelay + break_close_late))
leaveBreak(); leaveBreak();
foreach (var breakInfo in beatmap.Breaks) foreach (var breakInfo in beatmap.Breaks)
{ {
if (breakInfo.HasEffect) if (breakInfo.HasEffect)
{ {
using (BeginAbsoluteSequence(breakInfo.StartTime - break_open_early, true)) using (BeginAbsoluteSequence(breakInfo.StartTime - break_open_early))
{ {
enterBreak(); enterBreak();
using (BeginDelayedSequence(breakInfo.Duration + break_open_early + break_close_late, true)) using (BeginDelayedSequence(breakInfo.Duration + break_open_early + break_close_late))
leaveBreak(); leaveBreak();
} }
} }

2
osu.Game.Rulesets.Osu/Mods/OsuModSpinIn.cs
View File

@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Mods
switch (drawable) switch (drawable)
{ {
case DrawableHitCircle circle: case DrawableHitCircle circle:
using (circle.BeginAbsoluteSequence(h.StartTime - h.TimePreempt, true)) using (circle.BeginAbsoluteSequence(h.StartTime - h.TimePreempt))
{ {
circle.ApproachCircle.Hide(); circle.ApproachCircle.Hide();

2
osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
View File

@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Osu.Mods
private void applyCirclePieceState(DrawableOsuHitObject hitObject, IDrawable hitCircle = null) private void applyCirclePieceState(DrawableOsuHitObject hitObject, IDrawable hitCircle = null)
{ {
var h = hitObject.HitObject; var h = hitObject.HitObject;
using (hitObject.BeginAbsoluteSequence(h.StartTime - h.TimePreempt, true)) using (hitObject.BeginAbsoluteSequence(h.StartTime - h.TimePreempt))
(hitCircle ?? hitObject).Hide(); (hitCircle ?? hitObject).Hide();
} }

2
osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
View File

@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Osu.Mods
double appearTime = hitObject.StartTime - hitObject.TimePreempt - 1; double appearTime = hitObject.StartTime - hitObject.TimePreempt - 1;
double moveDuration = hitObject.TimePreempt + 1; double moveDuration = hitObject.TimePreempt + 1;
using (drawable.BeginAbsoluteSequence(appearTime, true)) using (drawable.BeginAbsoluteSequence(appearTime))
{ {
drawable drawable
.MoveToOffset(appearOffset) .MoveToOffset(appearOffset)

4
osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
View File

@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Osu.Mods
for (int i = 0; i < amountWiggles; i++) for (int i = 0; i < amountWiggles; i++)
{ {
using (drawable.BeginAbsoluteSequence(osuObject.StartTime - osuObject.TimePreempt + i * wiggle_duration, true)) using (drawable.BeginAbsoluteSequence(osuObject.StartTime - osuObject.TimePreempt + i * wiggle_duration))
wiggle(); wiggle();
} }
@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Osu.Mods
for (int i = 0; i < amountWiggles; i++) for (int i = 0; i < amountWiggles; i++)
{ {
using (drawable.BeginAbsoluteSequence(osuObject.StartTime + i * wiggle_duration, true)) using (drawable.BeginAbsoluteSequence(osuObject.StartTime + i * wiggle_duration))
wiggle(); wiggle();
} }
} }

14
osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs
View File

@ -130,18 +130,18 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
Spinner spinner = drawableSpinner.HitObject; Spinner spinner = drawableSpinner.HitObject;
using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true)) using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt))
{ {
this.ScaleTo(initial_scale); this.ScaleTo(initial_scale);
this.RotateTo(0); this.RotateTo(0);
using (BeginDelayedSequence(spinner.TimePreempt / 2, true)) using (BeginDelayedSequence(spinner.TimePreempt / 2))
{ {
// constant ambient rotation to give the spinner "spinning" character. // constant ambient rotation to give the spinner "spinning" character.
this.RotateTo((float)(25 * spinner.Duration / 2000), spinner.TimePreempt + spinner.Duration); this.RotateTo((float)(25 * spinner.Duration / 2000), spinner.TimePreempt + spinner.Duration);
} }
using (BeginDelayedSequence(spinner.TimePreempt + spinner.Duration + drawableHitObject.Result.TimeOffset, true)) using (BeginDelayedSequence(spinner.TimePreempt + spinner.Duration + drawableHitObject.Result.TimeOffset))
{ {
switch (state) switch (state)
{ {
@ -157,17 +157,17 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
} }
} }
using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true)) using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt))
{ {
centre.ScaleTo(0); centre.ScaleTo(0);
mainContainer.ScaleTo(0); mainContainer.ScaleTo(0);
using (BeginDelayedSequence(spinner.TimePreempt / 2, true)) using (BeginDelayedSequence(spinner.TimePreempt / 2))
{ {
centre.ScaleTo(0.3f, spinner.TimePreempt / 4, Easing.OutQuint); centre.ScaleTo(0.3f, spinner.TimePreempt / 4, Easing.OutQuint);
mainContainer.ScaleTo(0.2f, spinner.TimePreempt / 4, Easing.OutQuint); mainContainer.ScaleTo(0.2f, spinner.TimePreempt / 4, Easing.OutQuint);
using (BeginDelayedSequence(spinner.TimePreempt / 2, true)) using (BeginDelayedSequence(spinner.TimePreempt / 2))
{ {
centre.ScaleTo(0.5f, spinner.TimePreempt / 2, Easing.OutQuint); centre.ScaleTo(0.5f, spinner.TimePreempt / 2, Easing.OutQuint);
mainContainer.ScaleTo(1, spinner.TimePreempt / 2, Easing.OutQuint); mainContainer.ScaleTo(1, spinner.TimePreempt / 2, Easing.OutQuint);
@ -176,7 +176,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
} }
// transforms we have from completing the spinner will be rolled back, so reapply immediately. // transforms we have from completing the spinner will be rolled back, so reapply immediately.
using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true)) using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt))
updateComplete(state == ArmedState.Hit, 0); updateComplete(state == ArmedState.Hit, 0);
} }

1
osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
View File

@ -86,6 +86,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
public override void ApplyTransformsAt(double time, bool propagateChildren = false) public override void ApplyTransformsAt(double time, bool propagateChildren = false)
{ {
// For the same reasons as above w.r.t rewinding, we shouldn't propagate to children here either. // For the same reasons as above w.r.t rewinding, we shouldn't propagate to children here either.
// ReSharper disable once RedundantArgumentDefaultValue - removing the "redundant" default value triggers BaseMethodCallWithDefaultParameter
base.ApplyTransformsAt(time, false); base.ApplyTransformsAt(time, false);
} }

8
osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs
View File

@ -100,17 +100,17 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
case DrawableSpinner d: case DrawableSpinner d:
Spinner spinner = d.HitObject; Spinner spinner = d.HitObject;
using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true)) using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt))
this.FadeOut(); this.FadeOut();
using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimeFadeIn / 2, true)) using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimeFadeIn / 2))
this.FadeInFromZero(spinner.TimeFadeIn / 2); this.FadeInFromZero(spinner.TimeFadeIn / 2);
using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true)) using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt))
{ {
fixedMiddle.FadeColour(Color4.White); fixedMiddle.FadeColour(Color4.White);
using (BeginDelayedSequence(spinner.TimePreempt, true)) using (BeginDelayedSequence(spinner.TimePreempt))
fixedMiddle.FadeColour(Color4.Red, spinner.Duration); fixedMiddle.FadeColour(Color4.Red, spinner.Duration);
} }

4
osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
View File

@ -89,10 +89,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
Spinner spinner = d.HitObject; Spinner spinner = d.HitObject;
using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt, true)) using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimePreempt))
this.FadeOut(); this.FadeOut();
using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimeFadeIn / 2, true)) using (BeginAbsoluteSequence(spinner.StartTime - spinner.TimeFadeIn / 2))
this.FadeInFromZero(spinner.TimeFadeIn / 2); this.FadeInFromZero(spinner.TimeFadeIn / 2);
} }

8
osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
View File

@ -140,7 +140,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
{ {
double startTime = Math.Min(Time.Current, DrawableSpinner.HitStateUpdateTime - 400); double startTime = Math.Min(Time.Current, DrawableSpinner.HitStateUpdateTime - 400);
using (BeginAbsoluteSequence(startTime, true)) using (BeginAbsoluteSequence(startTime))
{ {
clear.FadeInFromZero(400, Easing.Out); clear.FadeInFromZero(400, Easing.Out);
@ -150,7 +150,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
} }
const double fade_out_duration = 50; const double fade_out_duration = 50;
using (BeginAbsoluteSequence(DrawableSpinner.HitStateUpdateTime - fade_out_duration, true)) using (BeginAbsoluteSequence(DrawableSpinner.HitStateUpdateTime - fade_out_duration))
clear.FadeOut(fade_out_duration); clear.FadeOut(fade_out_duration);
} }
else else
@ -182,14 +182,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
double spinFadeOutLength = Math.Min(400, d.HitObject.Duration); double spinFadeOutLength = Math.Min(400, d.HitObject.Duration);
using (BeginAbsoluteSequence(drawableHitObject.HitStateUpdateTime - spinFadeOutLength, true)) using (BeginAbsoluteSequence(drawableHitObject.HitStateUpdateTime - spinFadeOutLength))
spin.FadeOutFromOne(spinFadeOutLength); spin.FadeOutFromOne(spinFadeOutLength);
break; break;
case DrawableSpinnerTick d: case DrawableSpinnerTick d:
if (state == ArmedState.Hit) if (state == ArmedState.Hit)
{ {
using (BeginAbsoluteSequence(d.HitStateUpdateTime, true)) using (BeginAbsoluteSequence(d.HitStateUpdateTime))
spin.FadeOut(300); spin.FadeOut(300);
} }

2
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
View File

@ -227,7 +227,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
{ {
base.UpdateStartTimeStateTransforms(); base.UpdateStartTimeStateTransforms();
using (BeginDelayedSequence(-ring_appear_offset, true)) using (BeginDelayedSequence(-ring_appear_offset))
targetRing.ScaleTo(target_ring_scale, 400, Easing.OutQuint); targetRing.ScaleTo(target_ring_scale, 400, Easing.OutQuint);
} }

10
osu.Game.Tests/Beatmaps/SliderEventGenerationTest.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Tests.Beatmaps
[Test] [Test]
public void TestSingleSpan() public void TestSingleSpan()
{ {
var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1, null, default).ToArray(); var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1, null).ToArray();
Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head)); Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head));
Assert.That(events[0].Time, Is.EqualTo(start_time)); Assert.That(events[0].Time, Is.EqualTo(start_time));
@ -31,7 +31,7 @@ namespace osu.Game.Tests.Beatmaps
[Test] [Test]
public void TestRepeat() public void TestRepeat()
{ {
var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 2, null, default).ToArray(); var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 2, null).ToArray();
Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head)); Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head));
Assert.That(events[0].Time, Is.EqualTo(start_time)); Assert.That(events[0].Time, Is.EqualTo(start_time));
@ -52,7 +52,7 @@ namespace osu.Game.Tests.Beatmaps
[Test] [Test]
public void TestNonEvenTicks() public void TestNonEvenTicks()
{ {
var events = SliderEventGenerator.Generate(start_time, span_duration, 1, 300, span_duration, 2, null, default).ToArray(); var events = SliderEventGenerator.Generate(start_time, span_duration, 1, 300, span_duration, 2, null).ToArray();
Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head)); Assert.That(events[0].Type, Is.EqualTo(SliderEventType.Head));
Assert.That(events[0].Time, Is.EqualTo(start_time)); Assert.That(events[0].Time, Is.EqualTo(start_time));
@ -85,7 +85,7 @@ namespace osu.Game.Tests.Beatmaps
[Test] [Test]
public void TestLegacyLastTickOffset() public void TestLegacyLastTickOffset()
{ {
var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1, 100, default).ToArray(); var events = SliderEventGenerator.Generate(start_time, span_duration, 1, span_duration / 2, span_duration, 1, 100).ToArray();
Assert.That(events[2].Type, Is.EqualTo(SliderEventType.LegacyLastTick)); Assert.That(events[2].Type, Is.EqualTo(SliderEventType.LegacyLastTick));
Assert.That(events[2].Time, Is.EqualTo(900)); Assert.That(events[2].Time, Is.EqualTo(900));
@ -97,7 +97,7 @@ namespace osu.Game.Tests.Beatmaps
const double velocity = 5; const double velocity = 5;
const double min_distance = velocity * 10; const double min_distance = velocity * 10;
var events = SliderEventGenerator.Generate(start_time, span_duration, velocity, velocity, span_duration, 2, 0, default).ToArray(); var events = SliderEventGenerator.Generate(start_time, span_duration, velocity, velocity, span_duration, 2, 0).ToArray();
Assert.Multiple(() => Assert.Multiple(() =>
{ {

5
osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
View File

@ -114,11 +114,6 @@ namespace osu.Game.Tests.Visual.Gameplay
{ {
public bool ResultsCreated { get; private set; } public bool ResultsCreated { get; private set; }
public FakeRankingPushPlayer()
: base(true, true)
{
}
protected override ResultsScreen CreateResults(ScoreInfo score) protected override ResultsScreen CreateResults(ScoreInfo score)
{ {
var results = base.CreateResults(score); var results = base.CreateResults(score);

2
osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
View File

@ -75,7 +75,7 @@ namespace osu.Game.Tests.Visual.Gameplay
Children = new[] Children = new[]
{ {
new ExposedSkinnableDrawable("default", _ => new DefaultBox()), new ExposedSkinnableDrawable("default", _ => new DefaultBox()),
new ExposedSkinnableDrawable("available", _ => new DefaultBox(), ConfineMode.ScaleToFit), new ExposedSkinnableDrawable("available", _ => new DefaultBox()),
new ExposedSkinnableDrawable("available", _ => new DefaultBox(), ConfineMode.NoScaling) new ExposedSkinnableDrawable("available", _ => new DefaultBox(), ConfineMode.NoScaling)
} }
}, },

2
osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
View File

@ -179,7 +179,7 @@ namespace osu.Game.Tests.Visual.Gameplay
foreach (var legacyFrame in frames.Frames) foreach (var legacyFrame in frames.Frames)
{ {
var frame = new TestReplayFrame(); var frame = new TestReplayFrame();
frame.FromLegacy(legacyFrame, null, null); frame.FromLegacy(legacyFrame, null);
replay.Frames.Add(frame); replay.Frames.Add(frame);
} }
} }

4
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
View File

@ -137,7 +137,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
// Send initial frames for both players. A few more for player 1. // Send initial frames for both players. A few more for player 1.
sendFrames(PLAYER_1_ID, 20); sendFrames(PLAYER_1_ID, 20);
sendFrames(PLAYER_2_ID, 10); sendFrames(PLAYER_2_ID);
checkPausedInstant(PLAYER_1_ID, false); checkPausedInstant(PLAYER_1_ID, false);
checkPausedInstant(PLAYER_2_ID, false); checkPausedInstant(PLAYER_2_ID, false);
@ -194,7 +194,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
assertMuted(PLAYER_1_ID, true); assertMuted(PLAYER_1_ID, true);
assertMuted(PLAYER_2_ID, true); assertMuted(PLAYER_2_ID, true);
sendFrames(PLAYER_1_ID, 10); sendFrames(PLAYER_1_ID);
sendFrames(PLAYER_2_ID, 20); sendFrames(PLAYER_2_ID, 20);
checkPaused(PLAYER_1_ID, false); checkPaused(PLAYER_1_ID, false);
assertOneNotMuted(); assertOneNotMuted();

2
osu.Game.Tests/Visual/UserInterface/TestSceneProfileSubsectionHeader.cs
View File

@ -57,7 +57,7 @@ namespace osu.Game.Tests.Visual.UserInterface
[Test] [Test]
public void TestInitialVisibility() public void TestInitialVisibility()
{ {
AddStep("Create header with 0 value", () => createHeader("Header with visible when zero counter", CounterVisibilityState.VisibleWhenZero, 0)); AddStep("Create header with 0 value", () => createHeader("Header with visible when zero counter", CounterVisibilityState.VisibleWhenZero));
AddAssert("Value is 0", () => header.Current.Value == 0); AddAssert("Value is 0", () => header.Current.Value == 0);
AddAssert("Counter is visible", () => header.ChildrenOfType<CounterPill>().First().Alpha == 1); AddAssert("Counter is visible", () => header.ChildrenOfType<CounterPill>().First().Alpha == 1);

2
osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
View File

@ -172,7 +172,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
{ {
chat?.Contract(); chat?.Contract();
using (BeginDelayedSequence(300, true)) using (BeginDelayedSequence(300))
{ {
scoreDisplay.FadeIn(100); scoreDisplay.FadeIn(100);
SongBar.Expanded = true; SongBar.Expanded = true;

2
osu.Game/Graphics/Containers/BeatSyncedContainer.cs
View File

@ -97,7 +97,7 @@ namespace osu.Game.Graphics.Containers
if (timingPoint == lastTimingPoint && beatIndex == lastBeat) if (timingPoint == lastTimingPoint && beatIndex == lastBeat)
return; return;
using (BeginDelayedSequence(-TimeSinceLastBeat, true)) using (BeginDelayedSequence(-TimeSinceLastBeat))
OnNewBeat(beatIndex, timingPoint, effectPoint, track?.CurrentAmplitudes ?? ChannelAmplitudes.Empty); OnNewBeat(beatIndex, timingPoint, effectPoint, track?.CurrentAmplitudes ?? ChannelAmplitudes.Empty);
lastBeat = beatIndex; lastBeat = beatIndex;

2
osu.Game/Graphics/UserInterface/StarCounter.cs
View File

@ -113,7 +113,7 @@ namespace osu.Game.Graphics.UserInterface
double delay = (current <= newValue ? Math.Max(i - current, 0) : Math.Max(current - 1 - i, 0)) * AnimationDelay; double delay = (current <= newValue ? Math.Max(i - current, 0) : Math.Max(current - 1 - i, 0)) * AnimationDelay;
using (star.BeginDelayedSequence(delay, true)) using (star.BeginDelayedSequence(delay))
star.DisplayAt(getStarScale(i, newValue)); star.DisplayAt(getStarScale(i, newValue));
} }
} }

2
osu.Game/Online/API/Requests/GetSpotlightRankingsRequest.cs
View File

@ -13,7 +13,7 @@ namespace osu.Game.Online.API.Requests
private readonly RankingsSortCriteria sort; private readonly RankingsSortCriteria sort;
public GetSpotlightRankingsRequest(RulesetInfo ruleset, int spotlight, RankingsSortCriteria sort) public GetSpotlightRankingsRequest(RulesetInfo ruleset, int spotlight, RankingsSortCriteria sort)
: base(ruleset, 1) : base(ruleset)
{ {
this.spotlight = spotlight; this.spotlight = spotlight;
this.sort = sort; this.sort = sort;

2
osu.Game/Online/Leaderboards/Leaderboard.cs
View File

@ -82,7 +82,7 @@ namespace osu.Game.Online.Leaderboards
foreach (var s in scrollFlow.Children) foreach (var s in scrollFlow.Children)
{ {
using (s.BeginDelayedSequence(i++ * 50, true)) using (s.BeginDelayedSequence(i++ * 50))
s.Show(); s.Show();
} }

6
osu.Game/Online/Leaderboards/LeaderboardScore.cs
View File

@ -248,7 +248,7 @@ namespace osu.Game.Online.Leaderboards
this.FadeIn(200); this.FadeIn(200);
content.MoveToY(0, 800, Easing.OutQuint); content.MoveToY(0, 800, Easing.OutQuint);
using (BeginDelayedSequence(100, true)) using (BeginDelayedSequence(100))
{ {
avatar.FadeIn(300, Easing.OutQuint); avatar.FadeIn(300, Easing.OutQuint);
nameLabel.FadeIn(350, Easing.OutQuint); nameLabel.FadeIn(350, Easing.OutQuint);
@ -256,12 +256,12 @@ namespace osu.Game.Online.Leaderboards
avatar.MoveToX(0, 300, Easing.OutQuint); avatar.MoveToX(0, 300, Easing.OutQuint);
nameLabel.MoveToX(0, 350, Easing.OutQuint); nameLabel.MoveToX(0, 350, Easing.OutQuint);
using (BeginDelayedSequence(250, true)) using (BeginDelayedSequence(250))
{ {
scoreLabel.FadeIn(200); scoreLabel.FadeIn(200);
scoreRank.FadeIn(200); scoreRank.FadeIn(200);
using (BeginDelayedSequence(50, true)) using (BeginDelayedSequence(50))
{ {
var drawables = new Drawable[] { flagBadgeContainer, modsContainer }.Concat(statisticsLabels).ToArray(); var drawables = new Drawable[] { flagBadgeContainer, modsContainer }.Concat(statisticsLabels).ToArray();
for (int i = 0; i < drawables.Length; i++) for (int i = 0; i < drawables.Length; i++)

4
osu.Game/Overlays/MedalOverlay.cs
View File

@ -213,7 +213,7 @@ namespace osu.Game.Overlays
innerSpin.Spin(20000, RotationDirection.Clockwise); innerSpin.Spin(20000, RotationDirection.Clockwise);
outerSpin.Spin(40000, RotationDirection.Clockwise); outerSpin.Spin(40000, RotationDirection.Clockwise);
using (BeginDelayedSequence(200, true)) using (BeginDelayedSequence(200))
{ {
disc.FadeIn(initial_duration) disc.FadeIn(initial_duration)
.ScaleTo(1f, initial_duration * 2, Easing.OutElastic); .ScaleTo(1f, initial_duration * 2, Easing.OutElastic);
@ -221,7 +221,7 @@ namespace osu.Game.Overlays
particleContainer.FadeIn(initial_duration); particleContainer.FadeIn(initial_duration);
outerSpin.FadeTo(0.1f, initial_duration * 2); outerSpin.FadeTo(0.1f, initial_duration * 2);
using (BeginDelayedSequence(initial_duration + 200, true)) using (BeginDelayedSequence(initial_duration + 200))
{ {
backgroundStrip.FadeIn(step_duration); backgroundStrip.FadeIn(step_duration);
leftStrip.ResizeWidthTo(1f, step_duration, Easing.OutQuint); leftStrip.ResizeWidthTo(1f, step_duration, Easing.OutQuint);

2
osu.Game/Overlays/Mods/ModButton.cs
View File

@ -91,7 +91,7 @@ namespace osu.Game.Overlays.Mods
backgroundIcon.Mod = newSelection; backgroundIcon.Mod = newSelection;
using (BeginDelayedSequence(mod_switch_duration, true)) using (BeginDelayedSequence(mod_switch_duration))
{ {
foregroundIcon foregroundIcon
.RotateTo(-rotate_angle * direction) .RotateTo(-rotate_angle * direction)

2
osu.Game/Overlays/Mods/ModSelectOverlay.cs
View File

@ -128,7 +128,7 @@ namespace osu.Game.Overlays.Mods
RowDimensions = new[] RowDimensions = new[]
{ {
new Dimension(GridSizeMode.Absolute, 90), new Dimension(GridSizeMode.Absolute, 90),
new Dimension(GridSizeMode.Distributed), new Dimension(),
new Dimension(GridSizeMode.AutoSize), new Dimension(GridSizeMode.AutoSize),
}, },
Content = new[] Content = new[]

2
osu.Game/Overlays/News/NewsHeader.cs
View File

@ -13,7 +13,7 @@ namespace osu.Game.Overlays.News
public Action ShowFrontPage; public Action ShowFrontPage;
private readonly Bindable<string> article = new Bindable<string>(null); private readonly Bindable<string> article = new Bindable<string>();
public NewsHeader() public NewsHeader()
{ {

2
osu.Game/Overlays/Profile/Header/Components/PreviousUsernames.cs
View File

@ -57,7 +57,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
ColumnDimensions = new[] ColumnDimensions = new[]
{ {
new Dimension(GridSizeMode.AutoSize), new Dimension(GridSizeMode.AutoSize),
new Dimension(GridSizeMode.Distributed) new Dimension()
}, },
Content = new[] Content = new[]
{ {

2
osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
View File

@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Rankings.Tables
private static TableColumn[] mainHeaders => new[] private static TableColumn[] mainHeaders => new[]
{ {
new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.Absolute, 40)), // place new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.Absolute, 40)), // place
new TableColumn(string.Empty, Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed)), // flag and username (country name) new TableColumn(string.Empty, Anchor.CentreLeft, new Dimension()), // flag and username (country name)
}; };
protected abstract TableColumn[] CreateAdditionalHeaders(); protected abstract TableColumn[] CreateAdditionalHeaders();

2
osu.Game/Rulesets/Judgements/DrawableJudgement.cs
View File

@ -117,7 +117,7 @@ namespace osu.Game.Rulesets.Judgements
LifetimeStart = Result.TimeAbsolute; LifetimeStart = Result.TimeAbsolute;
using (BeginAbsoluteSequence(Result.TimeAbsolute, true)) using (BeginAbsoluteSequence(Result.TimeAbsolute))
{ {
// not sure if this should remain going forward. // not sure if this should remain going forward.
JudgementBody.ResetAnimation(); JudgementBody.ResetAnimation();

2
osu.Game/Rulesets/Mods/ModBarrelRoll.cs
View File

@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Mods
}; };
[SettingSource("Direction", "The direction of rotation")] [SettingSource("Direction", "The direction of rotation")]
public Bindable<RotationDirection> Direction { get; } = new Bindable<RotationDirection>(RotationDirection.Clockwise); public Bindable<RotationDirection> Direction { get; } = new Bindable<RotationDirection>();
public override string Name => "Barrel Roll"; public override string Name => "Barrel Roll";
public override string Acronym => "BR"; public override string Acronym => "BR";

6
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -404,13 +404,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
clearExistingStateTransforms(); clearExistingStateTransforms();
using (BeginAbsoluteSequence(transformTime, true)) using (BeginAbsoluteSequence(transformTime))
UpdateInitialTransforms(); UpdateInitialTransforms();
using (BeginAbsoluteSequence(StateUpdateTime, true)) using (BeginAbsoluteSequence(StateUpdateTime))
UpdateStartTimeStateTransforms(); UpdateStartTimeStateTransforms();
using (BeginAbsoluteSequence(HitStateUpdateTime, true)) using (BeginAbsoluteSequence(HitStateUpdateTime))
UpdateHitStateTransforms(newState); UpdateHitStateTransforms(newState);
state.Value = newState; state.Value = newState;

2
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -297,7 +297,7 @@ namespace osu.Game.Screens.Menu
Logger.Log($"{nameof(ButtonSystem)}'s state changed from {lastState} to {state}"); Logger.Log($"{nameof(ButtonSystem)}'s state changed from {lastState} to {state}");
using (buttonArea.BeginDelayedSequence(lastState == ButtonSystemState.Initial ? 150 : 0, true)) using (buttonArea.BeginDelayedSequence(lastState == ButtonSystemState.Initial ? 150 : 0))
{ {
buttonArea.ButtonSystemState = state; buttonArea.ButtonSystemState = state;

2
osu.Game/Screens/Menu/Disclaimer.cs
View File

@ -181,7 +181,7 @@ namespace osu.Game.Screens.Menu
icon.Delay(500).FadeIn(500).ScaleTo(1, 500, Easing.OutQuint); icon.Delay(500).FadeIn(500).ScaleTo(1, 500, Easing.OutQuint);
using (BeginDelayedSequence(3000, true)) using (BeginDelayedSequence(3000))
{ {
icon.FadeColour(iconColour, 200, Easing.OutQuint); icon.FadeColour(iconColour, 200, Easing.OutQuint);
icon.MoveToY(icon_y * 1.3f, 500, Easing.OutCirc) icon.MoveToY(icon_y * 1.3f, 500, Easing.OutCirc)

14
osu.Game/Screens/Menu/IntroSequence.cs
View File

@ -189,7 +189,7 @@ namespace osu.Game.Screens.Menu
double remainingTime() => length - TransformDelay; double remainingTime() => length - TransformDelay;
using (BeginDelayedSequence(250, true)) using (BeginDelayedSequence(250))
{ {
welcomeText.FadeIn(700); welcomeText.FadeIn(700);
welcomeText.TransformSpacingTo(new Vector2(20, 0), remainingTime(), Easing.Out); welcomeText.TransformSpacingTo(new Vector2(20, 0), remainingTime(), Easing.Out);
@ -212,17 +212,17 @@ namespace osu.Game.Screens.Menu
lineBottomLeft.MoveTo(new Vector2(-line_end_offset, line_end_offset), line_duration, Easing.OutQuint); lineBottomLeft.MoveTo(new Vector2(-line_end_offset, line_end_offset), line_duration, Easing.OutQuint);
lineBottomRight.MoveTo(new Vector2(line_end_offset, line_end_offset), line_duration, Easing.OutQuint); lineBottomRight.MoveTo(new Vector2(line_end_offset, line_end_offset), line_duration, Easing.OutQuint);
using (BeginDelayedSequence(length * 0.56, true)) using (BeginDelayedSequence(length * 0.56))
{ {
bigRing.ResizeTo(logo_size, 500, Easing.InOutQuint); bigRing.ResizeTo(logo_size, 500, Easing.InOutQuint);
bigRing.Foreground.Delay(250).ResizeTo(1, 850, Easing.OutQuint); bigRing.Foreground.Delay(250).ResizeTo(1, 850, Easing.OutQuint);
using (BeginDelayedSequence(250, true)) using (BeginDelayedSequence(250))
{ {
backgroundFill.ResizeHeightTo(1, remainingTime(), Easing.InOutQuart); backgroundFill.ResizeHeightTo(1, remainingTime(), Easing.InOutQuart);
backgroundFill.RotateTo(-90, remainingTime(), Easing.InOutQuart); backgroundFill.RotateTo(-90, remainingTime(), Easing.InOutQuart);
using (BeginDelayedSequence(50, true)) using (BeginDelayedSequence(50))
{ {
foregroundFill.ResizeWidthTo(1, remainingTime(), Easing.InOutQuart); foregroundFill.ResizeWidthTo(1, remainingTime(), Easing.InOutQuart);
foregroundFill.RotateTo(-90, remainingTime(), Easing.InOutQuart); foregroundFill.RotateTo(-90, remainingTime(), Easing.InOutQuart);
@ -239,19 +239,19 @@ namespace osu.Game.Screens.Menu
purpleCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.InOutQuart); purpleCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.InOutQuart);
purpleCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuart); purpleCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuart);
using (BeginDelayedSequence(appear_delay, true)) using (BeginDelayedSequence(appear_delay))
{ {
yellowCircle.MoveToY(-circle_size / 2, remainingTime(), Easing.InOutQuart); yellowCircle.MoveToY(-circle_size / 2, remainingTime(), Easing.InOutQuart);
yellowCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.InOutQuart); yellowCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.InOutQuart);
yellowCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuart); yellowCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuart);
using (BeginDelayedSequence(appear_delay, true)) using (BeginDelayedSequence(appear_delay))
{ {
blueCircle.MoveToX(-circle_size / 2, remainingTime(), Easing.InOutQuart); blueCircle.MoveToX(-circle_size / 2, remainingTime(), Easing.InOutQuart);
blueCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.InOutQuart); blueCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.InOutQuart);
blueCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuart); blueCircle.ResizeTo(circle_size, remainingTime(), Easing.InOutQuart);
using (BeginDelayedSequence(appear_delay, true)) using (BeginDelayedSequence(appear_delay))
{ {
pinkCircle.MoveToX(circle_size / 2, remainingTime(), Easing.InOutQuart); pinkCircle.MoveToX(circle_size / 2, remainingTime(), Easing.InOutQuart);
pinkCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.InOutQuart); pinkCircle.Delay(rotation_delay).RotateTo(-180, remainingTime() - rotation_delay, Easing.InOutQuart);

22
osu.Game/Screens/Menu/IntroTriangles.cs
View File

@ -172,27 +172,27 @@ namespace osu.Game.Screens.Menu
lazerLogo.Hide(); lazerLogo.Hide();
background.ApplyToBackground(b => b.Hide()); background.ApplyToBackground(b => b.Hide());
using (BeginAbsoluteSequence(0, true)) using (BeginAbsoluteSequence(0))
{ {
using (BeginDelayedSequence(text_1, true)) using (BeginDelayedSequence(text_1))
welcomeText.FadeIn().OnComplete(t => t.Text = "wel"); welcomeText.FadeIn().OnComplete(t => t.Text = "wel");
using (BeginDelayedSequence(text_2, true)) using (BeginDelayedSequence(text_2))
welcomeText.FadeIn().OnComplete(t => t.Text = "welcome"); welcomeText.FadeIn().OnComplete(t => t.Text = "welcome");
using (BeginDelayedSequence(text_3, true)) using (BeginDelayedSequence(text_3))
welcomeText.FadeIn().OnComplete(t => t.Text = "welcome to"); welcomeText.FadeIn().OnComplete(t => t.Text = "welcome to");
using (BeginDelayedSequence(text_4, true)) using (BeginDelayedSequence(text_4))
{ {
welcomeText.FadeIn().OnComplete(t => t.Text = "welcome to osu!"); welcomeText.FadeIn().OnComplete(t => t.Text = "welcome to osu!");
welcomeText.TransformTo(nameof(welcomeText.Spacing), new Vector2(50, 0), 5000); welcomeText.TransformTo(nameof(welcomeText.Spacing), new Vector2(50, 0), 5000);
} }
using (BeginDelayedSequence(text_glitch, true)) using (BeginDelayedSequence(text_glitch))
triangles.FadeIn(); triangles.FadeIn();
using (BeginDelayedSequence(rulesets_1, true)) using (BeginDelayedSequence(rulesets_1))
{ {
rulesetsScale.ScaleTo(0.8f, 1000); rulesetsScale.ScaleTo(0.8f, 1000);
rulesets.FadeIn().ScaleTo(1).TransformSpacingTo(new Vector2(200, 0)); rulesets.FadeIn().ScaleTo(1).TransformSpacingTo(new Vector2(200, 0));
@ -200,18 +200,18 @@ namespace osu.Game.Screens.Menu
triangles.FadeOut(); triangles.FadeOut();
} }
using (BeginDelayedSequence(rulesets_2, true)) using (BeginDelayedSequence(rulesets_2))
{ {
rulesets.ScaleTo(2).TransformSpacingTo(new Vector2(30, 0)); rulesets.ScaleTo(2).TransformSpacingTo(new Vector2(30, 0));
} }
using (BeginDelayedSequence(rulesets_3, true)) using (BeginDelayedSequence(rulesets_3))
{ {
rulesets.ScaleTo(4).TransformSpacingTo(new Vector2(10, 0)); rulesets.ScaleTo(4).TransformSpacingTo(new Vector2(10, 0));
rulesetsScale.ScaleTo(1.3f, 1000); rulesetsScale.ScaleTo(1.3f, 1000);
} }
using (BeginDelayedSequence(logo_1, true)) using (BeginDelayedSequence(logo_1))
{ {
rulesets.FadeOut(); rulesets.FadeOut();
@ -223,7 +223,7 @@ namespace osu.Game.Screens.Menu
logoContainerSecondary.ScaleTo(scale_start).Then().ScaleTo(scale_start - scale_adjust * 0.25f, logo_scale_duration, Easing.InQuad); logoContainerSecondary.ScaleTo(scale_start).Then().ScaleTo(scale_start - scale_adjust * 0.25f, logo_scale_duration, Easing.InQuad);
} }
using (BeginDelayedSequence(logo_2, true)) using (BeginDelayedSequence(logo_2))
{ {
lazerLogo.FadeOut().OnComplete(_ => lazerLogo.FadeOut().OnComplete(_ =>
{ {

2
osu.Game/Screens/Menu/IntroWelcome.cs
View File

@ -143,7 +143,7 @@ namespace osu.Game.Screens.Menu
{ {
base.LoadComplete(); base.LoadComplete();
using (BeginDelayedSequence(0, true)) using (BeginDelayedSequence(0))
{ {
scaleContainer.ScaleTo(0.9f).ScaleTo(1, delay_step_two).OnComplete(_ => Expire()); scaleContainer.ScaleTo(0.9f).ScaleTo(1, delay_step_two).OnComplete(_ => Expire());
scaleContainer.FadeInFromZero(1800); scaleContainer.FadeInFromZero(1800);

2
osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
View File

@ -93,7 +93,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
RowDimensions = new[] RowDimensions = new[]
{ {
new Dimension(GridSizeMode.Distributed), new Dimension(),
new Dimension(GridSizeMode.AutoSize), new Dimension(GridSizeMode.AutoSize),
}, },
Content = new[] Content = new[]

2
osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
View File

@ -75,7 +75,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
RowDimensions = new[] RowDimensions = new[]
{ {
new Dimension(GridSizeMode.Distributed), new Dimension(),
new Dimension(GridSizeMode.AutoSize), new Dimension(GridSizeMode.AutoSize),
}, },
Content = new[] Content = new[]

4
osu.Game/Screens/Play/BreakOverlay.cs
View File

@ -126,7 +126,7 @@ namespace osu.Game.Screens.Play
if (!b.HasEffect) if (!b.HasEffect)
continue; continue;
using (BeginAbsoluteSequence(b.StartTime, true)) using (BeginAbsoluteSequence(b.StartTime))
{ {
fadeContainer.FadeIn(BREAK_FADE_DURATION); fadeContainer.FadeIn(BREAK_FADE_DURATION);
breakArrows.Show(BREAK_FADE_DURATION); breakArrows.Show(BREAK_FADE_DURATION);
@ -143,7 +143,7 @@ namespace osu.Game.Screens.Play
remainingTimeCounter.CountTo(b.Duration).CountTo(0, b.Duration); remainingTimeCounter.CountTo(b.Duration).CountTo(0, b.Duration);
using (BeginDelayedSequence(b.Duration - BREAK_FADE_DURATION, true)) using (BeginDelayedSequence(b.Duration - BREAK_FADE_DURATION))
{ {
fadeContainer.FadeOut(BREAK_FADE_DURATION); fadeContainer.FadeOut(BREAK_FADE_DURATION);
breakArrows.Hide(BREAK_FADE_DURATION); breakArrows.Hide(BREAK_FADE_DURATION);

12
osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
View File

@ -23,8 +23,6 @@ namespace osu.Game.Screens.Play.HUD
private const double pop_out_duration = 150; private const double pop_out_duration = 150;
private const Easing pop_out_easing = Easing.None;
private const double fade_out_duration = 100; private const double fade_out_duration = 100;
/// <summary> /// <summary>
@ -170,9 +168,9 @@ namespace osu.Game.Screens.Play.HUD
popOutCount.FadeTo(0.75f); popOutCount.FadeTo(0.75f);
popOutCount.MoveTo(Vector2.Zero); popOutCount.MoveTo(Vector2.Zero);
popOutCount.ScaleTo(1, pop_out_duration, pop_out_easing); popOutCount.ScaleTo(1, pop_out_duration);
popOutCount.FadeOut(pop_out_duration, pop_out_easing); popOutCount.FadeOut(pop_out_duration);
popOutCount.MoveTo(displayedCountSpriteText.Position, pop_out_duration, pop_out_easing); popOutCount.MoveTo(displayedCountSpriteText.Position, pop_out_duration);
} }
private void transformNoPopOut(int newValue) private void transformNoPopOut(int newValue)
@ -186,7 +184,7 @@ namespace osu.Game.Screens.Play.HUD
{ {
((IHasText)displayedCountSpriteText).Text = formatCount(newValue); ((IHasText)displayedCountSpriteText).Text = formatCount(newValue);
displayedCountSpriteText.ScaleTo(1.1f); displayedCountSpriteText.ScaleTo(1.1f);
displayedCountSpriteText.ScaleTo(1, pop_out_duration, pop_out_easing); displayedCountSpriteText.ScaleTo(1, pop_out_duration);
} }
private void scheduledPopOutSmall(uint id) private void scheduledPopOutSmall(uint id)
@ -261,7 +259,7 @@ namespace osu.Game.Screens.Play.HUD
} }
private void transformRoll(int currentValue, int newValue) => private void transformRoll(int currentValue, int newValue) =>
this.TransformTo(nameof(DisplayedCount), newValue, getProportionalDuration(currentValue, newValue), Easing.None); this.TransformTo(nameof(DisplayedCount), newValue, getProportionalDuration(currentValue, newValue));
private string formatCount(int count) => $@"{count}x"; private string formatCount(int count) => $@"{count}x";

4
osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
View File

@ -256,7 +256,7 @@ namespace osu.Game.Screens.Ranking.Expanded
// Score counter value setting must be scheduled so it isn't transferred instantaneously // Score counter value setting must be scheduled so it isn't transferred instantaneously
ScheduleAfterChildren(() => ScheduleAfterChildren(() =>
{ {
using (BeginDelayedSequence(AccuracyCircle.ACCURACY_TRANSFORM_DELAY, true)) using (BeginDelayedSequence(AccuracyCircle.ACCURACY_TRANSFORM_DELAY))
{ {
scoreCounter.FadeIn(); scoreCounter.FadeIn();
scoreCounter.Current = scoreManager.GetBindableTotalScore(score); scoreCounter.Current = scoreManager.GetBindableTotalScore(score);
@ -265,7 +265,7 @@ namespace osu.Game.Screens.Ranking.Expanded
foreach (var stat in statisticDisplays) foreach (var stat in statisticDisplays)
{ {
using (BeginDelayedSequence(delay, true)) using (BeginDelayedSequence(delay))
stat.Appear(); stat.Appear();
delay += 200; delay += 200;

2
osu.Game/Screens/Ranking/Expanded/Statistics/ComboStatistic.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
if (isPerfect) if (isPerfect)
{ {
using (BeginDelayedSequence(AccuracyCircle.ACCURACY_TRANSFORM_DURATION / 2, true)) using (BeginDelayedSequence(AccuracyCircle.ACCURACY_TRANSFORM_DURATION / 2))
perfectText.FadeIn(50); perfectText.FadeIn(50);
} }
} }

2
osu.Game/Screens/Ranking/ScorePanel.cs
View File

@ -234,7 +234,7 @@ namespace osu.Game.Screens.Ranking
bool topLayerExpanded = topLayerContainer.Y < 0; bool topLayerExpanded = topLayerContainer.Y < 0;
// If the top layer was already expanded, then we don't need to wait for the resize and can instead transform immediately. This looks better when changing the panel state. // If the top layer was already expanded, then we don't need to wait for the resize and can instead transform immediately. This looks better when changing the panel state.
using (BeginDelayedSequence(topLayerExpanded ? 0 : RESIZE_DURATION + TOP_LAYER_EXPAND_DELAY, true)) using (BeginDelayedSequence(topLayerExpanded ? 0 : RESIZE_DURATION + TOP_LAYER_EXPAND_DELAY))
{ {
topLayerContainer.FadeIn(); topLayerContainer.FadeIn();

2
osu.Game/Screens/ScreenWhiteBox.cs
View File

@ -191,7 +191,7 @@ namespace osu.Game.Screens
boxContainer.ScaleTo(0.2f); boxContainer.ScaleTo(0.2f);
boxContainer.RotateTo(-20); boxContainer.RotateTo(-20);
using (BeginDelayedSequence(300, true)) using (BeginDelayedSequence(300))
{ {
boxContainer.ScaleTo(1, transition_time, Easing.OutElastic); boxContainer.ScaleTo(1, transition_time, Easing.OutElastic);
boxContainer.RotateTo(0, transition_time / 2, Easing.OutQuint); boxContainer.RotateTo(0, transition_time / 2, Easing.OutQuint);

2
osu.Game/Skinning/LegacyJudgementPieceNew.cs
View File

@ -72,7 +72,7 @@ namespace osu.Game.Skinning
if (particles != null) if (particles != null)
{ {
// start the particles already some way into their animation to break cluster away from centre. // start the particles already some way into their animation to break cluster away from centre.
using (particles.BeginDelayedSequence(-100, true)) using (particles.BeginDelayedSequence(-100))
particles.Restart(); particles.Restart();
} }

2
osu.Game/Tests/Visual/EditorTestScene.cs
View File

@ -94,7 +94,7 @@ namespace osu.Game.Tests.Visual
private readonly WorkingBeatmap testBeatmap; private readonly WorkingBeatmap testBeatmap;
public TestBeatmapManager(Storage storage, IDatabaseContextFactory contextFactory, RulesetStore rulesets, IAPIProvider api, [NotNull] AudioManager audioManager, IResourceStore<byte[]> resources, GameHost host, WorkingBeatmap defaultBeatmap, WorkingBeatmap testBeatmap) public TestBeatmapManager(Storage storage, IDatabaseContextFactory contextFactory, RulesetStore rulesets, IAPIProvider api, [NotNull] AudioManager audioManager, IResourceStore<byte[]> resources, GameHost host, WorkingBeatmap defaultBeatmap, WorkingBeatmap testBeatmap)
: base(storage, contextFactory, rulesets, api, audioManager, resources, host, defaultBeatmap, false) : base(storage, contextFactory, rulesets, api, audioManager, resources, host, defaultBeatmap)
{ {
this.testBeatmap = testBeatmap; this.testBeatmap = testBeatmap;
} }

2
osu.Game/Tests/Visual/OsuTestScene.cs
View File

@ -176,7 +176,7 @@ namespace osu.Game.Tests.Visual
protected virtual IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset); protected virtual IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset);
protected WorkingBeatmap CreateWorkingBeatmap(RulesetInfo ruleset) => protected WorkingBeatmap CreateWorkingBeatmap(RulesetInfo ruleset) =>
CreateWorkingBeatmap(CreateBeatmap(ruleset), null); CreateWorkingBeatmap(CreateBeatmap(ruleset));
protected virtual WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null) => protected virtual WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null) =>
new ClockBackedTestWorkingBeatmap(beatmap, storyboard, Clock, Audio); new ClockBackedTestWorkingBeatmap(beatmap, storyboard, Clock, Audio);

2
osu.sln.DotSettings
View File

@ -130,7 +130,7 @@
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleMultipleEnumeration/@EntryIndexedValue">HINT</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleMultipleEnumeration/@EntryIndexedValue">HINT</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PublicConstructorInAbstractClass/@EntryIndexedValue">WARNING</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PublicConstructorInAbstractClass/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArgumentDefaultValue/@EntryIndexedValue">HINT</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArgumentDefaultValue/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArrayCreationExpression/@EntryIndexedValue">WARNING</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArrayCreationExpression/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeParentheses/@EntryIndexedValue">WARNING</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeParentheses/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeUsageProperty/@EntryIndexedValue">WARNING</s:String> <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeUsageProperty/@EntryIndexedValue">WARNING</s:String>