From dbceb10cd120b2121cb93b63d50d804bc6f02f16 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 26 二月 2019 11:23:34 +0800
Subject: [PATCH] Merge branch 'master' into ItemReconstruction
---
Lua/Gen/DelegatesGensBridge.cs | 137 +++++++++++----------------------------------
1 files changed, 33 insertions(+), 104 deletions(-)
diff --git a/Lua/Gen/DelegatesGensBridge.cs b/Lua/Gen/DelegatesGensBridge.cs
index b3b966b..734fb68 100644
--- a/Lua/Gen/DelegatesGensBridge.cs
+++ b/Lua/Gen/DelegatesGensBridge.cs
@@ -6711,30 +6711,7 @@
#endif
}
- public UnityEngine.Vector3 __Gen_Delegate_Imp290(object p0, int p1)
- {
-#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);
- LuaAPI.xlua_pushinteger(L, p1);
-
- PCall(L, 2, 1, errFunc);
-
-
- UnityEngine.Vector3 __gen_ret;translator.Get(L, errFunc + 1, out __gen_ret);
- LuaAPI.lua_settop(L, errFunc - 1);
- return __gen_ret;
-#if THREAD_SAFE || HOTFIX_ENABLE
- }
-#endif
- }
-
- public UnityEngine.Vector3 __Gen_Delegate_Imp291(object p0, UnityEngine.Vector3 p1)
+ public UnityEngine.Vector3 __Gen_Delegate_Imp290(object p0, UnityEngine.Vector3 p1)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -6757,78 +6734,7 @@
#endif
}
- public void __Gen_Delegate_Imp292(object p0, bool 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);
- LuaAPI.lua_pushboolean(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_Imp293(object p0, Snxxz.UI.TreasureAnimation.TreasureShowStep p1)
- {
-#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.Push(L, p1);
-
- PCall(L, 2, 0, errFunc);
-
-
-
- LuaAPI.lua_settop(L, errFunc - 1);
-
-#if THREAD_SAFE || HOTFIX_ENABLE
- }
-#endif
- }
-
- public void __Gen_Delegate_Imp294(object p0, bool p1, int 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);
- LuaAPI.lua_pushboolean(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 UnityEngine.Vector3 __Gen_Delegate_Imp295(object p0)
+ public UnityEngine.Vector3 __Gen_Delegate_Imp291(object p0)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -6850,7 +6756,7 @@
#endif
}
- public Treasure3DConfig.TreasureParam __Gen_Delegate_Imp296(object p0)
+ public Treasure3DConfig.TreasureParam __Gen_Delegate_Imp292(object p0)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -6872,7 +6778,7 @@
#endif
}
- public Snxxz.UI.UI3DTreasureSelectStage __Gen_Delegate_Imp297()
+ public Snxxz.UI.UI3DTreasureSelectStage __Gen_Delegate_Imp293()
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -6893,7 +6799,7 @@
#endif
}
- public TreasureCategory __Gen_Delegate_Imp298(object p0)
+ public TreasureCategory __Gen_Delegate_Imp294(object p0)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -6915,7 +6821,7 @@
#endif
}
- public void __Gen_Delegate_Imp299(object p0, bool p1, TreasureCategory p2)
+ public void __Gen_Delegate_Imp295(object p0, bool p1, TreasureCategory p2)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -6939,7 +6845,7 @@
#endif
}
- public System.Collections.IEnumerator __Gen_Delegate_Imp300(object p0, TreasureCategory p1, object p2)
+ public System.Collections.IEnumerator __Gen_Delegate_Imp296(object p0, TreasureCategory p1, object p2)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -6963,7 +6869,7 @@
#endif
}
- public void __Gen_Delegate_Imp301(object p0, TreasureCategory p1, bool p2)
+ public void __Gen_Delegate_Imp297(object p0, TreasureCategory p1, bool p2)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -6987,7 +6893,30 @@
#endif
}
- public System.Collections.IEnumerator __Gen_Delegate_Imp302(object p0, object p1, float p2)
+ public UnityEngine.Vector3 __Gen_Delegate_Imp298(object p0, int p1)
+ {
+#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);
+ LuaAPI.xlua_pushinteger(L, p1);
+
+ PCall(L, 2, 1, errFunc);
+
+
+ UnityEngine.Vector3 __gen_ret;translator.Get(L, errFunc + 1, out __gen_ret);
+ LuaAPI.lua_settop(L, errFunc - 1);
+ return __gen_ret;
+#if THREAD_SAFE || HOTFIX_ENABLE
+ }
+#endif
+ }
+
+ public System.Collections.IEnumerator __Gen_Delegate_Imp299(object p0, object p1, float p2)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
@@ -7011,7 +6940,7 @@
#endif
}
- public Snxxz.UI.SignInModel __Gen_Delegate_Imp303(object p0)
+ public Snxxz.UI.SignInModel __Gen_Delegate_Imp300(object p0)
{
#if THREAD_SAFE || HOTFIX_ENABLE
lock (luaEnv.luaEnvLock)
--
Gitblit v1.8.0