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

Merge branch 'master' into fix-nested-folder-migration-endless-copy

Browse Source
This commit is contained in:
Dan Balasescu 2020-05-15 13:43:47 +09:00 committed by GitHub
commit e3025ede6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
View File

@ -19,7 +19,7 @@ using osuTK;
namespace osu.Game.Tournament.Screens.Editors namespace osu.Game.Tournament.Screens.Editors
{ {
public class SeedingEditorScreen : TournamentEditorScreen<SeedingEditorScreen.SeeingResultRow, SeedingResult> public class SeedingEditorScreen : TournamentEditorScreen<SeedingEditorScreen.SeedingResultRow, SeedingResult>
{ {
private readonly TournamentTeam team; private readonly TournamentTeam team;
@ -30,14 +30,14 @@ namespace osu.Game.Tournament.Screens.Editors
this.team = team; this.team = team;
} }
public class SeeingResultRow : CompositeDrawable, IModelBacked<SeedingResult> public class SeedingResultRow : CompositeDrawable, IModelBacked<SeedingResult>
{ {
public SeedingResult Model { get; } public SeedingResult Model { get; }
[Resolved] [Resolved]
private LadderInfo ladderInfo { get; set; } private LadderInfo ladderInfo { get; set; }
public SeeingResultRow(TournamentTeam team, SeedingResult round) public SeedingResultRow(TournamentTeam team, SeedingResult round)
{ {
Model = round; Model = round;
@ -281,6 +281,6 @@ namespace osu.Game.Tournament.Screens.Editors
} }
} }
protected override SeeingResultRow CreateDrawable(SeedingResult model) => new SeeingResultRow(team, model); protected override SeedingResultRow CreateDrawable(SeedingResult model) => new SeedingResultRow(team, model);
} }
} }

2
osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
View File

@ -42,7 +42,7 @@ namespace osu.Game.Tournament.Screens.MapPool
{ {
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
new TourneyVideo("gameplay") new TourneyVideo("mappool")
{ {
Loop = true, Loop = true,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,

19
osu.Game/Overlays/VolumeOverlay.cs
View File

@ -46,6 +46,13 @@ namespace osu.Game.Overlays
Width = 300, Width = 300,
Colour = ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.75f), Color4.Black.Opacity(0)) Colour = ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.75f), Color4.Black.Opacity(0))
}, },
muteButton = new MuteButton
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Margin = new MarginPadding(10),
Current = { BindTarget = IsMuted }
},
new FillFlowContainer new FillFlowContainer
{ {
Direction = FillDirection.Vertical, Direction = FillDirection.Vertical,
@ -56,19 +63,11 @@ namespace osu.Game.Overlays
Margin = new MarginPadding { Left = offset }, Margin = new MarginPadding { Left = offset },
Children = new Drawable[] Children = new Drawable[]
{ {
volumeMeterEffect = new VolumeMeter("EFFECTS", 125, colours.BlueDarker) volumeMeterEffect = new VolumeMeter("EFFECTS", 125, colours.BlueDarker),
{
Margin = new MarginPadding { Top = 100 + MuteButton.HEIGHT } // to counter the mute button and re-center the volume meters
},
volumeMeterMaster = new VolumeMeter("MASTER", 150, colours.PinkDarker), volumeMeterMaster = new VolumeMeter("MASTER", 150, colours.PinkDarker),
volumeMeterMusic = new VolumeMeter("MUSIC", 125, colours.BlueDarker), volumeMeterMusic = new VolumeMeter("MUSIC", 125, colours.BlueDarker),
muteButton = new MuteButton
{
Margin = new MarginPadding { Top = 100 },
Current = { BindTarget = IsMuted }
}
} }
}, }
}); });
volumeMeterMaster.Bindable.BindTo(audio.Volume); volumeMeterMaster.Bindable.BindTo(audio.Volume);