From f025f98a9f992a6ba171fbdf1bab2defa5a4f989 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 11 三月 2019 15:23:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Lua/Gen/SnxxzUIUI3DModelExhibitionWrap.cs | 109 ++++++++++++++++--------------------------------------
1 files changed, 32 insertions(+), 77 deletions(-)
diff --git a/Lua/Gen/SnxxzUIUI3DModelExhibitionWrap.cs b/Lua/Gen/SnxxzUIUI3DModelExhibitionWrap.cs
index 764f201..0252230 100644
--- a/Lua/Gen/SnxxzUIUI3DModelExhibitionWrap.cs
+++ b/Lua/Gen/SnxxzUIUI3DModelExhibitionWrap.cs
@@ -21,18 +21,16 @@
{
ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
System.Type type = typeof(Snxxz.UI.UI3DModelExhibition);
- Utils.BeginObjectRegister(type, L, translator, 0, 12, 3, 3);
+ Utils.BeginObjectRegister(type, L, translator, 0, 10, 3, 3);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetName", _m_GetName);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "ShowLoginPlayer", _m_ShowLoginPlayer);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "ShowPlayer", _m_ShowPlayer);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "ShowOtherPlayer", _m_ShowOtherPlayer);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "ShowSitDownPlayer", _m_ShowSitDownPlayer);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "ShowHourse", _m_ShowHourse);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "ShowEquipment", _m_ShowEquipment);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "ShowWing", _m_ShowWing);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "ShowNPC", _m_ShowNPC);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "ShowGodWeaponEffect", _m_ShowGodWeaponEffect);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "StopShow", _m_StopShow);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "ResetCameraColor", _m_ResetCameraColor);
@@ -156,10 +154,10 @@
{
- UnityEngine.UI.RawImage __rawImage = (UnityEngine.UI.RawImage)translator.GetObject(L, 2, typeof(UnityEngine.UI.RawImage));
- int __job = LuaAPI.xlua_tointeger(L, 3);
+ UnityEngine.UI.RawImage _rawImage = (UnityEngine.UI.RawImage)translator.GetObject(L, 2, typeof(UnityEngine.UI.RawImage));
+ int _job = LuaAPI.xlua_tointeger(L, 3);
- gen_to_be_invoked.ShowLoginPlayer( __rawImage, __job );
+ gen_to_be_invoked.ShowLoginPlayer( _rawImage, _job );
@@ -187,11 +185,11 @@
if(gen_param_count == 4&& translator.Assignable<UnityEngine.UI.RawImage>(L, 2)&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 3)&& LuaTypes.LUA_TBOOLEAN == LuaAPI.lua_type(L, 4))
{
- UnityEngine.UI.RawImage __rawImage = (UnityEngine.UI.RawImage)translator.GetObject(L, 2, typeof(UnityEngine.UI.RawImage));
- int __job = LuaAPI.xlua_tointeger(L, 3);
- bool __isDialogue = LuaAPI.lua_toboolean(L, 4);
+ UnityEngine.UI.RawImage _rawImage = (UnityEngine.UI.RawImage)translator.GetObject(L, 2, typeof(UnityEngine.UI.RawImage));
+ int _job = LuaAPI.xlua_tointeger(L, 3);
+ bool _isDialogue = LuaAPI.lua_toboolean(L, 4);
- gen_to_be_invoked.ShowPlayer( __rawImage, __job, __isDialogue );
+ gen_to_be_invoked.ShowPlayer( _rawImage, _job, _isDialogue );
@@ -199,10 +197,21 @@
}
if(gen_param_count == 3&& translator.Assignable<UnityEngine.UI.RawImage>(L, 2)&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 3))
{
- UnityEngine.UI.RawImage __rawImage = (UnityEngine.UI.RawImage)translator.GetObject(L, 2, typeof(UnityEngine.UI.RawImage));
- int __job = LuaAPI.xlua_tointeger(L, 3);
+ UnityEngine.UI.RawImage _rawImage = (UnityEngine.UI.RawImage)translator.GetObject(L, 2, typeof(UnityEngine.UI.RawImage));
+ int _job = LuaAPI.xlua_tointeger(L, 3);
- gen_to_be_invoked.ShowPlayer( __rawImage, __job );
+ gen_to_be_invoked.ShowPlayer( _rawImage, _job );
+
+
+
+ return 0;
+ }
+ if(gen_param_count == 3&& translator.Assignable<UnityEngine.UI.RawImage>(L, 2)&& translator.Assignable<Snxxz.UI.UI3DPlayerExhibitionData>(L, 3))
+ {
+ UnityEngine.UI.RawImage _rawImage = (UnityEngine.UI.RawImage)translator.GetObject(L, 2, typeof(UnityEngine.UI.RawImage));
+ Snxxz.UI.UI3DPlayerExhibitionData _data;translator.Get(L, 3, out _data);
+
+ gen_to_be_invoked.ShowPlayer( _rawImage, _data );
@@ -230,35 +239,6 @@
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_ShowOtherPlayer(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.UI3DModelExhibition gen_to_be_invoked = (Snxxz.UI.UI3DModelExhibition)translator.FastGetCSObj(L, 1);
-
-
-
- {
- UnityEngine.UI.RawImage __rawImage = (UnityEngine.UI.RawImage)translator.GetObject(L, 2, typeof(UnityEngine.UI.RawImage));
- Snxxz.UI.UI3DPlayerExhibitionData _data;translator.Get(L, 3, out _data);
-
- gen_to_be_invoked.ShowPlayer( __rawImage, _data );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int _m_ShowSitDownPlayer(RealStatePtr L)
{
try {
@@ -271,10 +251,10 @@
{
- UnityEngine.UI.RawImage __rawImage = (UnityEngine.UI.RawImage)translator.GetObject(L, 2, typeof(UnityEngine.UI.RawImage));
- int __job = LuaAPI.xlua_tointeger(L, 3);
+ UnityEngine.UI.RawImage _rawImage = (UnityEngine.UI.RawImage)translator.GetObject(L, 2, typeof(UnityEngine.UI.RawImage));
+ int _job = LuaAPI.xlua_tointeger(L, 3);
- gen_to_be_invoked.ShowSitDownPlayer( __rawImage, __job );
+ gen_to_be_invoked.ShowSitDownPlayer( _rawImage, _job );
@@ -300,10 +280,10 @@
{
- int __modelId = LuaAPI.xlua_tointeger(L, 2);
- UnityEngine.UI.RawImage __rawImage = (UnityEngine.UI.RawImage)translator.GetObject(L, 3, typeof(UnityEngine.UI.RawImage));
+ int _modelId = LuaAPI.xlua_tointeger(L, 2);
+ UnityEngine.UI.RawImage _rawImage = (UnityEngine.UI.RawImage)translator.GetObject(L, 3, typeof(UnityEngine.UI.RawImage));
- gen_to_be_invoked.ShowHourse( __modelId, __rawImage );
+ gen_to_be_invoked.ShowHourse( _modelId, _rawImage );
@@ -329,11 +309,11 @@
{
- int __modelId = LuaAPI.xlua_tointeger(L, 2);
- UnityEngine.Vector3 __localEulerAngles;translator.Get(L, 3, out __localEulerAngles);
- UnityEngine.UI.RawImage __rawImage = (UnityEngine.UI.RawImage)translator.GetObject(L, 4, typeof(UnityEngine.UI.RawImage));
+ int _modelId = LuaAPI.xlua_tointeger(L, 2);
+ UnityEngine.Vector3 _localEulerAngles;translator.Get(L, 3, out _localEulerAngles);
+ UnityEngine.UI.RawImage _rawImage = (UnityEngine.UI.RawImage)translator.GetObject(L, 4, typeof(UnityEngine.UI.RawImage));
- gen_to_be_invoked.ShowEquipment( __modelId, __localEulerAngles, __rawImage );
+ gen_to_be_invoked.ShowEquipment( _modelId, _localEulerAngles, _rawImage );
@@ -487,31 +467,6 @@
}
return LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.UI3DModelExhibition.ShowNPC!");
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_ShowGodWeaponEffect(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.UI3DModelExhibition gen_to_be_invoked = (Snxxz.UI.UI3DModelExhibition)translator.FastGetCSObj(L, 1);
-
-
-
- {
- int _type = LuaAPI.xlua_tointeger(L, 2);
- int _level = LuaAPI.xlua_tointeger(L, 3);
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
}
--
Gitblit v1.8.0