mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 14:32:55 +08:00
Merge branch 'master' into freemod-select-overlay
This commit is contained in:
commit
cb87da2bb8
@ -1,9 +1,12 @@
|
|||||||
// 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;
|
||||||
|
using System.Linq;
|
||||||
using Moq;
|
using Moq;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
using osu.Game.Rulesets.Mods;
|
using osu.Game.Rulesets.Mods;
|
||||||
|
using osu.Game.Rulesets.Osu.Mods;
|
||||||
using osu.Game.Utils;
|
using osu.Game.Utils;
|
||||||
|
|
||||||
namespace osu.Game.Tests.Mods
|
namespace osu.Game.Tests.Mods
|
||||||
@ -99,6 +102,53 @@ namespace osu.Game.Tests.Mods
|
|||||||
Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
|
Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static readonly object[] invalid_mod_test_scenarios =
|
||||||
|
{
|
||||||
|
// incompatible pair.
|
||||||
|
new object[]
|
||||||
|
{
|
||||||
|
new Mod[] { new OsuModDoubleTime(), new OsuModHalfTime() },
|
||||||
|
new[] { typeof(OsuModDoubleTime), typeof(OsuModHalfTime) }
|
||||||
|
},
|
||||||
|
// incompatible pair with derived class.
|
||||||
|
new object[]
|
||||||
|
{
|
||||||
|
new Mod[] { new OsuModNightcore(), new OsuModHalfTime() },
|
||||||
|
new[] { typeof(OsuModNightcore), typeof(OsuModHalfTime) }
|
||||||
|
},
|
||||||
|
// system mod.
|
||||||
|
new object[]
|
||||||
|
{
|
||||||
|
new Mod[] { new OsuModDoubleTime(), new OsuModTouchDevice() },
|
||||||
|
new[] { typeof(OsuModTouchDevice) }
|
||||||
|
},
|
||||||
|
// multi mod.
|
||||||
|
new object[]
|
||||||
|
{
|
||||||
|
new Mod[] { new MultiMod(new OsuModHalfTime()), new OsuModHalfTime() },
|
||||||
|
new[] { typeof(MultiMod) }
|
||||||
|
},
|
||||||
|
// valid pair.
|
||||||
|
new object[]
|
||||||
|
{
|
||||||
|
new Mod[] { new OsuModDoubleTime(), new OsuModHardRock() },
|
||||||
|
null
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
[TestCaseSource(nameof(invalid_mod_test_scenarios))]
|
||||||
|
public void TestInvalidModScenarios(Mod[] inputMods, Type[] expectedInvalid)
|
||||||
|
{
|
||||||
|
bool isValid = ModUtils.CheckValidForGameplay(inputMods, out var invalid);
|
||||||
|
|
||||||
|
Assert.That(isValid, Is.EqualTo(expectedInvalid == null));
|
||||||
|
|
||||||
|
if (isValid)
|
||||||
|
Assert.IsNull(invalid);
|
||||||
|
else
|
||||||
|
Assert.That(invalid?.Select(t => t.GetType()), Is.EquivalentTo(expectedInvalid));
|
||||||
|
}
|
||||||
|
|
||||||
public abstract class CustomMod1 : Mod
|
public abstract class CustomMod1 : Mod
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -3,8 +3,12 @@
|
|||||||
|
|
||||||
using System;
|
using System;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
|
using osu.Framework.Allocation;
|
||||||
using osu.Framework.Bindables;
|
using osu.Framework.Bindables;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Screens;
|
||||||
using osu.Framework.Testing;
|
using osu.Framework.Testing;
|
||||||
|
using osu.Game.Screens;
|
||||||
using osu.Game.Screens.OnlinePlay;
|
using osu.Game.Screens.OnlinePlay;
|
||||||
using osu.Game.Tests.Visual;
|
using osu.Game.Tests.Visual;
|
||||||
|
|
||||||
@ -58,5 +62,45 @@ namespace osu.Game.Tests.NonVisual
|
|||||||
AddStep("end operation", () => operation.Dispose());
|
AddStep("end operation", () => operation.Dispose());
|
||||||
AddAssert("operation is ended", () => !operationInProgress.Value);
|
AddAssert("operation is ended", () => !operationInProgress.Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestOperationDisposalAfterScreenExit()
|
||||||
|
{
|
||||||
|
TestScreenWithTracker screen = null;
|
||||||
|
OsuScreenStack stack;
|
||||||
|
IDisposable operation = null;
|
||||||
|
|
||||||
|
AddStep("create screen with tracker", () =>
|
||||||
|
{
|
||||||
|
Child = stack = new OsuScreenStack
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both
|
||||||
|
};
|
||||||
|
|
||||||
|
stack.Push(screen = new TestScreenWithTracker());
|
||||||
|
});
|
||||||
|
AddUntilStep("wait for loaded", () => screen.IsLoaded);
|
||||||
|
|
||||||
|
AddStep("begin operation", () => operation = screen.OngoingOperationTracker.BeginOperation());
|
||||||
|
AddAssert("operation in progress", () => screen.OngoingOperationTracker.InProgress.Value);
|
||||||
|
|
||||||
|
AddStep("dispose after screen exit", () =>
|
||||||
|
{
|
||||||
|
screen.Exit();
|
||||||
|
operation.Dispose();
|
||||||
|
});
|
||||||
|
AddAssert("operation ended", () => !screen.OngoingOperationTracker.InProgress.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private class TestScreenWithTracker : OsuScreen
|
||||||
|
{
|
||||||
|
public OngoingOperationTracker OngoingOperationTracker { get; private set; }
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader]
|
||||||
|
private void load()
|
||||||
|
{
|
||||||
|
InternalChild = OngoingOperationTracker = new OngoingOperationTracker();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -11,8 +11,8 @@ using osu.Framework.Graphics.Containers;
|
|||||||
using osu.Framework.Platform;
|
using osu.Framework.Platform;
|
||||||
using osu.Framework.Testing;
|
using osu.Framework.Testing;
|
||||||
using osu.Game.Beatmaps;
|
using osu.Game.Beatmaps;
|
||||||
|
using osu.Game.Beatmaps.Drawables;
|
||||||
using osu.Game.Graphics.Containers;
|
using osu.Game.Graphics.Containers;
|
||||||
using osu.Game.Graphics.UserInterface;
|
|
||||||
using osu.Game.Online.Rooms;
|
using osu.Game.Online.Rooms;
|
||||||
using osu.Game.Overlays;
|
using osu.Game.Overlays;
|
||||||
using osu.Game.Rulesets;
|
using osu.Game.Rulesets;
|
||||||
@ -20,6 +20,7 @@ using osu.Game.Rulesets.Osu;
|
|||||||
using osu.Game.Rulesets.Osu.Mods;
|
using osu.Game.Rulesets.Osu.Mods;
|
||||||
using osu.Game.Screens.OnlinePlay;
|
using osu.Game.Screens.OnlinePlay;
|
||||||
using osu.Game.Tests.Beatmaps;
|
using osu.Game.Tests.Beatmaps;
|
||||||
|
using osu.Game.Users;
|
||||||
using osuTK;
|
using osuTK;
|
||||||
using osuTK.Input;
|
using osuTK.Input;
|
||||||
|
|
||||||
@ -241,7 +242,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void moveToItem(int index, Vector2? offset = null)
|
private void moveToItem(int index, Vector2? offset = null)
|
||||||
=> AddStep($"move mouse to item {index}", () => InputManager.MoveMouseTo(playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index), offset));
|
=> AddStep($"move mouse to item {index}", () => InputManager.MoveMouseTo(playlist.ChildrenOfType<DifficultyIcon>().ElementAt(index), offset));
|
||||||
|
|
||||||
private void moveToDragger(int index, Vector2? offset = null) => AddStep($"move mouse to dragger {index}", () =>
|
private void moveToDragger(int index, Vector2? offset = null) => AddStep($"move mouse to dragger {index}", () =>
|
||||||
{
|
{
|
||||||
@ -252,7 +253,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
|
|||||||
private void moveToDeleteButton(int index, Vector2? offset = null) => AddStep($"move mouse to delete button {index}", () =>
|
private void moveToDeleteButton(int index, Vector2? offset = null) => AddStep($"move mouse to delete button {index}", () =>
|
||||||
{
|
{
|
||||||
var item = playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index);
|
var item = playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index);
|
||||||
InputManager.MoveMouseTo(item.ChildrenOfType<IconButton>().ElementAt(0), offset);
|
InputManager.MoveMouseTo(item.ChildrenOfType<DrawableRoomPlaylistItem.PlaylistRemoveButton>().ElementAt(0), offset);
|
||||||
});
|
});
|
||||||
|
|
||||||
private void assertHandleVisibility(int index, bool visible)
|
private void assertHandleVisibility(int index, bool visible)
|
||||||
@ -260,7 +261,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
|
|||||||
() => (playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>.PlaylistItemHandle>().ElementAt(index).Alpha > 0) == visible);
|
() => (playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>.PlaylistItemHandle>().ElementAt(index).Alpha > 0) == visible);
|
||||||
|
|
||||||
private void assertDeleteButtonVisibility(int index, bool visible)
|
private void assertDeleteButtonVisibility(int index, bool visible)
|
||||||
=> AddAssert($"delete button {index} {(visible ? "is" : "is not")} visible", () => (playlist.ChildrenOfType<IconButton>().ElementAt(2 + index * 2).Alpha > 0) == visible);
|
=> AddAssert($"delete button {index} {(visible ? "is" : "is not")} visible", () => (playlist.ChildrenOfType<DrawableRoomPlaylistItem.PlaylistRemoveButton>().ElementAt(2 + index * 2).Alpha > 0) == visible);
|
||||||
|
|
||||||
private void createPlaylist(bool allowEdit, bool allowSelection)
|
private void createPlaylist(bool allowEdit, bool allowSelection)
|
||||||
{
|
{
|
||||||
@ -278,7 +279,21 @@ namespace osu.Game.Tests.Visual.Multiplayer
|
|||||||
playlist.Items.Add(new PlaylistItem
|
playlist.Items.Add(new PlaylistItem
|
||||||
{
|
{
|
||||||
ID = i,
|
ID = i,
|
||||||
Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
|
Beatmap =
|
||||||
|
{
|
||||||
|
Value = i % 2 == 1
|
||||||
|
? new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo
|
||||||
|
: new BeatmapInfo
|
||||||
|
{
|
||||||
|
Metadata = new BeatmapMetadata
|
||||||
|
{
|
||||||
|
Artist = "Artist",
|
||||||
|
Author = new User { Username = "Creator name here" },
|
||||||
|
Title = "Long title used to check background colour",
|
||||||
|
},
|
||||||
|
BeatmapSet = new BeatmapSetInfo()
|
||||||
|
}
|
||||||
|
},
|
||||||
Ruleset = { Value = new OsuRuleset().RulesetInfo },
|
Ruleset = { Value = new OsuRuleset().RulesetInfo },
|
||||||
RequiredMods =
|
RequiredMods =
|
||||||
{
|
{
|
||||||
|
21
osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs
Normal file
21
osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
using NUnit.Framework;
|
||||||
|
using osu.Game.Rulesets.Osu.Mods;
|
||||||
|
using osu.Game.Rulesets.UI;
|
||||||
|
|
||||||
|
namespace osu.Game.Tests.Visual.UserInterface
|
||||||
|
{
|
||||||
|
public class TestSceneModIcon : OsuTestScene
|
||||||
|
{
|
||||||
|
[Test]
|
||||||
|
public void TestChangeModType()
|
||||||
|
{
|
||||||
|
ModIcon icon = null;
|
||||||
|
|
||||||
|
AddStep("create mod icon", () => Child = icon = new ModIcon(new OsuModDoubleTime()));
|
||||||
|
AddStep("change mod", () => icon.Mod = new OsuModEasy());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -4,54 +4,38 @@
|
|||||||
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.Shapes;
|
|
||||||
using osu.Framework.Graphics.Sprites;
|
using osu.Framework.Graphics.Sprites;
|
||||||
using osu.Game.Online;
|
using osu.Game.Online;
|
||||||
using osuTK;
|
using osuTK;
|
||||||
|
|
||||||
namespace osu.Game.Graphics.UserInterface
|
namespace osu.Game.Graphics.UserInterface
|
||||||
{
|
{
|
||||||
public class DownloadButton : OsuAnimatedButton
|
public class DownloadButton : GrayButton
|
||||||
{
|
{
|
||||||
public readonly Bindable<DownloadState> State = new Bindable<DownloadState>();
|
|
||||||
|
|
||||||
private readonly SpriteIcon icon;
|
|
||||||
private readonly SpriteIcon checkmark;
|
|
||||||
private readonly Box background;
|
|
||||||
|
|
||||||
[Resolved]
|
[Resolved]
|
||||||
private OsuColour colours { get; set; }
|
private OsuColour colours { get; set; }
|
||||||
|
|
||||||
|
public readonly Bindable<DownloadState> State = new Bindable<DownloadState>();
|
||||||
|
|
||||||
|
private SpriteIcon checkmark;
|
||||||
|
|
||||||
public DownloadButton()
|
public DownloadButton()
|
||||||
|
: base(FontAwesome.Solid.Download)
|
||||||
{
|
{
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
|
||||||
background = new Box
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
Depth = float.MaxValue
|
|
||||||
},
|
|
||||||
icon = new SpriteIcon
|
|
||||||
{
|
|
||||||
Anchor = Anchor.Centre,
|
|
||||||
Origin = Anchor.Centre,
|
|
||||||
Size = new Vector2(13),
|
|
||||||
Icon = FontAwesome.Solid.Download,
|
|
||||||
},
|
|
||||||
checkmark = new SpriteIcon
|
|
||||||
{
|
|
||||||
Anchor = Anchor.Centre,
|
|
||||||
Origin = Anchor.Centre,
|
|
||||||
X = 8,
|
|
||||||
Size = Vector2.Zero,
|
|
||||||
Icon = FontAwesome.Solid.Check,
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load()
|
private void load()
|
||||||
{
|
{
|
||||||
|
AddInternal(checkmark = new SpriteIcon
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
X = 8,
|
||||||
|
Size = Vector2.Zero,
|
||||||
|
Icon = FontAwesome.Solid.Check,
|
||||||
|
});
|
||||||
|
|
||||||
State.BindValueChanged(updateState, true);
|
State.BindValueChanged(updateState, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -60,27 +44,27 @@ namespace osu.Game.Graphics.UserInterface
|
|||||||
switch (state.NewValue)
|
switch (state.NewValue)
|
||||||
{
|
{
|
||||||
case DownloadState.NotDownloaded:
|
case DownloadState.NotDownloaded:
|
||||||
background.FadeColour(colours.Gray4, 500, Easing.InOutExpo);
|
Background.FadeColour(colours.Gray4, 500, Easing.InOutExpo);
|
||||||
icon.MoveToX(0, 500, Easing.InOutExpo);
|
Icon.MoveToX(0, 500, Easing.InOutExpo);
|
||||||
checkmark.ScaleTo(Vector2.Zero, 500, Easing.InOutExpo);
|
checkmark.ScaleTo(Vector2.Zero, 500, Easing.InOutExpo);
|
||||||
TooltipText = "Download";
|
TooltipText = "Download";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case DownloadState.Downloading:
|
case DownloadState.Downloading:
|
||||||
background.FadeColour(colours.Blue, 500, Easing.InOutExpo);
|
Background.FadeColour(colours.Blue, 500, Easing.InOutExpo);
|
||||||
icon.MoveToX(0, 500, Easing.InOutExpo);
|
Icon.MoveToX(0, 500, Easing.InOutExpo);
|
||||||
checkmark.ScaleTo(Vector2.Zero, 500, Easing.InOutExpo);
|
checkmark.ScaleTo(Vector2.Zero, 500, Easing.InOutExpo);
|
||||||
TooltipText = "Downloading...";
|
TooltipText = "Downloading...";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case DownloadState.Importing:
|
case DownloadState.Importing:
|
||||||
background.FadeColour(colours.Yellow, 500, Easing.InOutExpo);
|
Background.FadeColour(colours.Yellow, 500, Easing.InOutExpo);
|
||||||
TooltipText = "Importing";
|
TooltipText = "Importing";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case DownloadState.LocallyAvailable:
|
case DownloadState.LocallyAvailable:
|
||||||
background.FadeColour(colours.Green, 500, Easing.InOutExpo);
|
Background.FadeColour(colours.Green, 500, Easing.InOutExpo);
|
||||||
icon.MoveToX(-8, 500, Easing.InOutExpo);
|
Icon.MoveToX(-8, 500, Easing.InOutExpo);
|
||||||
checkmark.ScaleTo(new Vector2(13), 500, Easing.InOutExpo);
|
checkmark.ScaleTo(new Vector2(13), 500, Easing.InOutExpo);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
48
osu.Game/Graphics/UserInterface/GrayButton.cs
Normal file
48
osu.Game/Graphics/UserInterface/GrayButton.cs
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
using osu.Framework.Allocation;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
|
using osu.Framework.Graphics.Shapes;
|
||||||
|
using osu.Framework.Graphics.Sprites;
|
||||||
|
using osuTK;
|
||||||
|
|
||||||
|
namespace osu.Game.Graphics.UserInterface
|
||||||
|
{
|
||||||
|
public class GrayButton : OsuAnimatedButton
|
||||||
|
{
|
||||||
|
protected SpriteIcon Icon { get; private set; }
|
||||||
|
protected Box Background { get; private set; }
|
||||||
|
|
||||||
|
private readonly IconUsage icon;
|
||||||
|
|
||||||
|
[Resolved]
|
||||||
|
private OsuColour colours { get; set; }
|
||||||
|
|
||||||
|
public GrayButton(IconUsage icon)
|
||||||
|
{
|
||||||
|
this.icon = icon;
|
||||||
|
}
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader]
|
||||||
|
private void load()
|
||||||
|
{
|
||||||
|
Children = new Drawable[]
|
||||||
|
{
|
||||||
|
Background = new Box
|
||||||
|
{
|
||||||
|
Colour = colours.Gray4,
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Depth = float.MaxValue
|
||||||
|
},
|
||||||
|
Icon = new SpriteIcon
|
||||||
|
{
|
||||||
|
Anchor = Anchor.Centre,
|
||||||
|
Origin = Anchor.Centre,
|
||||||
|
Size = new Vector2(13),
|
||||||
|
Icon = icon,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -468,6 +468,12 @@ namespace osu.Game
|
|||||||
private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
|
private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
|
||||||
{
|
{
|
||||||
updateModDefaults();
|
updateModDefaults();
|
||||||
|
|
||||||
|
if (!ModUtils.CheckValidForGameplay(mods.NewValue, out var invalid))
|
||||||
|
{
|
||||||
|
// ensure we always have a valid set of mods.
|
||||||
|
SelectedMods.Value = mods.NewValue.Except(invalid).ToArray();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateModDefaults()
|
private void updateModDefaults()
|
||||||
|
@ -29,8 +29,6 @@ namespace osu.Game.Rulesets.UI
|
|||||||
|
|
||||||
private const float size = 80;
|
private const float size = 80;
|
||||||
|
|
||||||
private readonly ModType type;
|
|
||||||
|
|
||||||
public virtual string TooltipText => showTooltip ? mod.IconTooltip : null;
|
public virtual string TooltipText => showTooltip ? mod.IconTooltip : null;
|
||||||
|
|
||||||
private Mod mod;
|
private Mod mod;
|
||||||
@ -42,10 +40,18 @@ namespace osu.Game.Rulesets.UI
|
|||||||
set
|
set
|
||||||
{
|
{
|
||||||
mod = value;
|
mod = value;
|
||||||
updateMod(value);
|
|
||||||
|
if (IsLoaded)
|
||||||
|
updateMod(value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Resolved]
|
||||||
|
private OsuColour colours { get; set; }
|
||||||
|
|
||||||
|
private Color4 backgroundColour;
|
||||||
|
private Color4 highlightedColour;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Construct a new instance.
|
/// Construct a new instance.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -56,8 +62,6 @@ namespace osu.Game.Rulesets.UI
|
|||||||
this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
|
this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
|
||||||
this.showTooltip = showTooltip;
|
this.showTooltip = showTooltip;
|
||||||
|
|
||||||
type = mod.Type;
|
|
||||||
|
|
||||||
Size = new Vector2(size);
|
Size = new Vector2(size);
|
||||||
|
|
||||||
Children = new Drawable[]
|
Children = new Drawable[]
|
||||||
@ -89,6 +93,13 @@ namespace osu.Game.Rulesets.UI
|
|||||||
Icon = FontAwesome.Solid.Question
|
Icon = FontAwesome.Solid.Question
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void LoadComplete()
|
||||||
|
{
|
||||||
|
base.LoadComplete();
|
||||||
|
|
||||||
|
Selected.BindValueChanged(_ => updateColour());
|
||||||
|
|
||||||
updateMod(mod);
|
updateMod(mod);
|
||||||
}
|
}
|
||||||
@ -102,20 +113,14 @@ namespace osu.Game.Rulesets.UI
|
|||||||
{
|
{
|
||||||
modIcon.FadeOut();
|
modIcon.FadeOut();
|
||||||
modAcronym.FadeIn();
|
modAcronym.FadeIn();
|
||||||
return;
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
modIcon.FadeIn();
|
||||||
|
modAcronym.FadeOut();
|
||||||
}
|
}
|
||||||
|
|
||||||
modIcon.FadeIn();
|
switch (value.Type)
|
||||||
modAcronym.FadeOut();
|
|
||||||
}
|
|
||||||
|
|
||||||
private Color4 backgroundColour;
|
|
||||||
private Color4 highlightedColour;
|
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
|
||||||
private void load(OsuColour colours)
|
|
||||||
{
|
|
||||||
switch (type)
|
|
||||||
{
|
{
|
||||||
default:
|
default:
|
||||||
case ModType.DifficultyIncrease:
|
case ModType.DifficultyIncrease:
|
||||||
@ -149,12 +154,13 @@ namespace osu.Game.Rulesets.UI
|
|||||||
modIcon.Colour = colours.Yellow;
|
modIcon.Colour = colours.Yellow;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
updateColour();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void LoadComplete()
|
private void updateColour()
|
||||||
{
|
{
|
||||||
base.LoadComplete();
|
background.Colour = Selected.Value ? highlightedColour : backgroundColour;
|
||||||
Selected.BindValueChanged(selected => background.Colour = selected.NewValue ? highlightedColour : backgroundColour, true);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -124,101 +124,111 @@ namespace osu.Game.Screens.OnlinePlay
|
|||||||
modDisplay.Current.Value = requiredMods.ToArray();
|
modDisplay.Current.Value = requiredMods.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override Drawable CreateContent() => maskingContainer = new Container
|
protected override Drawable CreateContent()
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.X,
|
Action<SpriteText> fontParameters = s => s.Font = OsuFont.Default.With(weight: FontWeight.SemiBold);
|
||||||
Height = 50,
|
|
||||||
Masking = true,
|
return maskingContainer = new Container
|
||||||
CornerRadius = 10,
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
{
|
||||||
new Box // A transparent box that forces the border to be drawn if the panel background is opaque
|
RelativeSizeAxes = Axes.X,
|
||||||
|
Height = 50,
|
||||||
|
Masking = true,
|
||||||
|
CornerRadius = 10,
|
||||||
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
new Box // A transparent box that forces the border to be drawn if the panel background is opaque
|
||||||
Alpha = 0,
|
|
||||||
AlwaysPresent = true
|
|
||||||
},
|
|
||||||
new PanelBackground
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
Beatmap = { BindTarget = beatmap }
|
|
||||||
},
|
|
||||||
new FillFlowContainer
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
Padding = new MarginPadding { Left = 8 },
|
|
||||||
Spacing = new Vector2(8, 0),
|
|
||||||
Direction = FillDirection.Horizontal,
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
{
|
||||||
difficultyIconContainer = new Container
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Alpha = 0,
|
||||||
|
AlwaysPresent = true
|
||||||
|
},
|
||||||
|
new PanelBackground
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Beatmap = { BindTarget = beatmap }
|
||||||
|
},
|
||||||
|
new FillFlowContainer
|
||||||
|
{
|
||||||
|
RelativeSizeAxes = Axes.Both,
|
||||||
|
Padding = new MarginPadding { Left = 8 },
|
||||||
|
Spacing = new Vector2(8, 0),
|
||||||
|
Direction = FillDirection.Horizontal,
|
||||||
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
Anchor = Anchor.CentreLeft,
|
difficultyIconContainer = new Container
|
||||||
Origin = Anchor.CentreLeft,
|
|
||||||
AutoSizeAxes = Axes.Both,
|
|
||||||
},
|
|
||||||
new FillFlowContainer
|
|
||||||
{
|
|
||||||
Anchor = Anchor.CentreLeft,
|
|
||||||
Origin = Anchor.CentreLeft,
|
|
||||||
AutoSizeAxes = Axes.Both,
|
|
||||||
Direction = FillDirection.Vertical,
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
{
|
||||||
beatmapText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
|
Anchor = Anchor.CentreLeft,
|
||||||
new FillFlowContainer
|
Origin = Anchor.CentreLeft,
|
||||||
|
AutoSizeAxes = Axes.Both,
|
||||||
|
},
|
||||||
|
new FillFlowContainer
|
||||||
|
{
|
||||||
|
Anchor = Anchor.CentreLeft,
|
||||||
|
Origin = Anchor.CentreLeft,
|
||||||
|
AutoSizeAxes = Axes.Both,
|
||||||
|
Direction = FillDirection.Vertical,
|
||||||
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
AutoSizeAxes = Axes.Both,
|
beatmapText = new LinkFlowContainer(fontParameters) { AutoSizeAxes = Axes.Both },
|
||||||
Direction = FillDirection.Horizontal,
|
new FillFlowContainer
|
||||||
Spacing = new Vector2(10f, 0),
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
{
|
||||||
new FillFlowContainer
|
AutoSizeAxes = Axes.Both,
|
||||||
|
Direction = FillDirection.Horizontal,
|
||||||
|
Spacing = new Vector2(10f, 0),
|
||||||
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
AutoSizeAxes = Axes.Both,
|
new FillFlowContainer
|
||||||
Direction = FillDirection.Horizontal,
|
|
||||||
Spacing = new Vector2(10f, 0),
|
|
||||||
Children = new Drawable[]
|
|
||||||
{
|
{
|
||||||
authorText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
|
AutoSizeAxes = Axes.Both,
|
||||||
explicitContentPill = new ExplicitContentBeatmapPill
|
Direction = FillDirection.Horizontal,
|
||||||
|
Spacing = new Vector2(10f, 0),
|
||||||
|
Children = new Drawable[]
|
||||||
{
|
{
|
||||||
Alpha = 0f,
|
authorText = new LinkFlowContainer(fontParameters) { AutoSizeAxes = Axes.Both },
|
||||||
Anchor = Anchor.CentreLeft,
|
explicitContentPill = new ExplicitContentBeatmapPill
|
||||||
Origin = Anchor.CentreLeft,
|
{
|
||||||
Margin = new MarginPadding { Top = 3f },
|
Alpha = 0f,
|
||||||
}
|
Anchor = Anchor.CentreLeft,
|
||||||
|
Origin = Anchor.CentreLeft,
|
||||||
|
Margin = new MarginPadding { Top = 3f },
|
||||||
|
}
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
new Container
|
||||||
new Container
|
|
||||||
{
|
|
||||||
Anchor = Anchor.CentreLeft,
|
|
||||||
Origin = Anchor.CentreLeft,
|
|
||||||
AutoSizeAxes = Axes.Both,
|
|
||||||
Child = modDisplay = new ModDisplay
|
|
||||||
{
|
{
|
||||||
Scale = new Vector2(0.4f),
|
Anchor = Anchor.CentreLeft,
|
||||||
DisplayUnrankedText = false,
|
Origin = Anchor.CentreLeft,
|
||||||
ExpansionMode = ExpansionMode.AlwaysExpanded
|
AutoSizeAxes = Axes.Both,
|
||||||
|
Child = modDisplay = new ModDisplay
|
||||||
|
{
|
||||||
|
Scale = new Vector2(0.4f),
|
||||||
|
DisplayUnrankedText = false,
|
||||||
|
ExpansionMode = ExpansionMode.AlwaysExpanded
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
new FillFlowContainer
|
||||||
|
{
|
||||||
|
Anchor = Anchor.CentreRight,
|
||||||
|
Origin = Anchor.CentreRight,
|
||||||
|
Direction = FillDirection.Horizontal,
|
||||||
|
AutoSizeAxes = Axes.Both,
|
||||||
|
Spacing = new Vector2(5),
|
||||||
|
X = -10,
|
||||||
|
ChildrenEnumerable = CreateButtons().Select(button => button.With(b =>
|
||||||
|
{
|
||||||
|
b.Anchor = Anchor.Centre;
|
||||||
|
b.Origin = Anchor.Centre;
|
||||||
|
}))
|
||||||
}
|
}
|
||||||
},
|
|
||||||
new FillFlowContainer
|
|
||||||
{
|
|
||||||
Anchor = Anchor.CentreRight,
|
|
||||||
Origin = Anchor.CentreRight,
|
|
||||||
Direction = FillDirection.Horizontal,
|
|
||||||
AutoSizeAxes = Axes.Both,
|
|
||||||
X = -18,
|
|
||||||
ChildrenEnumerable = CreateButtons()
|
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
};
|
}
|
||||||
|
|
||||||
protected virtual IEnumerable<Drawable> CreateButtons() =>
|
protected virtual IEnumerable<Drawable> CreateButtons() =>
|
||||||
new Drawable[]
|
new Drawable[]
|
||||||
@ -227,14 +237,29 @@ namespace osu.Game.Screens.OnlinePlay
|
|||||||
{
|
{
|
||||||
Size = new Vector2(50, 30)
|
Size = new Vector2(50, 30)
|
||||||
},
|
},
|
||||||
new IconButton
|
new PlaylistRemoveButton
|
||||||
{
|
{
|
||||||
Icon = FontAwesome.Solid.MinusSquare,
|
Size = new Vector2(30, 30),
|
||||||
Alpha = allowEdit ? 1 : 0,
|
Alpha = allowEdit ? 1 : 0,
|
||||||
Action = () => RequestDeletion?.Invoke(Model),
|
Action = () => RequestDeletion?.Invoke(Model),
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
public class PlaylistRemoveButton : GrayButton
|
||||||
|
{
|
||||||
|
public PlaylistRemoveButton()
|
||||||
|
: base(FontAwesome.Solid.MinusSquare)
|
||||||
|
{
|
||||||
|
TooltipText = "Remove from playlist";
|
||||||
|
}
|
||||||
|
|
||||||
|
[BackgroundDependencyLoader]
|
||||||
|
private void load()
|
||||||
|
{
|
||||||
|
Icon.Scale = new Vector2(0.8f);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected override bool OnClick(ClickEvent e)
|
protected override bool OnClick(ClickEvent e)
|
||||||
{
|
{
|
||||||
if (allowSelection)
|
if (allowSelection)
|
||||||
@ -318,24 +343,18 @@ namespace osu.Game.Screens.OnlinePlay
|
|||||||
Colour = Color4.Black,
|
Colour = Color4.Black,
|
||||||
Width = 0.4f,
|
Width = 0.4f,
|
||||||
},
|
},
|
||||||
// Piecewise-linear gradient with 3 segments to make it appear smoother
|
// Piecewise-linear gradient with 2 segments to make it appear smoother
|
||||||
new Box
|
new Box
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
Colour = ColourInfo.GradientHorizontal(Color4.Black, new Color4(0f, 0f, 0f, 0.9f)),
|
Colour = ColourInfo.GradientHorizontal(Color4.Black, new Color4(0f, 0f, 0f, 0.7f)),
|
||||||
Width = 0.05f,
|
Width = 0.4f,
|
||||||
},
|
},
|
||||||
new Box
|
new Box
|
||||||
{
|
{
|
||||||
RelativeSizeAxes = Axes.Both,
|
RelativeSizeAxes = Axes.Both,
|
||||||
Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.9f), new Color4(0f, 0f, 0f, 0.1f)),
|
Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.7f), new Color4(0, 0, 0, 0.4f)),
|
||||||
Width = 0.2f,
|
Width = 0.4f,
|
||||||
},
|
|
||||||
new Box
|
|
||||||
{
|
|
||||||
RelativeSizeAxes = Axes.Both,
|
|
||||||
Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.1f), new Color4(0, 0, 0, 0)),
|
|
||||||
Width = 0.05f,
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -47,26 +47,21 @@ namespace osu.Game.Screens.OnlinePlay
|
|||||||
|
|
||||||
private void endOperationWithKnownLease(LeasedBindable<bool> lease)
|
private void endOperationWithKnownLease(LeasedBindable<bool> lease)
|
||||||
{
|
{
|
||||||
if (lease != leasedInProgress)
|
|
||||||
return;
|
|
||||||
|
|
||||||
// for extra safety, marshal the end of operation back to the update thread if necessary.
|
// for extra safety, marshal the end of operation back to the update thread if necessary.
|
||||||
Scheduler.Add(() =>
|
Scheduler.Add(() =>
|
||||||
{
|
{
|
||||||
leasedInProgress?.Return();
|
if (lease != leasedInProgress)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// UnbindAll() is purposefully used instead of Return() - the two do roughly the same thing, with one difference:
|
||||||
|
// the former won't throw if the lease has already been returned before.
|
||||||
|
// this matters because framework can unbind the lease via the internal UnbindAllBindables(), which is not always detectable
|
||||||
|
// (it is in the case of disposal, but not in the case of screen exit - at least not cleanly).
|
||||||
|
leasedInProgress?.UnbindAll();
|
||||||
leasedInProgress = null;
|
leasedInProgress = null;
|
||||||
}, false);
|
}, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void Dispose(bool isDisposing)
|
|
||||||
{
|
|
||||||
base.Dispose(isDisposing);
|
|
||||||
|
|
||||||
// base call does an UnbindAllBindables().
|
|
||||||
// clean up the leased reference here so that it doesn't get returned twice.
|
|
||||||
leasedInProgress = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private class OngoingOperation : IDisposable
|
private class OngoingOperation : IDisposable
|
||||||
{
|
{
|
||||||
private readonly OngoingOperationTracker tracker;
|
private readonly OngoingOperationTracker tracker;
|
||||||
|
@ -83,6 +83,30 @@ namespace osu.Game.Utils
|
|||||||
.All(m => allowedSet.Contains(m.GetType()));
|
.All(m => allowedSet.Contains(m.GetType()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Check the provided combination of mods are valid for a local gameplay session.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="mods">The mods to check.</param>
|
||||||
|
/// <param name="invalidMods">Invalid mods, if any were found. Can be null if all mods were valid.</param>
|
||||||
|
/// <returns>Whether the input mods were all valid. If false, <paramref name="invalidMods"/> will contain all invalid entries.</returns>
|
||||||
|
public static bool CheckValidForGameplay(IEnumerable<Mod> mods, out List<Mod>? invalidMods)
|
||||||
|
{
|
||||||
|
mods = mods.ToArray();
|
||||||
|
|
||||||
|
CheckCompatibleSet(mods, out invalidMods);
|
||||||
|
|
||||||
|
foreach (var mod in mods)
|
||||||
|
{
|
||||||
|
if (mod.Type == ModType.System || !mod.HasImplementation || mod is MultiMod)
|
||||||
|
{
|
||||||
|
invalidMods ??= new List<Mod>();
|
||||||
|
invalidMods.Add(mod);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return invalidMods == null;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Flattens a set of <see cref="Mod"/>s, returning a new set with all <see cref="MultiMod"/>s removed.
|
/// Flattens a set of <see cref="Mod"/>s, returning a new set with all <see cref="MultiMod"/>s removed.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
Loading…
Reference in New Issue
Block a user