Merge pull request #1067 from ps5mh/feature_asmdef

* fix gen code for asmdef feature
Tencent · Jun 12, 2023 · d860056 · d860056
2 parents 0d1e3eb + c5a8537
commit d860056
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 10 deletions.
diff --git a/Assets/XLua/Src/DelegateBridge.cs b/Assets/XLua/Src/DelegateBridge.cs
@@ -32,9 +32,12 @@ public abstract class DelegateBridgeBase : LuaBase
 
         protected int errorFuncRef;
 
+        protected RealStatePtr rawL;
+
         public DelegateBridgeBase(int reference, LuaEnv luaenv) : base(reference, luaenv)
         {
             errorFuncRef = luaenv.errorFuncRef;
+            rawL = luaenv.rawL;
         }
 
         public bool TryGetDelegate(Type key, out Delegate value)

diff --git a/Assets/XLua/Src/Editor/Hotfix.cs b/Assets/XLua/Src/Editor/Hotfix.cs
@@ -260,6 +260,7 @@ public class Hotfix
     {
         private TypeReference objType = null;
         private TypeReference delegateBridgeType = null;
+        private TypeReference delegateBridgeWrapType = null;
         private AssemblyDefinition injectAssembly = null;
 
         private MethodReference delegateBridgeGetter = null;
@@ -293,6 +294,7 @@ public void Init(AssemblyDefinition injectAssembly, AssemblyDefinition xluaAssem
             var delegateBridgeTypeDef = xluaAssembly.MainModule.Types.Single(t => t.FullName == "XLua.DelegateBridge");
             var delegateBridgeTypeWrapDef = genAssembly.MainModule.Types.SingleOrDefault(t => t.FullName == "XLua.DelegateBridge_Wrap");
             delegateBridgeType = injectModule.TryImport(delegateBridgeTypeDef);
+            delegateBridgeWrapType = injectModule.TryImport(delegateBridgeTypeWrapDef);
             delegateBridgeGetter = injectModule.TryImport(xluaAssembly.MainModule.Types.Single(t => t.FullName == "XLua.HotfixDelegateBridge")
                 .Methods.Single(m => m.Name == "Get"));
             hotfixFlagGetter = injectModule.TryImport(xluaAssembly.MainModule.Types.Single(t => t.FullName == "XLua.HotfixDelegateBridge")
@@ -1280,6 +1282,7 @@ bool injectMethod(MethodDefinition method, HotfixFlagInTool hotfixType)
                 {
                     processor.InsertBefore(insertPoint, processor.Create(OpCodes.Ldc_I4, bridgeIndexByKey.Count));
                     processor.InsertBefore(insertPoint, processor.Create(OpCodes.Call, delegateBridgeGetter));
+                    processor.InsertBefore(insertPoint, processor.Create(OpCodes.Castclass, delegateBridgeWrapType));
                 }
                 else
                 {
@@ -1422,6 +1425,7 @@ bool injectGenericMethod(MethodDefinition method, HotfixFlagInTool hotfixType)
                     processor.InsertBefore(insertPoint, jmpInstruction);
                     processor.InsertBefore(insertPoint, processor.Create(OpCodes.Ldc_I4, bridgeIndexByKey.Count));
                     processor.InsertBefore(insertPoint, processor.Create(OpCodes.Call, delegateBridgeGetter));
+                    processor.InsertBefore(insertPoint, processor.Create(OpCodes.Castclass, delegateBridgeWrapType));
                     processor.InsertBefore(insertPoint, processor.Create(OpCodes.Stloc, injection));
                 }
                 else
@@ -1716,9 +1720,10 @@ public static void HotfixInject(string assemblyDir)
                 }
             }
 
-            var genCodeAssemblyPath = (from assembly in AppDomain.CurrentDomain.GetAssemblies()
+            var genCodeAssemblyPathInProject = (from assembly in AppDomain.CurrentDomain.GetAssemblies()
                                        select assembly.GetType("XLua.DelegateBridge_Wrap")).FirstOrDefault(x => x != null).Module.FullyQualifiedName;
-
+            var genCodeAssemblyFileName = Path.GetFileName(genCodeAssemblyPathInProject);
+            var genCodeAssemblyPath = Path.Combine(assemblyDir, genCodeAssemblyFileName);
             List< string> args = new List<string>() { assembly_csharp_path, 
                 typeof(LuaEnv).Module.FullyQualifiedName,
                 genCodeAssemblyPath,

diff --git a/Assets/XLua/Src/Editor/Template/LuaDelegateBridge.tpl.txt b/Assets/XLua/Src/Editor/Template/LuaDelegateBridge.tpl.txt
@@ -46,7 +46,7 @@ namespace XLua
             lock (luaEnv.luaEnvLock)
             {
 #endif
-                RealStatePtr L = luaEnv.L;
+                RealStatePtr L = this.rawL;
                 int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                 <%if CallNeedTranslator(delegate, "") then %>ObjectTranslator translator = luaEnv.translator;<%end%>
                 <%

diff --git a/Assets/XLua/Src/Editor/Template/LuaInterfaceBridge.tpl.txt b/Assets/XLua/Src/Editor/Template/LuaInterfaceBridge.tpl.txt
@@ -19,13 +19,15 @@ namespace XLua.CSObjectWrap
 {
     public class <%=CSVariableName(type)%>Bridge : LuaBase, <%=CsFullTypeName(type)%>
     {
+    	RealStatePtr rawL;
 	    public static LuaBase __Create(int reference, LuaEnv luaenv)
 		{
 		    return new <%=CSVariableName(type)%>Bridge(reference, luaenv);
 		}
 
 		public <%=CSVariableName(type)%>Bridge(int reference, LuaEnv luaenv) : base(reference, luaenv)
         {
+        	rawL = luaenv.L;
         }
 
         <%
@@ -55,7 +57,7 @@ namespace XLua.CSObjectWrap
             lock (luaEnv.luaEnvLock)
             {
 #endif
-				RealStatePtr L = luaEnv.L;
+				RealStatePtr L = this.rawL;
 				int err_func = LuaAPI.load_error_func(L, luaEnv.errorFuncRef);
 				<%if CallNeedTranslator(method, "") then %>ObjectTranslator translator = luaEnv.translator;<%end%>
 
@@ -114,7 +116,7 @@ namespace XLua.CSObjectWrap
                 lock (luaEnv.luaEnvLock)
                 {
 #endif
-					RealStatePtr L = luaEnv.L;
+					RealStatePtr L = this.rawL;
 					int oldTop = LuaAPI.lua_gettop(L);
 					<%if not JustLuaType(property.PropertyType) then %>ObjectTranslator translator = luaEnv.translator;<%end%>
 					LuaAPI.lua_getref(L, luaReference);
@@ -138,7 +140,7 @@ namespace XLua.CSObjectWrap
                 lock (luaEnv.luaEnvLock)
                 {
 #endif
-					RealStatePtr L = luaEnv.L;
+					RealStatePtr L = this.rawL;
 					int oldTop = LuaAPI.lua_gettop(L);
 					<%if not JustLuaType(property.PropertyType) then %>ObjectTranslator translator = luaEnv.translator;<%end%>
 					LuaAPI.lua_getref(L, luaReference);
@@ -166,7 +168,7 @@ namespace XLua.CSObjectWrap
 				lock (luaEnv.luaEnvLock)
 				{
 #endif
-					RealStatePtr L = luaEnv.L;
+					RealStatePtr L = this.rawL;
 					int err_func = LuaAPI.load_error_func(L, luaEnv.errorFuncRef);
 					<%if CallNeedTranslator(event:GetAddMethod(), "") then %>ObjectTranslator translator = luaEnv.translator;<%end%>
 
@@ -209,7 +211,7 @@ namespace XLua.CSObjectWrap
 				lock (luaEnv.luaEnvLock)
 				{
 #endif
-					RealStatePtr L = luaEnv.L;
+					RealStatePtr L = this.rawL;
 					int err_func = LuaAPI.load_error_func(L, luaEnv.errorFuncRef);
 					<%if CallNeedTranslator(event:GetRemoveMethod(), "") then %>ObjectTranslator translator = luaEnv.translator;<%end%>
 
@@ -270,7 +272,7 @@ namespace XLua.CSObjectWrap
 				lock (luaEnv.luaEnvLock)
 				{
 #endif
-					RealStatePtr L = luaEnv.L;
+					RealStatePtr L = this.rawL;
 					int err_func = LuaAPI.load_error_func(L, luaEnv.errorFuncRef);
 					<%if CallNeedTranslator(method, "") then %>ObjectTranslator translator = luaEnv.translator;<%end%>
 
@@ -333,7 +335,7 @@ namespace XLua.CSObjectWrap
 				lock (luaEnv.luaEnvLock)
 				{
 #endif
-					RealStatePtr L = luaEnv.L;
+					RealStatePtr L = this.rawL;
 					int err_func = LuaAPI.load_error_func(L, luaEnv.errorFuncRef);
 					<%if CallNeedTranslator(method, "") then %>ObjectTranslator translator = luaEnv.translator;<%end%>
 

diff --git a/Tools/FilesSignature.exe b/Tools/FilesSignature.exe
diff --git a/Tools/FilesSignature.pdb b/Tools/FilesSignature.pdb
diff --git a/Tools/KeyPairsGen.exe b/Tools/KeyPairsGen.exe
diff --git a/Tools/KeyPairsGen.pdb b/Tools/KeyPairsGen.pdb
diff --git a/Tools/XLua.Mini.dll b/Tools/XLua.Mini.dll
diff --git a/Tools/XLua.Mini.pdb b/Tools/XLua.Mini.pdb
diff --git a/Tools/XLuaGenerate.exe b/Tools/XLuaGenerate.exe
diff --git a/Tools/XLuaGenerate.pdb b/Tools/XLuaGenerate.pdb
diff --git a/Tools/XLuaHotfixInject.exe b/Tools/XLuaHotfixInject.exe
diff --git a/Tools/XLuaHotfixInject.pdb b/Tools/XLuaHotfixInject.pdb