com.soosvet_games.common_tools 1.0.8 → 1.1.0

package/Editor/HierarchyActivationTool.cs

@@ -6,32 +6,53 @@ namespace SoosvetGames.CommonTools.Extensions.Editor
     [ InitializeOnLoad ]
     internal static class HierarchyActivationTool
     {
-        static HierarchyActivationTool() => EditorApplication.hierarchyWindowItemOnGUI += HierarchWindowOnGui;
+        static HierarchyActivationTool()
+        {
+#if UNITY_6000_3_OR_NEWER
+            EditorApplication.hierarchyWindowItemByEntityIdOnGUI += HierarchyWindowOnGui;
+#else
+            EditorApplication.hierarchyWindowItemOnGUI += HierarchyWindowOnGui;
+#endif
+        }
+
+#if UNITY_6000_3_OR_NEWER
+
+        private static void HierarchyWindowOnGui(EntityId entityId, Rect selectionRect)
+        {
+            var obj = EditorUtility.EntityIdToObject(entityId) as GameObject;
 
-        private static void HierarchWindowOnGui( int instanceID, Rect selectionRect )
+            DrawToggle(obj, selectionRect);
+        }
+
+#else
+
+        private static void HierarchyWindowOnGui( int instanceId, Rect selectionRect )
         {
-            // make rectangle
-            var r = new Rect(selectionRect);
-            r.x = 35;
-            r.width = 18;
-
-            // get objects
-            Object o = EditorUtility.InstanceIDToObject(instanceID);
-            var obj = o as GameObject;
-
-            // drag toggle gui
-            if (obj != null)
-            {
-                bool prev = obj.activeSelf;
-                bool next = GUI.Toggle(r, obj.activeSelf, string.Empty);
-
-                if (next != prev)
-                {
-                    Undo.RecordObject(obj, $"Record {obj.name}");
-                    obj.SetActive(next);
-                    EditorUtility.SetDirty(obj);
-                }
-            }
+            var obj = EditorUtility.InstanceIDToObject( instanceId ) as GameObject;
+
+            DrawToggle( obj, selectionRect );
+        }
+
+#endif
+
+        private static void DrawToggle( GameObject obj, Rect selectionRect )
+        {
+            if ( obj == null )
+                return;
+
+            var rect = new Rect( selectionRect ) { x = 35, width = 18 };
+
+            bool previousValue = obj.activeSelf;
+            bool newValue = GUI.Toggle( rect, previousValue, string.Empty );
+
+            if ( newValue == previousValue )
+                return;
+
+            Undo.RecordObject( obj, $"Set Active {obj.name}" );
+
+            obj.SetActive( newValue );
+
+            EditorUtility.SetDirty( obj );
         }
     }
 }

package/Runtime/Services/AudioService/AudioSource.cs

@@ -22,61 +22,50 @@ namespace SoosvetGames.CommonTools.Services.AudioService
         }
         private UnityEngine.AudioSource _source;
 
-        public bool IsPlaying
-        {
-            get => _isPlaying;
-            private set
-            {
-                _isPlaying = value;
-                PlayingChangedHandler();
-            }
-        }
-        private bool _isPlaying = false;
-        
-        public bool isLoop { get; private set; } = false;
+        public bool IsPlaying => Source.isPlaying || _isPaused;
+        public bool IsLoop => Source.loop;
+
+        private bool _isPaused;
+        private int _playVersion;
 
         public void PlayLoop( AudioClip clip )
         {
-            IsPlaying = true;
-            Source.clip = clip;
-            Loop( true );
+            Prepare( clip, true );
             Source.Play();
         }
 
         public void PlayOnce( AudioClip clip )
         {
-            Loop( false );
+            Prepare( clip, false );
+
+            var playVersion = ++_playVersion;
 
-            StartPlayDelay( clip.length );
-            Source.PlayOneShot( clip );
+            Source.Play();
 
-            IsPlaying = true;
+            WaitForComplete( playVersion ).Forget();
         }
 
         public void Stop()
         {
-            IsPlaying = false;
-            Source.clip = null;
-        }
-        
-        public void Rewind()
-        {
-            Source.time = 0;
+            ++_playVersion;
+
+            _isPaused = false;
+
             Source.Stop();
-        }
+            Source.clip = null;
 
-        public Tween DoVolume( float target, float duration )
-        {
-            return DOTween.To( () => Source.volume, ( x ) => Source.volume = x, target, duration );
+            DespawnIt();
         }
 
-        public void Mute( bool trigger )
+        public void Rewind()
         {
-            Source.mute = trigger;
+            Source.time = 0f;
         }
 
         public void Pause( bool trigger )
         {
+            _isPaused = trigger;
+
             if ( trigger )
             {
                 Source.Pause();
@@ -86,32 +75,44 @@ namespace SoosvetGames.CommonTools.Services.AudioService
                 Source.UnPause();
             }
         }
-        
+
+        public void Mute( bool trigger )
+        {
+            Source.mute = trigger;
+        }
+
         public void Loop( bool trigger )
         {
-            isLoop = trigger;
             Source.loop = trigger;
         }
-        
-        private void StartPlayDelay( float playTime )
+
+        public Tween DoVolume( float target, float duration )
         {
-            PlayDelay( playTime ).Forget();
+            return DOTween.To( () => Source.volume, x => Source.volume = x, target, duration );
         }
-        
-        private async UniTask PlayDelay( float playTime )
+
+        private void Prepare( AudioClip clip, bool loop )
         {
-            await UniTask.WaitForSeconds( playTime, cancellationToken: destroyCancellationToken );
-            await UniTask.WaitForSeconds( 0.16f, cancellationToken: destroyCancellationToken );
-            
-            IsPlaying = false;
+            ++_playVersion;
+
+            _isPaused = false;
+
+            Source.Stop();
+            Source.clip = clip;
+            Source.loop = loop;
         }
 
-        private void PlayingChangedHandler()
+        private async UniTask WaitForComplete( int playVersion )
         {
-            if ( !IsPlaying )
+            await UniTask.WaitUntil( () => playVersion != _playVersion || !IsPlaying, cancellationToken: destroyCancellationToken );
+
+            if ( playVersion != _playVersion )
             {
-                DespawnIt();
+                return;
             }
+
+            Source.clip = null;
+            DespawnIt();
         }
     }
 }

package/package.json

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