diff --git a/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs b/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs index 901383c38c..012679c04c 100644 --- a/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs +++ b/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs @@ -30,10 +30,19 @@ namespace GameLogic foreach (string ss in kvs) { string[] kv = ss.Split('#'); - if (kv[2] == "1") + if (kv[2] == "1")//数字 { d.Add(kv[0], Convert.ToInt32(kv[1])); } + else if(kv[2] == "2")//数组 + { + d.Add(kv[0], ss.Split(',')); + } + else if (kv[2] == "3")//日期 + { + var startTime = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));//当地时区 + d.Add(kv[0], startTime.AddSeconds(Convert.ToInt32(kv[1]))); + } else { d.Add(kv[0], kv[1]); diff --git a/Assets/Source/Generate/LuaBinder.cs b/Assets/Source/Generate/LuaBinder.cs index 3db206d7e0..b19b77aa16 100644 --- a/Assets/Source/Generate/LuaBinder.cs +++ b/Assets/Source/Generate/LuaBinder.cs @@ -39,6 +39,7 @@ public static class LuaBinder GameCore_UnitySingleton_GameLogic_GameManagerWrap.Register(L); GameCore_UnitySingleton_GameLogic_ThinkingAnalyticsManagerWrap.Register(L); GameCore_UnitySingleton_GameLogic_TapDBManagerWrap.Register(L); + GameCore_UnitySingleton_GameLogic_BuglyManagerWrap.Register(L); GameCore_UnitySingleton_GameLogic_LuaManagerWrap.Register(L); GameCore_UnitySingleton_GameLogic_NetworkManagerWrap.Register(L); GameCore_Singleton_GameLogic_ResourcesManagerWrap.Register(L); @@ -246,6 +247,7 @@ public static class LuaBinder GameLogic_GameManagerWrap.Register(L); GameLogic_ThinkingAnalyticsManagerWrap.Register(L); GameLogic_TapDBManagerWrap.Register(L); + GameLogic_BuglyManagerWrap.Register(L); GameLogic_LuaManagerWrap.Register(L); GameLogic_NetworkManagerWrap.Register(L); GameLogic_ResourcesManagerWrap.Register(L); @@ -277,6 +279,7 @@ public static class LuaBinder SDK_SDKSubmitExtraDataArgsWrap.Register(L); L.BeginModule("SDKManager"); L.RegFunction("InitLaunchAction", SDK_SDKManager_InitLaunchAction); + L.RegFunction("RegisterAction", SDK_SDKManager_RegisterAction); L.RegFunction("LoginAction", SDK_SDKManager_LoginAction); L.RegFunction("PayAction", SDK_SDKManager_PayAction); L.RegFunction("SwitchAccountAction", SDK_SDKManager_SwitchAccountAction); @@ -1940,6 +1943,33 @@ public static class LuaBinder } } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int SDK_SDKManager_RegisterAction(IntPtr L) + { + try + { + int count = LuaDLL.lua_gettop(L); + LuaFunction func = ToLua.CheckLuaFunction(L, 1); + + if (count == 1) + { + Delegate arg1 = DelegateTraits.Create(func); + ToLua.Push(L, arg1); + } + else + { + LuaTable self = ToLua.CheckLuaTable(L, 2); + Delegate arg1 = DelegateTraits.Create(func, self); + ToLua.Push(L, arg1); + } + return 1; + } + catch(Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int SDK_SDKManager_LoginAction(IntPtr L) {