From 5859e5dd0a45420d1eccc342ddbeb112e58cc189 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 16 一月 2019 11:57:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Lua/Gen/MaterialUtilityWrap.cs | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/Lua/Gen/MaterialUtilityWrap.cs b/Lua/Gen/MaterialUtilityWrap.cs
index bf66615..d4ca4d8 100644
--- a/Lua/Gen/MaterialUtilityWrap.cs
+++ b/Lua/Gen/MaterialUtilityWrap.cs
@@ -31,7 +31,7 @@
Utils.EndObjectRegister(type, L, translator, null, null,
null, null, null);
- Utils.BeginClassRegister(type, L, __CreateInstance, 9, 1, 0);
+ Utils.BeginClassRegister(type, L, __CreateInstance, 9, 2, 1);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetDefaultSpriteGrayMaterial", _m_GetDefaultSpriteGrayMaterial_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetInstantiatedSpriteGrayMaterial", _m_GetInstantiatedSpriteGrayMaterial_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetSmoothMaskGrayMaterial", _m_GetSmoothMaskGrayMaterial_xlua_st_);
@@ -44,8 +44,10 @@
Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "hudMaterial", _g_get_hudMaterial);
+ Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "m_HudMaterial", _g_get_m_HudMaterial);
-
+ Utils.RegisterFunc(L, Utils.CLS_SETTER_IDX, "m_HudMaterial", _s_set_m_HudMaterial);
+
Utils.EndClassRegister(type, L, translator);
}
@@ -287,8 +289,33 @@
return 1;
}
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_m_HudMaterial(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+ translator.Push(L, MaterialUtility.m_HudMaterial);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _s_set_m_HudMaterial(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+ MaterialUtility.m_HudMaterial = (UnityEngine.Material)translator.GetObject(L, 1, typeof(UnityEngine.Material));
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 0;
+ }
+
--
Gitblit v1.8.0