设置音量，商店完善

ColorlessWorld-2024-4-2/Assets/Audio/22-商店BGM.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 6cd3e5a8ae3963446a483cb25f052163
+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: 

ColorlessWorld-2024-4-2/Assets/Audio/23-战斗BGM.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: ea163b0948a84ab4f929c4579a9105e7
+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: 

ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity

@@ -10070,6 +10070,7 @@ MonoBehaviour:
   text: {fileID: 1206243804}
   scrollbar: {fileID: 513901907}
   isSync: 0
+  volumeType: 0
 --- !u!1 &514494708
 GameObject:
   m_ObjectHideFlags: 0
@@ -17522,6 +17523,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2b2b8537b62d04d45ad201dafc853142, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  mainVoiceVolume: 1
+  effectVoiceVolume: 1
+  musicVoiceVolume: 1
   UIClick: {fileID: 8300000, guid: 90e7a416c58aeda47898e5c6bafa1703, type: 3}
   menuOpenClip: {fileID: 8300000, guid: aa09967122165064693a43a3ee1ac3be, type: 3}
   menuCloseClip: {fileID: 8300000, guid: e526247df8496df41823965b29bcf59e, type: 3}
@@ -17541,8 +17545,12 @@ MonoBehaviour:
   gainMoneyClip: {fileID: 8300000, guid: 4bdf1399abfddc549af7f38a8c9446d2, type: 3}
   gainCardClip: {fileID: 8300000, guid: 2cba30942ef3c9a4181c67e0cad3fdaf, type: 3}
   buyClip: {fileID: 8300000, guid: cd6237820d5c34d4c9ad4c59d45002e4, type: 3}
+  fightBGM: {fileID: 8300000, guid: ea163b0948a84ab4f929c4579a9105e7, type: 3}
+  shopBGM: {fileID: 8300000, guid: 6cd3e5a8ae3963446a483cb25f052163, type: 3}
+  startMenuBgm: {fileID: 8300000, guid: 51d48687a1d476c45828b13642627ac3, type: 3}
   UIClickSource: {fileID: 992566369}
   ActionSource: {fileID: 992566372}
+  BGMSoure: {fileID: 992566373}
 --- !u!4 &992566371
 Transform:
   m_ObjectHideFlags: 0
@@ -17664,7 +17672,7 @@ AudioSource:
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 8300000, guid: 51d48687a1d476c45828b13642627ac3, type: 3}
+  m_audioClip: {fileID: 8300000, guid: ea163b0948a84ab4f929c4579a9105e7, type: 3}
   m_PlayOnAwake: 1
   m_Volume: 0.75
   m_Pitch: 1
@@ -18238,6 +18246,7 @@ MonoBehaviour:
   text: {fileID: 2120932320}
   scrollbar: {fileID: 1014114699}
   isSync: 0
+  volumeType: 1
 --- !u!1 &1019483700
 GameObject:
   m_ObjectHideFlags: 0
@@ -33482,6 +33491,7 @@ MonoBehaviour:
   text: {fileID: 637947711}
   scrollbar: {fileID: 1845795080}
   isSync: 0
+  volumeType: 2
 --- !u!1 &1847720222
 GameObject:
   m_ObjectHideFlags: 0
@@ -36698,6 +36708,50 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2060702280}
   m_CullTransparentMesh: 1
+--- !u!1 &2068068677
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2068068679}
+  - component: {fileID: 2068068678}
+  m_Layer: 0
+  m_Name: CardManager(Color)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &2068068678
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2068068677}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ca1e05724f689024392e0ea50533f6ad, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &2068068679
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2068068677}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 6.160092, y: 2.9316888, z: 3.9849322}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2076707499
 GameObject:
   m_ObjectHideFlags: 0
@@ -39600,3 +39654,4 @@ SceneRoots:
   - {fileID: 515302569}
   - {fileID: 992566371}
   - {fileID: 395072433}
+  - {fileID: 2068068679}

ColorlessWorld-2024-4-2/Assets/Scripts/Audio/AudioManager.cs

@@ -1,10 +1,16 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using static UnityEngine.InputSystem.Controls.AxisControl;
 using static UnityEngine.Rendering.DebugUI;
 
 public class AudioManager : Singleton<AudioManager>
 {
+    [Header("稜좆�零")]
+    public float mainVoiceVolume =1;
+    public float effectVoiceVolume =1;
+    public float musicVoiceVolume =1;
+    List<AudioSource> effectSource = new List<AudioSource> ();
     [Header("UI񙮵")]
     public AudioClip UIClick;
     public AudioClip menuOpenClip;
@@ -29,9 +35,14 @@ public class AudioManager : Singleton<AudioManager>
     public AudioClip gainCardClip;
     [Header("É̵ê½çÃæÒôƵ")]
     public AudioClip buyClip;
+    [Header("교쒼稜있")]
+    public AudioClip fightBGM;
+    public AudioClip shopBGM;
+    public AudioClip startMenuBgm;    
     [Header("ÒôÔ´")]
     public AudioSource UIClickSource;
     public AudioSource ActionSource;
+    public AudioSource BGMSoure;//교쒼稜있
     AudioSource GainObjectSource;//»ñµÃÎïÆ·½»»¥ÒôЧ
     AudioSource attackSource;
     AudioSource BookSource;
@@ -42,14 +53,73 @@ public class AudioManager : Singleton<AudioManager>
     {
 
         DontDestroyOnLoad(this.gameObject);
-
+        effectSource.Add(UIClickSource);
+        effectSource.Add(ActionSource);
         BookSource = gameObject.AddComponent<AudioSource>();
+        effectSource.Add(BookSource);
         CardSource = gameObject.AddComponent<AudioSource>();
+        effectSource.Add(CardSource);
         attackSource = gameObject.AddComponent<AudioSource>();
+        effectSource.Add(attackSource);
         enemyActionSource = gameObject.AddComponent<AudioSource>();
+        effectSource.Add(enemyActionSource);
         GainObjectSource = gameObject.AddComponent<AudioSource>();
+        effectSource.Add(GainObjectSource);
+    }
+    public void SetEffectVoiveVolume(float currentEffectVoiceVolume)
+    {
+        effectVoiceVolume = currentEffectVoiceVolume;
+        foreach (var source in effectSource )
+        {
+            source.volume = Mathf.Clamp01(effectVoiceVolume * mainVoiceVolume);
+        }
+    }
+    public void SetMainVoiveVolume(float currentMainVoiceVolume)
+    {
+        mainVoiceVolume = currentMainVoiceVolume;
+        foreach (var source in effectSource)
+        {
+            source.volume = Mathf.Clamp01(effectVoiceVolume * mainVoiceVolume);
+        }
+        BGMSoure .volume = Mathf.Clamp01(musicVoiceVolume * mainVoiceVolume);
+    }
+    public void SetMusicVoiveVolume(float currentMucsicVoiceVolume)
+    {
+        musicVoiceVolume = currentMucsicVoiceVolume;
+        BGMSoure.volume = Mathf.Clamp01(musicVoiceVolume * mainVoiceVolume);
     }
+    public void BGMSwitch(int scenceIndex)
+    {
+        switch (scenceIndex)
+        {
+            case 0:    
+                if (BGMSoure.clip != startMenuBgm)
+                {
+                    BGMSoure.clip = startMenuBgm;
+                    BGMSoure.Play();
+                }
+                break;
+            case 1:
+                if (BGMSoure.clip != fightBGM)
+                {
+                    BGMSoure.clip = fightBGM;
+                    BGMSoure.Play();
+                }                  
+                break;
+            case 2:
+                if (BGMSoure.clip != fightBGM)
+                {
+                    BGMSoure.clip = fightBGM;
+                    BGMSoure.Play();
+                }
+                break;
+            case 4:
+                BGMSoure.clip = shopBGM;
+                BGMSoure.Play();
+                break;
+        }
 
+    }
     public void UIClickPlayer()
     {
         UIClickSource.clip = UIClick;
@@ -161,4 +231,5 @@ public class AudioManager : Singleton<AudioManager>
         GainObjectSource.clip = buyClip;
         GainObjectSource.Play();
     }
+
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/LookCardManager.cs

@@ -42,7 +42,7 @@ public class LookCardManager : MonoBehaviour
             // currentCard.transform.localScale = cardScale;
             // cardGameObjectList.Add(currentCard);
 
-            var currentCard = TurnMaster.Instance.CreateCardWithIDForLook(cardList[i], transform);
+            var currentCard = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardList[i], transform);
             currentCard.transform.localScale = cardScale;
             cardGameObjectList.Add(currentCard);
         }
@@ -130,7 +130,7 @@ public class LookCardManager : MonoBehaviour
         {
             for (int i = 0; i < cardList.Count; i++)
             {
-                var currentCard = TurnMaster.Instance.CreateCardWithIDForLook(cardList[i], transform);
+                var currentCard = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardList[i], transform);
                 currentCard.transform.localScale = cardScale;
                 cardGameObjectList.Add(currentCard);
             }
@@ -139,7 +139,7 @@ public class LookCardManager : MonoBehaviour
         {
             for (int i = cardList.Count-1; i >= 0; i--)
             {
-                var currentCard = TurnMaster.Instance.CreateCardWithIDForLook(cardList[i], transform);
+                var currentCard =PlayerStatsManager.Instance.CreateCardWithIDForLook(cardList[i], transform);
                 currentCard.transform.localScale = cardScale;
                 cardGameObjectList.Add(currentCard);
             }

ColorlessWorld-2024-4-2/Assets/Scripts/UI/SyncTextUI/SyncVoiceText.cs

@@ -8,8 +8,17 @@ public class SyncVoiceText : MonoBehaviour,IPointerEnterHandler ,IPointerExitHan
     public Text text;
     public Scrollbar scrollbar;
     public bool isSync;
+    public VolumeType volumeType;
+    public enum VolumeType 
+    { 
+        main,
+        effect,
+        music
+    }
+
     public void OnPointerEnter(PointerEventData eventData)
     {
+       
         isSync = true;       
     }
 
@@ -19,7 +28,40 @@ public class SyncVoiceText : MonoBehaviour,IPointerEnterHandler ,IPointerExitHan
     }
     private void OnGUI()
     {
+       
         if (isSync )
-        text.text = (scrollbar.value * 100).ToString("#0") + "%";
+        {
+            text.text = (scrollbar.value * 100).ToString("#0") + "%";
+            switch (volumeType)
+            {
+                case VolumeType.main:
+                    AudioManager.Instance.SetMainVoiveVolume(scrollbar.value);
+                    break;
+                case VolumeType.effect:
+                    AudioManager.Instance.SetEffectVoiveVolume(scrollbar.value);
+                    break;
+                case VolumeType.music:
+                    AudioManager.Instance.SetMusicVoiveVolume(scrollbar.value);
+                    break;
+            }
+        }
+        else
+        {
+            Debug.Log("ͬ²½");
+            switch (volumeType)
+            {
+                case VolumeType.main:
+                    scrollbar.value = AudioManager.Instance.mainVoiceVolume;         
+                    break;
+                case VolumeType.effect:
+                    scrollbar.value = AudioManager.Instance.effectVoiceVolume;
+                    break;
+                case VolumeType.music:
+                    scrollbar.value = AudioManager.Instance.musicVoiceVolume;
+                    break;
+            }
+            text.text = (scrollbar.value * 100).ToString("#0") + "%";
+        }
+
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs

@@ -18,6 +18,9 @@ public class ScenceLoadManager : Singleton <ScenceLoadManager>
     IEnumerator LoadLevel(int levelIndex)
     {
         yield return new WaitForSeconds(0.5f);
+        //Çл»bgm
+        AudioManager.Instance.BGMSwitch(levelIndex);
+        //Çл»³¡¾°
         loadScreen.SetActive(true);
         AsyncOperation operation = SceneManager.LoadSceneAsync(levelIndex);