还原音量存储代码

GameClient/Assets/Game/HotUpdate/Sound/MusicManager.cs

@@ -11,9 +11,9 @@ namespace GFGGame
         private string currentName;
         private AssetOperationHandle handle;
         private Coroutine coroutine;
-        private float settingVolumn = 1f;       // 设置音量
-        private float tempVolume = 1f;          // 临时音量
-        private float changeBaseValue = 0.01f;  // 缓动单位改变基数
+        private float normalVolumn = 1f;
+        private float curVolume = 1f;
+        private float changeValue = 0.01f;
 
         private bool _isOn = true;
         public bool isOn
@@ -43,14 +43,16 @@ namespace GFGGame
             }
         }
 
-
         private void Awake()
         {
             player = this.gameObject.AddComponent<AudioSource>();
             player.loop = true;
             isOn = LocalCache.GetBool(LauncherConfig.MUSIC_KEY, true);
-            settingVolumn = LocalCache.GetFloat(LauncherConfig.MUSIC_VOLUMN_KEY, 1);
-            player.volume = settingVolumn;
+        }
+
+        private void Start()
+        {
+
         }
 
         private void Update()
@@ -60,23 +62,21 @@ namespace GFGGame
                 return;
             }
 
-            // 播放语音时背景音乐变小
             if (VoiceManager.Instance.IsPlaying())
             {
-                tempVolume = 0.17f;
+                curVolume = 0.17f;
             }
             else
             {
-                tempVolume = settingVolumn;
+                curVolume = normalVolumn;
             }
 
-            // 音量缓动变化
-            if (player.volume != tempVolume)
+            if (player.volume != curVolume)
             {
-                player.volume = Mathf.Lerp(player.volume, tempVolume, changeBaseValue);
-                if (Mathf.Abs(player.volume - tempVolume) <= 0.05)
+                player.volume = Mathf.Lerp(player.volume, curVolume, changeValue);
+                if (Mathf.Abs(player.volume - curVolume) <= 0.05)
                 {
-                    player.volume = tempVolume;
+                    player.volume = curVolume;
                 }
             }
         }
@@ -135,14 +135,9 @@ namespace GFGGame
             player.volume = volume;
         }
 
-        public void SetSettingVolumn(float volume)
-        {
-            settingVolumn = volume;
-        }
-
-        public float GetSettingVolumn()
+        public void SetNormalVolumn(float volume)
         {
-            return settingVolumn;
+            normalVolumn = volume;
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Sound/SoundManager.cs

@@ -11,7 +11,6 @@ namespace GFGGame
         private AudioSource player;
         private AssetOperationHandle handle;
         private Coroutine coroutine;
-        private float _lastVolumn = 1;
 
         private bool _isOn = true;
         public bool isOn
@@ -27,11 +26,10 @@ namespace GFGGame
                     _isOn = value;
                     if(_isOn)
                     {
-                        GRoot.inst.soundVolume = _lastVolumn;
+                        GRoot.inst.soundVolume = 1;
                     }
                     else
                     {
-                        _lastVolumn = GRoot.inst.soundVolume;
                         GRoot.inst.soundVolume = 0;
                         Stop();
                     }
@@ -44,7 +42,6 @@ namespace GFGGame
         {
             player = this.gameObject.AddComponent<AudioSource>();
             isOn = LocalCache.GetBool(LauncherConfig.SOUND_KEY, true);
-            player.volume = LocalCache.GetFloat(LauncherConfig.SOUND_VOLUMN_KEY, 1);
         }
 
         private void Start() 
@@ -84,10 +81,5 @@ namespace GFGGame
             player.Stop();
         }
 
-        public void SetVolumn(float volumn)
-        {
-            GRoot.inst.soundVolume = volumn;
-        }
-
     }
 }

GameClient/Assets/Game/HotUpdate/Sound/VoiceManager.cs

@@ -28,14 +28,14 @@ namespace GFGGame
                     _isOn = value;
                     if (_isOn)
                     {
-                        //player.volume = 1;
+                        GRoot.inst.soundVolume = 1;
                     }
                     else
                     {
-                        //player.volume = 0;
+                        GRoot.inst.soundVolume = 0;
                         Stop();
                     }
-                    LocalCache.SetBool(LauncherConfig.VOICE_KEY, _isOn);
+                    LocalCache.SetBool(LauncherConfig.SOUND_KEY, _isOn);
                 }
             }
         }
@@ -46,13 +46,12 @@ namespace GFGGame
             player.priority = 256;
             //设置这个声音会大一些
             player.spatialBlend = 1f;
-            isOn = LocalCache.GetBool(LauncherConfig.VOICE_KEY, true);
-            player.volume = LocalCache.GetFloat(LauncherConfig.VOICE_VOLUMN_KEY, 1);
+            isOn = LocalCache.GetBool(LauncherConfig.SOUND_KEY, true);
         }
 
         public void LoadRes(string path)
         {
-            if (!isOn || !YooAssets.CheckResExist(path))
+            if (!YooAssets.CheckResExist(path))
             {
                 return;
             }
@@ -140,15 +139,5 @@ namespace GFGGame
         {
             return player.isPlaying;
         }
-
-        public void SetVolumn(float volumn)
-        {
-            player.volume = volumn;
-        }
-
-        public float GetVolumn()
-        {
-            return player.volume;
-        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/SettingView.cs

@@ -11,8 +11,6 @@ namespace GFGGame
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
 
-        private readonly float disabledVolumnSliderAlpha = 0.25f;
-
         public override void Dispose()
         {
             EffectUIPool.Recycle(_effectUI1);
@@ -41,13 +39,6 @@ namespace GFGGame
             _ui.m_btnLogout.onClick.Add(OnClickBtnLogout);
             _ui.m_btnSound.onClick.Add(OnClickBtnSound);
             _ui.m_btnMusic.onClick.Add(OnClickBtnMusic);
-            _ui.m_btnVoice.onClick.Add(OnClickBtnVoice);
-            _ui.m_btnChooseMainBg.onClick.Add(OnClickBtnChangeMainBg);
-
-            _ui.m_voiceSlider.onChanged.Add(OnChangeVoiceVolumn);
-            _ui.m_musicSlider.onChanged.Add(OnChangeMusicVolumn);
-            _ui.m_soundSlider.onChanged.Add(OnChangeSoundVolumn);
-
             AddEffect();
         }
 
@@ -55,7 +46,8 @@ namespace GFGGame
         {
             base.OnShown();
             AddEffect();
-            InitVolumnSetting();
+            _ui.m_btnSound.selected = SoundManager.Instance.isOn;
+            _ui.m_btnMusic.selected = MusicManager.Instance.isOn;
         }
 
         protected override void OnHide()
@@ -95,69 +87,13 @@ namespace GFGGame
         private void OnClickBtnSound()
         {
             SoundManager.Instance.isOn = _ui.m_btnSound.selected;
-            _ui.m_soundSlider.touchable = SoundManager.Instance.isOn;
-            _ui.m_soundSlider.alpha = SoundManager.Instance.isOn ? 1 : disabledVolumnSliderAlpha;
 
         }
 
         private void OnClickBtnMusic()
         {
             MusicManager.Instance.isOn = _ui.m_btnMusic.selected;
-            _ui.m_musicSlider.touchable = MusicManager.Instance.isOn;
-            _ui.m_musicSlider.alpha = MusicManager.Instance.isOn ? 1 : disabledVolumnSliderAlpha;
-        }
-
-        private void OnClickBtnVoice()
-        {
-            VoiceManager.Instance.isOn = _ui.m_btnVoice.selected;
-            _ui.m_voiceSlider.touchable = VoiceManager.Instance.isOn;
-            _ui.m_voiceSlider.alpha = VoiceManager.Instance.isOn ? 1 : disabledVolumnSliderAlpha;
-        }
-
-        private void OnChangeVoiceVolumn()
-        {
-            float volumn = (float)_ui.m_voiceSlider.value / 100;
-            VoiceManager.Instance.SetVolumn(volumn);
-            Debug.LogError(volumn);
-            LocalCache.SetFloat(LauncherConfig.VOICE_VOLUMN_KEY, volumn);
-        }
-
-        private void OnChangeMusicVolumn()
-        {
-            float volumn = (float)_ui.m_musicSlider.value / 100;
-            MusicManager.Instance.SetSettingVolumn(volumn);
-            MusicManager.Instance.SetVolume(volumn);
-            LocalCache.SetFloat(LauncherConfig.MUSIC_VOLUMN_KEY, volumn);
-        }
-
-        private void OnChangeSoundVolumn()
-        {
-            float volumn = (float)_ui.m_soundSlider.value / 100;
-            SoundManager.Instance.SetVolumn(volumn);
-            LocalCache.SetFloat(LauncherConfig.SOUND_VOLUMN_KEY, volumn);
-        }
-
-        private void OnClickBtnChangeMainBg()
-        {
-            ViewManager.Show<MainBgChooseView>();
-        }
-
-        private void InitVolumnSetting()
-        {
-            _ui.m_btnMusic.selected = MusicManager.Instance.isOn;
-            _ui.m_musicSlider.touchable = MusicManager.Instance.isOn;
-            _ui.m_musicSlider.alpha = MusicManager.Instance.isOn ? 1 : disabledVolumnSliderAlpha;
-            _ui.m_musicSlider.value = MusicManager.Instance.GetSettingVolumn() * 100;
-
-            _ui.m_btnSound.selected = SoundManager.Instance.isOn;
-            _ui.m_soundSlider.touchable = SoundManager.Instance.isOn;
-            _ui.m_soundSlider.alpha = SoundManager.Instance.isOn ? 1 : disabledVolumnSliderAlpha;
-            _ui.m_soundSlider.value = GRoot.inst.soundVolume * 100;
 
-            _ui.m_btnVoice.selected = VoiceManager.Instance.isOn;
-            _ui.m_voiceSlider.touchable = VoiceManager.Instance.isOn;
-            _ui.m_voiceSlider.alpha = VoiceManager.Instance.isOn ? 1 : disabledVolumnSliderAlpha;
-            _ui.m_voiceSlider.value = VoiceManager.Instance.GetVolumn() * 100;
         }
     }
 }