fixed retry counter bug issue

michael811125 · Sep 10, 2023 · d2b97a3 · d2b97a3
1 parent 071fe7f
commit d2b97a3
Show file tree

Hide file tree

Showing 24 changed files with 215 additions and 193 deletions.
diff --git a/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Cacher/Base/AssetCache.cs b/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Cacher/Base/AssetCache.cs
@@ -17,7 +17,8 @@ public RetryCounter(byte maxRetryCount)
 
             public bool IsRetryValid()
             {
-                return this.retryCount < maxRetryCount;
+                // 嘗試次數先++, 後判斷, 所以需使用 <= 進行判斷
+                return this.retryCount <= maxRetryCount;
             }
 
             public void AddRetryCount()
@@ -30,9 +31,9 @@ public void AddRetryCount()
 
         protected Dictionary<string, RetryCounter> _loadingFlags;
 
-        public float reqSize { get; protected set; }
+        public float currentCount { get; protected set; }
 
-        public float totalSize { get; protected set; }
+        public float totalCount { get; protected set; }
 
         public int Count { get { return this._cacher.Count; } }
 

diff --git a/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Cacher/Base/AssetObject.cs b/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Cacher/Base/AssetObject.cs
@@ -102,42 +102,45 @@ public T GetOperationHandle<T>() where T : OperationHandleBase
         #region Raw
         public string GetRawFileText()
         {
-            return this.GetOperationHandle<RawFileOperationHandle>()?.GetRawFileText();
+            if (!this.IsValid()) return null;
+            return this.GetOperationHandle<RawFileOperationHandle>().GetRawFileText();
         }
 
         public byte[] GetRawFileData()
         {
-            return this.GetOperationHandle<RawFileOperationHandle>()?.GetRawFileData();
+            if (!this.IsValid()) return null;
+            return this.GetOperationHandle<RawFileOperationHandle>().GetRawFileData();
         }
 
         public void UnloadRawFile()
         {
-            if (this.IsValid()) this.GetOperationHandle<RawFileOperationHandle>()?.Release();
+            if (this.IsValid()) this.GetOperationHandle<RawFileOperationHandle>().Release();
         }
         #endregion
 
         #region Scene
         public Scene GetScene()
         {
-            if (this.operationHandle == null) return new Scene();
+            if (!this.IsValid()) return new Scene();
             return this.GetOperationHandle<SceneOperationHandle>().SceneObject;
         }
 
         public void UnloadScene()
         {
-            if (this.IsValid()) this.GetOperationHandle<SceneOperationHandle>()?.UnloadAsync();
+            if (this.IsValid()) this.GetOperationHandle<SceneOperationHandle>().UnloadAsync();
         }
         #endregion
 
         #region Asset
         public T GetAsset<T>() where T : Object
         {
+            if (!this.IsValid()) return null;
             return this.GetOperationHandle<AssetOperationHandle>()?.AssetObject as T;
         }
 
         public void UnloadAsset()
         {
-            if (this.IsValid()) this.GetOperationHandle<AssetOperationHandle>()?.Release();
+            if (this.IsValid()) this.GetOperationHandle<AssetOperationHandle>().Release();
         }
         #endregion
 

diff --git a/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Cacher/CacheBundle.cs b/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Cacher/CacheBundle.cs
diff --git a/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Cacher/CacheResource.cs b/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Cacher/CacheResource.cs
@@ -35,8 +35,8 @@ public async UniTask PreloadAssetAsync<T>(string[] assetNames, Progression progr
             if (assetNames == null || assetNames.Length == 0) return;
 
             // 先初始加載進度
-            this.reqSize = 0;
-            this.totalSize = assetNames.Length;
+            this.currentCount = 0;
+            this.totalCount = assetNames.Length;
 
             for (int i = 0; i < assetNames.Length; i++)
             {
@@ -58,8 +58,8 @@ public async UniTask PreloadAssetAsync<T>(string[] assetNames, Progression progr
                 // 如果有在緩存中就不進行預加載
                 if (this.HasInCache(assetName))
                 {
-                    this.reqSize++;
-                    progression?.Invoke(this.reqSize / this.totalSize, this.reqSize, this.totalSize);
+                    this.currentCount++;
+                    progression?.Invoke(this.currentCount / this.totalCount, this.currentCount, this.totalCount);
                     this.RemoveLoadingFlags(assetName);
                     continue;
                 }
@@ -71,14 +71,14 @@ public async UniTask PreloadAssetAsync<T>(string[] assetNames, Progression progr
 
                     if (req != null)
                     {
-                        float lastSize = 0;
+                        float lastCount = 0;
                         do
                         {
                             if (progression != null)
                             {
-                                this.reqSize += (req.progress - lastSize);
-                                lastSize = req.progress;
-                                progression.Invoke(this.reqSize / this.totalSize, this.reqSize, this.totalSize);
+                                this.currentCount += (req.progress - lastCount);
+                                lastCount = req.progress;
+                                progression.Invoke(this.currentCount / this.totalCount, this.currentCount, this.totalCount);
                             }
 
                             if (req.isDone)
@@ -119,8 +119,8 @@ public void PreloadAsset<T>(string[] assetNames, Progression progression, byte m
             if (assetNames == null || assetNames.Length == 0) return;
 
             // 先初始加載進度
-            this.reqSize = 0;
-            this.totalSize = assetNames.Length;
+            this.currentCount = 0;
+            this.totalCount = assetNames.Length;
 
             for (int i = 0; i < assetNames.Length; i++)
             {
@@ -142,8 +142,8 @@ public void PreloadAsset<T>(string[] assetNames, Progression progression, byte m
                 // 如果有在緩存中就不進行預加載
                 if (this.HasInCache(assetName))
                 {
-                    this.reqSize++;
-                    progression?.Invoke(this.reqSize / this.totalSize, this.reqSize, this.totalSize);
+                    this.currentCount++;
+                    progression?.Invoke(this.currentCount / this.totalCount, this.currentCount, this.totalCount);
                     this.RemoveLoadingFlags(assetName);
                     continue;
                 }
@@ -154,8 +154,8 @@ public void PreloadAsset<T>(string[] assetNames, Progression progression, byte m
                     var asset = Resources.Load<T>(assetName);
                     if (asset != null)
                     {
-                        this.reqSize++;
-                        progression?.Invoke(this.reqSize / this.totalSize, this.reqSize, this.totalSize);
+                        this.currentCount++;
+                        progression?.Invoke(this.currentCount / this.totalCount, this.currentCount, this.totalCount);
 
                         loaded = true;
                         pack.SetPack(assetName, asset);
@@ -197,8 +197,8 @@ public async UniTask<T> LoadAssetAsync<T>(string assetName, Progression progress
             }
 
             // 初始加載進度
-            this.reqSize = 0;
-            this.totalSize = 1;
+            this.currentCount = 0;
+            this.totalCount = 1;
 
             // Loading 標記
             this.AddLoadingFlags(assetName, maxRetryCount);
@@ -215,14 +215,14 @@ public async UniTask<T> LoadAssetAsync<T>(string assetName, Progression progress
 
                     if (req != null)
                     {
-                        float lastSize = 0;
+                        float lastCount = 0;
                         do
                         {
                             if (progression != null)
                             {
-                                this.reqSize += (req.progress - lastSize);
-                                lastSize = req.progress;
-                                progression.Invoke(this.reqSize / this.totalSize, this.reqSize, this.totalSize);
+                                this.currentCount += (req.progress - lastCount);
+                                lastCount = req.progress;
+                                progression.Invoke(this.currentCount / this.totalCount, this.currentCount, this.totalCount);
                             }
 
                             if (req.isDone)
@@ -244,8 +244,8 @@ public async UniTask<T> LoadAssetAsync<T>(string assetName, Progression progress
             }
             else
             {
-                this.reqSize = this.totalSize;
-                progression?.Invoke(this.reqSize / this.totalSize, this.reqSize, this.totalSize);
+                this.currentCount = this.totalCount;
+                progression?.Invoke(this.currentCount / this.totalCount, this.currentCount, this.totalCount);
             }
 
             var asset = pack.GetAsset<T>();
@@ -281,8 +281,8 @@ public T LoadAsset<T>(string assetName, Progression progression, byte maxRetryCo
             }
 
             // 初始加載進度
-            this.reqSize = 0;
-            this.totalSize = 1;
+            this.currentCount = 0;
+            this.totalCount = 1;
 
             // Loading 標記
             this.AddLoadingFlags(assetName, maxRetryCount);
@@ -299,8 +299,8 @@ public T LoadAsset<T>(string assetName, Progression progression, byte maxRetryCo
                     asset = Resources.Load<T>(assetName);
                     if (asset != null)
                     {
-                        this.reqSize = this.totalSize;
-                        progression?.Invoke(this.reqSize / this.totalSize, this.reqSize, this.totalSize);
+                        this.currentCount = this.totalCount;
+                        progression?.Invoke(this.currentCount / this.totalCount, this.currentCount, this.totalCount);
 
                         loaded = true;
                         pack.SetPack(assetName, asset);
@@ -315,8 +315,8 @@ public T LoadAsset<T>(string assetName, Progression progression, byte maxRetryCo
             }
             else
             {
-                this.reqSize = this.totalSize;
-                progression?.Invoke(this.reqSize / this.totalSize, this.reqSize, this.totalSize);
+                this.currentCount = this.totalCount;
+                progression?.Invoke(this.currentCount / this.totalCount, this.currentCount, this.totalCount);
             }
 
             asset = pack.GetAsset<T>();

diff --git a/...ssetLoader/Scripts/Runtime/Interface.meta → ...der/Scripts/Runtime/Cacher/Interface.meta b/...ssetLoader/Scripts/Runtime/Interface.meta → ...der/Scripts/Runtime/Cacher/Interface.meta
diff --git a/...cripts/Runtime/Interface/Cacher/ICache.cs → ...cripts/Runtime/Cacher/Interface/ICache.cs b/...cripts/Runtime/Interface/Cacher/ICache.cs → ...cripts/Runtime/Cacher/Interface/ICache.cs
@@ -1,7 +1,5 @@
-namespace OxGFrame.AssetLoader
+namespace OxGFrame.AssetLoader.Cacher
 {
-    public delegate void Progression(float progress, float reqSize, float totalSize);
-
     public interface ICache<T>
     {
         bool HasInCache(string name);

diff --git a/...s/Runtime/Interface/Cacher/ICache.cs.meta → ...s/Runtime/Cacher/Interface/ICache.cs.meta b/...s/Runtime/Interface/Cacher/ICache.cs.meta → ...s/Runtime/Cacher/Interface/ICache.cs.meta
diff --git a/Assets/OxGFrame/AssetLoader/Scripts/Runtime/GroupCacher/Base/GroupCache.cs b/Assets/OxGFrame/AssetLoader/Scripts/Runtime/GroupCacher/Base/GroupCache.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 
 namespace OxGFrame.AssetLoader.GroupCacher
 {

diff --git a/Assets/OxGFrame/AssetLoader/Scripts/Runtime/GroupCacher/GroupBundle.cs b/Assets/OxGFrame/AssetLoader/Scripts/Runtime/GroupCacher/GroupBundle.cs
@@ -64,7 +64,6 @@ public async UniTask<T> LoadRawFileAsync<T>(int id, string packageName, string a
                 if (keyGroup != null)
                 {
                     keyGroup.AddRef();
-
                     Logging.Print<Logger>($"【Load】 => Current << GroupBundle >> Cache Count: {this.Count}, KeyRef: {keyGroup.refCount}, GroupId: {id}");
                 }
             }
@@ -85,7 +84,6 @@ public T LoadRawFile<T>(int id, string packageName, string assetName, Progressio
                 if (keyGroup != null)
                 {
                     keyGroup.AddRef();
-
                     Logging.Print<Logger>($"【Load】 => Current << GroupBundle >> Cache Count: {this.Count}, KeyRef: {keyGroup.refCount}, GroupId: {id}");
                 }
             }
@@ -99,21 +97,18 @@ public void UnloadRawFile(int id, string assetName, bool forceUnload)
             if (keyGroup != null)
             {
                 keyGroup.DelRef();
-
                 Logging.Print<Logger>($"【Unload】 => Current << GroupBundle >> Cache Count: {this.Count}, KeyRef: {keyGroup.refCount}, GroupId: {id}");
 
                 // 強制釋放
                 if (forceUnload)
                 {
                     this.DelFromCache(id, keyGroup.assetName);
-
                     Logging.Print<Logger>($"【Force Unload Completes】 => Current << GroupBundle >> Cache Count: {this.Count}, GroupId: {id}");
                 }
                 // 使用引用計數釋放
                 else if (keyGroup.refCount <= 0)
                 {
                     this.DelFromCache(id, keyGroup.assetName);
-
                     Logging.Print<Logger>($"【Unload Completes】 => Current << GroupBundle >> Cache Count: {this.Count}, GroupId: {id}");
                 }
 
@@ -192,7 +187,6 @@ public async UniTask<T> LoadAssetAsync<T>(int id, string packageName, string ass
                 if (keyGroup != null)
                 {
                     keyGroup.AddRef();
-
                     Logging.Print<Logger>($"【Load】 => Current << GroupBundle >> Cache Count: {this.Count}, KeyRef: {keyGroup.refCount}, GroupId: {id}");
                 }
             }
@@ -213,7 +207,6 @@ public T LoadAsset<T>(int id, string packageName, string assetName, Progression
                 if (keyGroup != null)
                 {
                     keyGroup.AddRef();
-
                     Logging.Print<Logger>($"【Load】 => Current << GroupBundle >> Cache Count: {this.Count}, KeyRef: {keyGroup.refCount}, GroupId: {id}");
                 }
             }
@@ -227,21 +220,18 @@ public void UnloadAsset(int id, string assetName, bool forceUnload)
             if (keyGroup != null)
             {
                 keyGroup.DelRef();
-
                 Logging.Print<Logger>($"【Unload】 => Current << GroupBundle >> Cache Count: {this.Count}, KeyRef: {keyGroup.refCount}, GroupId: {id}");
 
                 // 強制釋放
                 if (forceUnload)
                 {
                     this.DelFromCache(id, keyGroup.assetName);
-
                     Logging.Print<Logger>($"【Force Unload Completes】 => Current << GroupBundle >> Cache Count: {this.Count}, GroupId: {id}");
                 }
                 // 使用引用計數釋放
                 else if (keyGroup.refCount <= 0)
                 {
                     this.DelFromCache(id, keyGroup.assetName);
-
                     Logging.Print<Logger>($"【Unload Completes】 => Current << GroupBundle >> Cache Count: {this.Count}, GroupId: {id}");
                 }
 

diff --git a/Assets/OxGFrame/AssetLoader/Scripts/Runtime/GroupCacher/GroupResource.cs b/Assets/OxGFrame/AssetLoader/Scripts/Runtime/GroupCacher/GroupResource.cs
@@ -63,7 +63,6 @@ public async UniTask<T> LoadAssetAsync<T>(int id, string assetName, Progression
                 if (keyGroup != null)
                 {
                     keyGroup.AddRef();
-
                     Logging.Print<Logger>($"【Load】 => Current << GroupResource >> Cache Count: {this.Count}, KeyRef: {keyGroup.refCount}, GroupId: {id}");
                 }
             }
@@ -84,7 +83,6 @@ public T LoadAsset<T>(int id, string assetName, Progression progression, byte ma
                 if (keyGroup != null)
                 {
                     keyGroup.AddRef();
-
                     Logging.Print<Logger>($"【Load】 => Current << GroupResource >> Cache Count: {this.Count}, KeyRef: {keyGroup.refCount}, GroupId: {id}");
                 }
             }
@@ -98,21 +96,18 @@ public void UnloadAsset(int id, string assetName, bool forceUnload)
             if (keyGroup != null)
             {
                 keyGroup.DelRef();
-
                 Logging.Print<Logger>($"【Unload】 => Current << GroupResource >> Cache Count: {this.Count}, KeyRef: {keyGroup.refCount}, GroupId: {id}");
 
                 // 強制釋放
                 if (forceUnload)
                 {
                     this.DelFromCache(id, keyGroup.assetName);
-
                     Logging.Print<Logger>($"【Force Unload Completes】 => Current << GroupResource >> Cache Count: {this.Count}, GroupId: {id}");
                 }
                 // 使用引用計數釋放
                 else if (keyGroup.refCount <= 0)
                 {
                     this.DelFromCache(id, keyGroup.assetName);
-
                     Logging.Print<Logger>($"【Unload Completes】 => Current << GroupResource >> Cache Count: {this.Count}, GroupId: {id}");
                 }
 

diff --git a/...der/Scripts/Runtime/Interface/Cacher.meta → ...cripts/Runtime/GroupCacher/Interface.meta b/...der/Scripts/Runtime/Interface/Cacher.meta → ...cripts/Runtime/GroupCacher/Interface.meta
diff --git a/...time/Interface/GroupCacher/IGroupCache.cs → ...time/GroupCacher/Interface/IGroupCache.cs b/...time/Interface/GroupCacher/IGroupCache.cs → ...time/GroupCacher/Interface/IGroupCache.cs
@@ -1,4 +1,4 @@
-namespace OxGFrame.AssetLoader
+namespace OxGFrame.AssetLoader.GroupCacher
 {
     public interface IGroupCache<T>
     {

diff --git a/...Interface/GroupCacher/IGroupCache.cs.meta → ...GroupCacher/Interface/IGroupCache.cs.meta b/...Interface/GroupCacher/IGroupCache.cs.meta → ...GroupCacher/Interface/IGroupCache.cs.meta
diff --git a/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Interface/GroupCacher.meta b/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Interface/GroupCacher.meta
diff --git a/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Progression.cs b/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Progression.cs
@@ -0,0 +1,4 @@
+namespace OxGFrame.AssetLoader
+{
+    public delegate void Progression(float progress, float currentCount, float totalCount);
+}
diff --git a/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Progression.cs.meta b/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Progression.cs.meta