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 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)