From d0d289d502fe85e9bb597ced1b41c73b8bc75889 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 14 三月 2019 10:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Lua/Gen/UIHelperWrap.cs | 81 +++++++++++++++++++++++++---------------
1 files changed, 50 insertions(+), 31 deletions(-)
diff --git a/Lua/Gen/UIHelperWrap.cs b/Lua/Gen/UIHelperWrap.cs
index 7be1232..df886d2 100644
--- a/Lua/Gen/UIHelperWrap.cs
+++ b/Lua/Gen/UIHelperWrap.cs
@@ -31,7 +31,7 @@
Utils.EndObjectRegister(type, L, translator, null, null,
null, null, null);
- Utils.BeginClassRegister(type, L, __CreateInstance, 65, 0, 0);
+ Utils.BeginClassRegister(type, L, __CreateInstance, 66, 0, 0);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetSuitNameByName", _m_GetSuitNameByName_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetSurplusSeconds", _m_GetSurplusSeconds_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetTime", _m_GetTime_xlua_st_);
@@ -47,9 +47,10 @@
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetDanLVColor", _m_GetDanLVColor_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "AppendDanLVNameColor", _m_AppendDanLVNameColor_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetUIColor", _m_GetUIColor_xlua_st_);
- Utils.RegisterFunc(L, Utils.CLS_IDX, "AppendStringColor", _m_AppendStringColor_xlua_st_);
+ Utils.RegisterFunc(L, Utils.CLS_IDX, "AppendColor", _m_AppendColor_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetRealmName", _m_GetRealmName_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetRealmColorByLv", _m_GetRealmColorByLv_xlua_st_);
+ Utils.RegisterFunc(L, Utils.CLS_IDX, "AppendStringColor", _m_AppendStringColor_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetItemColor", _m_GetItemColor_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetFightPower", _m_GetFightPower_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetFightPowerParmByAttrId", _m_GetFightPowerParmByAttrId_xlua_st_);
@@ -590,7 +591,7 @@
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_AppendStringColor_xlua_st_(RealStatePtr L)
+ static int _m_AppendColor_xlua_st_(RealStatePtr L)
{
try {
@@ -600,38 +601,13 @@
int gen_param_count = LuaAPI.lua_gettop(L);
- if(gen_param_count == 3&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 1)&& (LuaAPI.lua_isnil(L, 2) || LuaAPI.lua_type(L, 2) == LuaTypes.LUA_TSTRING)&& LuaTypes.LUA_TBOOLEAN == LuaAPI.lua_type(L, 3))
- {
- int _itemColor = LuaAPI.xlua_tointeger(L, 1);
- string _msg = LuaAPI.lua_tostring(L, 2);
- bool _bright = LuaAPI.lua_toboolean(L, 3);
-
- string gen_ret = UIHelper.AppendStringColor( _itemColor, _msg, _bright );
- LuaAPI.lua_pushstring(L, gen_ret);
-
-
-
- return 1;
- }
- if(gen_param_count == 2&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 1)&& (LuaAPI.lua_isnil(L, 2) || LuaAPI.lua_type(L, 2) == LuaTypes.LUA_TSTRING))
- {
- int _itemColor = LuaAPI.xlua_tointeger(L, 1);
- string _msg = LuaAPI.lua_tostring(L, 2);
-
- string gen_ret = UIHelper.AppendStringColor( _itemColor, _msg );
- LuaAPI.lua_pushstring(L, gen_ret);
-
-
-
- return 1;
- }
if(gen_param_count == 3&& translator.Assignable<TextColType>(L, 1)&& (LuaAPI.lua_isnil(L, 2) || LuaAPI.lua_type(L, 2) == LuaTypes.LUA_TSTRING)&& LuaTypes.LUA_TBOOLEAN == LuaAPI.lua_type(L, 3))
{
TextColType _type;translator.Get(L, 1, out _type);
string _msg = LuaAPI.lua_tostring(L, 2);
bool _bright = LuaAPI.lua_toboolean(L, 3);
- string gen_ret = UIHelper.AppendStringColor( _type, _msg, _bright );
+ string gen_ret = UIHelper.AppendColor( _type, _msg, _bright );
LuaAPI.lua_pushstring(L, gen_ret);
@@ -643,7 +619,7 @@
TextColType _type;translator.Get(L, 1, out _type);
string _msg = LuaAPI.lua_tostring(L, 2);
- string gen_ret = UIHelper.AppendStringColor( _type, _msg );
+ string gen_ret = UIHelper.AppendColor( _type, _msg );
LuaAPI.lua_pushstring(L, gen_ret);
@@ -655,7 +631,7 @@
return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
}
- return LuaAPI.luaL_error(L, "invalid arguments to UIHelper.AppendStringColor!");
+ return LuaAPI.luaL_error(L, "invalid arguments to UIHelper.AppendColor!");
}
@@ -744,6 +720,49 @@
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _m_AppendStringColor_xlua_st_(RealStatePtr L)
+ {
+ try {
+
+
+
+ int gen_param_count = LuaAPI.lua_gettop(L);
+
+ if(gen_param_count == 3&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 1)&& (LuaAPI.lua_isnil(L, 2) || LuaAPI.lua_type(L, 2) == LuaTypes.LUA_TSTRING)&& LuaTypes.LUA_TBOOLEAN == LuaAPI.lua_type(L, 3))
+ {
+ int _itemColor = LuaAPI.xlua_tointeger(L, 1);
+ string _msg = LuaAPI.lua_tostring(L, 2);
+ bool _bright = LuaAPI.lua_toboolean(L, 3);
+
+ string gen_ret = UIHelper.AppendColor( _itemColor, _msg, _bright );
+ LuaAPI.lua_pushstring(L, gen_ret);
+
+
+
+ return 1;
+ }
+ if(gen_param_count == 2&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 1)&& (LuaAPI.lua_isnil(L, 2) || LuaAPI.lua_type(L, 2) == LuaTypes.LUA_TSTRING))
+ {
+ int _itemColor = LuaAPI.xlua_tointeger(L, 1);
+ string _msg = LuaAPI.lua_tostring(L, 2);
+
+ string gen_ret = UIHelper.AppendColor( _itemColor, _msg );
+ LuaAPI.lua_pushstring(L, gen_ret);
+
+
+
+ return 1;
+ }
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+
+ return LuaAPI.luaL_error(L, "invalid arguments to UIHelper.AppendStringColor!");
+
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int _m_GetItemColor_xlua_st_(RealStatePtr L)
{
try {
--
Gitblit v1.8.0