From 35a4c61b42a4741d9946b970ea93d787f876ffa1 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 22 Sep 2020 16:59:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=AD=82=E5=8D=B0?= =?UTF-8?q?=E5=9B=BE=E9=89=B4=E7=95=8C=E9=9D=A2=E9=94=80=E6=AF=81=E5=90=8E?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=89=93=E5=BC=80=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/SoulPrint/SoulPrintHandBook.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintHandBook.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintHandBook.lua index f248090027..57f69c7594 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintHandBook.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintHandBook.lua @@ -102,6 +102,7 @@ function SoulPrintHandBook:OnClose() end function SoulPrintHandBook:OnDestroy() + list = {} this.scrollView=nil end From 29d509d54ac68fdc8c02ad64e35e6c1d3eae16c1 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 22 Sep 2020 17:05:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=9E=E6=BB=9ALayoutWrap=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Generate/UnityEngine_UI_LayoutUtilityWrap.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Assets/Source/Generate/UnityEngine_UI_LayoutUtilityWrap.cs b/Assets/Source/Generate/UnityEngine_UI_LayoutUtilityWrap.cs index 5888a8f2db..1c248d5956 100644 --- a/Assets/Source/Generate/UnityEngine_UI_LayoutUtilityWrap.cs +++ b/Assets/Source/Generate/UnityEngine_UI_LayoutUtilityWrap.cs @@ -27,6 +27,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); float o = UnityEngine.UI.LayoutUtility.GetMinSize(arg0, arg1); LuaDLL.lua_pushnumber(L, o); @@ -45,6 +46,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); float o = UnityEngine.UI.LayoutUtility.GetPreferredSize(arg0, arg1); LuaDLL.lua_pushnumber(L, o); @@ -63,6 +65,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); float o = UnityEngine.UI.LayoutUtility.GetFlexibleSize(arg0, arg1); LuaDLL.lua_pushnumber(L, o); @@ -81,6 +84,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); LuaDLL.lua_pushnumber(L, o); return 1; @@ -98,6 +102,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); LuaDLL.lua_pushnumber(L, o); return 1; @@ -115,6 +120,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); LuaDLL.lua_pushnumber(L, o); return 1; @@ -132,6 +138,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); LuaDLL.lua_pushnumber(L, o); return 1; @@ -149,6 +156,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); LuaDLL.lua_pushnumber(L, o); return 1; @@ -166,6 +174,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); LuaDLL.lua_pushnumber(L, o); return 1; @@ -186,6 +195,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); float arg2 = (float)LuaDLL.luaL_checknumber(L, 3); float o = UnityEngine.UI.LayoutUtility.GetLayoutProperty(arg0, arg1, arg2); @@ -195,6 +205,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); float arg2 = (float)LuaDLL.luaL_checknumber(L, 3); UnityEngine.UI.ILayoutElement arg3 = null;