From 29b4d1b781b85a453abb441f7ed3ed3e7f3dacdf Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 03 四月 2019 14:12:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Lua/Gen/UIHelperWrap.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Lua/Gen/UIHelperWrap.cs b/Lua/Gen/UIHelperWrap.cs
index bb7cef5..8510504 100644
--- a/Lua/Gen/UIHelperWrap.cs
+++ b/Lua/Gen/UIHelperWrap.cs
@@ -36,7 +36,7 @@
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetSurplusSeconds", _m_GetSurplusSeconds_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetTime", _m_GetTime_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetFadeTime", _m_GetFadeTime_xlua_st_);
- Utils.RegisterFunc(L, Utils.CLS_IDX, "GetPropertyMapPlayerData", _m_GetPropertyMapPlayerData_xlua_st_);
+ Utils.RegisterFunc(L, Utils.CLS_IDX, "GetPropertyValue", _m_GetPropertyValue_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "ReplaceNewLine", _m_ReplaceNewLine_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "ReplaceLargeNum", _m_ReplaceLargeNum_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "ReplaceXianYuanCoinsNum", _m_ReplaceXianYuanCoinsNum_xlua_st_);
@@ -220,7 +220,7 @@
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_GetPropertyMapPlayerData_xlua_st_(RealStatePtr L)
+ static int _m_GetPropertyValue_xlua_st_(RealStatePtr L)
{
try {
@@ -232,8 +232,8 @@
{
PropertyType _type;translator.Get(L, 1, out _type);
- float gen_ret = UIHelper.GetPropertyMapPlayerData( _type );
- LuaAPI.lua_pushnumber(L, gen_ret);
+ int gen_ret = UIHelper.GetPropertyValue( _type );
+ LuaAPI.xlua_pushinteger(L, gen_ret);
--
Gitblit v1.8.0