updated to v2.12.5

michael811125 · michael811125 · commit 00921c3d7e3b · 2025-01-02T13:37:35.000+08:00
diff --git a/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Bundle/PatchLauncher.cs b/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Bundle/PatchLauncher.cs
@@ -26,7 +26,7 @@ internal class PatchLauncher : MonoBehaviour
 
         [Separator("Download Options")]
         [Tooltip("* [WebRequest] supports dynamic query built-in files (Some memory will be used, but will be released at next GC).\n\n* [BuiltinFileManifest] query built-in files from manifest (setup at build-time or manual export).\n\n* [BuiltinFileManifest with CRC] query built-in files and check CRC from manifest (setup at build-time or manual export).")]
-        public BundleConfig.BuiltinQueryMode builtinQueryMode = BundleConfig.BuiltinQueryMode.WebRequest;
+        public BundleConfig.BuiltinQueryMode builtinQueryMode = BundleConfig.BuiltinQueryMode.BuiltinFileManifest;
         public int maxConcurrencyDownloadCount = BundleConfig.maxConcurrencyDownloadCount;
         public int failedRetryCount = BundleConfig.failedRetryCount;
         [Tooltip("If file size >= [BreakpointFileSizeThreshold] that file will enable breakpoint mechanism (for all downloaders).")]
diff --git a/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Bundle/YooAssets/StreamingAssetsHelper/StreamingAssetsHelper.cs b/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Bundle/YooAssets/StreamingAssetsHelper/StreamingAssetsHelper.cs
@@ -152,11 +152,11 @@ internal class PreprocessBuild : UnityEditor.Build.IPreprocessBuildWithReport
         /// </summary>
         public void OnPreprocessBuild(UnityEditor.Build.Reporting.BuildReport report)
         {
-            ExportBuiltinFileManifest();
+            _ExportBuiltinFileManifest();
         }
 
         [UnityEditor.MenuItem("OxGFrame/AssetLoader/" + "Export Built-in File Manifest (BuiltinFileManifest.asset)", false, 879)]
-        private static void ExportBuiltinFileManifest()
+        private static void _ExportBuiltinFileManifest()
         {
             string saveFilePath = Path.Combine(_resourcesPath, _MANIFEST_FILE_NAME + _MANIFEST_FILE_EXTENSION);
             string saveFileMetaPath = Path.Combine(_resourcesPath, _MANIFEST_FILE_NAME + _MANIFEST_FILE_EXTENSION + _META_FILE_EXTENSION);
diff --git a/Assets/OxGFrame/CHANGELOG.md b/Assets/OxGFrame/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## [2.12.5] - 2025-01-02
+- Modified the default value of builtinQueryMode in PatchLauncher to BuiltinFileManifest. WebRequest will be deprecated in the future, so it is recommended to switch to BuiltinFileManifest. 
+- Optimized to reduce the FrameManager Update GC issue in CoreFrame.
+- Optimized to accelerate the garbage collection efficiency of the Collector dictionary in FrameBase.
+
 ## [2.12.4] - 2024-12-30
 - Fixed the issue with the condition triggering PackageEvents.PatchInitPatchModeFailed.SendEventMessage in PackageFsmStates.
 
diff --git a/Assets/OxGFrame/CoreFrame/Scripts/Runtime/Core/CPFrame/CPBase.cs b/Assets/OxGFrame/CoreFrame/Scripts/Runtime/Core/CPFrame/CPBase.cs
@@ -57,6 +57,7 @@ private void OnDisable()
         private void OnDestroy()
         {
             this.OnRelease();
+            this.Dispose();
             AssetLoaders.UnloadAsset(this.assetName);
         }
 
diff --git a/Assets/OxGFrame/CoreFrame/Scripts/Runtime/Core/Implement/FrameBase.cs b/Assets/OxGFrame/CoreFrame/Scripts/Runtime/Core/Implement/FrameBase.cs
@@ -1,5 +1,6 @@
 ﻿using Cysharp.Threading.Tasks;
 using MyBox;
+using System;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -14,7 +15,7 @@ namespace OxGFrame.CoreFrame
     public abstract class FrameBase : MonoBehaviour
     {
         #region 綁定物件的收集器
-        public class Collector
+        public class Collector : IDisposable
         {
             #region 依照綁定類型建立緩存容器
             // 用於存放綁定物件的緩存 (GameObject)
@@ -99,6 +100,15 @@ public TComponent[] GetNodeComponents<TComponent>(string bindName)
 
                 return components;
             }
+
+            /// <summary>
+            /// Release
+            /// </summary>
+            public void Dispose()
+            {
+                this._nodes.Clear();
+                this._nodes = null;
+            }
             #endregion
         }
         #endregion
@@ -259,6 +269,15 @@ protected virtual void OnHide() { }
         /// </summary>
         public virtual void OnRelease() { }
 
+        /// <summary>
+        /// 釋放引用
+        /// </summary>
+        internal virtual void Dispose()
+        {
+            this.collector.Dispose();
+            this.collector = null;
+        }
+
         /// <summary>
         /// 調用關閉自己
         /// </summary>
diff --git a/Assets/OxGFrame/CoreFrame/Scripts/Runtime/Core/Implement/FrameManager.cs b/Assets/OxGFrame/CoreFrame/Scripts/Runtime/Core/Implement/FrameManager.cs
@@ -133,65 +133,57 @@ public U Pop()
         private void Update()
         {
             if (!this.enabledUpdate) return;
+            _dt = ignoreTimeScale ? Time.unscaledDeltaTime : Time.deltaTime;
             this.DriveUpdates(UpdateType.Update);
         }
 
         private void FixedUpdate()
         {
             if (!this.enabledFixedUpdate) return;
+            _fdt = ignoreTimeScale ? Time.fixedUnscaledDeltaTime : Time.fixedDeltaTime;
             this.DriveUpdates(UpdateType.FixedUpdate);
         }
 
         private void LateUpdate()
         {
             if (!this.enabledLateUpdate) return;
+            _dt = ignoreTimeScale ? Time.unscaledDeltaTime : Time.deltaTime;
             this.DriveUpdates(UpdateType.LateUpdate);
         }
 
         public void DriveUpdates(UpdateType updateType)
         {
-            if (this._dictAllCache.Count > 0)
+            if (this._dictAllCache.Count == 0)
+                return;
+
+            int fStackCount = this._dictAllCache.Count;
+            foreach (var fStack in this._dictAllCache.Values)
             {
-                var fStacks = this._dictAllCache.Values.ToArray();
-                foreach (var fStack in fStacks)
-                {
-                    // 判斷陣列長度是否有改變, 有改變表示陣列元素有更動
-                    if (this._dictAllCache.Count != fStacks.Length) break;
+                // 判斷陣列長度是否有改變, 有改變表示陣列元素有更動
+                if (this._dictAllCache.Count != fStackCount)
+                    break;
 
-                    var fBases = fStack.cache.ToArray();
-                    foreach (var fBase in fBases)
-                    {
-                        if (fStack.Count() != fBases.Length) break;
+                int fBaseCount = fStack.Count();
+                foreach (var fBase in fStack.cache)
+                {
+                    if (fStack.Count() != fBaseCount)
+                        break;
 
-                        // 僅刷新激活的物件
-                        if (this.CheckIsShowing(fBase))
-                        {
-                            switch (updateType)
-                            {
-                                case UpdateType.Update:
-                                case UpdateType.LateUpdate:
-                                    if (!this.ignoreTimeScale) _dt = Time.deltaTime;
-                                    else _dt = Time.unscaledDeltaTime;
-                                    break;
-                                case UpdateType.FixedUpdate:
-                                    if (!this.ignoreTimeScale) _fdt = Time.fixedDeltaTime;
-                                    else _fdt = Time.fixedUnscaledDeltaTime;
-                                    break;
-                            }
+                    // 僅刷新激活的物件
+                    if (!this.CheckIsShowing(fBase))
+                        continue;
 
-                            switch (updateType)
-                            {
-                                case UpdateType.Update:
-                                    fBase.HandleUpdate(_dt);
-                                    break;
-                                case UpdateType.FixedUpdate:
-                                    fBase.HandleFixedUpdate(_fdt);
-                                    break;
-                                case UpdateType.LateUpdate:
-                                    fBase.HandleLateUpdate(_dt);
-                                    break;
-                            }
-                        }
+                    switch (updateType)
+                    {
+                        case UpdateType.Update:
+                            fBase.HandleUpdate(_dt);
+                            break;
+                        case UpdateType.FixedUpdate:
+                            fBase.HandleFixedUpdate(_fdt);
+                            break;
+                        case UpdateType.LateUpdate:
+                            fBase.HandleLateUpdate(_dt);
+                            break;
                     }
                 }
             }
@@ -609,6 +601,7 @@ protected virtual void Destroy(T fBase, string assetName)
         {
             // 調用釋放接口
             fBase.OnRelease();
+            fBase.Dispose();
 
             // 刪除物件
             if (!fBase.gameObject.IsDestroyed()) Destroy(fBase.gameObject);
diff --git a/Assets/OxGFrame/package.json b/Assets/OxGFrame/package.json
@@ -2,7 +2,7 @@
 	"name": "com.michaelo.oxgframe",
 	"displayName": "OxGFrame",
 	"description": "The OxGFrame is a framework based on Unity for accelerating game development. Supports multi-platform Win, OSX, Android, iOS, WebGL.",
-	"version": "2.12.4",
+	"version": "2.12.5",
 	"unity": "2021.3",
 	"license": "MIT",
 	"samples": [

Original file line number	Diff line number	Diff line change
`@@ -152,11 +152,11 @@ internal class PreprocessBuild : UnityEditor.Build.IPreprocessBuildWithReport`
`152`	`152`	`/// </summary>`
`153`	`153`	`public void OnPreprocessBuild(UnityEditor.Build.Reporting.BuildReport report)`
`154`	`154`	`{`
`155`		`- ExportBuiltinFileManifest();`
	`155`	`+ _ExportBuiltinFileManifest();`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`[UnityEditor.MenuItem("OxGFrame/AssetLoader/" + "Export Built-in File Manifest (BuiltinFileManifest.asset)", false, 879)]`
`159`		`- private static void ExportBuiltinFileManifest()`
	`159`	`+ private static void _ExportBuiltinFileManifest()`
`160`	`160`	`{`
`161`	`161`	`string saveFilePath = Path.Combine(_resourcesPath, _MANIFEST_FILE_NAME + _MANIFEST_FILE_EXTENSION);`
`162`	`162`	`string saveFileMetaPath = Path.Combine(_resourcesPath, _MANIFEST_FILE_NAME + _MANIFEST_FILE_EXTENSION + _META_FILE_EXTENSION);`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ private void OnDisable()`
`57`	`57`	`private void OnDestroy()`
`58`	`58`	`{`
`59`	`59`	`this.OnRelease();`
	`60`	`+ this.Dispose();`
`60`	`61`	`AssetLoaders.UnloadAsset(this.assetName);`
`61`	`62`	`}`
`62`	`63`