From 4d3bbe4cfd8d6968c131d28f0fcb8f963008cffe Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 30 Mar 2021 14:13:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E7=A7=B0=E5=8F=B7=E5=9D=90?= =?UTF-8?q?=E9=AA=91=E6=97=B6=E8=A3=85=E3=80=91=E5=A4=A7=E9=97=B9=E5=A4=A9?= =?UTF-8?q?=E5=AE=AB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Expedition/ExpeditionMainPanel.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua index 4a086601c6..eb7dea769e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua @@ -562,14 +562,14 @@ function ExpeditionMainPanel:OnClose() timer2:Stop() timer2 = nil end - if self.liveNode then - self.liveNode:OnClose() - end end --界面销毁时调用(用于子类重写) function ExpeditionMainPanel:OnDestroy() + if self.liveNode then + self.liveNode:OnClose() + end --if live2dList and #live2dList > 0 then -- for i = 1, #live2dList do -- poolManager:UnLoadLive(live2dList[i][1], live2dList[i][2], PoolManager.AssetType.GameObject) From 1ecb48c2335950e2ab253fdf5174b16b6cf64eef Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 30 Mar 2021 14:22:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=99=90=E6=97=B6?= =?UTF-8?q?=E5=8F=AC=E5=94=A4=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/TimeLimitedCall.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index 2fadb46ecc..e6b5b66534 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -45,9 +45,9 @@ local activityType = { [4303] = { bg = "Bg2", hero = { - [1]={name="Bg2/hero1",id=10006,hero="c_ccfy_kuang02"}, --共工 - [2]={name="Bg2/hero3",id=10023,hero="c_ccfy_kuang03"}, --孙悟空 - [3]={name="Bg2/hero2",id=10014,hero="c_ccfy_kuang01"}, --哪吒 + [1]={name="Bg2/hero1",id=10041,hero="y_yunchouweiwo_shenjiang2"}, + [2]={name="Bg2/hero3",id=10024,hero="d_danxinbixue_shenjiang3"}, + [3]={name="Bg2/hero2",id=10003,hero="s_suoxiangpimi_shenjiang2"}, }, title = "c_ccfy_slogan_zh", helptype = HELP_TYPE.TimeLimitedCall