tschesky/AppleHillsProduction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Audio refactor almost done

Browse Source
This commit is contained in:
journaliciouz
2025-10-30 16:31:01 +01:00
parent 2b41a9f200
commit d48b459fea
6 changed files with 605 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

729
Assets/Scenes/Levels/Quarry.unity
View File

File diff suppressed because it is too large Load Diff

20
Assets/Scripts/DamianExperiments/Picnic/PicnicBehaviour.cs
View File

@@ -18,7 +18,7 @@ public class PicnicBehaviour : MonoBehaviour
[Header("The FakeChocolate to destroy!")] [Header("The FakeChocolate to destroy!")]
[SerializeField] private GameObject fakeChocolate; // Assign in Inspector [SerializeField] private GameObject fakeChocolate; // Assign in Inspector
private AudioSource _audioSource; private AppleAudioSource _audioSource;
public AudioResource distractedAudioClips; public AudioResource distractedAudioClips;
public AudioResource angryAudioClips; public AudioResource angryAudioClips;
public AudioResource feederClips; public AudioResource feederClips;
@@ -34,7 +34,7 @@ public class PicnicBehaviour : MonoBehaviour
{ {
stateMachine = GetComponent<StateMachine>(); stateMachine = GetComponent<StateMachine>();
animator = GetComponent<Animator>(); animator = GetComponent<Animator>();
_audioSource = GetComponent<AudioSource>(); _audioSource = GetComponent<AppleAudioSource>();
} }
private IEnumerator StateCycleRoutine() private IEnumerator StateCycleRoutine()
@@ -68,8 +68,8 @@ public class PicnicBehaviour : MonoBehaviour
animator.SetTrigger("theyAngry"); animator.SetTrigger("theyAngry");
//stateMachine.ChangeState("Picnic PPL Angry"); //stateMachine.ChangeState("Picnic PPL Angry");
Logging.Debug("Hey! Don't steal my chocolate!"); Logging.Debug("Hey! Don't steal my chocolate!");
_audioSource.resource = angryAudioClips; _audioSource.audioSource.resource = angryAudioClips;
_audioSource.Play(); _audioSource.Play(0);
} }
public void destroyFakeChocolate() public void destroyFakeChocolate()
@@ -83,20 +83,20 @@ public class PicnicBehaviour : MonoBehaviour
public void PlayFeederAudio() public void PlayFeederAudio()
{ {
_audioSource.resource = feederClips; _audioSource.audioSource.resource = feederClips;
_audioSource.Play(); _audioSource.Play(0);
} }
public void PlayMoanerAudio() public void PlayMoanerAudio()
{ {
_audioSource.resource = moanerClips; _audioSource.audioSource.resource = moanerClips;
_audioSource.Play(); _audioSource.Play(0);
} }
public void PlayDistractedAudio() public void PlayDistractedAudio()
{ {
_audioSource.resource = distractedAudioClips; _audioSource.audioSource.resource = distractedAudioClips;
_audioSource.Play(); _audioSource.Play(0);
} }

4
Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/Sound Generator.cs
View File

@@ -7,7 +7,7 @@ public class SoundGenerator : MonoBehaviour
[SerializeField] private Sprite enterSprite; [SerializeField] private Sprite enterSprite;
[SerializeField] private Sprite exitSprite; [SerializeField] private Sprite exitSprite;
[SerializeField] private AudioClip enterSound; [SerializeField] private AudioClip enterSound;
[SerializeField] private AudioSource audioSource; [SerializeField] private AppleAudioSource audioSource;
[SerializeField] private StateMachine soundBirdSMRef; [SerializeField] private StateMachine soundBirdSMRef;
[SerializeField] private soundBird_CanFly soundbirdHearingCheck; [SerializeField] private soundBird_CanFly soundbirdHearingCheck;
@@ -35,7 +35,7 @@ public class SoundGenerator : MonoBehaviour
} }
if (audioSource != null && enterSound != null) if (audioSource != null && enterSound != null)
{ {
audioSource.PlayOneShot(enterSound); audioSource.audioSource.PlayOneShot(enterSound);
} }
if (soundBirdSMRef != null && soundBirdSMRef.currentState.name == "SoundBird" && soundbirdHearingCheck.canFly == true) if (soundBirdSMRef != null && soundBirdSMRef.currentState.name == "SoundBird" && soundbirdHearingCheck.canFly == true)
{ {

4
Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/soundBird_TakeOffBehaviour.cs
View File

@@ -13,7 +13,7 @@ public class soundBird_TakeOffBehaviour : MonoBehaviour
private Animator animator; private Animator animator;
private TweenBase objectTween; private TweenBase objectTween;
public AudioSource audioSource; public AppleAudioSource audioSource;
void Awake() void Awake()
{ {
@@ -29,7 +29,7 @@ public class soundBird_TakeOffBehaviour : MonoBehaviour
{ {
animator.SetBool("isScared", true); animator.SetBool("isScared", true);
objectTween = Tween.Spline(FlightSpline, SoundBirdObject, 0, 1, false, flightDuration, flightDelay, Tween.EaseIn, Tween.LoopType.None, HandleTweenStarted, HandleTweenFinished); objectTween = Tween.Spline(FlightSpline, SoundBirdObject, 0, 1, false, flightDuration, flightDelay, Tween.EaseIn, Tween.LoopType.None, HandleTweenStarted, HandleTweenFinished);
audioSource.Play(); audioSource.Play(0);
} }
void HandleTweenStarted() void HandleTweenStarted()
{ {

6
Assets/Scripts/Sound/AudioManager.cs
View File

@@ -150,6 +150,12 @@ public class AudioManager : MonoBehaviour, IPausable
Debug.Log($"[AUDIOMANAGER] Playing {currentlyPlayingVO.name} as nothing is currently playing."); Debug.Log($"[AUDIOMANAGER] Playing {currentlyPlayingVO.name} as nothing is currently playing.");
return true; return true;
} }
// If the requested audio is not critical, and the currently playing audio is, tell the request to get bent
if (requestedAudioSource.audioSourceType == AppleAudioSource.AudioSourceType.VO && currentlyPlayingVO.audioSourceType == AppleAudioSource.AudioSourceType.CriticalVO)
{
return false;
}
// If the requested audio source is the same, interrupt and trigger it again // If the requested audio source is the same, interrupt and trigger it again
if (currentlyPlayingVO == requestedAudioSource) if (currentlyPlayingVO == requestedAudioSource)
{ {

2
Assets/Scripts/Sound/BushAudioController.cs
View File

@@ -30,7 +30,7 @@ public class BushAudioController : MonoBehaviour
public void PlayPhotoSoundBite() public void PlayPhotoSoundBite()
{ {
VOPlayer.audioSource.resource = reactionClipToPlay; VOPlayer.audioSource.resource = reactionClipToPlay;
VOPlayer.Play(0); VOPlayer.Play(1);
} }
public void PlayFlashSound() public void PlayFlashSound()