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

Update with framework bindable changes

Browse Source
This commit is contained in:
smoogipoo
2019-02-21 18:56:34 +09:00
parent d637b184e4
commit bca347427f
195 changed files with 567 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -117,7 +117,7 @@ namespace osu.Game.Screens.Menu
[BackgroundDependencyLoader(true)]
private void load(AudioManager audio, IdleTracker idleTracker)
{
isIdle.ValueChanged += updateIdleState;
isIdle.ValueChanged += e => updateIdleState(e.NewValue);
if (idleTracker != null) isIdle.BindTo(idleTracker.IsIdle);

8
osu.Game/Screens/Menu/Intro.cs
View File

@ -52,7 +52,7 @@ namespace osu.Game.Screens.Menu
BeatmapSetInfo setInfo = null;
if (!menuMusic)
if (!menuMusic.Value)
{
var sets = beatmaps.GetAllUsableBeatmapSets();
if (sets.Count > 0)
@ -93,13 +93,13 @@ namespace osu.Game.Screens.Menu
{
Beatmap.Value = introBeatmap;
if (menuVoice)
if (menuVoice.Value)
welcome.Play();
Scheduler.AddDelayed(delegate
{
// Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Manu.
if (menuMusic)
if (menuMusic.Value)
track.Start();
LoadComponentAsync(mainMenu = new MainMenu());
@ -158,7 +158,7 @@ namespace osu.Game.Screens.Menu
double fadeOutTime = EXIT_DELAY;
//we also handle the exit transition.
if (menuVoice)
if (menuVoice.Value)
seeya.Play();
else
fadeOutTime = 500;

3
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -5,6 +5,7 @@ using osuTK;
using osuTK.Graphics;
using osuTK.Input;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Input.Events;
using osu.Framework.Screens;
@ -157,7 +158,7 @@ namespace osu.Game.Screens.Menu
.OnComplete(l => buttons.SetOsuLogo(null));
}
private void beatmap_ValueChanged(WorkingBeatmap newValue)
private void beatmap_ValueChanged(ValueChangedEvent<WorkingBeatmap> e)
{
if (!this.IsCurrentScreen())
return;