sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 09:03:50 +09:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
DrabWeb
2017-06-24 01:48:55 -03:00
parent 0133f9c086
commit b2c516238e
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ namespace osu.Game.Overlays
private const float border_width = 5; private const float border_width = 5;
private readonly Box background; private readonly Box background;
private readonly Container backgroundStrip; private readonly Container backgroundStrip, particleContainer;
private readonly BackgroundStrip leftStrip, rightStrip; private readonly BackgroundStrip leftStrip, rightStrip;
private readonly CircularContainer disc; private readonly CircularContainer disc;
private readonly Sprite innerSpin, outterSpin; private readonly Sprite innerSpin, outterSpin;
@ -61,7 +61,6 @@ namespace osu.Game.Overlays
{ {
background = new Box background = new Box
{ {
Name = @"dim",
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = Color4.Black.Opacity(60), Colour = Color4.Black.Opacity(60),
}, },
@ -74,7 +73,6 @@ namespace osu.Game.Overlays
}, },
backgroundStrip = new Container backgroundStrip = new Container
{ {
Name = @"background strip",
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
@ -112,9 +110,12 @@ namespace osu.Game.Overlays
}, },
}, },
}, },
particleContainer = new Container
{
RelativeSizeAxes = Axes.Both,
},
disc = new CircularContainer disc = new CircularContainer
{ {
Name = @"content",
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Alpha = 0f, Alpha = 0f,
@ -168,7 +169,11 @@ namespace osu.Game.Overlays
Colour = colours.Blue.Opacity(0.5f), Colour = colours.Blue.Opacity(0.5f),
Radius = 50, Radius = 50,
}; };
}
protected override void LoadComplete()
{
base.LoadComplete();
Show(); Show();
} }
@ -176,7 +181,7 @@ namespace osu.Game.Overlays
{ {
base.Update(); base.Update();
Add(new MedalParticle(RNG.Next(0, 359))); particleContainer.Add(new MedalParticle(RNG.Next(0, 359)));
} }
protected override void PopIn() protected override void PopIn()

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

@ -34,7 +34,7 @@ namespace osu.Game.Overlays.MedalSplash
Children = new Drawable[] Children = new Drawable[]
{ {
this.medalContainer = new Container medalContainer = new Container
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
@ -63,7 +63,7 @@ namespace osu.Game.Overlays.MedalSplash
TextSize = 24, TextSize = 24,
Font = @"Exo2.0-Light", Font = @"Exo2.0-Light",
Alpha = 0f, Alpha = 0f,
Scale = new Vector2(1 / scale_when_unlocked), Scale = new Vector2(1f / scale_when_unlocked),
}, },
infoFlow = new FillFlowContainer infoFlow = new FillFlowContainer
{ {
@ -84,7 +84,7 @@ namespace osu.Game.Overlays.MedalSplash
TextSize = 20, TextSize = 20,
Font = @"Exo2.0-Bold", Font = @"Exo2.0-Bold",
Alpha = 0f, Alpha = 0f,
Scale = new Vector2(1 / scale_when_full), Scale = new Vector2(1f / scale_when_full),
}, },
description = new TextFlowContainer description = new TextFlowContainer
{ {
@ -93,7 +93,7 @@ namespace osu.Game.Overlays.MedalSplash
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Alpha = 0f, Alpha = 0f,
Scale = new Vector2(1 / scale_when_full), Scale = new Vector2(1f / scale_when_full),
}, },
}, },
}, },
@ -116,10 +116,8 @@ namespace osu.Game.Overlays.MedalSplash
foreach (var s in descriptionSprites) foreach (var s in descriptionSprites)
s.Colour = colours.BlueLight; s.Colour = colours.BlueLight;
var pos = new Vector2(0f, medalContainer.Size.Y / 2 + 10); unlocked.Position = new Vector2(0f, medalContainer.Size.Y / 2 + 10);
unlocked.Position = pos; infoFlow.Position = new Vector2(0f, unlocked.Position.Y + 90);
pos.Y += 90;
infoFlow.Position = pos;
} }
public void ChangeState(DisplayState newState, double duration) public void ChangeState(DisplayState newState, double duration)