com.soosvet_games.common_tools 1.0.6 → 1.0.7

package/Runtime/Common/AudioMixer.mixer

@@ -0,0 +1,146 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!244 &-8461503843806639858
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: c24b38b14a201af4a8bb8cc381f855d8
+  m_EffectName: Attenuation
+  m_MixLevel: 2a05e862ec030764a817f269040402a8
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
+--- !u!243 &-7223703584047178425
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Music
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: 415e865aecb0dec4989735320c5bb716
+  m_Children: []
+  m_Volume: f4cef9da461a56742a9df82963bd79e5
+  m_Pitch: 78c764bb0b17db645a6fca89748403f3
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: 3972384365331816477}
+  m_UserColorIndex: 0
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0
+--- !u!241 &24100000
+AudioMixerController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: AudioMixer
+  m_OutputGroup: {fileID: 0}
+  m_MasterGroup: {fileID: 24300002}
+  m_Snapshots:
+  - {fileID: 24500006}
+  m_StartSnapshot: {fileID: 24500006}
+  m_SuspendThreshold: -80
+  m_EnableSuspend: 1
+  m_UpdateMode: 0
+  m_ExposedParameters:
+  - guid: 8be27f7d6772d324b8a32e0f5eef83b2
+    name: MasterVolume
+  - guid: f4cef9da461a56742a9df82963bd79e5
+    name: MusicVolume
+  - guid: 53532c3a048fc5f488a95c8142d94800
+    name: SFXVolume
+  m_AudioMixerGroupViews:
+  - guids:
+    - 0700f2dc9a05e7e4d90aa3186eab1b88
+    - 415e865aecb0dec4989735320c5bb716
+    - ffe1964c3c64bce47a44ed22eab1bc8c
+    name: View
+  m_CurrentViewIndex: 0
+  m_TargetSnapshot: {fileID: 24500006}
+--- !u!243 &24300002
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Master
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: 0700f2dc9a05e7e4d90aa3186eab1b88
+  m_Children:
+  - {fileID: -7223703584047178425}
+  - {fileID: 8236444753114105489}
+  m_Volume: 8be27f7d6772d324b8a32e0f5eef83b2
+  m_Pitch: 5cc0cb3aaf2e46d42b51763cf66e1246
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: 24400004}
+  m_UserColorIndex: 0
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0
+--- !u!244 &24400004
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: 8dc4092d1a1a5f849bbb99e207fe44d5
+  m_EffectName: Attenuation
+  m_MixLevel: 84dc2916f7346af4b989de3c6b0e8c51
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
+--- !u!245 &24500006
+AudioMixerSnapshotController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Snapshot
+  m_AudioMixer: {fileID: 24100000}
+  m_SnapshotID: 2f7b4746b332c86469f3e5c36a0d171f
+  m_FloatValues:
+    53532c3a048fc5f488a95c8142d94800: -0.025776558
+    8be27f7d6772d324b8a32e0f5eef83b2: -0.27209902
+  m_TransitionOverrides: {}
+--- !u!244 &3972384365331816477
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: 11568c368f090bc41a8c1f78b98b9312
+  m_EffectName: Attenuation
+  m_MixLevel: 6d117e9f830c04f418b98e828995eb86
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
+--- !u!243 &8236444753114105489
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SFX
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: ffe1964c3c64bce47a44ed22eab1bc8c
+  m_Children: []
+  m_Volume: 53532c3a048fc5f488a95c8142d94800
+  m_Pitch: eae576986e55aaa41ba4b10f9e81ff1c
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: -8461503843806639858}
+  m_UserColorIndex: 0
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0

package/Runtime/Common/AudioMixer.mixer.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c6cc49c36bf4f2240910895c31fe7cee
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 24100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Common.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1a208ce236f78bf4db74e6780246b932
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Services/AudioService/AudioService.cs

@@ -0,0 +1,77 @@
+using UnityEngine;
+using UnityEngine.Audio;
+
+namespace SoosvetGames.CommonTools.Services.AudioService
+{
+    internal sealed class AudioService : IAudioService
+    {
+        private const string MIXER_MASTER = "MasterVolume";
+        private const string MIXER_MUSIC = "MusicVolume";
+        private const string MIXER_SFX = "SFXVolume";
+
+        private const string SFX = "SFX";
+        private const string MUSIC = "Music";
+        
+        private readonly AudioSourceFactory _audioFactory;
+        private readonly AudioMixer _audioMixer;
+
+        public AudioService( AudioSourceFactory audioFactory, AudioMixer audioMixer )
+        {
+            _audioFactory = audioFactory;
+            _audioMixer = audioMixer;
+        }
+
+        public AudioSource PlaySound( AudioClip clip, bool isLoop = false )
+        {
+            var source = CreateSound();
+            
+            if ( isLoop )
+            {
+                source.PlayLoop( clip );
+            }
+            else
+            {
+                source.PlayOnce( clip );
+            }
+
+            return source;
+        }
+
+        public void SetMixerMasterVolume( float value )
+        {
+            _audioMixer.SetFloat( MIXER_MASTER, value );
+        }
+
+        public void SetMixerMusicVolume( float value )
+        {
+            _audioMixer.SetFloat( MIXER_MUSIC, value );
+        }
+
+        public void SetMixerSoundVolume( float value )
+        {
+            _audioMixer.SetFloat( MIXER_SFX, value );
+        }
+
+        private AudioSource CreateSound()
+        {
+            var source = _audioFactory.Create();
+            if ( _audioMixer != null )
+            {
+                source.Source.outputAudioMixerGroup = _audioMixer.FindMatchingGroups( SFX )[ 0 ];
+            }
+
+            return source;
+        }
+
+        public MusicSource CreateMusic()
+        {
+            var source = _audioFactory.Create();
+            if ( _audioMixer != null )
+            {
+                source.Source.outputAudioMixerGroup = _audioMixer.FindMatchingGroups( MUSIC )[ 0 ];
+            }
+
+            return new( source );
+        }
+    }
+}

package/Runtime/Services/AudioService/AudioService.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a188bea943044d769e3becff1ef22e7c
+timeCreated: 1786797139

package/Runtime/Services/AudioService/AudioServiceInstaller.cs

@@ -0,0 +1,18 @@
+using UnityEngine.Audio;
+using Zenject;
+
+namespace SoosvetGames.CommonTools.Services.AudioService
+{
+    public sealed class AudioServiceInstaller
+    {
+        public static void Install( DiContainer container, AudioMixer audioMixer, int poolSize = 1 )
+        {
+            container.BindFactory< AudioSource, AudioSourceFactory >()
+                .FromMonoPoolableMemoryPool((x) => x.WithInitialSize( poolSize )
+                    .FromNewComponentOnNewGameObject())
+                .WhenInjectedInto<AudioService>().Lazy();
+            container.BindInstance( audioMixer ).WhenInjectedInto< AudioService >().Lazy();
+            container.BindInterfacesTo< AudioService >().AsSingle().Lazy();
+        }
+    }
+}

package/Runtime/Services/AudioService/AudioServiceInstaller.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ee8d8d83e4b94489858dc40e3651cbd3
+timeCreated: 1786798166

package/Runtime/Services/AudioService/AudioSource.cs

@@ -0,0 +1,118 @@
+using Cysharp.Threading.Tasks;
+using DG.Tweening;
+using SoosvetGames.IoC;
+using UnityEngine;
+
+namespace SoosvetGames.CommonTools.Services.AudioService
+{
+    [ RequireComponent( typeof(UnityEngine.AudioSource) ) ]
+    public sealed class AudioSource : ZenjectMonoPoolable
+    {
+        public UnityEngine.AudioSource Source
+        {
+            get
+            {
+                if ( _source == null )
+                {
+                    _source = GetComponent< UnityEngine.AudioSource >();
+                }
+
+                return _source;
+            }
+        }
+        private UnityEngine.AudioSource _source;
+
+        public bool IsPlaying => Source.isPlaying || _isPaused;
+        public bool IsLoop => Source.loop;
+
+        private bool _isPaused;
+        private int _playVersion;
+
+        public void PlayLoop( AudioClip clip )
+        {
+            Prepare( clip, true );
+            Source.Play();
+        }
+
+        public void PlayOnce( AudioClip clip )
+        {
+            Prepare( clip, false );
+
+            var playVersion = ++_playVersion;
+
+            Source.Play();
+
+            WaitForComplete( playVersion ).Forget();
+        }
+
+        public void Stop()
+        {
+            ++_playVersion;
+
+            _isPaused = false;
+
+            Source.Stop();
+            Source.clip = null;
+
+            DespawnIt();
+        }
+
+        public void Rewind()
+        {
+            Source.time = 0f;
+        }
+
+        public void Pause( bool trigger )
+        {
+            _isPaused = trigger;
+
+            if ( trigger )
+            {
+                Source.Pause();
+            }
+            else
+            {
+                Source.UnPause();
+            }
+        }
+
+        public void Mute( bool trigger )
+        {
+            Source.mute = trigger;
+        }
+
+        public void Loop( bool trigger )
+        {
+            Source.loop = trigger;
+        }
+
+        public Tween DoVolume( float target, float duration )
+        {
+            return DOTween.To( () => Source.volume, x => Source.volume = x, target, duration );
+        }
+
+        private void Prepare( AudioClip clip, bool loop )
+        {
+            ++_playVersion;
+
+            _isPaused = false;
+
+            Source.Stop();
+            Source.clip = clip;
+            Source.loop = loop;
+        }
+
+        private async UniTask WaitForComplete( int playVersion )
+        {
+            await UniTask.WaitUntil( () => playVersion != _playVersion || !IsPlaying, cancellationToken: destroyCancellationToken );
+
+            if ( playVersion != _playVersion )
+            {
+                return;
+            }
+
+            Source.clip = null;
+            DespawnIt();
+        }
+    }
+}

package/Runtime/Services/AudioService/AudioSource.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 689165225ef24fe59c4554a08eb76f19
+timeCreated: 1786797163

package/Runtime/Services/AudioService/AudioSourceFactory.cs

@@ -0,0 +1,6 @@
+using Zenject;
+
+namespace SoosvetGames.CommonTools.Services.AudioService
+{
+    internal sealed class AudioSourceFactory : PlaceholderFactory< AudioSource > { }
+}

package/Runtime/Services/AudioService/AudioSourceFactory.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5dcfad645ce24b03b4662fd7af6dce79
+timeCreated: 1786797883

package/Runtime/Services/AudioService/IAudioService.cs

@@ -0,0 +1,15 @@
+using UnityEngine;
+
+namespace SoosvetGames.CommonTools.Services.AudioService
+{
+    public interface IAudioService
+    {
+        AudioSource PlaySound( AudioClip clip, bool isLoop = false );
+        
+        void SetMixerMasterVolume( float value );
+        void SetMixerMusicVolume( float value );
+        void SetMixerSoundVolume( float value );
+
+        MusicSource CreateMusic();
+    }
+}

package/Runtime/Services/AudioService/IAudioService.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 56021ea433074645a7bfce852897052d
+timeCreated: 1786797937

package/Runtime/Services/AudioService/MusicSource.cs

@@ -0,0 +1,67 @@
+using DG.Tweening;
+using System;
+using UnityEngine;
+
+namespace SoosvetGames.CommonTools.Services.AudioService
+{
+    public sealed class MusicSource
+    {
+        public AudioSource Audio { get; }
+
+        private Tween _fade;
+        
+        public MusicSource( AudioSource audioSource )
+        {
+            Audio = audioSource ?? throw new ArgumentNullException( nameof(audioSource) );
+        }
+        
+        public void Play( AudioClip clip )
+        {
+            Audio.PlayLoop( clip );
+        }
+
+        public void Change( AudioClip clip, float fadeOut = 0.33f, float fadeIn = 0.33f )
+        {
+            _fade?.Kill();
+
+            if ( _fade == null )
+            {
+                Play( clip );
+                Audio.Source.volume = 0f;
+                _fade = Audio.DoVolume( 1f, fadeIn );
+            }
+            else
+            {
+                _fade = Audio
+                    .DoVolume( 0f, fadeOut )
+                    .OnComplete( VolumeCompleted );
+            }
+
+            void VolumeCompleted()
+            {
+                Play( clip );
+                _fade = Audio.DoVolume( 1f, fadeIn );
+            }
+        }
+
+        public void SetVolume( float value )
+        {
+            Audio.Source.volume = value;
+        }
+
+        public Tween DoVolume( float target, float duration )
+        {
+            return Audio.DoVolume( target, duration );
+        }
+        
+        public void Pause( bool trigger )
+        {
+            Audio.Pause( trigger );
+        }
+        
+        public void Mute( bool trigger )
+        {
+            Audio.Mute( trigger );
+        }
+    }
+}

package/Runtime/Services/AudioService/MusicSource.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 55faaa2afa144884abb62ba1fbb0e6c4
+timeCreated: 1786797988

package/Runtime/Services/AudioService.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7c3e19f7a328413fac74b59c3c249355
+timeCreated: 1786797127

package/Runtime/SoosvetGames.CommonTools.asmdef

@@ -2,7 +2,10 @@
     "name": "SoosvetGames.CommonTools",
     "rootNamespace": "",
     "references": [
-        "GUID:0c0c8357443d62a4c9e55fe39d3a3e51"
+        "GUID:0c0c8357443d62a4c9e55fe39d3a3e51",
+        "GUID:0d8beb7f090555447a6cf5ce9e54dbb4",
+        "GUID:9e5f34ba0cc07fc4184cb3bf9d5c4b7e",
+        "GUID:f51ebe6a0ceec4240a699833d6309b23"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

package/package.json

@@ -1,7 +1,7 @@
 {
     "name" : "com.soosvet_games.common_tools",
     "displayName" : "Soosvet Games Common Tools",
-    "version" : "1.0.6",
+    "version" : "1.0.7",
     "author" : "Soosvet Games",
     "description" : "Common tools for Unity.",
     "repository": {