From 5734d4f9958c1b2010c0df0e8b4e770901fc64b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=88=E6=8C=BA?= <ting.shen@centurygame.com>
Date: Tue, 9 Jul 2024 16:11:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E7=83=AD=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E9=9B=86=E7=9A=84=E5=B4=A9=E6=BA=83bug?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Main/Procedure/ProcedureLoadAssembly.cs   | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/UnityProject/Assets/GameScripts/Main/Procedure/ProcedureLoadAssembly.cs b/UnityProject/Assets/GameScripts/Main/Procedure/ProcedureLoadAssembly.cs
index b8090917..34b90dfe 100644
--- a/UnityProject/Assets/GameScripts/Main/Procedure/ProcedureLoadAssembly.cs
+++ b/UnityProject/Assets/GameScripts/Main/Procedure/ProcedureLoadAssembly.cs
@@ -9,6 +9,7 @@ using UnityEngine;
 using TEngine;
 using System.Reflection;
 using YooAsset;
+using Cysharp.Threading.Tasks;
 
 namespace GameMain
 {
@@ -38,6 +39,12 @@ namespace GameMain
             base.OnEnter(procedureOwner);
             Log.Debug("HyBridCLR ProcedureLoadAssembly OnEnter");
             m_procedureOwner = procedureOwner;
+
+            LoadAssembly().Forget();
+        }
+
+        private async UniTaskVoid LoadAssembly()
+        {
             m_LoadAssemblyComplete = false;
             m_HotfixAssemblys = new List<Assembly>();
 
@@ -55,7 +62,7 @@ namespace GameMain
             {
                 m_LoadMetadataAssemblyComplete = true;
             }
-            
+
             if (!SettingsUtils.HybridCLRCustomGlobalSettings.Enable || GameModule.Resource.PlayMode == EPlayMode.EditorSimulateMode)
             {
                 m_MainLogicAssembly = GetMainLogicAssembly();
@@ -75,10 +82,11 @@ namespace GameMain
                                     SettingsUtils.HybridCLRCustomGlobalSettings.AssemblyTextAssetPath,
                                     $"{hotUpdateDllName}{SettingsUtils.HybridCLRCustomGlobalSettings.AssemblyTextAssetExtension}"));
                         }
-                           
+
                         Log.Debug($"LoadAsset: [ {assetLocation} ]");
                         m_LoadAssetCount++;
-                        GameModule.Resource.LoadAsset<TextAsset>(assetLocation,LoadAssetSuccess);
+                        var result = await GameModule.Resource.LoadAssetAsync<TextAsset>(assetLocation);
+                        LoadAssetSuccess(result);
                     }
 
                     m_LoadAssemblyWait = true;
@@ -94,7 +102,7 @@ namespace GameMain
                 m_LoadAssemblyComplete = true;
             }
         }
-        
+
         protected override void OnUpdate(IFsm<IProcedureManager> procedureOwner, float elapseSeconds, float realElapseSeconds)
         {
             base.OnUpdate(procedureOwner, elapseSeconds, realElapseSeconds);
@@ -108,7 +116,7 @@ namespace GameMain
             }
             AllAssemblyLoadComplete();
         }
-        
+
         private void AllAssemblyLoadComplete()
         {
             ChangeState<ProcedureStartGame>(m_procedureOwner);
@@ -231,11 +239,11 @@ namespace GameMain
                             SettingsUtils.HybridCLRCustomGlobalSettings.AssemblyTextAssetPath,
                             $"{aotDllName}{SettingsUtils.HybridCLRCustomGlobalSettings.AssemblyTextAssetExtension}"));
                 }
-                
-                
+
+
                 Log.Debug($"LoadMetadataAsset: [ {assetLocation} ]");
                 m_LoadMetadataAssetCount++;
-                GameModule.Resource.LoadAsset<TextAsset>(assetLocation,LoadMetadataAssetSuccess);
+                GameModule.Resource.LoadAsset<TextAsset>(assetLocation, LoadMetadataAssetSuccess);
             }
             m_LoadMetadataAssemblyWait = true;
         }