From 7942d812d752d6b67a0a5d5729f1dec59a409fdc Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 12 二月 2019 11:54:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Lua/Gen/GAMgrWrap.cs | 122 +++++++++++++++++++++++++++++-----------
1 files changed, 88 insertions(+), 34 deletions(-)
diff --git a/Lua/Gen/GAMgrWrap.cs b/Lua/Gen/GAMgrWrap.cs
index dad3eb8..2d10e7a 100644
--- a/Lua/Gen/GAMgrWrap.cs
+++ b/Lua/Gen/GAMgrWrap.cs
@@ -21,8 +21,11 @@
{
ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
System.Type type = typeof(GAMgr);
- Utils.BeginObjectRegister(type, L, translator, 0, 31, 8, 8);
+ Utils.BeginObjectRegister(type, L, translator, 0, 34, 7, 7);
+ Utils.RegisterFunc(L, Utils.METHOD_IDX, "AddReJustPosActor", _m_AddReJustPosActor);
+ Utils.RegisterFunc(L, Utils.METHOD_IDX, "DoReAdjustPos", _m_DoReAdjustPos);
+ Utils.RegisterFunc(L, Utils.METHOD_IDX, "ClearReJustActor", _m_ClearReJustActor);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "AddNeedDestroyPrefab", _m_AddNeedDestroyPrefab);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "RemoveNeedDestroyPrefab", _m_RemoveNeedDestroyPrefab);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
@@ -56,8 +59,7 @@
Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnFightNpcRequest", _e_OnFightNpcRequest);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnFightNpcRelease", _e_OnFightNpcRelease);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "reAdjustPosList", _g_get_reAdjustPosList);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "s_NpcID2BundleName", _g_get_s_NpcID2BundleName);
+ Utils.RegisterFunc(L, Utils.GETTER_IDX, "s_NpcID2BundleName", _g_get_s_NpcID2BundleName);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "s_NpcID2Assetname", _g_get_s_NpcID2Assetname);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "needDestroyPrefabList", _g_get_needDestroyPrefabList);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "needDieList", _g_get_needDieList);
@@ -65,8 +67,7 @@
Utils.RegisterFunc(L, Utils.GETTER_IDX, "otherPlayerAtkHeroDict", _g_get_otherPlayerAtkHeroDict);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "_removeIdList", _g_get__removeIdList);
- Utils.RegisterFunc(L, Utils.SETTER_IDX, "reAdjustPosList", _s_set_reAdjustPosList);
- Utils.RegisterFunc(L, Utils.SETTER_IDX, "s_NpcID2BundleName", _s_set_s_NpcID2BundleName);
+ Utils.RegisterFunc(L, Utils.SETTER_IDX, "s_NpcID2BundleName", _s_set_s_NpcID2BundleName);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "s_NpcID2Assetname", _s_set_s_NpcID2Assetname);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "needDestroyPrefabList", _s_set_needDestroyPrefabList);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "needDieList", _s_set_needDieList);
@@ -117,6 +118,88 @@
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _m_AddReJustPosActor(RealStatePtr L)
+ {
+ try {
+
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+
+ GAMgr gen_to_be_invoked = (GAMgr)translator.FastGetCSObj(L, 1);
+
+
+
+ {
+ GActor _actor = (GActor)translator.GetObject(L, 2, typeof(GActor));
+
+ gen_to_be_invoked.AddReJustPosActor( _actor );
+
+
+
+ return 0;
+ }
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _m_DoReAdjustPos(RealStatePtr L)
+ {
+ try {
+
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+
+ GAMgr gen_to_be_invoked = (GAMgr)translator.FastGetCSObj(L, 1);
+
+
+
+ {
+
+ gen_to_be_invoked.DoReAdjustPos( );
+
+
+
+ return 0;
+ }
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _m_ClearReJustActor(RealStatePtr L)
+ {
+ try {
+
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+
+ GAMgr gen_to_be_invoked = (GAMgr)translator.FastGetCSObj(L, 1);
+
+
+
+ {
+
+ gen_to_be_invoked.ClearReJustActor( );
+
+
+
+ return 0;
+ }
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+
+ }
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int _m_AddNeedDestroyPrefab(RealStatePtr L)
@@ -929,20 +1012,6 @@
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_reAdjustPosList(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- GAMgr gen_to_be_invoked = (GAMgr)translator.FastGetCSObj(L, 1);
- translator.Push(L, gen_to_be_invoked.reAdjustPosList);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int _g_get_s_NpcID2BundleName(RealStatePtr L)
{
try {
@@ -1041,21 +1110,6 @@
}
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _s_set_reAdjustPosList(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- GAMgr gen_to_be_invoked = (GAMgr)translator.FastGetCSObj(L, 1);
- gen_to_be_invoked.reAdjustPosList = (System.Collections.Generic.List<GActor>)translator.GetObject(L, 2, typeof(System.Collections.Generic.List<GActor>));
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 0;
- }
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int _s_set_s_NpcID2BundleName(RealStatePtr L)
--
Gitblit v1.8.0