fix:(Sound): Audio source inaccesible

Author: jcs090218

Assets/JCSUnity/Scripts/Actions/2D/AI/AIMoveAction/JCS_2DFlyAction.cs

@@ -495,14 +495,13 @@ private void SpaceLimitCheck()
         /// </summary>
         private void PlayFlySound()
         {
-            // play fly sound,
+            if (mSoundPlayer == null)
+                return;
+
             // fly sound should be looped.
-            if (mSoundPlayer != null)
-            {
-                mSoundPlayer.GetAudioSource().loop = true;
-                mSoundPlayer.GetAudioSource().clip = mFlySound;
-                mSoundPlayer.GetAudioSource().Play();
-            }
+            mSoundPlayer.audioSource.loop = true;
+            mSoundPlayer.audioSource.clip = mFlySound;
+            mSoundPlayer.audioSource.Play();
         }
 
     }

Assets/JCSUnity/Scripts/Effects/Particle/JCS_ParticleSystem.cs

@@ -14,7 +14,7 @@ namespace JCSUnity
     /// <summary>
     /// Particle System thats spawns `JCS_Particle` object.
     /// </summary>
-    [RequireComponent(typeof(JCS_EnvironmentSoundPlayer))]
+    [RequireComponent(typeof(JCS_EnvSoundPlayer))]
     public class JCS_ParticleSystem : MonoBehaviour
     {
         /* Variables */

…le/Weather/JCS_EnvironmentSoundPlayer.cs …s/Particle/Weather/JCS_EnvSoundPlayer.csAssets/JCSUnity/Scripts/Effects/Particle/Weather/JCS_EnvironmentSoundPlayer.cs renamed to Assets/JCSUnity/Scripts/Effects/Particle/Weather/JCS_EnvSoundPlayer.cs Assets/JCSUnity/Scripts/Effects/Particle/Weather/JCS_EnvironmentSoundPlayer.cs renamed to Assets/JCSUnity/Scripts/Effects/Particle/Weather/JCS_EnvSoundPlayer.cs

@@ -14,15 +14,15 @@ namespace JCSUnity
     /// <summary>
     /// Sound player specific for environment sound.
     /// </summary>
-    public class JCS_EnvironmentSoundPlayer : JCS_SoundPlayer
+    public class JCS_EnvSoundPlayer : JCS_SoundPlayer
     {
         /* Variables */
 
-        [Separator("Initialize Variables (JCS_EnvironmentSoundPlayer)")]
+        [Separator("Initialize Variables (JCS_EnvSoundPlayer)")]
 
         [Tooltip("Sound to play for environment sound.")]
         [SerializeField]
-        private AudioClip mEnvironmentSound = null;
+        private AudioClip mEnvSound = null;
 
         /* Setter & Getter */
 
@@ -32,11 +32,11 @@ protected override void Awake()
         {
             base.Awake();
 
-            GetAudioSource().loop = true;
+            mAudioSource.loop = true;
 
             // NOTE(JenChieh): does not connect to bgm yet.
-            GetAudioSource().clip = mEnvironmentSound;
-            GetAudioSource().Play();
+            mAudioSource.clip = mEnvSound;
+            mAudioSource.Play();
         }
     }
 }

…ather/JCS_EnvironmentSoundPlayer.cs.meta …ticle/Weather/JCS_EnvSoundPlayer.cs.metaAssets/JCSUnity/Scripts/Effects/Particle/Weather/JCS_EnvironmentSoundPlayer.cs.meta renamed to Assets/JCSUnity/Scripts/Effects/Particle/Weather/JCS_EnvSoundPlayer.cs.meta Assets/JCSUnity/Scripts/Effects/Particle/Weather/JCS_EnvironmentSoundPlayer.cs.meta renamed to Assets/JCSUnity/Scripts/Effects/Particle/Weather/JCS_EnvSoundPlayer.cs.meta

@@ -27,15 +27,15 @@ public void SetAudioClipAndPlayOneShot(AudioClip clip)
             if (mSoundPlayer == null)
                 mSoundPlayer = this.GetComponent<JCS_SoundPlayer>();
 
-            this.mSoundPlayer.GetAudioSource().clip = clip;
+            this.mSoundPlayer.audioSource.clip = clip;
             this.mSoundPlayer.PlayOneShot(clip);
         }
 
         /* Functions */
 
         private void Update()
         {
-            if (mSoundPlayer.GetAudioSource().isPlaying)
+            if (mSoundPlayer.audioSource.isPlaying)
                 return;
 
             Destroy(this.gameObject);

Assets/JCSUnity/Scripts/Events/Destroy/JCS_DestroySoundEndEvent.cs

@@ -100,7 +100,7 @@ public void AttackSound()
             if (!mOverrideSound)
             {
                 // do not override the sound
-                if (mSoundPlayer.GetAudioSource().isPlaying)
+                if (mSoundPlayer.audioSource.isPlaying)
                     return;
             }
 

Assets/JCSUnity/Scripts/GameObject/2D/2DAudioController/JCS_2DSideScrollerPlayerAudioController.cs

@@ -181,7 +181,7 @@ private void Start()
                     if (mFadeSound == null)
                         mFadeSound = this.gameObject.AddComponent<JCS_FadeSound>();
 
-                    AudioSource bgmAudioSource = JCS_BGMPlayer.instance.GetAudioSource();
+                    AudioSource bgmAudioSource = JCS_BGMPlayer.instance.audioSource;
 
                     // set the background audio source.
                     mFadeSound.SetAudioSource(
@@ -393,7 +393,7 @@ public void LoadScene(string sceneName, float fadeInTime, Color screenColor, boo
                     if (mFadeSound == null)
                         mFadeSound = this.gameObject.AddComponent<JCS_FadeSound>();
 
-                    AudioSource bgmAudioSource = JCS_BGMPlayer.instance.GetAudioSource();
+                    AudioSource bgmAudioSource = JCS_BGMPlayer.instance.audioSource;
 
                     mFadeSound.SetAudioSource(bgmAudioSource);
 

Assets/JCSUnity/Scripts/Managers/JCS_SceneManager.cs

@@ -176,7 +176,7 @@ public void SwitchBGM(
             }
 
             // get the background music audio source.
-            AudioSource bgmAudioSource = JCS_BGMPlayer.instance.GetAudioSource();
+            AudioSource bgmAudioSource = JCS_BGMPlayer.instance.audioSource;
 
             // check if loop
             bgmAudioSource.loop = loop;
@@ -295,7 +295,7 @@ private void DoSwitchBGM()
                     return;
 
                 // get the background music audio source.
-                AudioSource bgmAudioSource = JCS_BGMPlayer.instance.GetAudioSource();
+                AudioSource bgmAudioSource = JCS_BGMPlayer.instance.audioSource;
 
                 // set the audio source.
                 mJCSFadeSound.SetAudioSource(bgmAudioSource);
@@ -338,7 +338,7 @@ private void DoStackBGM()
             if (mSwitchingBGM)
                 return;
 
-            AudioSource bgmAudioSource = JCS_BGMPlayer.instance.GetAudioSource();
+            AudioSource bgmAudioSource = JCS_BGMPlayer.instance.audioSource;
 
             // do nothing if still playing
             if (bgmAudioSource.isPlaying)

Assets/JCSUnity/Scripts/Managers/JCS_SoundManager.cs

@@ -6,6 +6,7 @@
  * $Notice: See LICENSE.txt for modification and distribution information 
  *                   Copyright (c) 2016 by Shen, Jen-Chieh $
  */
+using UnityEngine;
 using UnityEngine.SceneManagement;
 
 namespace JCSUnity
@@ -67,16 +68,16 @@ private void LevelLoaded()
         {
             // In 2023.2.19f1, the loop will be turned off for some reason.
             // Let's force BGM to run loop!
-            GetAudioSource().loop = true;
+            mAudioSource.loop = true;
 
             var ss = JCS_SoundSettings.instance;
 
             if (!ss.KEEP_BGM_SWITCH_SCENE)
             {
                 // Assign BGM from Sound Manager!
-                GetAudioSource().clip = ss.BACKGROUND_MUSIC;
+                mAudioSource.clip = ss.BACKGROUND_MUSIC;
 
-                GetAudioSource().Play();
+                mAudioSource.Play();
             }
         }
     }

Assets/JCSUnity/Scripts/Sound/JCS_BGMPlayer.cs

@@ -7,7 +7,6 @@
  *                   Copyright (c) 2016 by Shen, Jen-Chieh $
  */
 using UnityEngine;
-using MyBox;
 
 namespace JCSUnity
 {
@@ -20,11 +19,11 @@ public class JCS_SoundPlayer : MonoBehaviour
     {
         /* Variables */
 
-        private AudioSource mAudioSource = null;
+        protected AudioSource mAudioSource = null;
 
         /* Setter & Getter */
 
-        public AudioSource GetAudioSource() { return this.mAudioSource; }
+        public AudioSource audioSource { get { return mAudioSource; } }
 
         /* Functions */
 
@@ -67,18 +66,18 @@ public void PlayOneShot(AudioClip clip, float volume = 1.0f)
             if (clip == null)
                 return;
 
-            GetAudioSource().PlayOneShot(clip, volume);
+            mAudioSource.PlayOneShot(clip, volume);
         }
 
         /// <summary>
         /// play sound when is not playing any sound.
         /// </summary>
         public void PlayOneShotWhileNotPlaying(AudioClip clip, float volume = 1.0f)
         {
-            if (GetAudioSource() == null)
+            if (mAudioSource == null)
                 return;
 
-            if (GetAudioSource().isPlaying)
+            if (mAudioSource.isPlaying)
                 return;
 
             PlayOneShot(clip, volume);
@@ -89,10 +88,10 @@ public void PlayOneShotWhileNotPlaying(AudioClip clip, float volume = 1.0f)
         /// </summary>
         public void PlayOneShotInterrupt(AudioClip clip, float volume = 1.0f)
         {
-            if (GetAudioSource() == null)
+            if (mAudioSource == null)
                 return;
 
-            GetAudioSource().Stop();
+            mAudioSource.Stop();
 
             PlayOneShot(clip, volume);
         }