h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 03:22:55 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/ppy/master' into news-sidebar-new

Browse Source
This commit is contained in:
Andrei Zavatski 2021-05-11 23:41:45 +03:00
commit 085c3d067f
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
View File

@ -1,11 +1,13 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // 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. // See the LICENCE file in the repository root for full licence text.
using System.Linq;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Testing;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Scoring;
using osu.Game.Screens.Play.HUD; using osu.Game.Screens.Play.HUD;
@ -50,9 +52,9 @@ namespace osu.Game.Tests.Visual.Gameplay
}); });
AddStep("set health to 0.10", () => layer.Current.Value = 0.1); AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
AddUntilStep("layer fade is visible", () => layer.Child.Alpha > 0.1f); AddUntilStep("layer fade is visible", () => layer.ChildrenOfType<Container>().First().Alpha > 0.1f);
AddStep("set health to 1", () => layer.Current.Value = 1f); AddStep("set health to 1", () => layer.Current.Value = 1f);
AddUntilStep("layer fade is invisible", () => !layer.Child.IsPresent); AddUntilStep("layer fade is invisible", () => !layer.ChildrenOfType<Container>().First().IsPresent);
} }
[Test] [Test]

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

@ -78,7 +78,7 @@ namespace osu.Game.Screens.Play.HUD
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
Margin = new MarginPadding { Top = 20 }; Margin = new MarginPadding { Top = 20 };
Children = new Drawable[] InternalChildren = new Drawable[]
{ {
new Box new Box
{ {

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

@ -43,7 +43,7 @@ namespace osu.Game.Screens.Play.HUD
public FailingLayer() public FailingLayer()
{ {
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
Children = new Drawable[] InternalChildren = new Drawable[]
{ {
boxes = new Container boxes = new Container
{ {

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

@ -14,7 +14,7 @@ namespace osu.Game.Screens.Play.HUD
/// A container for components displaying the current player health. /// A container for components displaying the current player health.
/// Gets bound automatically to the <see cref="Rulesets.Scoring.HealthProcessor"/> when inserted to <see cref="DrawableRuleset.Overlays"/> hierarchy. /// Gets bound automatically to the <see cref="Rulesets.Scoring.HealthProcessor"/> when inserted to <see cref="DrawableRuleset.Overlays"/> hierarchy.
/// </summary> /// </summary>
public abstract class HealthDisplay : Container public abstract class HealthDisplay : CompositeDrawable
{ {
[Resolved] [Resolved]
protected HealthProcessor HealthProcessor { get; private set; } protected HealthProcessor HealthProcessor { get; private set; }