[修改]1. 修改热更新程序集的处理

Author: AlianBlank

GameFrameX.Core/Actors/ActorManager.cs

@@ -115,7 +115,7 @@ internal static async Task<IComponentAgent> GetComponentAgent(long actorId, Type
     /// <returns>组件代理任务</returns>
     public static Task<T> GetComponentAgent<T>(bool isNew = true) where T : IComponentAgent
     {
-        var compType = HotfixManager.GetCompType(typeof(T));
+        var compType = HotfixManager.GetComponentType(typeof(T));
         var actorType = ComponentRegister.GetActorType(compType);
         var actorId = ActorIdGenerator.GetActorId(actorType);
         return GetComponentAgent<T>(actorId, isNew);
@@ -479,7 +479,7 @@ public static void ActorForEach(Action<IActor> action)
     public static void ActorForEach<T>(Func<T, Task> func) where T : IComponentAgent
     {
         var agentType = typeof(T);
-        var compType = HotfixManager.GetCompType(agentType);
+        var compType = HotfixManager.GetComponentType(agentType);
         var actorType = ComponentRegister.GetActorType(compType);
         foreach (var actor in ActorMap.Values)
         {
@@ -504,7 +504,7 @@ async Task Work()
     public static void ActorForEach<T>(Action<T> action) where T : IComponentAgent
     {
         var agentType = typeof(T);
-        var compType = HotfixManager.GetCompType(agentType);
+        var compType = HotfixManager.GetComponentType(agentType);
         var actorType = ComponentRegister.GetActorType(compType);
         foreach (var actor in ActorMap.Values)
         {

GameFrameX.Core/Hotfix/HotfixManager.cs

@@ -99,10 +99,10 @@ private static async Task<bool> Load(HotfixModule newModule, AppSetting setting,
             DoingHotfix = true;
             var oldModuleHash = oldModule.GetHashCode();
             OldModuleMap.TryAdd(oldModuleHash, oldModule);
-            // 延迟10分钟后清理旧模块
+            // 延迟10分钟后清理旧模块
             _ = Task.Run(async () =>
             {
-                await Task.Delay(TimeSpan.FromMinutes(10));
+                await Task.Delay(TimeSpan.FromMinutes(10));
                 OldModuleMap.TryRemove(oldModuleHash, out _);
                 oldModule.Unload();
                 DoingHotfix = !OldModuleMap.IsEmpty;
@@ -133,14 +133,44 @@ public static Task Stop(string message = "")
     /// </summary>
     internal static Type GetAgentType(Type compType)
     {
+        if (OldModuleMap.IsEmpty)
+        {
+            return _module.GetAgentType(compType);
+        }
+
+        var compTypeAssembly = compType.Assembly;
+        foreach (var kv in OldModuleMap)
+        {
+            var old = kv.Value;
+            if (compTypeAssembly == old.HotfixAssembly)
+            {
+                return old.GetAgentType(compType);
+            }
+        }
+
         return _module.GetAgentType(compType);
     }
 
     /// <summary>
     /// 获取代理对应的组件类型
     /// </summary>
-    internal static Type GetCompType(Type agentType)
+    internal static Type GetComponentType(Type agentType)
     {
+        if (OldModuleMap.IsEmpty)
+        {
+            return _module.GetComponentType(agentType);
+        }
+
+        var agentTypeAssembly = agentType.Assembly;
+        foreach (var kv in OldModuleMap)
+        {
+            var old = kv.Value;
+            if (agentTypeAssembly == old.HotfixAssembly)
+            {
+                return old.GetComponentType(agentType);
+            }
+        }
+
         return _module.GetComponentType(agentType);
     }
 
@@ -153,17 +183,19 @@ internal static Type GetCompType(Type agentType)
     /// <returns>返回代理实例</returns>
     public static T GetAgent<T>(BaseComponent component, Type refAssemblyType) where T : IComponentAgent
     {
-        if (!OldModuleMap.IsEmpty)
+        if (OldModuleMap.IsEmpty)
         {
-            var asb = typeof(T).Assembly;
-            var asb2 = refAssemblyType?.Assembly;
-            foreach (var kv in OldModuleMap)
+            return _module.GetAgent<T>(component);
+        }
+
+        var assembly = typeof(T).Assembly;
+        var refAssembly = refAssemblyType?.Assembly;
+        foreach (var kv in OldModuleMap)
+        {
+            var old = kv.Value;
+            if (assembly == old.HotfixAssembly || refAssembly == old.HotfixAssembly)
             {
-                var old = kv.Value;
-                if (asb == old.HotfixAssembly || asb2 == old.HotfixAssembly)
-                {
-                    return old.GetAgent<T>(component);
-                }
+                return old.GetAgent<T>(component);
             }
         }
 
@@ -235,16 +267,18 @@ public static T GetInstance<T>(string typeName, Type refAssemblyType = null)
             return default;
         }
 
-        if (OldModuleMap.Count > 0)
+        if (OldModuleMap.IsEmpty)
+        {
+            return _module.GetInstance<T>(typeName);
+        }
+
+        var asb = refAssemblyType?.Assembly;
+        foreach (var kv in OldModuleMap)
         {
-            var asb = refAssemblyType?.Assembly;
-            foreach (var kv in OldModuleMap)
+            var old = kv.Value;
+            if (asb == old.HotfixAssembly)
             {
-                var old = kv.Value;
-                if (asb == old.HotfixAssembly)
-                {
-                    return old.GetInstance<T>(typeName);
-                }
+                return old.GetInstance<T>(typeName);
             }
         }