From 4c6d58af44cd4235501e15a78bf79674ba2fcc4a Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 15 一月 2019 10:41:31 +0800
Subject: [PATCH] Merge branch 'master' into GrowthFund
---
Lua/Gen/SDKUtilityWrap.cs | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/Lua/Gen/SDKUtilityWrap.cs b/Lua/Gen/SDKUtilityWrap.cs
index cd56ece..b8fc00b 100644
--- a/Lua/Gen/SDKUtilityWrap.cs
+++ b/Lua/Gen/SDKUtilityWrap.cs
@@ -21,7 +21,7 @@
{
ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
System.Type type = typeof(SDKUtility);
- Utils.BeginObjectRegister(type, L, translator, 0, 25, 29, 20);
+ Utils.BeginObjectRegister(type, L, translator, 0, 26, 29, 20);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "InstallAPK", _m_InstallAPK);
@@ -37,6 +37,7 @@
Utils.RegisterFunc(L, Utils.METHOD_IDX, "FreePlatformInit", _m_FreePlatformInit);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "FreePlatformBindPhone", _m_FreePlatformBindPhone);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "FreePlatformLogin", _m_FreePlatformLogin);
+ Utils.RegisterFunc(L, Utils.METHOD_IDX, "TencentLogin", _m_TencentLogin);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "FreePlatformLoginout", _m_FreePlatformLoginout);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "FreePlatformSwitchAccount", _m_FreePlatformSwitchAccount);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "FreePlatformPay", _m_FreePlatformPay);
@@ -105,13 +106,14 @@
Utils.EndObjectRegister(type, L, translator, null, null,
null, null, null);
- Utils.BeginClassRegister(type, L, __CreateInstance, 2, 3, 0);
+ Utils.BeginClassRegister(type, L, __CreateInstance, 2, 4, 0);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetApplicationContext", _m_GetApplicationContext_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "Yj_AppID", _g_get_Yj_AppID);
Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "Yj_SpID", _g_get_Yj_SpID);
+ Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "Yj_BanHao", _g_get_Yj_BanHao);
Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "builtinAssetCopyFinished", _g_get_builtinAssetCopyFinished);
@@ -560,6 +562,34 @@
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _m_TencentLogin(RealStatePtr L)
+ {
+ try {
+
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+
+ SDKUtility gen_to_be_invoked = (SDKUtility)translator.FastGetCSObj(L, 1);
+
+
+
+ {
+ string _param = LuaAPI.lua_tostring(L, 2);
+
+ gen_to_be_invoked.TencentLogin( _param );
+
+
+
+ return 0;
+ }
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int _m_FreePlatformLoginout(RealStatePtr L)
{
try {
@@ -916,6 +946,18 @@
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_Yj_BanHao(RealStatePtr L)
+ {
+ try {
+
+ LuaAPI.lua_pushstring(L, SDKUtility.Yj_BanHao);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int _g_get_InitFinished(RealStatePtr L)
{
try {
--
Gitblit v1.8.0