From eedeb8a020fce13e0e63ad7c57adfdff7578e875 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 14 三月 2019 21:05:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Lua/Gen/SnxxzUIItemTipsModelWrap.cs | 41 ++++++-----------------------------------
1 files changed, 6 insertions(+), 35 deletions(-)
diff --git a/Lua/Gen/SnxxzUIItemTipsModelWrap.cs b/Lua/Gen/SnxxzUIItemTipsModelWrap.cs
index 570cd3e..dadf0af 100644
--- a/Lua/Gen/SnxxzUIItemTipsModelWrap.cs
+++ b/Lua/Gen/SnxxzUIItemTipsModelWrap.cs
@@ -1008,10 +1008,6 @@
System.Collections.Generic.List<int> _valuelist = (System.Collections.Generic.List<int>)translator.GetObject(L, 3, typeof(System.Collections.Generic.List<int>));
ItemConfig _itemConfig = (ItemConfig)translator.GetObject(L, 4, typeof(ItemConfig));
- string gen_ret = gen_to_be_invoked.GetLegendAttr( _idlist, _valuelist, _itemConfig );
- LuaAPI.lua_pushstring(L, gen_ret);
-
-
return 1;
}
@@ -1153,14 +1149,6 @@
{
- System.Collections.Generic.List<int> _idlist = (System.Collections.Generic.List<int>)translator.GetObject(L, 2, typeof(System.Collections.Generic.List<int>));
- System.Collections.Generic.List<int> _valuelist = (System.Collections.Generic.List<int>)translator.GetObject(L, 3, typeof(System.Collections.Generic.List<int>));
- ItemConfig _itemConfig = (ItemConfig)translator.GetObject(L, 4, typeof(ItemConfig));
- bool _isCustom = LuaAPI.lua_toboolean(L, 5);
-
- string gen_ret = gen_to_be_invoked.GetPreviewLegendAttr( _idlist, _valuelist, _itemConfig, _isCustom );
- LuaAPI.lua_pushstring(L, gen_ret);
-
return 1;
@@ -1291,31 +1279,14 @@
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int _m_GetProValueTypeStr(RealStatePtr L)
{
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- Snxxz.UI.ItemTipsModel gen_to_be_invoked = (Snxxz.UI.ItemTipsModel)translator.FastGetCSObj(L, 1);
-
-
-
- {
- PlayerPropertyConfig _playerproModel = (PlayerPropertyConfig)translator.GetObject(L, 2, typeof(PlayerPropertyConfig));
- int _value = LuaAPI.xlua_tointeger(L, 3);
-
- string gen_ret = gen_to_be_invoked.GetProValueTypeStr( _playerproModel, _value );
- LuaAPI.lua_pushstring(L, gen_ret);
-
-
-
- return 1;
- }
-
- } catch(System.Exception gen_e) {
+ try
+ {
+ return 1;
+ }
+ catch (System.Exception gen_e)
+ {
return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
}
-
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
--
Gitblit v1.8.0