合并master

Author: DESKTOP-UBV38B7\codingworks

Assets/Game/HotFix.meta

@@ -21,6 +21,7 @@ public class GameMode : MonoBehaviour
         public static NodeManager Node;
         public static ResourceManager Resource;
         public static UIManager UI;
+        public static HotFixManager HotFix;
 
         /// <summary>
         /// 当前程序集
@@ -55,6 +56,7 @@ IEnumerator Start()
             Node = GameFrameworkMode.GetModule<NodeManager>();
             Resource = GameFrameworkMode.GetModule<ResourceManager>();
             UI = GameFrameworkMode.GetModule<UIManager>();
+            HotFix = GameFrameworkMode.GetModule<HotFixManager>();
             #endregion
 
             #region resource

Assets/Game/HotFix/HotFix.dll.bytes

@@ -24,7 +24,7 @@ static void GenerateCLRBinding()
         types.Add(typeof(UnityEngine.Object));
         types.Add(typeof(Transform));
         types.Add(typeof(RectTransform));
-     //   types.Add(typeof(CLRBindingTestClass));
+       // types.Add(typeof(CLRBindingTestClass));
         types.Add(typeof(Time));
         types.Add(typeof(Debug));
         //所有DLL内的类型的真实C#类型都是ILTypeInstance
@@ -39,7 +39,7 @@ static void GenerateCLRBindingByAnalysis()
     {
         //用新的分析热更dll调用引用来生成绑定代码
         ILRuntime.Runtime.Enviorment.AppDomain domain = new ILRuntime.Runtime.Enviorment.AppDomain();
-        using (System.IO.FileStream fs = new System.IO.FileStream("Assets/VrCoreEntity/HotFix/HotFix.dll.bytes", System.IO.FileMode.Open, System.IO.FileAccess.Read))
+        using (System.IO.FileStream fs = new System.IO.FileStream("Assets/StreamingAssets/HotFix_Project.dll", System.IO.FileMode.Open, System.IO.FileAccess.Read))
         {
             domain.LoadAssembly(fs);
         }
@@ -51,9 +51,9 @@ static void GenerateCLRBindingByAnalysis()
     static void InitILRuntime(ILRuntime.Runtime.Enviorment.AppDomain domain)
     {
         //这里需要注册所有热更DLL中用到的跨域继承Adapter，否则无法正确抓取引用
-        //domain.RegisterCrossBindingAdaptor(new MonoBehaviourAdapter());
-        //domain.RegisterCrossBindingAdaptor(new CoroutineAdapter());
-        //domain.RegisterCrossBindingAdaptor(new InheritanceAdapter());
+       // domain.RegisterCrossBindingAdaptor(new MonoBehaviourAdapter());
+      //  domain.RegisterCrossBindingAdaptor(new CoroutineAdapter());
+      //  domain.RegisterCrossBindingAdaptor(new InheritanceAdapter());
     }
 }
 #endif

Assets/Game/HotFix/HotFix.dll.bytes.meta

@@ -103,8 +103,7 @@ public void RegisterFunctionDelegate<T1, T2, TResult>()
             functions.Add(node);
             RegisterDelegateConvertor<Func<T1, T2, TResult>>(defaultConverter);
         }
-        
-        
+
         public void RegisterFunctionDelegate<T1, T2, T3, TResult>()
         {
             DelegateMapNode node = new Enviorment.DelegateManager.DelegateMapNode();