mirror of
https://github.com/ppy/osu.git
synced 2024-11-11 22:27:25 +08:00
commit
6ce0b7c83a
@ -13,7 +13,7 @@ namespace osu.Desktop.VisualTests
|
||||
private double timePerTest = 200;
|
||||
|
||||
[BackgroundDependencyLoader]
|
||||
private void load(Framework.Game game)
|
||||
private void load()
|
||||
{
|
||||
Host.MaximumDrawHz = int.MaxValue;
|
||||
Host.MaximumUpdateHz = int.MaxValue;
|
||||
|
@ -37,7 +37,7 @@ namespace osu.Desktop.Overlays
|
||||
[BackgroundDependencyLoader]
|
||||
private void load(NotificationManager notification, OsuColour colours, TextureStore textures)
|
||||
{
|
||||
this.notificationManager = notification;
|
||||
notificationManager = notification;
|
||||
|
||||
AutoSizeAxes = Axes.Both;
|
||||
Anchor = Anchor.BottomCentre;
|
||||
|
@ -16,7 +16,7 @@ namespace osu.Game.Beatmaps.Drawables
|
||||
}
|
||||
|
||||
[BackgroundDependencyLoader]
|
||||
private void load(OsuGameBase game)
|
||||
private void load()
|
||||
{
|
||||
if (working.Background != null)
|
||||
Texture = working.Background;
|
||||
|
@ -52,7 +52,7 @@ namespace osu.Game.Graphics.Cursor
|
||||
}
|
||||
|
||||
[BackgroundDependencyLoader]
|
||||
private void load(TextureStore textures, OsuConfigManager config)
|
||||
private void load(OsuConfigManager config)
|
||||
{
|
||||
cursorScale = config.GetBindable<double>(OsuConfig.CursorSize);
|
||||
|
||||
|
@ -14,8 +14,6 @@ namespace osu.Game.Graphics.UserInterface
|
||||
{
|
||||
private readonly Container<Star> stars;
|
||||
|
||||
private double transformStartTime;
|
||||
|
||||
/// <summary>
|
||||
/// Maximum amount of stars displayed.
|
||||
/// </summary>
|
||||
|
@ -214,7 +214,7 @@ namespace osu.Game
|
||||
}
|
||||
}
|
||||
|
||||
return base.OnKeyDown(state, args);
|
||||
return false;
|
||||
}
|
||||
|
||||
public event Action<Screen> ModeChanged;
|
||||
|
@ -29,8 +29,6 @@ namespace osu.Game.Overlays
|
||||
{
|
||||
const float textbox_height = 40;
|
||||
|
||||
private DrawableChannel channelDisplay;
|
||||
|
||||
private ScheduledDelegate messageRequest;
|
||||
|
||||
private Container content;
|
||||
@ -126,7 +124,7 @@ namespace osu.Game.Overlays
|
||||
|
||||
private void addChannel(Channel channel)
|
||||
{
|
||||
Add(channelDisplay = new DrawableChannel(channel));
|
||||
Add(new DrawableChannel(channel));
|
||||
careChannels.Add(channel);
|
||||
}
|
||||
|
||||
|
@ -75,8 +75,7 @@ namespace osu.Game.Overlays
|
||||
}
|
||||
|
||||
[BackgroundDependencyLoader]
|
||||
private void load(OsuGameBase osuGame, OsuConfigManager config, BeatmapDatabase beatmaps, AudioManager audio,
|
||||
TextureStore textures, OsuColour colours)
|
||||
private void load(OsuGameBase osuGame, OsuConfigManager config, BeatmapDatabase beatmaps, OsuColour colours)
|
||||
{
|
||||
game = osuGame;
|
||||
|
||||
|
@ -25,7 +25,7 @@ namespace osu.Game.Overlays
|
||||
private FlowContainer<NotificationSection> sections;
|
||||
|
||||
[BackgroundDependencyLoader(permitNulls: true)]
|
||||
private void load(OsuColour colours)
|
||||
private void load()
|
||||
{
|
||||
Width = width;
|
||||
RelativeSizeAxes = Axes.Y;
|
||||
|
@ -256,7 +256,7 @@ namespace osu.Game.Overlays.Notifications
|
||||
}
|
||||
|
||||
[BackgroundDependencyLoader]
|
||||
private void load(OsuColour colours)
|
||||
private void load()
|
||||
{
|
||||
Size = new Vector2(6, 15);
|
||||
|
||||
|
@ -101,7 +101,7 @@ namespace osu.Game.Overlays.Options
|
||||
{
|
||||
Margin = new MarginPadding { Top = 5 },
|
||||
RelativeSizeAxes = Axes.X,
|
||||
Items = this.Items,
|
||||
Items = Items,
|
||||
}
|
||||
};
|
||||
dropdown.ValueChanged += dropdown_ValueChanged;
|
||||
|
@ -21,7 +21,7 @@ namespace osu.Game.Overlays.Options
|
||||
bindable = value;
|
||||
if (bindable != null)
|
||||
{
|
||||
base.Text = bindable.Value;
|
||||
Text = bindable.Value;
|
||||
bindable.ValueChanged += bindableValueChanged;
|
||||
}
|
||||
|
||||
|
@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Options.Sections
|
||||
|
||||
public GameplaySection()
|
||||
{
|
||||
base.Children = new Drawable[]
|
||||
Children = new Drawable[]
|
||||
{
|
||||
new GeneralOptions(),
|
||||
new SongSelectOptions(),
|
||||
|
@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Pause
|
||||
public class QuitButton : PauseButton
|
||||
{
|
||||
[BackgroundDependencyLoader]
|
||||
private void load(AudioManager audio, OsuColour colours)
|
||||
private void load(AudioManager audio)
|
||||
{
|
||||
ButtonColour = new Color4(170, 27, 39, 255); // The red from the design isn't in the palette so it's used directly
|
||||
SampleHover = audio.Sample.Get(@"Menu/menuclick");
|
||||
|
@ -9,7 +9,7 @@ namespace osu.Game.Screens.Backgrounds
|
||||
public class BackgroundScreenDefault : BackgroundScreen
|
||||
{
|
||||
[BackgroundDependencyLoader]
|
||||
private void load(Framework.Game game)
|
||||
private void load()
|
||||
{
|
||||
Add(new Background(@"Backgrounds/bg1"));
|
||||
}
|
||||
|
@ -117,7 +117,7 @@ namespace osu.Game.Screens.Menu
|
||||
}
|
||||
|
||||
[BackgroundDependencyLoader(true)]
|
||||
private void load(AudioManager audio, OsuGame game = null)
|
||||
private void load(OsuGame game = null)
|
||||
{
|
||||
toolbar = game?.Toolbar;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user