Merge branch 'focus-creative-games:main' into main

Author: AlianBlank

Data~/hybridclr_version.json

@@ -2,37 +2,37 @@
     "versions": [
     {
         "unity_version":"2019",
-        "hybridclr" : { "branch":"v8.0.0"},
+        "hybridclr" : { "branch":"v8.4.0"},
         "il2cpp_plus": { "branch":"v2019-8.1.0"}
     },
     {
         "unity_version":"2020",
-        "hybridclr" : { "branch":"v8.0.0"},
+        "hybridclr" : { "branch":"v8.4.0"},
         "il2cpp_plus": { "branch":"v2020-8.1.0"}
     },
     {
         "unity_version":"2021",
-        "hybridclr" : { "branch":"v8.0.0"},
+        "hybridclr" : { "branch":"v8.4.0"},
         "il2cpp_plus": { "branch":"v2021-8.1.0"}
     },
     {
         "unity_version":"2022",
-        "hybridclr" : { "branch":"v8.0.0"},
-        "il2cpp_plus": { "branch":"v2022-8.1.0"}
+        "hybridclr" : { "branch":"v8.4.0"},
+        "il2cpp_plus": { "branch":"v2022-8.2.0"}
     },
     {
         "unity_version":"2022-tuanjie",
-        "hybridclr" : { "branch":"v8.0.0"},
-        "il2cpp_plus": { "branch":"v2022-tuanjie-8.1.0"}
+        "hybridclr" : { "branch":"v8.4.0"},
+        "il2cpp_plus": { "branch":"v2022-tuanjie-8.3.0"}
     },
     {
         "unity_version":"2023",
-        "hybridclr" : { "branch":"v8.0.0"},
+        "hybridclr" : { "branch":"v8.4.0"},
         "il2cpp_plus": { "branch":"v2023-8.1.0"}
     },
     {
         "unity_version":"6000",
-        "hybridclr" : { "branch":"v8.0.0"},
+        "hybridclr" : { "branch":"v8.4.0"},
         "il2cpp_plus": { "branch":"v6000-8.1.0"}
     }
     ]

Editor/Commands/StripAOTDllCommand.cs

@@ -136,8 +136,8 @@ public static void GenerateStripedAOTDlls(BuildTarget target)
                     options = buildOptions,
                     target = target,
                     targetGroup = BuildPipeline.GetBuildTargetGroup(target),
-#if UNITY_2021_1_OR_NEWER
-                    subtarget = (int)EditorUserBuildSettings.standaloneBuildSubtarget,
+#if UNITY_SERVER
+                    subtarget = (int)StandaloneBuildSubtarget.Server,
 #endif
                 };
 

Editor/Meta/GenericMethod.cs

@@ -94,7 +94,7 @@ public static GenericMethod ResolveMethod(IMethod method, GenericArgumentContext
             methodDef = method.ResolveMethodDef();
             if (methodDef == null)
             {
-                Debug.LogWarning($"method:{method} ResolveMethodDef() == null");
+                //Debug.LogWarning($"method:{method} ResolveMethodDef() == null");
                 return null;
             }
             if (method is MethodSpec methodSpec)

Editor/MethodBridge/Generator.cs

@@ -287,6 +287,7 @@ private void CollectTypesAndMethods()
             CollectStructDefs(_managed2NativeMethodList0, structTypeSet);
             CollectStructDefs(_native2ManagedMethodList0, structTypeSet);
             CollectStructDefs(_adjustThunkMethodList0, structTypeSet);
+            CollectStructDefs(_originalCalliMethodSignatures.Select(m => m.MethodSig).ToList(), structTypeSet);
             _structTypes0 = structTypeSet.ToList();
             _structTypes0.Sort((a, b) => a.TypeId - b.TypeId);
 
@@ -829,6 +830,38 @@ private void CollectStructDefs(List<MethodDesc> methods, HashSet<TypeInfo> struc
 
         }
 
+        private void CollectStructDefs(List<MethodSig> methods, HashSet<TypeInfo> structTypes)
+        {
+            ICorLibTypes corLibTypes = _genericMethods[0].Method.Module.CorLibTypes;
+
+            foreach (var method in methods)
+            {
+                foreach (var paramInfo in method.Params)
+                {
+                    var paramType = GetSharedTypeInfo(MetaUtil.ToShareTypeSig(corLibTypes, paramInfo));
+                    if (paramType.IsStruct)
+                    {
+                        structTypes.Add(paramType);
+                        if (paramType.Klass.ContainsGenericParameter)
+                        {
+                            throw new Exception($"[CollectStructDefs] method:{method} type:{paramType.Klass} contains generic parameter");
+                        }
+                    }
+
+                }
+                var returnType = GetSharedTypeInfo(MetaUtil.ToShareTypeSig(corLibTypes, method.RetType));
+                if (returnType.IsStruct)
+                {
+                    structTypes.Add(returnType);
+                    if (returnType.Klass.ContainsGenericParameter)
+                    {
+                        throw new Exception($"[CollectStructDefs] method:{method} type:{returnType.Klass} contains generic parameter");
+                    }
+                }
+            }
+
+        }
+
         class FieldInfo
         {
             public FieldDef field;

Editor/MethodBridge/MonoPInvokeCallbackAnalyzer.cs

@@ -55,7 +55,7 @@ private void CollectReversePInvokeMethods()
                     }
                     if (!MetaUtil.IsSupportedPInvokeMethodSignature(method.MethodSig))
                     {
-                        throw new Exception($"MonoPInvokeCallback method {method.FullName} has unsupported parameter or return type. Please check the method signature.");
+                        Debug.LogError($"MonoPInvokeCallback method {method.FullName} has unsupported parameter or return type. Please check the method signature.");
                     }
                     //foreach (var ca in method.CustomAttributes)
                     //{

Editor/MethodBridge/PInvokeAnalyzer.cs

@@ -38,7 +38,7 @@ public void Run()
                         {
                             if (!MetaUtil.IsSupportedPInvokeMethodSignature(method.MethodSig))
                             {
-                                throw new Exception($"PInvoke method {method.FullName} has unsupported parameter or return type. Please check the method signature.");
+                                Debug.LogError($"PInvoke method {method.FullName} has unsupported parameter or return type. Please check the method signature.");
                             }
                             _pinvokeMethodSignatures.Add(new CallNativeMethodSignatureInfo { MethodSig = method.MethodSig });
                         }

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Code Philosophy Technology Ltd.
+Copyright (c) 2025 Code Philosophy Technology Ltd.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,6 +1,3 @@
-- [README 中文](./README.md)
-- [README English](./README_EN.md)
-
 # HybridCLR
 
 [![license](http://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/focus-creative-games/hybridclr/blob/main/LICENSE)
@@ -10,6 +7,10 @@
 <br/>
 <br/>
 
+[README 中文](./README.md) | [README English](./README_EN.md)
+
+[Github](https://github.com/focus-creative-games/hybridclr) | [Gitee](https://gitee.com/focus-creative-games/hybridclr)
+
 HybridCLR是一个**特性完整、零成本、高性能、低内存**的**近乎完美**的Unity全平台原生c#热更新解决方案。
 
 HybridCLR扩充了il2cpp运行时代码，使它由纯[AOT](https://en.wikipedia.org/wiki/Ahead-of-time_compilation) runtime变成AOT+Interpreter 混合runtime，进而原生支持动态加载assembly，从底层彻底支持了热更新。使用HybridCLR技术的游戏不仅能在Android平台，也能在IOS、Consoles、WebGL等所有il2cpp支持的平台上高效运行。
@@ -24,7 +25,6 @@ HybridCLR扩充了il2cpp运行时代码，使它由纯[AOT](https://en.wikipedia
 - [快速上手](https://hybridclr.doc.code-philosophy.com/docs/beginner/quickstart)
 - [商业项目案例](https://hybridclr.doc.code-philosophy.com/docs/other/businesscase)
 
-
 ## 特性
 
 - 近乎完整实现了[ECMA-335规范](https://www.ecma-international.org/publications-and-standards/standards/ecma-335/)，只有极少量的[不支持的特性](https://hybridclr.doc.code-philosophy.com/docs/basic/notsupportedfeatures)。
@@ -34,14 +34,16 @@ HybridCLR扩充了il2cpp运行时代码，使它由纯[AOT](https://en.wikipedia
 - 执行高效。实现了一个极其高效的寄存器解释器，所有指标都大幅优于其他热更新方案。[性能测试报告](https://hybridclr.doc.code-philosophy.com/docs/basic/performance)
 - 内存高效。 热更新脚本中定义的类跟普通c#类占用一样的内存空间，远优于其他热更新方案。[内存占用报告](https://hybridclr.doc.code-philosophy.com/docs/basic/memory)
 - 支持MonoPInvokeCallback，可以与native代码或者其他语言如lua、javascript、python良好交互
-- 支持一些il2cpp不支持的特性，如__makeref、 __reftype、__refvalue指令
+- 支持PInvoke
+- 支持一些il2cpp不支持的特性，如\_\_makeref、 \_\_reftype、\_\_refvalue指令
 - 支持独创的 **Differential Hybrid Execution(DHE)** 差分混合执行技术，即可以对AOT dll任意增删改，会智能地让未改动的函数以AOT方式运行，变化或者新增的函数以interpreter模式运行，让热更新的游戏逻辑的运行性能基本达到原生AOT的水平
-- 支持 **热重载** 技术，可以100%卸载程序集
+- 支持**热重载**技术，可以100%卸载程序集
+- 支持动态**Hotfix**技术，可以运行过程中无感修复代码bug
 - 支持现代的dll加密技术，有效保障代码安全
 
 ## 支持的版本与平台
 
-- 支持2019.4.x、2020.3.x、2021.3.x、2022.3.x、2023.2.x、6000.x.y全系列LTS版本
+- 支持2019.4.x、2020.3.x、2021.3.x、2022.3.x、2023.2.x、6000.x.y 所有LTS版本
 - 支持所有il2cpp支持的平台
 - 支持团结引擎和鸿蒙平台
 
@@ -73,7 +75,7 @@ HybridCLR已经被广泛验证是非常高效、稳定的Unity热更新解决方
 - 新手1群（3000人）：428404198（满）
 - 新手2群（2000人）：680274677（满）
 - 新手3群（2000人）：**920714552（推荐）**
-- discord频道 https://discord.gg/BATfNfJnm2
+- discord频道 `https://discord.gg/BATfNfJnm2`
 - 商业合作邮箱: business#code-philosophy.com
 - [商业化支持](https://hybridclr.doc.code-philosophy.com/docs/business/intro)
 

RELEASELOG.md

@@ -1,5 +1,48 @@
 # ReleaseLog
 
+## 8.4.0
+
+Release Date: 2025-07-26.
+
+### Runtime
+
+- **[new] IMPORTANT! support custom image format**
+- [change] the type of field `offset` of ldsfld, stfld, ldthreadlocalfld、stthreadlocalfld changed from uint16_t to uint32_t so that supports class with huge static fields.
+- [opt] optimize to use NewValueTypeVar_Ctor_0 for new zero-argument value type and System.Activator.CreateInstance<T>()
+- [opt] optimize new ValueType with zero arguments.
+
+### Editor
+
+- [fix] fix the issue that `Texture Compression` option in Build Settings was changed after running `HybridCLR/Generate/All` on Android platform
+
+## 8.3.0
+
+Release Date: 2025-07-04.
+
+### Runtime
+
+- [fix] fix the bug where RuntimeInitClassCCtor was executed during InterpreterModule::GetInterpMethodInfo. This caused the type static constructor to be incorrectly executed prematurely during PrejitMethod.
+- [fix] fix bug that JitMethod jit method of generic class incorrectly.
+- [merge] merge il2cpp of tuanjie changes from 1.5.0-1.6.0
+
+### Editor
+
+- [fix] fix the bug that not collect struct in calli and extern method signature in generating MethodBridge.
+
+## 8.2.0
+
+Release Date: 2025-06-12.
+
+### Runtime
+
+- [fix] fix line number mistake in stacktrace
+- [fix] Fixed bug that PDBImage::SetupStackFrameInfo didn't set ilOffset and sourceCodeLineNumber of stackFrame when SequencePoint not found
+- [merge] merge il2cpp changes from 2022.3.54-2022.3.63
+
+### Editor
+
+- [change] changed from throw exception to logError when not supported pinvoke or reverse pinvoke method parameter type was found
+
 ## 8.1.0
 
 Release Date: 2025-05-29.

Runtime/LoadImageErrorCode.cs

@@ -11,6 +11,9 @@ public enum LoadImageErrorCode
         HOMOLOGOUS_ASSEMBLY_HAS_LOADED, // can not load supplementary metadata assembly for the same assembly
         INVALID_HOMOLOGOUS_MODE, // invalid homologous image mode
         PDB_BAD_FILE, // invalid pdb file
+        UNKNOWN_IMAGE_FORMAT,
+        UNSUPPORT_FORMAT_VERSION,
+        UNMATCH_FORMAT_VARIANT,
     };
 }