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

Merge pull request #17699 from nekodex/mp-countdown-sfx-2

Browse Source 
Add MP lobby 'warning' SFX for the final seconds of countdown
This commit is contained in:
Dean Herbert
2022-04-07 14:13:29 +09:00
committed by GitHub
parent c997d0fcf0 9ed4f31048
commit 04235ca76e
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Android.props
View File

@ -51,7 +51,7 @@
<Reference Include="Java.Interop" /> <Reference Include="Java.Interop" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.405.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2022.407.0" />
<PackageReference Include="ppy.osu.Framework.Android" Version="2022.405.0" /> <PackageReference Include="ppy.osu.Framework.Android" Version="2022.405.0" />
</ItemGroup> </ItemGroup>
<ItemGroup Label="Transitive Dependencies"> <ItemGroup Label="Transitive Dependencies">

16
osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
View File

@ -30,13 +30,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
private MultiplayerRoom room => multiplayerClient.Room; private MultiplayerRoom room => multiplayerClient.Room;
private Sample countdownTickSample; private Sample countdownTickSample;
private Sample countdownWarnSample;
private Sample countdownWarnFinalSample;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio) private void load(AudioManager audio)
{ {
countdownTickSample = audio.Samples.Get(@"Multiplayer/countdown-tick"); countdownTickSample = audio.Samples.Get(@"Multiplayer/countdown-tick");
// disabled for now pending further work on sound effect countdownWarnSample = audio.Samples.Get(@"Multiplayer/countdown-warn");
// countdownTickFinalSample = audio.Samples.Get(@"Multiplayer/countdown-tick-final"); countdownWarnFinalSample = audio.Samples.Get(@"Multiplayer/countdown-warn-final");
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -102,8 +104,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
private void playTickSound(int secondsRemaining) private void playTickSound(int secondsRemaining)
{ {
if (secondsRemaining < 10) countdownTickSample?.Play(); if (secondsRemaining < 10) countdownTickSample?.Play();
// disabled for now pending further work on sound effect
// if (secondsRemaining <= 3) countdownTickFinalSample?.Play(); if (secondsRemaining <= 3)
{
if (secondsRemaining > 0)
countdownWarnSample?.Play();
else
countdownWarnFinalSample?.Play();
}
} }
private void updateButtonText() private void updateButtonText()

2
osu.Game/osu.Game.csproj
View File

@ -36,7 +36,7 @@
</PackageReference> </PackageReference>
<PackageReference Include="Realm" Version="10.10.0" /> <PackageReference Include="Realm" Version="10.10.0" />
<PackageReference Include="ppy.osu.Framework" Version="2022.405.0" /> <PackageReference Include="ppy.osu.Framework" Version="2022.405.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.405.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2022.407.0" />
<PackageReference Include="Sentry" Version="3.14.1" /> <PackageReference Include="Sentry" Version="3.14.1" />
<PackageReference Include="SharpCompress" Version="0.30.1" /> <PackageReference Include="SharpCompress" Version="0.30.1" />
<PackageReference Include="NUnit" Version="3.13.2" /> <PackageReference Include="NUnit" Version="3.13.2" />

2
osu.iOS.props
View File

@ -62,7 +62,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup Label="Package References"> <ItemGroup Label="Package References">
<PackageReference Include="ppy.osu.Framework.iOS" Version="2022.405.0" /> <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.405.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2022.405.0" /> <PackageReference Include="ppy.osu.Game.Resources" Version="2022.407.0" />
</ItemGroup> </ItemGroup>
<!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) --> <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
<PropertyGroup> <PropertyGroup>