duplicate key pool fix

Author: duyca

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

@@ -9,11 +9,8 @@ namespace ZBase.Foundation.Pooling.GameObjectItem.LazyPool
 {
     public class GlobalAssetRefGameObjectPool : IPool, IShareable
     {
-        private readonly Dictionary<AssetRefGameObjectPrefab, AssetRefGameObjectItemPool> _pools =
-            new(new AssetRefGameObjectPrefabEqualityComparer());
-
+        private readonly Dictionary<AssetRefGameObjectPrefab, AssetRefGameObjectItemPool> _pools = new(new AssetRefGameObjectPrefabEqualityComparer());
         private readonly Dictionary<int, AssetRefGameObjectItemPool> _dicTrackingInstancePools = new();
-
         private readonly Dictionary<AssetReferenceGameObject, AssetRefGameObjectPrefab> _poolKeyCache = new();
         private readonly Dictionary<string, AssetRefGameObjectPrefab> _poolStringKeyCache = new();
 
@@ -28,9 +25,10 @@ public async UniTask<GameObject> Rent(string address)
 
         public async UniTask<GameObject> Rent(AssetReferenceGameObject gameObjectReference)
         {
-            if (!_poolKeyCache.TryGetValue(gameObjectReference, out var key))
-                _poolKeyCache.Add(gameObjectReference,
-                    key = new AssetRefGameObjectPrefab { Source = gameObjectReference, });
+            if (_poolKeyCache.TryGetValue(gameObjectReference, out var key))
+                return await Rent(key);
+            key = new AssetRefGameObjectPrefab { Source = gameObjectReference };
+            this._poolKeyCache[gameObjectReference] = key;
             return await Rent(key);
         }
 
@@ -44,7 +42,10 @@ public async UniTask<GameObject> Rent(AssetRefGameObjectPrefab gameObjectReferen
                 this._pools.Add(gameObjectReference, pool);
             }
             GameObject item = await pool.Rent();
-            _dicTrackingInstancePools.Add(item.GetInstanceID(), pool);
+            var keyInstance = item.GetInstanceID();
+            if (_dicTrackingInstancePools.ContainsKey(keyInstance))
+                Debug.LogError("Duplicate key pool");
+            _dicTrackingInstancePools[keyInstance]= pool;
             return item;
         }
 

Packages/ZBase.Foundation.Pooling/ZBase.Foundation.Pooling.Addressables/ScriptablePools/ScriptableAssetRefGameObjectSource.cs

@@ -19,17 +19,11 @@ public override async UniTask<Object> InstantiateAsync(Transform parent,
             CancellationToken cancelToken = default)
         {
             var source = Source;
-
             if (source == null)
                 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.source);
-
-            AsyncOperationHandle<GameObject> handle;
-
-            if (parent)
-                handle = source.InstantiateAsync(parent, true);
-            else
-                handle = source.InstantiateAsync();
-
+            AsyncOperationHandle<GameObject> handle = default;
+            if (source != null)
+                handle = parent ? source.InstantiateAsync(parent, true) : source.InstantiateAsync();
             return await handle.WithCancellation(cancelToken);
         }
 

Packages/ZBase.Foundation.Pooling/ZBase.Foundation.Pooling/ScriptablePools/Common/UnityObjectPrefab.cs

@@ -9,7 +9,7 @@
 namespace ZBase.Foundation.Pooling.ScriptablePools
 {
     [Serializable]
-    public class UnityObjectPrefab : IPrefab<UnityEngine.Object, ScriptableSource>
+    public class UnityObjectPrefab : IPrefab<Object, ScriptableSource>
     {
         [SerializeField]
         private ScriptableSource _source;

Packages/ZBase.Foundation.Pooling/package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.zbase.foundation.pooling",
   "displayName": "ZBase.Foundation.Pooling",
-  "version": "2.3.16",
+  "version": "2.3.17",
   "unity": "2021.3",
   "documentationUrl": "https://github.com/WolffunGame/Unity.Pooling/blob/main/README.md",
   "dependencies": {