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

Update framework

Browse Source
This commit is contained in:
Thomas Müller 2017-07-21 17:24:09 +02:00
parent 2cd8f6b30c
commit a7dc8a892b
13 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 82044038805e640ae4602be2fe4772bf09d23e94 Subproject commit d09246eeb0e7e30bc31cc017af3847ee09b4df08

2
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
View File

@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
protected sealed override void UpdateState(ArmedState state) protected sealed override void UpdateState(ArmedState state)
{ {
Flush(); FinishTransforms();
using (BeginAbsoluteSequence(HitObject.StartTime - TIME_PREEMPT, true)) using (BeginAbsoluteSequence(HitObject.StartTime - TIME_PREEMPT, true))
{ {

2
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
View File

@ -127,7 +127,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
if (Complete && updateCompleteTick()) if (Complete && updateCompleteTick())
{ {
background.Flush(false, nameof(Alpha)); background.FinishTransforms(false, nameof(Alpha));
background background
.FadeTo(tracking_alpha + 0.2f, 60, EasingTypes.OutExpo) .FadeTo(tracking_alpha + 0.2f, 60, EasingTypes.OutExpo)
.Then() .Then()

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

@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
protected override void UpdateState(ArmedState state) protected override void UpdateState(ArmedState state)
{ {
var circlePiece = MainPiece as CirclePiece; var circlePiece = MainPiece as CirclePiece;
circlePiece?.FlashBox.Flush(); circlePiece?.FlashBox.FinishTransforms();
using (BeginDelayedSequence(HitObject.StartTime - Time.Current + Judgement.TimeOffset, true)) using (BeginDelayedSequence(HitObject.StartTime - Time.Current + Judgement.TimeOffset, true))
{ {

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

@ -127,7 +127,7 @@ namespace osu.Game.Graphics.UserInterface
/// </summary> /// </summary>
public virtual void StopRolling() public virtual void StopRolling()
{ {
Flush(false, nameof(DisplayedCount)); FinishTransforms(false, nameof(DisplayedCount));
DisplayedCount = Current; DisplayedCount = Current;
} }

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

@ -247,7 +247,7 @@ namespace osu.Game.Overlays
{ {
// if we haven't yet, play out the animation fully // if we haven't yet, play out the animation fully
drawableMedal.State = DisplayState.Full; drawableMedal.State = DisplayState.Full;
Flush(true); FinishTransforms(true);
return; return;
} }

2
osu.Game/Overlays/Music/PlaylistItem.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Music
if (value == selected) return; if (value == selected) return;
selected = value; selected = value;
Flush(true); FinishTransforms(true);
foreach (SpriteText s in titleSprites) foreach (SpriteText s in titleSprites)
s.FadeColour(Selected ? hoverColour : Color4.White, fade_duration); s.FadeColour(Selected ? hoverColour : Color4.White, fade_duration);
} }

2
osu.Game/Overlays/OnScreenDisplay.cs
View File

@ -260,7 +260,7 @@ namespace osu.Game.Overlays
}; };
updateGlow(); updateGlow();
Flush(true); FinishTransforms(true);
} }
} }
} }

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

@ -517,13 +517,13 @@ namespace osu.Game.Overlays.Profile
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)
{ {
FadeColour(hoverColour, 500, EasingTypes.OutQuint); this.FadeColour(hoverColour, 500, EasingTypes.OutQuint);
return base.OnHover(state); return base.OnHover(state);
} }
protected override void OnHoverLost(InputState state) protected override void OnHoverLost(InputState state)
{ {
FadeColour(Color4.White, 500, EasingTypes.OutQuint); this.FadeColour(Color4.White, 500, EasingTypes.OutQuint);
base.OnHoverLost(state); base.OnHoverLost(state);
} }

2
osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
View File

@ -40,7 +40,7 @@ namespace osu.Game.Screens.Backgrounds
if (background != null) if (background != null)
{ {
newDepth = background.Depth + 1; newDepth = background.Depth + 1;
background.Flush(); background.FinishTransforms();
background.FadeOut(250); background.FadeOut(250);
background.Expire(); background.Expire();
} }

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

@ -216,7 +216,7 @@ namespace osu.Game.Screens.Menu
bool fromInitial = lastState == MenuState.Initial; bool fromInitial = lastState == MenuState.Initial;
if (state == MenuState.TopLevel) if (state == MenuState.TopLevel)
buttonArea.Flush(true); buttonArea.FinishTransforms(true);
using (buttonArea.BeginDelayedSequence(fromInitial ? 150 : 0, true)) using (buttonArea.BeginDelayedSequence(fromInitial ? 150 : 0, true))
{ {

2
osu.Game/Screens/Play/HUD/ComboCounter.cs
View File

@ -169,7 +169,7 @@ namespace osu.Game.Screens.Play.HUD
if (!rolling) if (!rolling)
{ {
Flush(false, nameof(DisplayedCount)); FinishTransforms(false, nameof(DisplayedCount));
IsRolling = false; IsRolling = false;
DisplayedCount = prev; DisplayedCount = prev;

2
osu.Game/Screens/Play/HUD/ModDisplay.cs
View File

@ -80,7 +80,7 @@ namespace osu.Game.Screens.Play.HUD
else else
unrankedText.Hide(); unrankedText.Hide();
iconsContainer.Flush(); iconsContainer.FinishTransforms();
iconsContainer.FadeInFromZero(fade_duration, EasingTypes.OutQuint); iconsContainer.FadeInFromZero(fade_duration, EasingTypes.OutQuint);
expand(); expand();
using (iconsContainer.BeginDelayedSequence(1200)) using (iconsContainer.BeginDelayedSequence(1200))