CommonParrot/Space-Smash-Out
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: new zone enter/leave sounds, small match reset order adjustment

Browse Source
This commit is contained in:
Jakob Feldmann 2024-04-14 15:56:47 +02:00
parent 6dc42a05cc
commit 25ba3c6e65
8 changed files with 63 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/AudioResources/Sounds/SPACECRAFT_Cartoon_01_Sweeping_Wind_Blink_Tone_Passby_SS1_mono edit.wav Normal file
View File

Binary file not shown.

23
Assets/AudioResources/Sounds/SPACECRAFT_Cartoon_01_Sweeping_Wind_Blink_Tone_Passby_SS1_mono edit.wav.meta Normal file
View File

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: fad7b8b8149e035499ded4af2227b5aa
AudioImporter:
externalObjects: {}
serializedVersion: 7
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/AudioResources/Sounds/SPACECRAFT_Cartoon_04_Sweeping_Blink_Tone_Passby_SS2_mono edit.wav Normal file
View File

Binary file not shown.

23
Assets/AudioResources/Sounds/SPACECRAFT_Cartoon_04_Sweeping_Blink_Tone_Passby_SS2_mono edit.wav.meta Normal file
View File

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 4c5447693497adc4ebc7065f253d8b9f
AudioImporter:
externalObjects: {}
serializedVersion: 7
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

6
Assets/Prefabs/Audio/Zone Change In.prefab
View File

@ -46,7 +46,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
id: 1
audioTag: thruster
audioTag: zone_change_in
pitchRange: 0.4
volumeRange: 0.3
--- !u!82 &7696877450501702533
@ -59,9 +59,9 @@ AudioSource:
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 025361f5b3f97a445ad89bc9ac61c30b, type: 3}
m_audioClip: {fileID: 8300000, guid: 4c5447693497adc4ebc7065f253d8b9f, type: 3}
m_PlayOnAwake: 0
m_Volume: 0.08
m_Volume: 0.25
m_Pitch: 1
Loop: 0
Mute: 0

6
Assets/Prefabs/Audio/Zone Change Out.prefab
View File

@ -46,7 +46,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
id: 1
audioTag: thruster
audioTag: zone_change_out
pitchRange: 0.4
volumeRange: 0.3
--- !u!82 &7696877450501702533
@ -59,9 +59,9 @@ AudioSource:
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 025361f5b3f97a445ad89bc9ac61c30b, type: 3}
m_audioClip: {fileID: 8300000, guid: fad7b8b8149e035499ded4af2227b5aa, type: 3}
m_PlayOnAwake: 0
m_Volume: 0.08
m_Volume: 0.25
m_Pitch: 1
Loop: 0
Mute: 0

10
Assets/Scripts/Managers/MatchManager.cs
View File

@ -234,24 +234,24 @@ namespace Managers
" has won the match!", 1.618f);
await Tween.Delay(1.618f);
ResetMatch();
UIManager.G.announcments.QueueAnnounceText("Restarting.", 0.3f);
UIManager.G.announcments.QueueAnnounceText("Restarting..", 0.3f);
UIManager.G.announcments.QueueAnnounceText("Restarting...", 0.3f);
UIManager.G.announcments.QueueAnnounceText("GO!", 0.5f);
await Tween.Delay(0.9f);
RestartMatch();
matchState = MatchState.Match;
}
/// <summary>
/// Starts the match anew.
/// Resetting player positions and statistics.
/// Resets player positions and statistics.
/// </summary>
public void RestartMatch()
public void ResetMatch()
{
ResetMatchCharacters();
SetupMatchPlayerStatistics();
matchState = MatchState.Match;
}
/// <summary>

11
Assets/Scripts/Ship.cs
View File

@ -51,8 +51,8 @@ public class Ship : MonoBehaviour
BoosterSound = AudioManager.G.GetLocalSound("booster", 1, gameObject.transform);
BeingTackledSound = AudioManager.G.GetLocalSound("normal_tackle", 1, gameObject.transform);
BeingCriticallyTackledSound = AudioManager.G.GetLocalSound("critical_tackle", 1, gameObject.transform);
LeaveZoneSound = AudioManager.G.GetLocalSound("thruster_sound", 1, gameObject.transform);
EnterZoneSound = AudioManager.G.GetLocalSound("thruster_sound", 1, gameObject.transform);
LeaveZoneSound = AudioManager.G.GetLocalSound("zone_change_out", 1, gameObject.transform);
EnterZoneSound = AudioManager.G.GetLocalSound("zone_change_in", 1, gameObject.transform);
}
// Start is called before the first frame update
@ -82,6 +82,7 @@ public class Ship : MonoBehaviour
// Update is called once per frame
void FixedUpdate()
{
// TODO: This is handled by match manager now
if (state.reset)
{
state.reset = false;
@ -353,7 +354,7 @@ public class Ship : MonoBehaviour
ThrusterSound.PlayAudio(true);
ThrusterSound.ChangePitch(
math.smoothstep(0, props.normalMaxVelocity, body.velocity.magnitude));
math.smoothstep(0, props.absolutMaxVelocity, body.velocity.magnitude));
}
else
{
@ -384,12 +385,12 @@ public class Ship : MonoBehaviour
{
if (newZone != Zone.NimbleZone)
{
//LeaveZoneSound?.PlayAudio(false);
LeaveZoneSound.PlayAudio(false);
AudioManager.G.BroadcastAudioEffect(AudioEffects.LowPass, transform, true);
}
else
{
//EnterZoneSound?.PlayAudio(false);
EnterZoneSound.PlayAudio(false);
AudioManager.G.BroadcastAudioEffect(AudioEffects.LowPass, transform, false);
}
}