h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 06:57:39 +08:00
Code Issues Releases Wiki Activity

Medal sprite, make MedalOverlay auto-show when loaded.

Browse Source
This commit is contained in:
DrabWeb 2017-06-24 01:19:44 -03:00
parent c71f34c507
commit 0133f9c086
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Desktop.VisualTests/Tests/TestCaseMedalOverlay.cs
View File

@ -15,14 +15,12 @@ namespace osu.Desktop.VisualTests.Tests
{
base.Reset();
MedalOverlay overlay;
Add(overlay = new MedalOverlay(new Medal
Add(new MedalOverlay(new Medal
{
Name = @"Animations",
InternalName = @"all-intro-doubletime",
Description = @"More complex than you think.",
}));
AddStep(@"show", overlay.Show);
}
}
}

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

@ -168,6 +168,8 @@ namespace osu.Game.Overlays
Colour = colours.Blue.Opacity(0.5f),
Radius = 50,
};
Show();
}
protected override void Update()

23
osu.Game/Overlays/MedalSplash/DrawableMedal.cs
View File

@ -19,8 +19,9 @@ namespace osu.Game.Overlays.MedalSplash
private const float scale_when_unlocked = 0.76f;
private const float scale_when_full = 0.6f;
private readonly Container medal;
private readonly Sprite medalGlow;
private readonly Medal medal;
private readonly Container medalContainer;
private readonly Sprite medalGlow, medalSprite;
private readonly OsuSpriteText unlocked, name;
private readonly TextFlowContainer description;
private readonly FillFlowContainer infoFlow;
@ -28,11 +29,12 @@ namespace osu.Game.Overlays.MedalSplash
public DrawableMedal(Medal medal)
{
this.medal = medal;
Position = new Vector2(0f, MedalOverlay.DISC_SIZE / 2);
Children = new Drawable[]
{
this.medal = new Container
this.medalContainer = new Container
{
Anchor = Anchor.TopCentre,
Origin = Anchor.Centre,
@ -40,6 +42,12 @@ namespace osu.Game.Overlays.MedalSplash
Alpha = 0f,
Children = new[]
{
medalSprite = new Sprite
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Scale = new Vector2(0.81f),
},
medalGlow = new Sprite
{
Anchor = Anchor.Centre,
@ -102,12 +110,13 @@ namespace osu.Game.Overlays.MedalSplash
[BackgroundDependencyLoader]
private void load(OsuColour colours, TextureStore textures)
{
medalSprite.Texture = textures.Get(medal.ImageUrl);
medalGlow.Texture = textures.Get(@"MedalSplash/medal-glow");
foreach (var s in descriptionSprites)
s.Colour = colours.BlueLight;
var pos = new Vector2(0f, medal.Size.Y / 2 + 10);
var pos = new Vector2(0f, medalContainer.Size.Y / 2 + 10);
unlocked.Position = pos;
pos.Y += 90;
infoFlow.Position = pos;
@ -118,9 +127,9 @@ namespace osu.Game.Overlays.MedalSplash
switch (newState)
{
case DisplayState.Icon:
medal.Scale = Vector2.Zero;
medal.ScaleTo(1, duration, EasingTypes.OutElastic);
medal.FadeInFromZero(duration);
medalContainer.Scale = Vector2.Zero;
medalContainer.ScaleTo(1, duration, EasingTypes.OutElastic);
medalContainer.FadeInFromZero(duration);
break;
case DisplayState.MedalUnlocked:
ScaleTo(scale_when_unlocked, duration, EasingTypes.OutExpo);

2
osu.Game/Users/Medal.cs
View File

@ -6,6 +6,8 @@ namespace osu.Game.Users
public class Medal
{
public string Name { get; set; }
public string InternalName { get; set; }
public string ImageUrl => $@"https://s.ppy.sh/images/medals-client/{InternalName}@2x.png";
public string Description { get; set; }
}
}