From cbb4009abdf84cf020be9cfc1de88dc436652bb3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 07 一月 2019 10:44:07 +0800
Subject: [PATCH] Merge branch 'master' into CrossServerBoss
---
Lua/Gen/DelegatesGensBridge.cs | 88 ++++++++++++++++++++++----------------------
1 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/Lua/Gen/DelegatesGensBridge.cs b/Lua/Gen/DelegatesGensBridge.cs
index fc760bf..4ec8874 100644
--- a/Lua/Gen/DelegatesGensBridge.cs
+++ b/Lua/Gen/DelegatesGensBridge.cs
@@ -2704,7 +2704,31 @@
#endif
}
- public void __Gen_Delegate_Imp118(object p0, ItemWinBtnType p1, object p2)
+ public void __Gen_Delegate_Imp118(object p0, object p1, bool p2)
+ {
+#if THREAD_SAFE || HOTFIX_ENABLE
+ lock (luaEnv.luaEnvLock)
+ {
+#endif
+ RealStatePtr L = luaEnv.rawL;
+ int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
+ ObjectTranslator translator = luaEnv.translator;
+ translator.PushAny(L, p0);
+ translator.PushAny(L, p1);
+ LuaAPI.lua_pushboolean(L, p2);
+
+ PCall(L, 3, 0, errFunc);
+
+
+
+ LuaAPI.lua_settop(L, errFunc - 1);
+
+#if THREAD_SAFE || HOTFIX_ENABLE
+ }
+#endif
+ }
+
+ public void __Gen_Delegate_Imp119(object p0, ItemWinBtnType p1, object p2)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -2728,7 +2752,7 @@
#endif
}
- public void __Gen_Delegate_Imp119(object p0, int p1, int p2)
+ public void __Gen_Delegate_Imp120(object p0, int p1, int p2)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -2752,7 +2776,7 @@
#endif
}
- public void __Gen_Delegate_Imp120(object p0, PackType p1, int p2)
+ public void __Gen_Delegate_Imp121(object p0, PackType p1, int p2)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -2776,7 +2800,7 @@
#endif
}
- public System.Collections.IEnumerator __Gen_Delegate_Imp121(object p0, UnityEngine.Vector3 p1, UnityEngine.Vector3 p2)
+ public System.Collections.IEnumerator __Gen_Delegate_Imp122(object p0, UnityEngine.Vector3 p1, UnityEngine.Vector3 p2)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -2800,7 +2824,7 @@
#endif
}
- public System.Collections.Generic.List<int> __Gen_Delegate_Imp122(object p0)
+ public System.Collections.Generic.List<int> __Gen_Delegate_Imp123(object p0)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -2822,7 +2846,7 @@
#endif
}
- public System.Collections.Generic.List<Snxxz.UI.GatherSoulItem> __Gen_Delegate_Imp123(object p0)
+ public System.Collections.Generic.List<Snxxz.UI.GatherSoulItem> __Gen_Delegate_Imp124(object p0)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -2844,7 +2868,7 @@
#endif
}
- public System.Collections.Generic.Dictionary<int, int> __Gen_Delegate_Imp124(object p0)
+ public System.Collections.Generic.Dictionary<int, int> __Gen_Delegate_Imp125(object p0)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -2866,7 +2890,7 @@
#endif
}
- public string __Gen_Delegate_Imp125(int p0)
+ public string __Gen_Delegate_Imp126(int p0)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -2888,7 +2912,7 @@
#endif
}
- public int __Gen_Delegate_Imp126(object p0, object p1)
+ public int __Gen_Delegate_Imp127(object p0, object p1)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -2911,7 +2935,7 @@
#endif
}
- public void __Gen_Delegate_Imp127(object p0, PackType p1)
+ public void __Gen_Delegate_Imp128(object p0, PackType p1)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -2934,7 +2958,7 @@
#endif
}
- public bool __Gen_Delegate_Imp128(object p0, out System.Collections.Generic.List<int> p1)
+ public bool __Gen_Delegate_Imp129(object p0, out System.Collections.Generic.List<int> p1)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -2957,7 +2981,7 @@
#endif
}
- public bool __Gen_Delegate_Imp129(object p0, int p1)
+ public bool __Gen_Delegate_Imp130(object p0, int p1)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -2980,7 +3004,7 @@
#endif
}
- public void __Gen_Delegate_Imp130(object p0, int p1, ref System.Collections.Generic.List<Snxxz.UI.GatherSoulItem> p2)
+ public void __Gen_Delegate_Imp131(object p0, int p1, ref System.Collections.Generic.List<Snxxz.UI.GatherSoulItem> p2)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -3005,7 +3029,7 @@
#endif
}
- public bool __Gen_Delegate_Imp131(object p0, object p1, int p2, out int p3)
+ public bool __Gen_Delegate_Imp132(object p0, object p1, int p2, out int p3)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -3030,7 +3054,7 @@
#endif
}
- public bool __Gen_Delegate_Imp132(object p0, object p1, out int p2)
+ public bool __Gen_Delegate_Imp133(object p0, object p1, out int p2)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -3054,7 +3078,7 @@
#endif
}
- public bool __Gen_Delegate_Imp133(object p0, int p1, object p2)
+ public bool __Gen_Delegate_Imp134(object p0, int p1, object p2)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -3078,7 +3102,7 @@
#endif
}
- public int __Gen_Delegate_Imp134(object p0, int p1, object p2)
+ public int __Gen_Delegate_Imp135(object p0, int p1, object p2)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -3102,7 +3126,7 @@
#endif
}
- public bool __Gen_Delegate_Imp135(object p0, int p1, int p2)
+ public bool __Gen_Delegate_Imp136(object p0, int p1, int p2)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -3126,7 +3150,7 @@
#endif
}
- public bool __Gen_Delegate_Imp136(object p0, object p1, int p2, int p3)
+ public bool __Gen_Delegate_Imp137(object p0, object p1, int p2, int p3)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -3151,7 +3175,7 @@
#endif
}
- public void __Gen_Delegate_Imp137(object p0, object p1, int p2)
+ public void __Gen_Delegate_Imp138(object p0, object p1, int p2)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -3163,30 +3187,6 @@
translator.PushAny(L, p0);
translator.PushAny(L, p1);
LuaAPI.xlua_pushinteger(L, p2);
-
- PCall(L, 3, 0, errFunc);
-
-
-
- LuaAPI.lua_settop(L, errFunc - 1);
-
-#if THREAD_SAFE || HOTFIX_ENABLE
- }
-#endif
- }
-
- public void __Gen_Delegate_Imp138(object p0, object p1, bool p2)
- {
-#if THREAD_SAFE || HOTFIX_ENABLE
- lock (luaEnv.luaEnvLock)
- {
-#endif
- RealStatePtr L = luaEnv.rawL;
- int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
- ObjectTranslator translator = luaEnv.translator;
- translator.PushAny(L, p0);
- translator.PushAny(L, p1);
- LuaAPI.lua_pushboolean(L, p2);
PCall(L, 3, 0, errFunc);
--
Gitblit v1.8.0