diff --git a/Assets/Resources/Prefabs/Panels/Setting Panel.prefab b/Assets/Resources/Prefabs/Panels/Setting Panel.prefab index 0b9d12b..54538f0 100644 --- a/Assets/Resources/Prefabs/Panels/Setting Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Setting Panel.prefab @@ -14,7 +14,7 @@ GameObject: - component: {fileID: 6789969287113785900} - component: {fileID: 413977444317235173} m_Layer: 5 - m_Name: Switch + m_Name: BGM Switch m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -762,7 +762,7 @@ GameObject: - component: {fileID: 3464089222698319368} - component: {fileID: 8434701791193156984} m_Layer: 5 - m_Name: Switch + m_Name: SFX Switch m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Script/Common/AudioManager.cs b/Assets/Script/Common/AudioManager.cs index 0395904..01465c9 100644 --- a/Assets/Script/Common/AudioManager.cs +++ b/Assets/Script/Common/AudioManager.cs @@ -19,7 +19,7 @@ public class AudioManager : Singleton private Dictionary audioClips = new Dictionary(); - private void Awake() + protected override void Awake() { base.Awake(); // 부모 클래스의 Awake 호출 diff --git a/Assets/Script/UI/PanelChildController/SwitchController.cs b/Assets/Script/UI/PanelChildController/SwitchController.cs index 8df8317..d95f4e5 100644 --- a/Assets/Script/UI/PanelChildController/SwitchController.cs +++ b/Assets/Script/UI/PanelChildController/SwitchController.cs @@ -19,7 +19,6 @@ public class SwitchController : MonoBehaviour private RectTransform _handleRectTransform; private Image _backgroundImage; - private AudioSource _audioSource; private bool _isOn; @@ -27,7 +26,6 @@ public class SwitchController : MonoBehaviour { _handleRectTransform = handleImage.GetComponent(); _backgroundImage = GetComponent(); - _audioSource = GetComponent(); } private void Start() @@ -35,7 +33,15 @@ public class SwitchController : MonoBehaviour //초기 상태는 false _handleRectTransform.anchoredPosition = new Vector2(-14, 0); _backgroundImage.color = OffColor; - _isOn = false; + + if (gameObject.name == "SFX Switch") + { + _isOn = UserManager.IsPlaySFX; + } + else if (gameObject.name == "BGM Switch") + { + _isOn = UserManager.IsPlayBGM; + } } //스위치 상태 변경 함수