diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Module/UIModule/UIModule.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Module/UIModule/UIModule.cs index 11d9444b..c2d48931 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Module/UIModule/UIModule.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Module/UIModule/UIModule.cs @@ -538,7 +538,7 @@ namespace GameLogic private UIWindow CreateInstance(Type type) { - UIWindow window = EmitHelper.CreateInstance(type) as UIWindow; + UIWindow window = Activator.CreateInstance(type) as UIWindow; WindowAttribute attribute = Attribute.GetCustomAttribute(type, typeof(WindowAttribute)) as WindowAttribute; if (window == null) diff --git a/UnityProject/Assets/TEngine/Runtime/Core/MemoryPool/MemoryPool.MemoryCollection.cs b/UnityProject/Assets/TEngine/Runtime/Core/MemoryPool/MemoryPool.MemoryCollection.cs index 2d222e41..aba4bcf0 100644 --- a/UnityProject/Assets/TEngine/Runtime/Core/MemoryPool/MemoryPool.MemoryCollection.cs +++ b/UnityProject/Assets/TEngine/Runtime/Core/MemoryPool/MemoryPool.MemoryCollection.cs @@ -77,7 +77,7 @@ namespace TEngine } _addMemoryCount++; - return (IMemory)EmitHelper.CreateInstance(_memoryType); + return (IMemory)Activator.CreateInstance(_memoryType); } public void Release(IMemory memory) @@ -121,7 +121,7 @@ namespace TEngine _addMemoryCount += count; while (count-- > 0) { - _memories.Enqueue((IMemory)EmitHelper.CreateInstance(_memoryType)); + _memories.Enqueue((IMemory)Activator.CreateInstance(_memoryType)); } } } diff --git a/UnityProject/Assets/TEngine/Runtime/Core/ModuleSystem.cs b/UnityProject/Assets/TEngine/Runtime/Core/ModuleSystem.cs index d7eb37e1..401590d4 100644 --- a/UnityProject/Assets/TEngine/Runtime/Core/ModuleSystem.cs +++ b/UnityProject/Assets/TEngine/Runtime/Core/ModuleSystem.cs @@ -106,7 +106,7 @@ namespace TEngine /// 要创建的游戏框架模块。 private static Module CreateModule(Type moduleType) { - Module module = (Module)EmitHelper.CreateInstance(moduleType); + Module module = (Module)Activator.CreateInstance(moduleType); if (module == null) { throw new GameFrameworkException(Utility.Text.Format("Can not create module '{0}'.", moduleType.FullName)); diff --git a/UnityProject/Assets/TEngine/Runtime/Core/Utility/EmitHelper.cs b/UnityProject/Assets/TEngine/Runtime/Core/Utility/EmitHelper.cs deleted file mode 100644 index bf30026b..00000000 --- a/UnityProject/Assets/TEngine/Runtime/Core/Utility/EmitHelper.cs +++ /dev/null @@ -1,193 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Reflection.Emit; - -namespace TEngine -{ - public static class EmitHelper - { - private static readonly Dictionary _defaultCache = new Dictionary(); - - private static readonly Dictionary _argCache = new Dictionary(); - - public static T CreateInstance() where T : new() - { - var type = typeof(T); - - if (!_defaultCache.TryGetValue(type, out var factory)) - { - if (!_defaultCache.TryGetValue(type, out factory)) - { - factory = CreateFactory(); - _defaultCache.TryAdd(type, factory); - } - } - - return ((Func)factory)(); - } - - public static object CreateInstance(Type type) - { - if (!_defaultCache.TryGetValue(type, out var factory)) - { - lock (_defaultCache) - { - if (!_defaultCache.TryGetValue(type, out factory)) - { - var constructor = type.GetConstructor( - BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, - null, Type.EmptyTypes, null); - - if (constructor == null) - { - throw new MissingMethodException($"No parameterless constructor defined for type '{type.FullName}'"); - } - - // 创建动态方法（关键优化点） - var dynamicMethod = new DynamicMethod( - name: $"CreateInstance_{type.FullName}", - returnType: typeof(object), - parameterTypes: Type.EmptyTypes, - owner: typeof(object), - skipVisibility: true); - - // 生成IL指令（核心逻辑） - var il = dynamicMethod.GetILGenerator(); - - // 处理值类型和引用类型的差异 - if (type.IsValueType) - { - il.DeclareLocal(type); - il.Emit(OpCodes.Ldloca_S, 0); - il.Emit(OpCodes.Initobj, type); - il.Emit(OpCodes.Ldloc_0); - il.Emit(OpCodes.Box, type); // 值类型需要装箱 - } - else - { - il.Emit(OpCodes.Newobj, constructor); - } - - il.Emit(OpCodes.Ret); - - factory = dynamicMethod.CreateDelegate(typeof(Func)); - _defaultCache.TryAdd(type, factory); - } - } - } - - return ((Func)factory)(); - } - - private static Func CreateFactory() where T : new() - { - var constructor = typeof(T).GetConstructor( - BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, - null, Type.EmptyTypes, null); - - var dynamicMethod = new DynamicMethod( - name: $"CreateInstance_{typeof(T).FullName}", - returnType: typeof(T), - parameterTypes: Type.EmptyTypes, - owner: typeof(object), // 关键优化：使用object类型模块 - skipVisibility: true); - - var il = dynamicMethod.GetILGenerator(); - il.Emit(OpCodes.Newobj, constructor); - il.Emit(OpCodes.Ret); - - return (Func)dynamicMethod.CreateDelegate(typeof(Func)); - } - - - public static object CreateInstance(Type type, params object[] args) - { - if (type == null) throw new ArgumentNullException(nameof(type)); - args ??= Array.Empty(); - - // 预转换参数类型数组 - var argTypes = Array.ConvertAll(args, a => a?.GetType() ?? typeof(object)); - var cacheKey = new CacheKey(type, argTypes); - - if (!_argCache.TryGetValue(cacheKey, out var factory)) - { - if (!_argCache.TryGetValue(cacheKey, out factory)) - { - // 预热动态方法生成 - factory = CreateDynamicFactory(type, argTypes); - _argCache.TryAdd(cacheKey, factory); - - // 预热编译器 - ((Func)factory)(args); - } - } - - return ((Func)factory)(args); - } - - private static Func CreateDynamicFactory(Type type, Type[] argTypes) - { - // 精确匹配构造函数 - var constructor = type.GetConstructor( - BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, - null, argTypes, null) ?? throw new MissingMethodException(type.Name); - - // 创建动态方法 - var dynamicMethod = new DynamicMethod( - name: $"CreateInstance_{type.Name}", - returnType: typeof(object), - parameterTypes: new[] { typeof(object[]) }, - owner: typeof(object), - skipVisibility: true); - - var il = dynamicMethod.GetILGenerator(); - - for (int i = 0; i < argTypes.Length; i++) - { - // 高效参数加载序列（网页9 IL优化） - il.Emit(OpCodes.Ldarg_0); - il.Emit(OpCodes.Ldc_I4, i); - il.Emit(OpCodes.Ldelem_Ref); - - // 类型转换合并优化 - if (argTypes[i].IsValueType) - { - il.Emit(OpCodes.Unbox_Any, argTypes[i]); - } - else if (argTypes[i] != typeof(object)) - { - il.Emit(OpCodes.Castclass, argTypes[i]); - } - } - - il.Emit(OpCodes.Newobj, constructor); - - // 统一装箱处理 - if (type.IsValueType) - { - il.Emit(OpCodes.Box, type); - } - - il.Emit(OpCodes.Ret); - - return (Func)dynamicMethod.CreateDelegate(typeof(Func)); - } - - private readonly struct CacheKey - { - public readonly Type Type; - - public readonly Type[] ArgTypes; - - public CacheKey(Type type, Type[] argTypes) - { - Type = type; - ArgTypes = argTypes; - } - - public override int GetHashCode() => Type.GetHashCode() ^ ArgTypes.Aggregate(0, (h, t) => h ^ t.GetHashCode()); - } - } -} \ No newline at end of file diff --git a/UnityProject/Assets/TEngine/Runtime/Core/Utility/EmitHelper.cs.meta b/UnityProject/Assets/TEngine/Runtime/Core/Utility/EmitHelper.cs.meta deleted file mode 100644 index b5406be6..00000000 --- a/UnityProject/Assets/TEngine/Runtime/Core/Utility/EmitHelper.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: d629990b98cb407dafee703ef18dd2c5 -timeCreated: 1742174169 \ No newline at end of file diff --git a/UnityProject/Assets/TEngine/Runtime/Module/ObjectPoolModule/ObjectPoolModule.cs b/UnityProject/Assets/TEngine/Runtime/Module/ObjectPoolModule/ObjectPoolModule.cs index ee69d90b..c1f8aefb 100644 --- a/UnityProject/Assets/TEngine/Runtime/Module/ObjectPoolModule/ObjectPoolModule.cs +++ b/UnityProject/Assets/TEngine/Runtime/Module/ObjectPoolModule/ObjectPoolModule.cs @@ -1271,7 +1271,7 @@ namespace TEngine Type objectPoolType = typeof(ObjectPool<>).MakeGenericType(objectType); ObjectPoolBase objectPool = - (ObjectPoolBase)EmitHelper.CreateInstance(objectPoolType, name, allowMultiSpawn, autoReleaseInterval, capacity, expireTime, priority); + (ObjectPoolBase)Activator.CreateInstance(objectPoolType, name, allowMultiSpawn, autoReleaseInterval, capacity, expireTime, priority); _objectPools.Add(typeNamePair, objectPool); return objectPool; } diff --git a/UnityProject/Assets/TEngine/Runtime/Module/ProcedureModule/ProcedureSetting.cs b/UnityProject/Assets/TEngine/Runtime/Module/ProcedureModule/ProcedureSetting.cs index 55442a32..4fb86db0 100644 --- a/UnityProject/Assets/TEngine/Runtime/Module/ProcedureModule/ProcedureSetting.cs +++ b/UnityProject/Assets/TEngine/Runtime/Module/ProcedureModule/ProcedureSetting.cs @@ -75,7 +75,7 @@ namespace TEngine return; } - procedures[i] = (ProcedureBase)EmitHelper.CreateInstance(procedureType); + procedures[i] = (ProcedureBase)Activator.CreateInstance(procedureType); if (procedures[i] == null) { Log.Error("Can not create procedure instance '{0}'.", availableProcedureTypeNames[i]); diff --git a/UnityProject/Assets/TEngine/Runtime/Module/RootModule.cs b/UnityProject/Assets/TEngine/Runtime/Module/RootModule.cs index 5c64c57d..cd73eae0 100644 --- a/UnityProject/Assets/TEngine/Runtime/Module/RootModule.cs +++ b/UnityProject/Assets/TEngine/Runtime/Module/RootModule.cs @@ -225,7 +225,7 @@ namespace TEngine return; } - Utility.Text.ITextHelper textHelper = (Utility.Text.ITextHelper)EmitHelper.CreateInstance(textHelperType); + Utility.Text.ITextHelper textHelper = (Utility.Text.ITextHelper)Activator.CreateInstance(textHelperType); if (textHelper == null) { Log.Error("Can not create text helper instance '{0}'.", textHelperTypeName); @@ -250,7 +250,7 @@ namespace TEngine } GameFrameworkLog.ILogHelper - logHelper = (GameFrameworkLog.ILogHelper)EmitHelper.CreateInstance(logHelperType); + logHelper = (GameFrameworkLog.ILogHelper)Activator.CreateInstance(logHelperType); if (logHelper == null) { throw new GameFrameworkException(Utility.Text.Format("Can not create log helper instance '{0}'.", @@ -274,7 +274,7 @@ namespace TEngine return; } - Utility.Json.IJsonHelper jsonHelper = (Utility.Json.IJsonHelper)EmitHelper.CreateInstance(jsonHelperType); + Utility.Json.IJsonHelper jsonHelper = (Utility.Json.IJsonHelper)Activator.CreateInstance(jsonHelperType); if (jsonHelper == null) { Log.Error("Can not create JSON helper instance '{0}'.", jsonHelperTypeName);