1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 06:42:54 +08:00

Add basic HP display support.

This commit is contained in:
Dean Herbert 2017-01-10 16:01:53 +08:00
parent 97c5a2f970
commit 7eab50b989
5 changed files with 60 additions and 2 deletions

View File

@ -15,5 +15,6 @@ namespace osu.Game.Modes
public double Accuracy { get; set; }
public double Combo { get; set; }
public double MaxCombo { get; set; }
public double Health { get; set; }
}
}

View File

@ -18,13 +18,16 @@ namespace osu.Game.Modes
TotalScore = TotalScore,
Combo = Combo,
MaxCombo = HighestCombo,
Accuracy = Accuracy
Accuracy = Accuracy,
Health = Health,
};
public readonly BindableDouble TotalScore = new BindableDouble { MinValue = 0 };
public readonly BindableDouble Accuracy = new BindableDouble { MinValue = 0, MaxValue = 1 };
public readonly BindableDouble Health = new BindableDouble { MinValue = 0, MaxValue = 1 };
public readonly BindableInt Combo = new BindableInt();
public readonly BindableInt HighestCombo = new BindableInt();

View File

@ -0,0 +1,42 @@
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transformations;
using System;
namespace osu.Game.Modes.UI
{
public class HPDisplay : Container
{
private Box background;
private Box fill;
public HPDisplay()
{
Children = new Drawable[]
{
background = new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Gray,
},
fill = new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.White,
},
};
}
public double Current;
public void Set(double value)
{
Current = value;
fill.ScaleTo(new Vector2((float)Current, 1), 200, EasingTypes.OutQuint);
}
}
}

View File

@ -6,6 +6,8 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Modes.Objects;
using OpenTK;
using osu.Framework.Graphics.Primitives;
namespace osu.Game.Modes.UI
{
@ -15,12 +17,19 @@ namespace osu.Game.Modes.UI
public ComboCounter ComboCounter;
public ScoreCounter ScoreCounter;
public PercentageCounter AccuracyCounter;
public HPDisplay HPDisplay;
public Score Score { get; set; }
protected abstract KeyCounterCollection CreateKeyCounter();
protected abstract ComboCounter CreateComboCounter();
protected abstract PercentageCounter CreateAccuracyCounter();
protected abstract ScoreCounter CreateScoreCounter();
protected virtual HPDisplay CreateHPDisplay() => new HPDisplay
{
Size = new Vector2(0.5f, 20),
RelativeSizeAxes = Axes.X,
Padding = new MarginPadding(5)
};
public virtual void OnHit(HitObject h)
{
@ -44,6 +53,7 @@ namespace osu.Game.Modes.UI
ComboCounter = CreateComboCounter(),
ScoreCounter = CreateScoreCounter(),
AccuracyCounter = CreateAccuracyCounter(),
HPDisplay = CreateHPDisplay(),
};
}
@ -53,6 +63,7 @@ namespace osu.Game.Modes.UI
processor.TotalScore.ValueChanged += delegate { ScoreCounter?.Set((ulong)processor.TotalScore.Value); };
processor.Accuracy.ValueChanged += delegate { AccuracyCounter?.Set((float)processor.Accuracy.Value); };
processor.Combo.ValueChanged += delegate { ComboCounter?.Set((ulong)processor.Combo.Value); };
processor.Health.ValueChanged += delegate { HPDisplay?.Set((ulong)processor.Combo.Value); };
}
}
}

View File

@ -70,6 +70,7 @@
<Compile Include="Modes\Objects\HitObjectParser.cs" />
<Compile Include="Modes\Score.cs" />
<Compile Include="Modes\ScoreProcesssor.cs" />
<Compile Include="Modes\UI\HPDisplay.cs" />
<Compile Include="Online\API\IOnlineComponent.cs" />
<Compile Include="Online\API\Requests\GetUserRequest.cs" />
<Compile Include="Overlays\DragBar.cs" />
@ -259,4 +260,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>