diff --git a/Assets/Scripts/Common/SDK/DZSDKManager.cs b/Assets/Scripts/Common/SDK/DZSDKManager.cs deleted file mode 100644 index 969ea6856..000000000 --- a/Assets/Scripts/Common/SDK/DZSDKManager.cs +++ /dev/null @@ -1,116 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using System; -// using BF.NativeCore.Platform; - -namespace BF -{ - //copy from sdk - public enum NotchType - { - NONE, - ANDROID, - } - - [System.Serializable] - public class NotchScreenInfo - { - public NotchType notchType = NotchType.NONE; - public bool enabled = false; - public int width = 0; - public int height = 0; - - public override string ToString() - { - return string.Format("notchType:{0} showNotch:{1} width:{2} height:{3}", notchType, enabled, width, height); - } - } - public class DZSDKManager : MonoBehaviour - { - -#if UNITY_ANDROID - /// - /// android原生代码对象 - /// - AndroidJavaObject ajc; -#endif - //解析的数据 - private NotchScreenInfo notchScreenInfo = new NotchScreenInfo(); - private bool initNotchScreen = false; - - private void Awake() - { -#if UNITY_ANDROID - //通过该API来实例化导入的arr中对应的类 - ajc = new AndroidJavaObject("com.droidhang.aod.AODHelper"); -#endif - } - - public void CSGetNotchScreenInfo() - { - if (initNotchScreen) return; - BFLog.Log("尝试获取适配信息 CSGetNotchScreenInfo"); -#if UNITY_ANDROID - //通过API来调用原生代码的方法 - bool success = ajc.Call("getNotchScreen"); - if (success) - { - initNotchScreen = true; - //请求成功 - BFLog.Log("获取安卓刘海屏成功"); - } -#endif - } - - /// - /// 原生层通过该方法传回信息 - /// - /// - public void GetNotchScreen(string content) - { -#if UNITY_ANDROID - BFLog.Log("获取NotchInfo:" + content); - - if (!string.IsNullOrEmpty(content)) - { - //解析刘海屏数据 - notchScreenInfo = JsonUtility.FromJson(content); - - BFLog.Log("解析 NotchScreen:" + notchScreenInfo.ToString()); - } -#endif - } - - /// - /// 对外接口 获取刘海屏信息 - /// - /// - public NotchScreenInfo GetNotchScreenInfo() - { - return notchScreenInfo; - } - - // 刘海屏信息 *************************************************************************************************** - - public NotchType GetNotchScreenType() - { - return notchScreenInfo.notchType; - } - - public bool GetNotchScreenEnable() - { - return notchScreenInfo.enabled; - } - - public int GetNotchScreenWidth() - { - return notchScreenInfo.width; - } - - public int GetNotchScreenHeight() - { - return notchScreenInfo.height; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Common/SDK/DZSDKManager.cs.meta b/Assets/Scripts/Common/SDK/DZSDKManager.cs.meta deleted file mode 100644 index 26a276329..000000000 --- a/Assets/Scripts/Common/SDK/DZSDKManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 69c854ae7d148be429e876656d170acd -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Common/SDK/SDKManager.cs b/Assets/Scripts/Common/SDK/SDKManager.cs index 9befe8411..42ce08d4b 100644 --- a/Assets/Scripts/Common/SDK/SDKManager.cs +++ b/Assets/Scripts/Common/SDK/SDKManager.cs @@ -65,8 +65,6 @@ namespace BF public BFIronSourceSDKManager BFIronSourceSDKMgr { get; private set; } public BFNativeSDKManager BFNativeSDKMgr { get; private set; } public BFThirdReportSDKManager BFThirdReportSDKMgr { get; private set; } - //刘海屏 - public DZSDKManager DZSDKMgr { get; private set; } static SDKManager instance; public static SDKManager Create() @@ -87,9 +85,6 @@ namespace BF { sdkGo = new GameObject("SDKManager"); } - - // 刘海屏数据 - DZSDKMgr = sdkGo.AddComponent(); // 登陆 BFLoginSDKMgr = sdkGo.AddComponent(); // 支付 @@ -127,27 +122,5 @@ namespace BF { return NativeUtils.GetTimeZone(); } - - // 刘海屏信息 *************************************************************************************************** - - public NotchType GetNotchScreenType() - { - return DZSDKMgr.GetNotchScreenType(); - } - - public bool GetNotchScreenEnable() - { - return DZSDKMgr.GetNotchScreenEnable(); - } - - public int GetNotchScreenWidth() - { - return DZSDKMgr.GetNotchScreenWidth(); - } - - public int GetNotchScreenHeight() - { - return DZSDKMgr.GetNotchScreenHeight(); - } } } \ No newline at end of file diff --git a/Assets/Scripts/Common/SafeAreaManager.cs b/Assets/Scripts/Common/SafeAreaManager.cs index bcec24b9b..7f09d7893 100644 --- a/Assets/Scripts/Common/SafeAreaManager.cs +++ b/Assets/Scripts/Common/SafeAreaManager.cs @@ -4,10 +4,9 @@ using UnityEngine; namespace BF { public class SafeAreaManager { - // public const string NOTCH_SCREEN_SIMULATE = "NOTCH_SCREEN_SIMULATE"; private static SafeAreaManager instance; - public static SafeAreaManager Instance { + public static SafeAreaManager Instance{ get { if (instance == null) { instance = new SafeAreaManager(); @@ -16,47 +15,23 @@ namespace BF { } } - /// - /// 是否开启模拟模式 - /// - /// - // public static bool CheckIfSimulate () { - // return PlayerPrefs.GetInt ("NOTCH_SCREEN_SIMULATE", 0) == 1; - // } - /// /// 得到安全区域 /// /// - public static Rect GetSafeArea () { - // 当前屏幕尺寸 - float screenWidth = Screen.width; - float screenHeight = Screen.height; -#if UNITY_EDITOR + public static Rect GetSafeArea () + { return Screen.safeArea; -#elif UNITY_IPHONE - return Screen.safeArea; -#elif UNITY_ANDROID - // 安卓直接用SDK方法 不使用SafeArea - return new Rect (0, 0, screenWidth, screenHeight); -#else - return new Rect (0, 0, screenWidth, screenHeight); -#endif } /// /// 得到竖屏时的刘海高度 /// /// - public static float GetNotchScreenHeight() { - Rect rect = GetSafeArea (); -#if UNITY_EDITOR + public static float GetNotchScreenHeight() + { + Rect rect = GetSafeArea(); return Screen.height - rect.height - rect.y; -#elif UNITY_ANDROID - return BFMain.Instance.SDKMgr.GetNotchScreenHeight(); -#else - return Screen.height - rect.height - rect.y; -#endif } } } \ No newline at end of file diff --git a/Assets/XLua/Gen/BF_DZSDKManagerWrap.cs b/Assets/XLua/Gen/BF_DZSDKManagerWrap.cs deleted file mode 100644 index 18b777fb1..000000000 --- a/Assets/XLua/Gen/BF_DZSDKManagerWrap.cs +++ /dev/null @@ -1,286 +0,0 @@ -#if USE_UNI_LUA -using LuaAPI = UniLua.Lua; -using RealStatePtr = UniLua.ILuaState; -using LuaCSFunction = UniLua.CSharpFunctionDelegate; -#else -using LuaAPI = XLua.LuaDLL.Lua; -using RealStatePtr = System.IntPtr; -using LuaCSFunction = XLua.LuaDLL.lua_CSFunction; -#endif - -using XLua; -using System.Collections.Generic; - - -namespace XLua.CSObjectWrap -{ - using Utils = XLua.Utils; - public class BFDZSDKManagerWrap - { - public static void __Register(RealStatePtr L) - { - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - System.Type type = typeof(BF.DZSDKManager); - Utils.BeginObjectRegister(type, L, translator, 0, 7, 0, 0); - - Utils.RegisterFunc(L, Utils.METHOD_IDX, "CSGetNotchScreenInfo", _m_CSGetNotchScreenInfo); - Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetNotchScreen", _m_GetNotchScreen); - Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetNotchScreenInfo", _m_GetNotchScreenInfo); - Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetNotchScreenType", _m_GetNotchScreenType); - Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetNotchScreenEnable", _m_GetNotchScreenEnable); - Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetNotchScreenWidth", _m_GetNotchScreenWidth); - Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetNotchScreenHeight", _m_GetNotchScreenHeight); - - - - - - Utils.EndObjectRegister(type, L, translator, null, null, - null, null, null); - - Utils.BeginClassRegister(type, L, __CreateInstance, 1, 0, 0); - - - - - - - Utils.EndClassRegister(type, L, translator); - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int __CreateInstance(RealStatePtr L) - { - - try { - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - if(LuaAPI.lua_gettop(L) == 1) - { - - var gen_ret = new BF.DZSDKManager(); - translator.Push(L, gen_ret); - - return 1; - } - - } - catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - return LuaAPI.luaL_error(L, "invalid arguments to BF.DZSDKManager constructor!"); - - } - - - - - - - - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _m_CSGetNotchScreenInfo(RealStatePtr L) - { - try { - - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - - BF.DZSDKManager gen_to_be_invoked = (BF.DZSDKManager)translator.FastGetCSObj(L, 1); - - - - { - - gen_to_be_invoked.CSGetNotchScreenInfo( ); - - - - return 0; - } - - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _m_GetNotchScreen(RealStatePtr L) - { - try { - - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - - BF.DZSDKManager gen_to_be_invoked = (BF.DZSDKManager)translator.FastGetCSObj(L, 1); - - - - { - string _content = LuaAPI.lua_tostring(L, 2); - - gen_to_be_invoked.GetNotchScreen( _content ); - - - - return 0; - } - - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _m_GetNotchScreenInfo(RealStatePtr L) - { - try { - - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - - BF.DZSDKManager gen_to_be_invoked = (BF.DZSDKManager)translator.FastGetCSObj(L, 1); - - - - { - - var gen_ret = gen_to_be_invoked.GetNotchScreenInfo( ); - translator.Push(L, gen_ret); - - - - return 1; - } - - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _m_GetNotchScreenType(RealStatePtr L) - { - try { - - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - - BF.DZSDKManager gen_to_be_invoked = (BF.DZSDKManager)translator.FastGetCSObj(L, 1); - - - - { - - var gen_ret = gen_to_be_invoked.GetNotchScreenType( ); - translator.Push(L, gen_ret); - - - - return 1; - } - - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _m_GetNotchScreenEnable(RealStatePtr L) - { - try { - - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - - BF.DZSDKManager gen_to_be_invoked = (BF.DZSDKManager)translator.FastGetCSObj(L, 1); - - - - { - - var gen_ret = gen_to_be_invoked.GetNotchScreenEnable( ); - LuaAPI.lua_pushboolean(L, gen_ret); - - - - return 1; - } - - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _m_GetNotchScreenWidth(RealStatePtr L) - { - try { - - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - - BF.DZSDKManager gen_to_be_invoked = (BF.DZSDKManager)translator.FastGetCSObj(L, 1); - - - - { - - var gen_ret = gen_to_be_invoked.GetNotchScreenWidth( ); - LuaAPI.xlua_pushinteger(L, gen_ret); - - - - return 1; - } - - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _m_GetNotchScreenHeight(RealStatePtr L) - { - try { - - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - - BF.DZSDKManager gen_to_be_invoked = (BF.DZSDKManager)translator.FastGetCSObj(L, 1); - - - - { - - var gen_ret = gen_to_be_invoked.GetNotchScreenHeight( ); - LuaAPI.xlua_pushinteger(L, gen_ret); - - - - return 1; - } - - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - - } - - - - - - - - - - - } -} diff --git a/Assets/XLua/Gen/BF_NotchScreenInfoWrap.cs b/Assets/XLua/Gen/BF_NotchScreenInfoWrap.cs deleted file mode 100644 index 3af032a32..000000000 --- a/Assets/XLua/Gen/BF_NotchScreenInfoWrap.cs +++ /dev/null @@ -1,238 +0,0 @@ -#if USE_UNI_LUA -using LuaAPI = UniLua.Lua; -using RealStatePtr = UniLua.ILuaState; -using LuaCSFunction = UniLua.CSharpFunctionDelegate; -#else -using LuaAPI = XLua.LuaDLL.Lua; -using RealStatePtr = System.IntPtr; -using LuaCSFunction = XLua.LuaDLL.lua_CSFunction; -#endif - -using XLua; -using System.Collections.Generic; - - -namespace XLua.CSObjectWrap -{ - using Utils = XLua.Utils; - public class BFNotchScreenInfoWrap - { - public static void __Register(RealStatePtr L) - { - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - System.Type type = typeof(BF.NotchScreenInfo); - Utils.BeginObjectRegister(type, L, translator, 0, 1, 4, 4); - - Utils.RegisterFunc(L, Utils.METHOD_IDX, "ToString", _m_ToString); - - - Utils.RegisterFunc(L, Utils.GETTER_IDX, "notchType", _g_get_notchType); - Utils.RegisterFunc(L, Utils.GETTER_IDX, "enabled", _g_get_enabled); - Utils.RegisterFunc(L, Utils.GETTER_IDX, "width", _g_get_width); - Utils.RegisterFunc(L, Utils.GETTER_IDX, "height", _g_get_height); - - Utils.RegisterFunc(L, Utils.SETTER_IDX, "notchType", _s_set_notchType); - Utils.RegisterFunc(L, Utils.SETTER_IDX, "enabled", _s_set_enabled); - Utils.RegisterFunc(L, Utils.SETTER_IDX, "width", _s_set_width); - Utils.RegisterFunc(L, Utils.SETTER_IDX, "height", _s_set_height); - - - Utils.EndObjectRegister(type, L, translator, null, null, - null, null, null); - - Utils.BeginClassRegister(type, L, __CreateInstance, 1, 0, 0); - - - - - - - Utils.EndClassRegister(type, L, translator); - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int __CreateInstance(RealStatePtr L) - { - - try { - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - if(LuaAPI.lua_gettop(L) == 1) - { - - var gen_ret = new BF.NotchScreenInfo(); - translator.Push(L, gen_ret); - - return 1; - } - - } - catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - return LuaAPI.luaL_error(L, "invalid arguments to BF.NotchScreenInfo constructor!"); - - } - - - - - - - - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _m_ToString(RealStatePtr L) - { - try { - - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - - BF.NotchScreenInfo gen_to_be_invoked = (BF.NotchScreenInfo)translator.FastGetCSObj(L, 1); - - - - { - - var gen_ret = gen_to_be_invoked.ToString( ); - LuaAPI.lua_pushstring(L, gen_ret); - - - - return 1; - } - - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - - } - - - - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _g_get_notchType(RealStatePtr L) - { - try { - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - BF.NotchScreenInfo gen_to_be_invoked = (BF.NotchScreenInfo)translator.FastGetCSObj(L, 1); - translator.Push(L, gen_to_be_invoked.notchType); - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - return 1; - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _g_get_enabled(RealStatePtr L) - { - try { - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - BF.NotchScreenInfo gen_to_be_invoked = (BF.NotchScreenInfo)translator.FastGetCSObj(L, 1); - LuaAPI.lua_pushboolean(L, gen_to_be_invoked.enabled); - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - return 1; - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _g_get_width(RealStatePtr L) - { - try { - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - BF.NotchScreenInfo gen_to_be_invoked = (BF.NotchScreenInfo)translator.FastGetCSObj(L, 1); - LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.width); - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - return 1; - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _g_get_height(RealStatePtr L) - { - try { - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - BF.NotchScreenInfo gen_to_be_invoked = (BF.NotchScreenInfo)translator.FastGetCSObj(L, 1); - LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.height); - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - return 1; - } - - - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _s_set_notchType(RealStatePtr L) - { - try { - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - BF.NotchScreenInfo gen_to_be_invoked = (BF.NotchScreenInfo)translator.FastGetCSObj(L, 1); - BF.NotchType gen_value;translator.Get(L, 2, out gen_value); - gen_to_be_invoked.notchType = gen_value; - - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - return 0; - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _s_set_enabled(RealStatePtr L) - { - try { - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - BF.NotchScreenInfo gen_to_be_invoked = (BF.NotchScreenInfo)translator.FastGetCSObj(L, 1); - gen_to_be_invoked.enabled = LuaAPI.lua_toboolean(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_width(RealStatePtr L) - { - try { - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - BF.NotchScreenInfo gen_to_be_invoked = (BF.NotchScreenInfo)translator.FastGetCSObj(L, 1); - gen_to_be_invoked.width = LuaAPI.xlua_tointeger(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_height(RealStatePtr L) - { - try { - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - BF.NotchScreenInfo gen_to_be_invoked = (BF.NotchScreenInfo)translator.FastGetCSObj(L, 1); - gen_to_be_invoked.height = LuaAPI.xlua_tointeger(L, 2); - - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - return 0; - } - - - - - - } -} diff --git a/Assets/XLua/Gen/BF_SDKManagerWrap.cs b/Assets/XLua/Gen/BF_SDKManagerWrap.cs index 0eb8760c4..875ebd9e8 100644 --- a/Assets/XLua/Gen/BF_SDKManagerWrap.cs +++ b/Assets/XLua/Gen/BF_SDKManagerWrap.cs @@ -21,16 +21,12 @@ namespace XLua.CSObjectWrap { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); System.Type type = typeof(BF.SDKManager); - Utils.BeginObjectRegister(type, L, translator, 0, 8, 7, 0); + Utils.BeginObjectRegister(type, L, translator, 0, 4, 6, 0); Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init); Utils.RegisterFunc(L, Utils.METHOD_IDX, "Destroy", _m_Destroy); Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetLanguage", _m_GetLanguage); Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetTimeZone", _m_GetTimeZone); - Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetNotchScreenType", _m_GetNotchScreenType); - Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetNotchScreenEnable", _m_GetNotchScreenEnable); - Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetNotchScreenWidth", _m_GetNotchScreenWidth); - Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetNotchScreenHeight", _m_GetNotchScreenHeight); Utils.RegisterFunc(L, Utils.GETTER_IDX, "BFLoginSDKMgr", _g_get_BFLoginSDKMgr); @@ -39,7 +35,6 @@ namespace XLua.CSObjectWrap Utils.RegisterFunc(L, Utils.GETTER_IDX, "BFIronSourceSDKMgr", _g_get_BFIronSourceSDKMgr); Utils.RegisterFunc(L, Utils.GETTER_IDX, "BFNativeSDKMgr", _g_get_BFNativeSDKMgr); Utils.RegisterFunc(L, Utils.GETTER_IDX, "BFThirdReportSDKMgr", _g_get_BFThirdReportSDKMgr); - Utils.RegisterFunc(L, Utils.GETTER_IDX, "DZSDKMgr", _g_get_DZSDKMgr); @@ -206,118 +201,6 @@ namespace XLua.CSObjectWrap } - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _m_GetNotchScreenType(RealStatePtr L) - { - try { - - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - - BF.SDKManager gen_to_be_invoked = (BF.SDKManager)translator.FastGetCSObj(L, 1); - - - - { - - var gen_ret = gen_to_be_invoked.GetNotchScreenType( ); - translator.Push(L, gen_ret); - - - - return 1; - } - - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _m_GetNotchScreenEnable(RealStatePtr L) - { - try { - - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - - BF.SDKManager gen_to_be_invoked = (BF.SDKManager)translator.FastGetCSObj(L, 1); - - - - { - - var gen_ret = gen_to_be_invoked.GetNotchScreenEnable( ); - LuaAPI.lua_pushboolean(L, gen_ret); - - - - return 1; - } - - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _m_GetNotchScreenWidth(RealStatePtr L) - { - try { - - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - - BF.SDKManager gen_to_be_invoked = (BF.SDKManager)translator.FastGetCSObj(L, 1); - - - - { - - var gen_ret = gen_to_be_invoked.GetNotchScreenWidth( ); - LuaAPI.xlua_pushinteger(L, gen_ret); - - - - return 1; - } - - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - - } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _m_GetNotchScreenHeight(RealStatePtr L) - { - try { - - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - - BF.SDKManager gen_to_be_invoked = (BF.SDKManager)translator.FastGetCSObj(L, 1); - - - - { - - var gen_ret = gen_to_be_invoked.GetNotchScreenHeight( ); - LuaAPI.xlua_pushinteger(L, gen_ret); - - - - return 1; - } - - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - - } - @@ -405,20 +288,6 @@ namespace XLua.CSObjectWrap return 1; } - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int _g_get_DZSDKMgr(RealStatePtr L) - { - try { - ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); - - BF.SDKManager gen_to_be_invoked = (BF.SDKManager)translator.FastGetCSObj(L, 1); - translator.Push(L, gen_to_be_invoked.DZSDKMgr); - } catch(System.Exception gen_e) { - return LuaAPI.luaL_error(L, "c# exception:" + gen_e); - } - return 1; - } - diff --git a/Assets/XLua/Gen/XLuaGenAutoRegister.cs b/Assets/XLua/Gen/XLuaGenAutoRegister.cs index 2281e1cfa..310f6056e 100644 --- a/Assets/XLua/Gen/XLuaGenAutoRegister.cs +++ b/Assets/XLua/Gen/XLuaGenAutoRegister.cs @@ -1422,24 +1422,18 @@ namespace XLua.CSObjectWrap translator.DelayWrapLoader(typeof(BF.BFThirdReportSDKManager), BFBFThirdReportSDKManagerWrap.__Register); - translator.DelayWrapLoader(typeof(BF.NotchScreenInfo), BFNotchScreenInfoWrap.__Register); - - - translator.DelayWrapLoader(typeof(BF.DZSDKManager), BFDZSDKManagerWrap.__Register); - - translator.DelayWrapLoader(typeof(BF.NativeUtils), BFNativeUtilsWrap.__Register); - } - - static void wrapInit9(LuaEnv luaenv, ObjectTranslator translator) - { translator.DelayWrapLoader(typeof(BF.BFParseClientManager), BFBFParseClientManagerWrap.__Register); translator.DelayWrapLoader(typeof(BF.SDKManager), BFSDKManagerWrap.__Register); + } + + static void wrapInit9(LuaEnv luaenv, ObjectTranslator translator) + { translator.DelayWrapLoader(typeof(BF.SafeAreaManager), BFSafeAreaManagerWrap.__Register); @@ -1587,16 +1581,16 @@ namespace XLua.CSObjectWrap translator.DelayWrapLoader(typeof(BF.NodeHelper), BFNodeHelperWrap.__Register); - } - - static void wrapInit10(LuaEnv luaenv, ObjectTranslator translator) - { translator.DelayWrapLoader(typeof(BF.GameObjectInfo), BFGameObjectInfoWrap.__Register); translator.DelayWrapLoader(typeof(BF.PrefabHelper), BFPrefabHelperWrap.__Register); + } + + static void wrapInit10(LuaEnv luaenv, ObjectTranslator translator) + { translator.DelayWrapLoader(typeof(BF.ShowDebugText), BFShowDebugTextWrap.__Register); @@ -1744,16 +1738,16 @@ namespace XLua.CSObjectWrap translator.DelayWrapLoader(typeof(BF.TutorialClickArea), BFTutorialClickAreaWrap.__Register); - } - - static void wrapInit11(LuaEnv luaenv, ObjectTranslator translator) - { translator.DelayWrapLoader(typeof(BF.UIDynamicBrightEffect), BFUIDynamicBrightEffectWrap.__Register); translator.DelayWrapLoader(typeof(BF.UIDynamicShinyEffect), BFUIDynamicShinyEffectWrap.__Register); + } + + static void wrapInit11(LuaEnv luaenv, ObjectTranslator translator) + { translator.DelayWrapLoader(typeof(BF.BFGraphicFlip), BFBFGraphicFlipWrap.__Register); @@ -1901,16 +1895,16 @@ namespace XLua.CSObjectWrap translator.DelayWrapLoader(typeof(TMPro.TMP_FontUtilities), TMProTMP_FontUtilitiesWrap.__Register); - } - - static void wrapInit12(LuaEnv luaenv, ObjectTranslator translator) - { translator.DelayWrapLoader(typeof(TMPro.TMP_FontAssetUtilities), TMProTMP_FontAssetUtilitiesWrap.__Register); translator.DelayWrapLoader(typeof(TMPro.TMP_FontFeatureTable), TMProTMP_FontFeatureTableWrap.__Register); + } + + static void wrapInit12(LuaEnv luaenv, ObjectTranslator translator) + { translator.DelayWrapLoader(typeof(TMPro.TMP_GlyphValueRecord), TMProTMP_GlyphValueRecordWrap.__Register); @@ -2058,16 +2052,16 @@ namespace XLua.CSObjectWrap translator.DelayWrapLoader(typeof(TMPro.TMP_Dropdown.OptionDataList), TMProTMP_DropdownOptionDataListWrap.__Register); - } - - static void wrapInit13(LuaEnv luaenv, ObjectTranslator translator) - { translator.DelayWrapLoader(typeof(TMPro.TMP_Dropdown.DropdownEvent), TMProTMP_DropdownDropdownEventWrap.__Register); translator.DelayWrapLoader(typeof(TMPro.TMP_InputField.SubmitEvent), TMProTMP_InputFieldSubmitEventWrap.__Register); + } + + static void wrapInit13(LuaEnv luaenv, ObjectTranslator translator) + { translator.DelayWrapLoader(typeof(TMPro.TMP_InputField.OnChangeEvent), TMProTMP_InputFieldOnChangeEventWrap.__Register); @@ -2215,16 +2209,16 @@ namespace XLua.CSObjectWrap translator.DelayWrapLoader(typeof(UnityEngine.UI.Shadow), UnityEngineUIShadowWrap.__Register); - } - - static void wrapInit14(LuaEnv luaenv, ObjectTranslator translator) - { translator.DelayWrapLoader(typeof(UnityEngine.UI.Button.ButtonClickedEvent), UnityEngineUIButtonButtonClickedEventWrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.UI.Dropdown.OptionData), UnityEngineUIDropdownOptionDataWrap.__Register); + } + + static void wrapInit14(LuaEnv luaenv, ObjectTranslator translator) + { translator.DelayWrapLoader(typeof(UnityEngine.UI.Dropdown.OptionDataList), UnityEngineUIDropdownOptionDataListWrap.__Register); @@ -2372,16 +2366,16 @@ namespace XLua.CSObjectWrap translator.DelayWrapLoader(typeof(FBWindowsA2UNotificationsManager), FBWindowsA2UNotificationsManagerWrap.__Register); - } - - static void wrapInit15(LuaEnv luaenv, ObjectTranslator translator) - { translator.DelayWrapLoader(typeof(FBWindowsADSManager), FBWindowsADSManagerWrap.__Register); translator.DelayWrapLoader(typeof(FBWindowsExampleTabsManager), FBWindowsExampleTabsManagerWrap.__Register); + } + + static void wrapInit15(LuaEnv luaenv, ObjectTranslator translator) + { translator.DelayWrapLoader(typeof(FBWindowsFriendsManager), FBWindowsFriendsManagerWrap.__Register); @@ -2529,16 +2523,16 @@ namespace XLua.CSObjectWrap translator.DelayWrapLoader(typeof(SignInWithAppleTest_Callbacks), SignInWithAppleTest_CallbacksWrap.__Register); - } - - static void wrapInit16(LuaEnv luaenv, ObjectTranslator translator) - { translator.DelayWrapLoader(typeof(SignInWithAppleTest_EventSystem), SignInWithAppleTest_EventSystemWrap.__Register); translator.DelayWrapLoader(typeof(LuaAsset), LuaAssetWrap.__Register); + } + + static void wrapInit16(LuaEnv luaenv, ObjectTranslator translator) + { translator.DelayWrapLoader(typeof(Security.XXTEA), SecurityXXTEAWrap.__Register); @@ -2686,16 +2680,16 @@ namespace XLua.CSObjectWrap translator.DelayWrapLoader(typeof(UIImageSheetAnimation.StartFrameType), UIImageSheetAnimationStartFrameTypeWrap.__Register); - } - - static void wrapInit17(LuaEnv luaenv, ObjectTranslator translator) - { translator.DelayWrapLoader(typeof(ThinkingAnalytics.ThinkingAnalyticsAPI.Token), ThinkingAnalyticsThinkingAnalyticsAPITokenWrap.__Register); translator.DelayWrapLoader(typeof(object), SystemObjectWrap.__Register); + } + + static void wrapInit17(LuaEnv luaenv, ObjectTranslator translator) + { translator.DelayWrapLoader(typeof(System.ValueType), SystemValueTypeWrap.__Register); @@ -2843,16 +2837,16 @@ namespace XLua.CSObjectWrap translator.DelayWrapLoader(typeof(UnityEngine.Events.UnityEvent), UnityEngineEventsUnityEvent_1_UnityEngineVector2_Wrap.__Register); - } - - static void wrapInit18(LuaEnv luaenv, ObjectTranslator translator) - { translator.DelayWrapLoader(typeof(UnityEngine.Events.UnityEvent), UnityEngineEventsUnityEvent_1_SystemInt32_Wrap.__Register); translator.DelayWrapLoader(typeof(UnityEngine.Events.UnityEvent), UnityEngineEventsUnityEvent_1_SystemInt64_Wrap.__Register); + } + + static void wrapInit18(LuaEnv luaenv, ObjectTranslator translator) + { translator.DelayWrapLoader(typeof(UnityEngine.Events.UnityEventBase), UnityEngineEventsUnityEventBaseWrap.__Register); @@ -3000,16 +2994,16 @@ namespace XLua.CSObjectWrap translator.DelayWrapLoader(typeof(Spine.Unity.MeshGenerator.Settings), SpineUnityMeshGeneratorSettingsWrap.__Register); - } - - static void wrapInit19(LuaEnv luaenv, ObjectTranslator translator) - { translator.DelayWrapLoader(typeof(Spine.Unity.SkeletonRenderer), SpineUnitySkeletonRendererWrap.__Register); translator.DelayWrapLoader(typeof(Spine.Unity.SkeletonRenderer.SpriteMaskInteractionMaterials), SpineUnitySkeletonRendererSpriteMaskInteractionMaterialsWrap.__Register); + } + + static void wrapInit19(LuaEnv luaenv, ObjectTranslator translator) + { translator.DelayWrapLoader(typeof(Spine.Unity.BoneFollower), SpineUnityBoneFollowerWrap.__Register); diff --git a/Assets/XLua/Gen/link.xml b/Assets/XLua/Gen/link.xml index 403ce35d6..d0a4fe0aa 100644 --- a/Assets/XLua/Gen/link.xml +++ b/Assets/XLua/Gen/link.xml @@ -82,8 +82,6 @@ - -