diff --git a/Assets/Scripts/Bridge/ResourcesManager.cs b/Assets/Scripts/Bridge/ResourcesManager.cs index aba7024abe..4b86ec47f3 100644 --- a/Assets/Scripts/Bridge/ResourcesManager.cs +++ b/Assets/Scripts/Bridge/ResourcesManager.cs @@ -196,6 +196,7 @@ namespace GameLogic { { resMgr.LoadStreamingText(name, luaFunction, null); } + [NoToLua] public void LoadStreamingText(string name, UnityAction action) { resMgr.LoadStreamingText(name, null, action); diff --git a/Assets/Scripts/Editor/Custom/CustomSettings.cs b/Assets/Scripts/Editor/Custom/CustomSettings.cs index 621eb8ae24..aa1105b1db 100644 --- a/Assets/Scripts/Editor/Custom/CustomSettings.cs +++ b/Assets/Scripts/Editor/Custom/CustomSettings.cs @@ -99,7 +99,7 @@ public static class CustomSettings _GT(typeof(DG.Tweening.PathType)), _GT(typeof(DG.Tweening.RotateMode)), _GT(typeof(DG.Tweening.Ease)), - _GT(typeof(Component)).AddExtendType(typeof(DG.Tweening.ShortcutExtensions)), + _GT(typeof(Component)).AddExtendType(typeof(DG.Tweening.ShortcutExtensions)).AddExtendType(typeof(UnityEngineObjectExtention)), _GT(typeof(Transform)).AddExtendType(typeof(DG.Tweening.ShortcutExtensions)), _GT(typeof(Light)).AddExtendType(typeof(DG.Tweening.ShortcutExtensions)), _GT(typeof(Material)).AddExtendType(typeof(DG.Tweening.ShortcutExtensions)), diff --git a/Assets/Source/Generate/DelegateFactory.cs b/Assets/Source/Generate/DelegateFactory.cs index 670240d0f4..2822d501fa 100644 --- a/Assets/Source/Generate/DelegateFactory.cs +++ b/Assets/Source/Generate/DelegateFactory.cs @@ -84,6 +84,7 @@ public class DelegateFactory dict.Add(typeof(UnityEngine.UI.InputField.OnValidateInput), factory.UnityEngine_UI_InputField_OnValidateInput); dict.Add(typeof(System.Action), factory.System_Action_string); dict.Add(typeof(UnityEngine.Events.UnityAction), factory.UnityEngine_Events_UnityAction_string_UnityEngine_Object); + dict.Add(typeof(UnityEngine.Events.UnityAction), factory.UnityEngine_Events_UnityAction_bool_string); dict.Add(typeof(SDK.SDKManager.InitLaunchAction), factory.SDK_SDKManager_InitLaunchAction); dict.Add(typeof(SDK.SDKManager.RegisterAction), factory.SDK_SDKManager_RegisterAction); dict.Add(typeof(SDK.SDKManager.LoginAction), factory.SDK_SDKManager_LoginAction); @@ -170,6 +171,7 @@ public class DelegateFactory DelegateTraits.Init(factory.UnityEngine_UI_InputField_OnValidateInput); DelegateTraits>.Init(factory.System_Action_string); DelegateTraits>.Init(factory.UnityEngine_Events_UnityAction_string_UnityEngine_Object); + DelegateTraits>.Init(factory.UnityEngine_Events_UnityAction_bool_string); DelegateTraits.Init(factory.SDK_SDKManager_InitLaunchAction); DelegateTraits.Init(factory.SDK_SDKManager_RegisterAction); DelegateTraits.Init(factory.SDK_SDKManager_LoginAction); @@ -256,6 +258,7 @@ public class DelegateFactory TypeTraits.Init(factory.Check_UnityEngine_UI_InputField_OnValidateInput); TypeTraits>.Init(factory.Check_System_Action_string); TypeTraits>.Init(factory.Check_UnityEngine_Events_UnityAction_string_UnityEngine_Object); + TypeTraits>.Init(factory.Check_UnityEngine_Events_UnityAction_bool_string); TypeTraits.Init(factory.Check_SDK_SDKManager_InitLaunchAction); TypeTraits.Init(factory.Check_SDK_SDKManager_RegisterAction); TypeTraits.Init(factory.Check_SDK_SDKManager_LoginAction); @@ -342,6 +345,7 @@ public class DelegateFactory StackTraits.Push = factory.Push_UnityEngine_UI_InputField_OnValidateInput; StackTraits>.Push = factory.Push_System_Action_string; StackTraits>.Push = factory.Push_UnityEngine_Events_UnityAction_string_UnityEngine_Object; + StackTraits>.Push = factory.Push_UnityEngine_Events_UnityAction_bool_string; StackTraits.Push = factory.Push_SDK_SDKManager_InitLaunchAction; StackTraits.Push = factory.Push_SDK_SDKManager_RegisterAction; StackTraits.Push = factory.Push_SDK_SDKManager_LoginAction; @@ -4354,6 +4358,65 @@ public class DelegateFactory ToLua.Push(L, o); } + class UnityEngine_Events_UnityAction_bool_string_Event : LuaDelegate + { + public UnityEngine_Events_UnityAction_bool_string_Event(LuaFunction func) : base(func) { } + public UnityEngine_Events_UnityAction_bool_string_Event(LuaFunction func, LuaTable self) : base(func, self) { } + + public void Call(bool param0, string param1) + { + func.BeginPCall(); + func.Push(param0); + func.Push(param1); + func.PCall(); + func.EndPCall(); + } + + public void CallWithSelf(bool param0, string param1) + { + func.BeginPCall(); + func.Push(self); + func.Push(param0); + func.Push(param1); + func.PCall(); + func.EndPCall(); + } + } + + public UnityEngine.Events.UnityAction UnityEngine_Events_UnityAction_bool_string(LuaFunction func, LuaTable self, bool flag) + { + if (func == null) + { + UnityEngine.Events.UnityAction fn = delegate(bool param0, string param1) { }; + return fn; + } + + if(!flag) + { + UnityEngine_Events_UnityAction_bool_string_Event target = new UnityEngine_Events_UnityAction_bool_string_Event(func); + UnityEngine.Events.UnityAction d = target.Call; + target.method = d.Method; + return d; + } + else + { + UnityEngine_Events_UnityAction_bool_string_Event target = new UnityEngine_Events_UnityAction_bool_string_Event(func, self); + UnityEngine.Events.UnityAction d = target.CallWithSelf; + target.method = d.Method; + return d; + } + } + + bool Check_UnityEngine_Events_UnityAction_bool_string(IntPtr L, int pos) + { + return TypeChecker.CheckDelegateType(typeof(UnityEngine.Events.UnityAction), L, pos); + } + + void Push_UnityEngine_Events_UnityAction_bool_string(IntPtr L, UnityEngine.Events.UnityAction o) + { + ToLua.Push(L, o); + } + class SDK_SDKManager_InitLaunchAction_Event : LuaDelegate { public SDK_SDKManager_InitLaunchAction_Event(LuaFunction func) : base(func) { } diff --git a/Assets/Source/Generate/LuaBinder.cs b/Assets/Source/Generate/LuaBinder.cs index a056b25e2b..9f08f8d619 100644 --- a/Assets/Source/Generate/LuaBinder.cs +++ b/Assets/Source/Generate/LuaBinder.cs @@ -237,6 +237,7 @@ public static class LuaBinder L.RegFunction("UnityAction_bool", UnityEngine_Events_UnityAction_bool); L.RegFunction("UnityAction_UnityEngine_Vector2", UnityEngine_Events_UnityAction_UnityEngine_Vector2); L.RegFunction("UnityAction_string_UnityEngine_Object", UnityEngine_Events_UnityAction_string_UnityEngine_Object); + L.RegFunction("UnityAction_bool_string", UnityEngine_Events_UnityAction_bool_string); L.EndModule(); L.BeginModule("Camera"); L.RegFunction("CameraCallback", UnityEngine_Camera_CameraCallback); @@ -1586,6 +1587,33 @@ public static class LuaBinder } } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int UnityEngine_Events_UnityAction_bool_string(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 UnityEngine_Camera_CameraCallback(IntPtr L) { diff --git a/Assets/Source/Generate/SDK_SDKManagerWrap.cs b/Assets/Source/Generate/SDK_SDKManagerWrap.cs index 500048c80a..5f0e8bf236 100644 --- a/Assets/Source/Generate/SDK_SDKManagerWrap.cs +++ b/Assets/Source/Generate/SDK_SDKManagerWrap.cs @@ -20,6 +20,8 @@ public class SDK_SDKManagerWrap L.RegFunction("CaptureShot", CaptureShot); L.RegFunction("CustomEvent", CustomEvent); L.RegFunction("NewRoleTutorial", NewRoleTutorial); + L.RegFunction("GetChannel", GetChannel); + L.RegFunction("GetSubChannel", GetSubChannel); L.RegFunction("InitCallback", InitCallback); L.RegFunction("RegisterCallback", RegisterCallback); L.RegFunction("LoginCallback", LoginCallback); @@ -267,6 +269,40 @@ public class SDK_SDKManagerWrap } } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int GetChannel(IntPtr L) + { + try + { + ToLua.CheckArgsCount(L, 1); + SDK.SDKManager obj = (SDK.SDKManager)ToLua.CheckObject(L, 1); + string o = obj.GetChannel(); + LuaDLL.lua_pushstring(L, o); + return 1; + } + catch (Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int GetSubChannel(IntPtr L) + { + try + { + ToLua.CheckArgsCount(L, 1); + SDK.SDKManager obj = (SDK.SDKManager)ToLua.CheckObject(L, 1); + string o = obj.GetSubChannel(); + LuaDLL.lua_pushstring(L, o); + return 1; + } + catch (Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int InitCallback(IntPtr L) { diff --git a/Assets/Source/Generate/UnityEngine_ComponentWrap.cs b/Assets/Source/Generate/UnityEngine_ComponentWrap.cs index a98f1bf570..ede1502d52 100644 --- a/Assets/Source/Generate/UnityEngine_ComponentWrap.cs +++ b/Assets/Source/Generate/UnityEngine_ComponentWrap.cs @@ -1,6 +1,7 @@ //this source code was auto-generated by tolua#, do not modify it using System; using DG.Tweening; +using GameLogic; using LuaInterface; public class UnityEngine_ComponentWrap @@ -30,6 +31,7 @@ public class UnityEngine_ComponentWrap L.RegFunction("DOFlip", DOFlip); L.RegFunction("DOKill", DOKill); L.RegFunction("DOComplete", DOComplete); + L.RegFunction("IsNull", IsNull); L.RegFunction("New", _CreateUnityEngine_Component); L.RegFunction("__eq", op_Equality); L.RegFunction("__tostring", ToLua.op_ToString); @@ -708,6 +710,23 @@ public class UnityEngine_ComponentWrap } } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int IsNull(IntPtr L) + { + try + { + ToLua.CheckArgsCount(L, 1); + UnityEngine.Component obj = (UnityEngine.Component)ToLua.CheckObject(L, 1); + bool o = obj.IsNull(); + LuaDLL.lua_pushboolean(L, o); + return 1; + } + catch (Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int op_Equality(IntPtr L) {