111

Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/HotFixDllState.cs

@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Cysharp.Threading.Tasks;
+#if !UNITY_WEBGL
 using HybridCLR;
+#endif
 using UnityEngine;
 using YooAsset;
 
@@ -230,11 +232,6 @@ namespace Stary.Evo
             }
         }
 
-        public override UniTask OnEnterAsync()
-        {
-            return UniTask.CompletedTask;
-        }
-
         private Type IsAssetLoaded(string assemblyName)
         {
             var assemblies = AppDomain.CurrentDomain.GetAssemblies();
@@ -253,26 +250,9 @@ namespace Stary.Evo
 
         #region 补充元数据
 
-        // //补充元数据dll的列表
-        // //通过RuntimeApi.LoadMetadataForAOTAssembly()函数来补充AOT泛型的原始元数据
-        // private  List<string> AOTMetaAssemblyFiles { get; } =new()
-        // {
-        //     "Android_mscorlib.dll", "Android_System.dll", "Android_System.Core.dll",
-        // };
-
         private readonly List<TextAsset> _sAssetDatas = new();
 
-
-        // public byte[] ReadBytesFromStreamingAssets(string dllName)
-        // {
-        //     if (_sAssetDatas.ContainsKey(dllName))
-        //     {
-        //         return _sAssetDatas[dllName].bytes;
-        //     }
-        //
-        //     return Array.Empty<byte>();
-        // }
-
+        
 
         /// <summary>
         ///     为aot assembly加载原始metadata， 这个代码放aot或者热更新都行。
@@ -280,6 +260,7 @@ namespace Stary.Evo
         /// </summary>
         private void LoadMetadataForAOTAssemblies()
         {
+#if !UNITY_WEBGL
             var mode = HomologousImageMode.SuperSet;
             // foreach (var aotDllName in AOTGenericReferences.PatchedAOTAssemblyList)
             foreach (var aotDll in _sAssetDatas)
@@ -300,6 +281,7 @@ namespace Stary.Evo
 
                     Debug.Log($"UnityEvo:【补元】{aotDll.name} 加载结果: {err} 字节数: {dllBytes.Length}");
                 }
+#endif
         }
 
         #endregion

Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/ResStartState.cs

@@ -20,7 +20,14 @@ namespace Stary.Evo
             if (AppConfig.DeveloperMode)
             {
                 domainConfig = param1 as DomainConfig;
+#if UNITY_WEBGL
+                string typeName = $"{domainConfig.@namespace}.{domainConfig.className},{domainConfig.assemblyName}"; // 完整命名空间
+                Type type = Type.GetType(typeName);     
+#else
                 Type type = param2 as Type;
+#endif
+
+
 
                 GameObject mainPrefab = null;