From 6a5cc758cd9f385a30783828fd34d1188de25427 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期六, 29 六月 2019 16:52:33 +0800
Subject: [PATCH] Merge branch 'master' into HEAD

---
 Lua/Gen/StoreModelWrap.cs |  110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 108 insertions(+), 2 deletions(-)

diff --git a/Lua/Gen/StoreModelWrap.cs b/Lua/Gen/StoreModelWrap.cs
index 29824ca..8be7fa6 100644
--- a/Lua/Gen/StoreModelWrap.cs
+++ b/Lua/Gen/StoreModelWrap.cs
@@ -21,7 +21,7 @@
         {
 			ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
 			System.Type type = typeof(StoreModel);
-			Utils.BeginObjectRegister(type, L, translator, 0, 67, 29, 12);
+			Utils.BeginObjectRegister(type, L, translator, 0, 68, 31, 14);
 			
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnBeforePlayerDataInitialize", _m_OnBeforePlayerDataInitialize);
@@ -70,6 +70,7 @@
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdateFreeShopRedpoint", _m_UpdateFreeShopRedpoint);
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdateCanBuyRedpoint", _m_UpdateCanBuyRedpoint);
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdateMustBuyRedpoint", _m_UpdateMustBuyRedpoint);
+			Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdateAlchemyStudyItemRedpoint", _m_UpdateAlchemyStudyItemRedpoint);
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "ClearMustBuyRedpoint", _m_ClearMustBuyRedpoint);
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetIsMustBuyDay", _m_SetIsMustBuyDay);
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "CheckIsMustBuy", _m_CheckIsMustBuy);
@@ -120,6 +121,8 @@
             Utils.RegisterFunc(L, Utils.GETTER_IDX, "storeFunc3Point", _g_get_storeFunc3Point);
             Utils.RegisterFunc(L, Utils.GETTER_IDX, "storeFunc4Point", _g_get_storeFunc4Point);
             Utils.RegisterFunc(L, Utils.GETTER_IDX, "storeFunc5Point", _g_get_storeFunc5Point);
+            Utils.RegisterFunc(L, Utils.GETTER_IDX, "storeFunc8Point", _g_get_storeFunc8Point);
+            Utils.RegisterFunc(L, Utils.GETTER_IDX, "fairyStoreRemindRedpoint", _g_get_fairyStoreRemindRedpoint);
             Utils.RegisterFunc(L, Utils.GETTER_IDX, "shopRedDict", _g_get_shopRedDict);
             
 			Utils.RegisterFunc(L, Utils.SETTER_IDX, "jumpToItemId", _s_set_jumpToItemId);
@@ -133,13 +136,15 @@
             Utils.RegisterFunc(L, Utils.SETTER_IDX, "storeFunc3Point", _s_set_storeFunc3Point);
             Utils.RegisterFunc(L, Utils.SETTER_IDX, "storeFunc4Point", _s_set_storeFunc4Point);
             Utils.RegisterFunc(L, Utils.SETTER_IDX, "storeFunc5Point", _s_set_storeFunc5Point);
+            Utils.RegisterFunc(L, Utils.SETTER_IDX, "storeFunc8Point", _s_set_storeFunc8Point);
+            Utils.RegisterFunc(L, Utils.SETTER_IDX, "fairyStoreRemindRedpoint", _s_set_fairyStoreRemindRedpoint);
             Utils.RegisterFunc(L, Utils.SETTER_IDX, "shopRedDict", _s_set_shopRedDict);
             
 			
 			Utils.EndObjectRegister(type, L, translator, null, null,
 			    null, null, null);
 
-		    Utils.BeginClassRegister(type, L, __CreateInstance, 7, 0, 0);
+		    Utils.BeginClassRegister(type, L, __CreateInstance, 9, 0, 0);
 			
 			
             Utils.RegisterObject(L, translator, Utils.CLS_IDX, "StoreFunc_RedKey", StoreModel.StoreFunc_RedKey);
@@ -148,6 +153,8 @@
             Utils.RegisterObject(L, translator, Utils.CLS_IDX, "StoreFunc3_RedKey", StoreModel.StoreFunc3_RedKey);
             Utils.RegisterObject(L, translator, Utils.CLS_IDX, "StoreFunc4_RedKey", StoreModel.StoreFunc4_RedKey);
             Utils.RegisterObject(L, translator, Utils.CLS_IDX, "StoreFunc5_RedKey", StoreModel.StoreFunc5_RedKey);
+            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "StoreFunc8_RedKey", StoreModel.StoreFunc8_RedKey);
+            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "FairyStoreRemind_RedKey", StoreModel.FairyStoreRemind_RedKey);
             
 			
 			
@@ -1555,6 +1562,47 @@
         }
         
         [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+        static int _m_UpdateAlchemyStudyItemRedpoint(RealStatePtr L)
+        {
+		    try {
+            
+                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+            
+            
+                StoreModel gen_to_be_invoked = (StoreModel)translator.FastGetCSObj(L, 1);
+            
+            
+			    int gen_param_count = LuaAPI.lua_gettop(L);
+            
+                if(gen_param_count == 1) 
+                {
+                    
+                    gen_to_be_invoked.UpdateAlchemyStudyItemRedpoint(  );
+                    
+                    
+                    
+                    return 0;
+                }
+                if(gen_param_count == 2&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 2)) 
+                {
+                    int _shopType = LuaAPI.xlua_tointeger(L, 2);
+                    
+                    gen_to_be_invoked.UpdateAlchemyStudyItemRedpoint( _shopType );
+                    
+                    
+                    
+                    return 0;
+                }
+                
+            } catch(System.Exception gen_e) {
+                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+            }
+            
+            return LuaAPI.luaL_error(L, "invalid arguments to StoreModel.UpdateAlchemyStudyItemRedpoint!");
+            
+        }
+        
+        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
         static int _m_ClearMustBuyRedpoint(RealStatePtr L)
         {
 		    try {
@@ -2379,6 +2427,34 @@
         }
         
         [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+        static int _g_get_storeFunc8Point(RealStatePtr L)
+        {
+		    try {
+                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+			
+                StoreModel gen_to_be_invoked = (StoreModel)translator.FastGetCSObj(L, 1);
+                translator.Push(L, gen_to_be_invoked.storeFunc8Point);
+            } catch(System.Exception gen_e) {
+                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+            }
+            return 1;
+        }
+        
+        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+        static int _g_get_fairyStoreRemindRedpoint(RealStatePtr L)
+        {
+		    try {
+                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+			
+                StoreModel gen_to_be_invoked = (StoreModel)translator.FastGetCSObj(L, 1);
+                translator.Push(L, gen_to_be_invoked.fairyStoreRemindRedpoint);
+            } catch(System.Exception gen_e) {
+                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+            }
+            return 1;
+        }
+        
+        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
         static int _g_get_shopRedDict(RealStatePtr L)
         {
 		    try {
@@ -2561,6 +2637,36 @@
         }
         
         [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+        static int _s_set_storeFunc8Point(RealStatePtr L)
+        {
+		    try {
+                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+			
+                StoreModel gen_to_be_invoked = (StoreModel)translator.FastGetCSObj(L, 1);
+                gen_to_be_invoked.storeFunc8Point = (Snxxz.UI.Redpoint)translator.GetObject(L, 2, typeof(Snxxz.UI.Redpoint));
+            
+            } catch(System.Exception gen_e) {
+                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+            }
+            return 0;
+        }
+        
+        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+        static int _s_set_fairyStoreRemindRedpoint(RealStatePtr L)
+        {
+		    try {
+                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+			
+                StoreModel gen_to_be_invoked = (StoreModel)translator.FastGetCSObj(L, 1);
+                gen_to_be_invoked.fairyStoreRemindRedpoint = (Snxxz.UI.Redpoint)translator.GetObject(L, 2, typeof(Snxxz.UI.Redpoint));
+            
+            } catch(System.Exception gen_e) {
+                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+            }
+            return 0;
+        }
+        
+        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
         static int _s_set_shopRedDict(RealStatePtr L)
         {
 		    try {

--
Gitblit v1.8.0