diff --git a/Assets/Source/Generate/DelegateFactory.cs b/Assets/Source/Generate/DelegateFactory.cs index 302ac4d67d..03dcf70179 100644 --- a/Assets/Source/Generate/DelegateFactory.cs +++ b/Assets/Source/Generate/DelegateFactory.cs @@ -71,6 +71,7 @@ public class DelegateFactory dict.Add(typeof(UnityEngine.Application.AdvertisingIdentifierCallback), factory.UnityEngine_Application_AdvertisingIdentifierCallback); dict.Add(typeof(UnityEngine.Application.LowMemoryCallback), factory.UnityEngine_Application_LowMemoryCallback); dict.Add(typeof(UnityEngine.Application.LogCallback), factory.UnityEngine_Application_LogCallback); + dict.Add(typeof(System.Action), factory.System_Action_bool); dict.Add(typeof(System.Func), factory.System_Func_bool); dict.Add(typeof(UnityEngine.AudioClip.PCMReaderCallback), factory.UnityEngine_AudioClip_PCMReaderCallback); dict.Add(typeof(UnityEngine.AudioClip.PCMSetPositionCallback), factory.UnityEngine_AudioClip_PCMSetPositionCallback); @@ -153,6 +154,7 @@ public class DelegateFactory DelegateTraits.Init(factory.UnityEngine_Application_AdvertisingIdentifierCallback); DelegateTraits.Init(factory.UnityEngine_Application_LowMemoryCallback); DelegateTraits.Init(factory.UnityEngine_Application_LogCallback); + DelegateTraits>.Init(factory.System_Action_bool); DelegateTraits>.Init(factory.System_Func_bool); DelegateTraits.Init(factory.UnityEngine_AudioClip_PCMReaderCallback); DelegateTraits.Init(factory.UnityEngine_AudioClip_PCMSetPositionCallback); @@ -235,6 +237,7 @@ public class DelegateFactory TypeTraits.Init(factory.Check_UnityEngine_Application_AdvertisingIdentifierCallback); TypeTraits.Init(factory.Check_UnityEngine_Application_LowMemoryCallback); TypeTraits.Init(factory.Check_UnityEngine_Application_LogCallback); + TypeTraits>.Init(factory.Check_System_Action_bool); TypeTraits>.Init(factory.Check_System_Func_bool); TypeTraits.Init(factory.Check_UnityEngine_AudioClip_PCMReaderCallback); TypeTraits.Init(factory.Check_UnityEngine_AudioClip_PCMSetPositionCallback); @@ -317,6 +320,7 @@ public class DelegateFactory StackTraits.Push = factory.Push_UnityEngine_Application_AdvertisingIdentifierCallback; StackTraits.Push = factory.Push_UnityEngine_Application_LowMemoryCallback; StackTraits.Push = factory.Push_UnityEngine_Application_LogCallback; + StackTraits>.Push = factory.Push_System_Action_bool; StackTraits>.Push = factory.Push_System_Func_bool; StackTraits.Push = factory.Push_UnityEngine_AudioClip_PCMReaderCallback; StackTraits.Push = factory.Push_UnityEngine_AudioClip_PCMSetPositionCallback; @@ -3583,6 +3587,63 @@ public class DelegateFactory ToLua.Push(L, o); } + class System_Action_bool_Event : LuaDelegate + { + public System_Action_bool_Event(LuaFunction func) : base(func) { } + public System_Action_bool_Event(LuaFunction func, LuaTable self) : base(func, self) { } + + public void Call(bool param0) + { + func.BeginPCall(); + func.Push(param0); + func.PCall(); + func.EndPCall(); + } + + public void CallWithSelf(bool param0) + { + func.BeginPCall(); + func.Push(self); + func.Push(param0); + func.PCall(); + func.EndPCall(); + } + } + + public System.Action System_Action_bool(LuaFunction func, LuaTable self, bool flag) + { + if (func == null) + { + System.Action fn = delegate(bool param0) { }; + return fn; + } + + if(!flag) + { + System_Action_bool_Event target = new System_Action_bool_Event(func); + System.Action d = target.Call; + target.method = d.Method; + return d; + } + else + { + System_Action_bool_Event target = new System_Action_bool_Event(func, self); + System.Action d = target.CallWithSelf; + target.method = d.Method; + return d; + } + } + + bool Check_System_Action_bool(IntPtr L, int pos) + { + return TypeChecker.CheckDelegateType(typeof(System.Action), L, pos); + } + + void Push_System_Action_bool(IntPtr L, System.Action o) + { + ToLua.Push(L, o); + } + class System_Func_bool_Event : LuaDelegate { public System_Func_bool_Event(LuaFunction func) : base(func) { } diff --git a/Assets/Source/Generate/GameLogic_ResourcesManagerWrap.cs b/Assets/Source/Generate/GameLogic_ResourcesManagerWrap.cs index 1ce5ab7689..9d2c2f15ee 100644 --- a/Assets/Source/Generate/GameLogic_ResourcesManagerWrap.cs +++ b/Assets/Source/Generate/GameLogic_ResourcesManagerWrap.cs @@ -16,6 +16,7 @@ public class GameLogic_ResourcesManagerWrap L.RegFunction("HaveAsset", HaveAsset); L.RegFunction("UnLoadAll", UnLoadAll); L.RegFunction("Reset", Reset); + L.RegFunction("ClearFilesCache", ClearFilesCache); L.RegFunction("New", _CreateGameLogic_ResourcesManager); L.RegFunction("__tostring", ToLua.op_ToString); L.RegVar("isLoading", get_isLoading, set_isLoading); @@ -198,6 +199,22 @@ public class GameLogic_ResourcesManagerWrap } } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int ClearFilesCache(IntPtr L) + { + try + { + ToLua.CheckArgsCount(L, 1); + GameLogic.ResourcesManager obj = (GameLogic.ResourcesManager)ToLua.CheckObject(L, 1); + obj.ClearFilesCache(); + return 0; + } + catch (Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int get_isLoading(IntPtr L) { diff --git a/Assets/Source/Generate/GameLogic_VersionManagerWrap.cs b/Assets/Source/Generate/GameLogic_VersionManagerWrap.cs index f87d2859d8..60dae9570d 100644 --- a/Assets/Source/Generate/GameLogic_VersionManagerWrap.cs +++ b/Assets/Source/Generate/GameLogic_VersionManagerWrap.cs @@ -13,7 +13,6 @@ public class GameLogic_VersionManagerWrap L.RegFunction("GetLocalVersion", GetLocalVersion); L.RegFunction("VersionCompare", VersionCompare); L.RegFunction("GetVersionInfo", GetVersionInfo); - L.RegFunction("CheckPackageVersionSame", CheckPackageVersionSame); L.RegFunction("New", _CreateGameLogic_VersionManager); L.RegFunction("__tostring", ToLua.op_ToString); L.EndClass(); @@ -117,8 +116,8 @@ public class GameLogic_VersionManagerWrap ToLua.CheckArgsCount(L, 2); string arg0 = ToLua.CheckString(L, 1); string arg1 = ToLua.CheckString(L, 2); - int o = GameLogic.VersionManager.VersionCompare(arg0, arg1); - LuaDLL.lua_pushinteger(L, o); + ResUpdate.ResourcesUpdateState o = GameLogic.VersionManager.VersionCompare(arg0, arg1); + ToLua.Push(L, o); return 1; } catch (Exception e) @@ -144,22 +143,5 @@ public class GameLogic_VersionManagerWrap return LuaDLL.toluaL_exception(L, e); } } - - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int CheckPackageVersionSame(IntPtr L) - { - try - { - ToLua.CheckArgsCount(L, 1); - string arg0 = ToLua.CheckString(L, 1); - bool o = GameLogic.VersionManager.CheckPackageVersionSame(arg0); - LuaDLL.lua_pushboolean(L, o); - return 1; - } - catch (Exception e) - { - return LuaDLL.toluaL_exception(L, e); - } - } } diff --git a/Assets/Source/Generate/LuaBinder.cs b/Assets/Source/Generate/LuaBinder.cs index affca7f33b..22e89fa784 100644 --- a/Assets/Source/Generate/LuaBinder.cs +++ b/Assets/Source/Generate/LuaBinder.cs @@ -380,6 +380,7 @@ public static class LuaBinder L.RegFunction("Action_int", System_Action_int); L.RegFunction("Comparison_int", System_Comparison_int); L.RegFunction("Func_int_int", System_Func_int_int); + L.RegFunction("Action_bool", System_Action_bool); L.RegFunction("Func_bool", System_Func_bool); L.RegFunction("Action_UnityEngine_AsyncOperation", System_Action_UnityEngine_AsyncOperation); L.RegFunction("Action_string", System_Action_string); @@ -2404,6 +2405,33 @@ public static class LuaBinder } } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int System_Action_bool(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 System_Func_bool(IntPtr L) { diff --git a/Assets/Source/Generate/ResUpdate_ResourcesUpdateStateWrap.cs b/Assets/Source/Generate/ResUpdate_ResourcesUpdateStateWrap.cs index 223a422803..28cae4badd 100644 --- a/Assets/Source/Generate/ResUpdate_ResourcesUpdateStateWrap.cs +++ b/Assets/Source/Generate/ResUpdate_ResourcesUpdateStateWrap.cs @@ -17,6 +17,9 @@ public class ResUpdate_ResourcesUpdateStateWrap L.RegVar("UpdateResourcesFailed", get_UpdateResourcesFailed, null); L.RegVar("Success", get_Success, null); L.RegVar("OldPackageNeedChange", get_OldPackageNeedChange, null); + L.RegVar("PackageNeedRes", get_PackageNeedRes, null); + L.RegVar("Normal", get_Normal, null); + L.RegVar("Err", get_Err, null); L.RegFunction("IntToEnum", IntToEnum); L.EndEnum(); TypeTraits.Check = CheckType; @@ -103,6 +106,27 @@ public class ResUpdate_ResourcesUpdateStateWrap return 1; } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int get_PackageNeedRes(IntPtr L) + { + ToLua.Push(L, ResUpdate.ResourcesUpdateState.PackageNeedRes); + return 1; + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int get_Normal(IntPtr L) + { + ToLua.Push(L, ResUpdate.ResourcesUpdateState.Normal); + return 1; + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int get_Err(IntPtr L) + { + ToLua.Push(L, ResUpdate.ResourcesUpdateState.Err); + return 1; + } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int IntToEnum(IntPtr L) { diff --git a/Assets/Source/Generate/SDK_SDKManagerWrap.cs b/Assets/Source/Generate/SDK_SDKManagerWrap.cs index fc7eabc4f9..009bc07768 100644 --- a/Assets/Source/Generate/SDK_SDKManagerWrap.cs +++ b/Assets/Source/Generate/SDK_SDKManagerWrap.cs @@ -15,6 +15,7 @@ public class SDK_SDKManagerWrap L.RegFunction("Pay", Pay); L.RegFunction("IsSupportExit", IsSupportExit); L.RegFunction("ExitGame", ExitGame); + L.RegFunction("ClearFileCacheAndroid", ClearFileCacheAndroid); L.RegFunction("GetPayOrderID", GetPayOrderID); L.RegFunction("CaptureShot", CaptureShot); L.RegFunction("CustomEvent", CustomEvent); @@ -174,6 +175,22 @@ public class SDK_SDKManagerWrap } } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int ClearFileCacheAndroid(IntPtr L) + { + try + { + ToLua.CheckArgsCount(L, 1); + SDK.SDKManager obj = (SDK.SDKManager)ToLua.CheckObject(L, 1); + obj.ClearFileCacheAndroid(); + return 0; + } + catch (Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int GetPayOrderID(IntPtr L) { diff --git a/Assets/Source/Generate/UnityEngine_ApplicationWrap.cs b/Assets/Source/Generate/UnityEngine_ApplicationWrap.cs index 8bb8a9fe63..8e6aedd8cf 100644 --- a/Assets/Source/Generate/UnityEngine_ApplicationWrap.cs +++ b/Assets/Source/Generate/UnityEngine_ApplicationWrap.cs @@ -54,6 +54,7 @@ public class UnityEngine_ApplicationWrap L.RegVar("logMessageReceived", get_logMessageReceived, set_logMessageReceived); L.RegVar("logMessageReceivedThreaded", get_logMessageReceivedThreaded, set_logMessageReceivedThreaded); L.RegVar("onBeforeRender", get_onBeforeRender, set_onBeforeRender); + L.RegVar("focusChanged", get_focusChanged, set_focusChanged); L.RegVar("wantsToQuit", get_wantsToQuit, set_wantsToQuit); L.RegVar("quitting", get_quitting, set_quitting); L.RegFunction("AdvertisingIdentifierCallback", UnityEngine_Application_AdvertisingIdentifierCallback); @@ -752,6 +753,13 @@ public class UnityEngine_ApplicationWrap return 1; } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int get_focusChanged(IntPtr L) + { + ToLua.Push(L, new EventObject(typeof(System.Action))); + return 1; + } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int get_wantsToQuit(IntPtr L) { @@ -951,6 +959,41 @@ public class UnityEngine_ApplicationWrap } } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int set_focusChanged(IntPtr L) + { + try + { + EventObject arg0 = null; + + if (LuaDLL.lua_isuserdata(L, 2) != 0) + { + arg0 = (EventObject)ToLua.ToObject(L, 2); + } + else + { + return LuaDLL.luaL_throw(L, "The event 'UnityEngine.Application.focusChanged' can only appear on the left hand side of += or -= when used outside of the type 'UnityEngine.Application'"); + } + + if (arg0.op == EventOp.Add) + { + System.Action ev = (System.Action)arg0.func; + UnityEngine.Application.focusChanged += ev; + } + else if (arg0.op == EventOp.Sub) + { + System.Action ev = (System.Action)arg0.func; + UnityEngine.Application.focusChanged -= ev; + } + + return 0; + } + catch (Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int set_wantsToQuit(IntPtr L) { diff --git a/Assets/Source/Generate/UnityEngine_UI_LayoutUtilityWrap.cs b/Assets/Source/Generate/UnityEngine_UI_LayoutUtilityWrap.cs index 96841e1c36..5888a8f2db 100644 --- a/Assets/Source/Generate/UnityEngine_UI_LayoutUtilityWrap.cs +++ b/Assets/Source/Generate/UnityEngine_UI_LayoutUtilityWrap.cs @@ -27,9 +27,8 @@ public class UnityEngine_UI_LayoutUtilityWrap { ToLua.CheckArgsCount(L, 2); UnityEngine.RectTransform arg0 = (UnityEngine.RectTransform)ToLua.CheckObject(L, 1, typeof(UnityEngine.RectTransform)); - UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(arg0); - int arg1 = (int)LuaDLL.luaL_checknumber(L, 2); - float o = UnityEngine.UI.LayoutUtility.GetMinSize(arg0, arg1); + int arg1 = (int)LuaDLL.luaL_checknumber(L, 2); + float o = UnityEngine.UI.LayoutUtility.GetMinSize(arg0, arg1); LuaDLL.lua_pushnumber(L, o); return 1; } @@ -46,8 +45,7 @@ public class UnityEngine_UI_LayoutUtilityWrap { ToLua.CheckArgsCount(L, 2); UnityEngine.RectTransform arg0 = (UnityEngine.RectTransform)ToLua.CheckObject(L, 1, typeof(UnityEngine.RectTransform)); - UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(arg0); - int arg1 = (int)LuaDLL.luaL_checknumber(L, 2); + int arg1 = (int)LuaDLL.luaL_checknumber(L, 2); float o = UnityEngine.UI.LayoutUtility.GetPreferredSize(arg0, arg1); LuaDLL.lua_pushnumber(L, o); return 1; @@ -65,8 +63,7 @@ public class UnityEngine_UI_LayoutUtilityWrap { ToLua.CheckArgsCount(L, 2); UnityEngine.RectTransform arg0 = (UnityEngine.RectTransform)ToLua.CheckObject(L, 1, typeof(UnityEngine.RectTransform)); - UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(arg0); - int arg1 = (int)LuaDLL.luaL_checknumber(L, 2); + int arg1 = (int)LuaDLL.luaL_checknumber(L, 2); float o = UnityEngine.UI.LayoutUtility.GetFlexibleSize(arg0, arg1); LuaDLL.lua_pushnumber(L, o); return 1; @@ -84,8 +81,7 @@ public class UnityEngine_UI_LayoutUtilityWrap { ToLua.CheckArgsCount(L, 1); UnityEngine.RectTransform arg0 = (UnityEngine.RectTransform)ToLua.CheckObject(L, 1, typeof(UnityEngine.RectTransform)); - UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(arg0); - float o = UnityEngine.UI.LayoutUtility.GetMinWidth(arg0); + float o = UnityEngine.UI.LayoutUtility.GetMinWidth(arg0); LuaDLL.lua_pushnumber(L, o); return 1; } @@ -102,8 +98,7 @@ public class UnityEngine_UI_LayoutUtilityWrap { ToLua.CheckArgsCount(L, 1); UnityEngine.RectTransform arg0 = (UnityEngine.RectTransform)ToLua.CheckObject(L, 1, typeof(UnityEngine.RectTransform)); - UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(arg0); - float o = UnityEngine.UI.LayoutUtility.GetPreferredWidth(arg0); + float o = UnityEngine.UI.LayoutUtility.GetPreferredWidth(arg0); LuaDLL.lua_pushnumber(L, o); return 1; } @@ -120,8 +115,7 @@ public class UnityEngine_UI_LayoutUtilityWrap { ToLua.CheckArgsCount(L, 1); UnityEngine.RectTransform arg0 = (UnityEngine.RectTransform)ToLua.CheckObject(L, 1, typeof(UnityEngine.RectTransform)); - UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(arg0); - float o = UnityEngine.UI.LayoutUtility.GetFlexibleWidth(arg0); + float o = UnityEngine.UI.LayoutUtility.GetFlexibleWidth(arg0); LuaDLL.lua_pushnumber(L, o); return 1; } @@ -138,8 +132,7 @@ public class UnityEngine_UI_LayoutUtilityWrap { ToLua.CheckArgsCount(L, 1); UnityEngine.RectTransform arg0 = (UnityEngine.RectTransform)ToLua.CheckObject(L, 1, typeof(UnityEngine.RectTransform)); - UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(arg0); - float o = UnityEngine.UI.LayoutUtility.GetMinHeight(arg0); + float o = UnityEngine.UI.LayoutUtility.GetMinHeight(arg0); LuaDLL.lua_pushnumber(L, o); return 1; } @@ -156,8 +149,7 @@ public class UnityEngine_UI_LayoutUtilityWrap { ToLua.CheckArgsCount(L, 1); UnityEngine.RectTransform arg0 = (UnityEngine.RectTransform)ToLua.CheckObject(L, 1, typeof(UnityEngine.RectTransform)); - UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(arg0); - float o = UnityEngine.UI.LayoutUtility.GetPreferredHeight(arg0); + float o = UnityEngine.UI.LayoutUtility.GetPreferredHeight(arg0); LuaDLL.lua_pushnumber(L, o); return 1; } @@ -174,8 +166,7 @@ public class UnityEngine_UI_LayoutUtilityWrap { ToLua.CheckArgsCount(L, 1); UnityEngine.RectTransform arg0 = (UnityEngine.RectTransform)ToLua.CheckObject(L, 1, typeof(UnityEngine.RectTransform)); - UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(arg0); - float o = UnityEngine.UI.LayoutUtility.GetFlexibleHeight(arg0); + float o = UnityEngine.UI.LayoutUtility.GetFlexibleHeight(arg0); LuaDLL.lua_pushnumber(L, o); return 1; } @@ -195,8 +186,7 @@ public class UnityEngine_UI_LayoutUtilityWrap if (count == 3) { UnityEngine.RectTransform arg0 = (UnityEngine.RectTransform)ToLua.CheckObject(L, 1, typeof(UnityEngine.RectTransform)); - UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(arg0); - System.Func arg1 = (System.Func)ToLua.CheckDelegate>(L, 2); + System.Func arg1 = (System.Func)ToLua.CheckDelegate>(L, 2); float arg2 = (float)LuaDLL.luaL_checknumber(L, 3); float o = UnityEngine.UI.LayoutUtility.GetLayoutProperty(arg0, arg1, arg2); LuaDLL.lua_pushnumber(L, o); @@ -205,8 +195,7 @@ public class UnityEngine_UI_LayoutUtilityWrap else if (count == 4) { UnityEngine.RectTransform arg0 = (UnityEngine.RectTransform)ToLua.CheckObject(L, 1, typeof(UnityEngine.RectTransform)); - UnityEngine.UI.LayoutRebuilder.ForceRebuildLayoutImmediate(arg0); - System.Func arg1 = (System.Func)ToLua.CheckDelegate>(L, 2); + System.Func arg1 = (System.Func)ToLua.CheckDelegate>(L, 2); float arg2 = (float)LuaDLL.luaL_checknumber(L, 3); UnityEngine.UI.ILayoutElement arg3 = null; float o = UnityEngine.UI.LayoutUtility.GetLayoutProperty(arg0, arg1, arg2, out arg3);