mirror of
https://github.com/ppy/osu.git
synced 2025-01-27 03:23:03 +08:00
Move initial show to base implementation and add transition for legacy version
This commit is contained in:
parent
bfa026879c
commit
ea027eda46
@ -104,8 +104,6 @@ namespace osu.Game.Screens.Play.HUD
|
||||
|
||||
protected override void LoadComplete()
|
||||
{
|
||||
Show();
|
||||
|
||||
AllowSeeking.BindValueChanged(_ => updateBarVisibility(), true);
|
||||
ShowGraph.BindValueChanged(_ => updateGraphVisibility(), true);
|
||||
|
||||
|
@ -36,13 +36,20 @@ namespace osu.Game.Screens.Play.HUD
|
||||
}
|
||||
}
|
||||
|
||||
protected override void LoadComplete()
|
||||
{
|
||||
base.LoadComplete();
|
||||
|
||||
Show();
|
||||
}
|
||||
|
||||
protected double FirstHitTime { get; private set; }
|
||||
|
||||
//TODO: this isn't always correct (consider mania where a non-last object may last for longer than the last in the list).
|
||||
protected double LastHitTime { get; private set; }
|
||||
|
||||
protected abstract void UpdateProgress(double progress, bool isIntro);
|
||||
protected abstract void UpdateObjects(IEnumerable<HitObject>? objects);
|
||||
protected virtual void UpdateObjects(IEnumerable<HitObject>? objects) { }
|
||||
|
||||
[BackgroundDependencyLoader]
|
||||
private void load()
|
||||
|
@ -1,13 +1,11 @@
|
||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||
// See the LICENCE file in the repository root for full licence text.
|
||||
|
||||
using System.Collections.Generic;
|
||||
using osu.Framework.Allocation;
|
||||
using osu.Framework.Graphics;
|
||||
using osu.Framework.Graphics.Containers;
|
||||
using osu.Framework.Graphics.Shapes;
|
||||
using osu.Framework.Graphics.UserInterface;
|
||||
using osu.Game.Rulesets.Objects;
|
||||
using osu.Game.Screens.Play.HUD;
|
||||
using osuTK;
|
||||
|
||||
@ -60,14 +58,12 @@ namespace osu.Game.Skinning
|
||||
|
||||
protected override void PopIn()
|
||||
{
|
||||
this.FadeIn(500, Easing.OutQuint);
|
||||
}
|
||||
|
||||
protected override void PopOut()
|
||||
{
|
||||
}
|
||||
|
||||
protected override void UpdateObjects(IEnumerable<HitObject>? objects)
|
||||
{
|
||||
this.FadeOut(100);
|
||||
}
|
||||
|
||||
protected override void UpdateProgress(double progress, bool isIntro)
|
||||
|
Loading…
Reference in New Issue
Block a user