diff --git a/Assets/Scripts/Common/GameLaunch/BFVersionInfo.cs b/Assets/Scripts/Common/GameLaunch/BFVersionInfo.cs index 723ae0e05..975cc2edf 100644 --- a/Assets/Scripts/Common/GameLaunch/BFVersionInfo.cs +++ b/Assets/Scripts/Common/GameLaunch/BFVersionInfo.cs @@ -17,6 +17,7 @@ namespace BF public string env; public string cdn_url; public List> game_urls = new List>(); - public long open_time; + public long open_at; + public string notice; } } \ No newline at end of file diff --git a/Assets/XLua/Gen/BF_BFVersionInfoWrap.cs b/Assets/XLua/Gen/BF_BFVersionInfoWrap.cs index f86d37c9d..c752229d8 100644 --- a/Assets/XLua/Gen/BF_BFVersionInfoWrap.cs +++ b/Assets/XLua/Gen/BF_BFVersionInfoWrap.cs @@ -21,7 +21,7 @@ namespace XLua.CSObjectWrap { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); System.Type type = typeof(BF.BFVersionInfo); - Utils.BeginObjectRegister(type, L, translator, 0, 0, 8, 8); + Utils.BeginObjectRegister(type, L, translator, 0, 0, 9, 9); @@ -32,7 +32,8 @@ namespace XLua.CSObjectWrap Utils.RegisterFunc(L, Utils.GETTER_IDX, "env", _g_get_env); Utils.RegisterFunc(L, Utils.GETTER_IDX, "cdn_url", _g_get_cdn_url); Utils.RegisterFunc(L, Utils.GETTER_IDX, "game_urls", _g_get_game_urls); - Utils.RegisterFunc(L, Utils.GETTER_IDX, "open_time", _g_get_open_time); + Utils.RegisterFunc(L, Utils.GETTER_IDX, "open_at", _g_get_open_at); + Utils.RegisterFunc(L, Utils.GETTER_IDX, "notice", _g_get_notice); Utils.RegisterFunc(L, Utils.SETTER_IDX, "min_version", _s_set_min_version); Utils.RegisterFunc(L, Utils.SETTER_IDX, "latest_version", _s_set_latest_version); @@ -41,7 +42,8 @@ namespace XLua.CSObjectWrap Utils.RegisterFunc(L, Utils.SETTER_IDX, "env", _s_set_env); Utils.RegisterFunc(L, Utils.SETTER_IDX, "cdn_url", _s_set_cdn_url); Utils.RegisterFunc(L, Utils.SETTER_IDX, "game_urls", _s_set_game_urls); - Utils.RegisterFunc(L, Utils.SETTER_IDX, "open_time", _s_set_open_time); + Utils.RegisterFunc(L, Utils.SETTER_IDX, "open_at", _s_set_open_at); + Utils.RegisterFunc(L, Utils.SETTER_IDX, "notice", _s_set_notice); Utils.EndObjectRegister(type, L, translator, null, null, @@ -189,13 +191,27 @@ namespace XLua.CSObjectWrap } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _g_get_open_time(RealStatePtr L) + static int _g_get_open_at(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); BF.BFVersionInfo gen_to_be_invoked = (BF.BFVersionInfo)translator.FastGetCSObj(L, 1); - LuaAPI.lua_pushint64(L, gen_to_be_invoked.open_time); + LuaAPI.lua_pushint64(L, gen_to_be_invoked.open_at); + } catch(System.Exception gen_e) { + return LuaAPI.luaL_error(L, "c# exception:" + gen_e); + } + return 1; + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int _g_get_notice(RealStatePtr L) + { + try { + ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); + + BF.BFVersionInfo gen_to_be_invoked = (BF.BFVersionInfo)translator.FastGetCSObj(L, 1); + LuaAPI.lua_pushstring(L, gen_to_be_invoked.notice); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } @@ -310,13 +326,28 @@ namespace XLua.CSObjectWrap } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _s_set_open_time(RealStatePtr L) + static int _s_set_open_at(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); BF.BFVersionInfo gen_to_be_invoked = (BF.BFVersionInfo)translator.FastGetCSObj(L, 1); - gen_to_be_invoked.open_time = LuaAPI.lua_toint64(L, 2); + gen_to_be_invoked.open_at = LuaAPI.lua_toint64(L, 2); + + } catch(System.Exception gen_e) { + return LuaAPI.luaL_error(L, "c# exception:" + gen_e); + } + return 0; + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int _s_set_notice(RealStatePtr L) + { + try { + ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); + + BF.BFVersionInfo gen_to_be_invoked = (BF.BFVersionInfo)translator.FastGetCSObj(L, 1); + gen_to_be_invoked.notice = LuaAPI.lua_tostring(L, 2); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); diff --git a/BFVersions/android/google_common/launcher/build.gradle b/BFVersions/android/google_common/launcher/build.gradle index 270000946..f6abf5d37 100644 --- a/BFVersions/android/google_common/launcher/build.gradle +++ b/BFVersions/android/google_common/launcher/build.gradle @@ -1,8 +1,8 @@ // GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN apply plugin: 'com.android.application' -// apply plugin: 'com.google.gms.google-services' -// apply plugin: 'com.google.firebase.crashlytics' +apply plugin: 'com.google.gms.google-services' +apply plugin: 'com.google.firebase.crashlytics' dependencies { implementation project(':unityLibrary')