Clean

Author: duyca

Packages/ZBase.Foundation.Pooling/GameObjectLazyPool/Foundation/Pools/AssetRefGameObjectItemPool.cs

@@ -1,13 +1,10 @@
-using System;
-using UnityEngine;
+using UnityEngine;
 using ZBase.Foundation.Pooling.AddressableAssets;
 
 namespace ZBase.Foundation.Pooling.GameObjectItem.LazyPool
 {
     public class AssetRefGameObjectItemPool : AssetRefGameObjectPool
     {
-        internal event Action<GameObject> OnReturn;
-        
         public AssetRefGameObjectItemPool(AssetRefGameObjectPrefab prefab) : base(prefab)
         {
         }
@@ -19,11 +16,5 @@ protected override void ProcessNewInstance(GameObject instance)
                 poolItem = instance.AddComponent<AssetRefGameObjectPoolItem>();
             poolItem.SetUp(this);
         }
-
-        protected override void ReturnPreprocess(GameObject instance)
-        {
-            base.ReturnPreprocess(instance);
-            OnReturn?.Invoke(instance);
-        }
     }
 }

Packages/ZBase.Foundation.Pooling/GameObjectLazyPool/Foundation/Pools/GameObjectItemPool.cs

@@ -7,7 +7,6 @@ namespace ZBase.Foundation.Pooling.GameObjectItem.LazyPool
 {
     public sealed class GameObjectItemPool : GameObjectPool
     {
-        internal event Action<GameObject> OnReturn;
         internal event Action<GameObjectItemPool> OnPoolEmpty;
         private readonly List<int > _poolItems = new();
 
@@ -31,11 +30,5 @@ private void OnItemDestroy(GameObject instance)
             if(this._poolItems.Count == 0)
                 OnPoolEmpty?.Invoke(this);
         }
-        
-        protected override void ReturnPreprocess(GameObject instance)
-        {
-            base.ReturnPreprocess(instance);
-            OnReturn?.Invoke(instance);
-        }
     }
 }

Packages/ZBase.Foundation.Pooling/GameObjectLazyPool/GlobalPools/GlobalAssetRefGameObjectPool.cs

@@ -39,7 +39,8 @@ public async UniTask<GameObject> Rent(AssetRefGameObjectPrefab gameObjectReferen
             if (!_pools.TryGetValue(gameObjectReference, out var pool))
             {
                 pool = new AssetRefGameObjectItemPool(gameObjectReference);
-                pool.OnReturn += OnReturnToPool;
+                pool.OnItemDestroyAction += RemoveTrackingItem;
+                pool.OnReturnAction += RemoveTrackingItem;
                 this._pools.Add(gameObjectReference, pool);
             }
             GameObject item = await pool.Rent();
@@ -69,7 +70,7 @@ public void ReleaseInstances(int keep, System.Action<GameObject> onReleased = nu
                 pool.ReleaseInstances(keep, onReleased);
         }
 
-        private void OnReturnToPool(GameObject gameObject) => _dicTrackingInstancePools.Remove(gameObject.GetInstanceID());
+        private void RemoveTrackingItem(GameObject gameObject) => _dicTrackingInstancePools.Remove(gameObject.GetInstanceID());
 
         public void Dispose()
         {

Packages/ZBase.Foundation.Pooling/GameObjectLazyPool/GlobalPools/GlobalGameObjectPool.cs

@@ -28,7 +28,8 @@ public async UniTask<GameObject> Rent(GameObjectPrefab gameObjectReference)
                 if (gameObjectReference.Source.scene.IsValid())
                     throw new Exception($"Non Prefab not supported {gameObjectReference.Source.name}");
                 pool = new GameObjectItemPool(gameObjectReference);
-                pool.OnReturn += OnReturnToPool;
+                pool.OnReturnAction += RemoveTrackingItem;
+                pool.OnItemDestroyAction += RemoveTrackingItem;
                 pool.OnPoolEmpty += OnPoolEmpty;
                 this._pools.Add(instanceID, pool);
             }
@@ -92,7 +93,7 @@ private void RemoveCacheKey(int poolID)
             }
         }
 
-        private void OnReturnToPool(GameObject gameObject) =>
+        private void RemoveTrackingItem(GameObject gameObject) =>
             this._dicTrackingInstancePools.Remove(gameObject.GetInstanceID());
 
         public void Dispose()

Packages/ZBase.Foundation.Pooling/ZBase.Foundation.Pooling/UnityPools/Pools/GameObjectPool{TPrefab}.cs

@@ -8,6 +8,7 @@ namespace ZBase.Foundation.Pooling.UnityPools
     public class GameObjectPool<TPrefab> : UnityPool<GameObject, TPrefab> where TPrefab : IPrefab<GameObject>
     {
         [SerializeField] private bool _dontApplyPrefabParentOnReturn;
+        public event Action<GameObject> OnReturnAction;
 
         public GameObjectPool()
         {
@@ -34,6 +35,7 @@ protected override void ReturnPreprocess(GameObject instance)
             instance.SetActive(false);
             if (_dontApplyPrefabParentOnReturn == false && Prefab != null)
                 instance.transform.SetParent(Prefab.Parent);
+            OnReturnAction?.Invoke(instance);
         }
     }
 }

Packages/ZBase.Foundation.Pooling/ZBase.Foundation.Pooling/UnityPools/Pools/UnityPool{T,TPrefab}.cs

@@ -10,6 +10,8 @@ namespace ZBase.Foundation.Pooling.UnityPools
     public class UnityPool<T, TPrefab>
         : IUnityPool<T, TPrefab>, IShareable, IDisposable where T : UnityEngine.Object where TPrefab : IPrefab<T>
     {
+        public event Action<T> OnItemDestroyAction;
+        
         private readonly UniqueQueue<int, T> _queue;
 
         [SerializeField] private TPrefab _prefab;
@@ -90,13 +92,13 @@ public void Return(T instance)
             _queue.TryEnqueue(instance.GetInstanceID(), instance);
         }
 
-        public void OnPoolItemDestroy(T instance)
+        public virtual void OnPoolItemDestroy(T instance)
         {
             if (!instance)
                 return;
-            ReturnPreprocess(instance);
             _queue.Remove(instance.GetInstanceID());
             _prefab.Release(instance);
+            OnItemDestroyAction?.Invoke(instance);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]