Развитие системы растений

Assets/Code/Infrastructure/Audio/AudioFactory.cs

@@ -29,7 +29,7 @@ namespace Code.Infrastructure.Audio
         {
             _eventBus = eventBus;
             _label = configLocator.TryGetManyConfigAssetReferences<AudioInfoConfig>();
-            
+
             for (var i = 0; i < typeof(AudioNames).GetEnumValues().Length; i++)
             {
                 _audioInfos.Add((AudioNames)i, new Dictionary<int, AssetReference>());
@@ -38,15 +38,17 @@ namespace Code.Infrastructure.Audio
 
             LoadConfigs().Forget();
         }
-        
+
         private async UniTaskVoid LoadConfigs()
         {
-            _configsHandle = Addressables.LoadAssetsAsync<AudioInfoConfig>(_label);
+            if ((await Addressables.LoadResourceLocationsAsync(_label).Task).Count != 0)
+            {
+                _configsHandle = Addressables.LoadAssetsAsync<AudioInfoConfig>(_label);
+                await _configsHandle.ToUniTask();
 
-            await _configsHandle.ToUniTask();
-
-            foreach (AudioInfoConfig config in _configsHandle.Result) 
-                _audioInfos[config.GroupName].Add(config.id, config.fileReference);
+                foreach (var config in _configsHandle.Result)
+                    _audioInfos[config.GroupName].Add(config.id, config.fileReference);
+            }
 
             _eventBus.RaiseEvent<IAudioConfigsLoadedHandle>(ui => ui.AudioConfigsLoaded());
         }
@@ -54,14 +56,15 @@ namespace Code.Infrastructure.Audio
         public async UniTaskVoid LoadAudioClips(AudioNames groupName)
         {
             UnityEngine.Debug.LogWarning($"Audios loaded {groupName}");
-            
+
             foreach (var audioInfo in _audioInfos[groupName])
                 if (!_clipsHandles[groupName].ContainsKey(audioInfo.Key))
-                    _clipsHandles[groupName].Add(audioInfo.Key, Addressables.LoadAssetAsync<AudioClip>(audioInfo.Value));
+                    _clipsHandles[groupName]
+                        .Add(audioInfo.Key, Addressables.LoadAssetAsync<AudioClip>(audioInfo.Value));
                 else
                     _clipsHandles[groupName][audioInfo.Key] = Addressables.LoadAssetAsync<AudioClip>(audioInfo.Value);
 
-            foreach (var handle in _clipsHandles[groupName]) 
+            foreach (var handle in _clipsHandles[groupName])
                 await handle.Value.ToUniTask();
 
             _eventBus.RaiseEvent<IAudioClipsEventHandle>(ui =>
@@ -73,11 +76,12 @@ namespace Code.Infrastructure.Audio
         public void ReleaseAudios(AudioNames groupName)
         {
             UnityEngine.Debug.LogWarning($"Audios unloaded {groupName}");
-            _eventBus.RaiseEvent<IAudioClipsEventHandle>(x=> x.AudioClipsUnLoaded(groupName));
-            
-            foreach (var handle in _clipsHandles) 
+            _eventBus.RaiseEvent<IAudioClipsEventHandle>(x => x.AudioClipsUnLoaded(groupName));
+
+            foreach (var handle in _clipsHandles)
                 Addressables.Release(handle.Value);
         }
+
         public void Dispose()
         {
             foreach (var handles in _clipsHandles)
@@ -88,7 +92,8 @@ namespace Code.Infrastructure.Audio
                 }
             }
 
-            _configsHandle.Release();
+            if (_configsHandle.IsValid())
+                _configsHandle.Release();
         }
     }
 

Assets/Code/Infrastructure/Audio/AudioSourcePool.cs

@@ -118,7 +118,7 @@ namespace Code.Infrastructure.Audio
         {
             Addressables.Release(_handles);
             Addressables.Release(_prefabConfigHandle);
-            Addressables.Release(_sourcePrefab);
+            if(_sourcePrefab) Addressables.Release(_sourcePrefab);
         }
     }