diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua index a86078f982..e9d6b29075 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua @@ -392,7 +392,13 @@ function this.RefreshJourneyWithWindShow() end end function this.JourneyWithWindBtnAutoClose() - this.btnJourneyWithWind:SetActive(false) + local idJourneyWithWind = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.JourneyWithWind) + if idJourneyWithWind and idJourneyWithWind > 0 then + this.btnJourneyWithWind:SetActive(true) + this.RefreshJourneyWithWindShow() + else + this.btnJourneyWithWind:SetActive(false) + end end --界面关闭时调用(用于子类重写) function InvadeMonsterView:OnClose() diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index 621a74763c..b74b94570a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -301,7 +301,7 @@ function this.InitSingleEndlessHero(_msgHeroData) local soulPrintList = {} for i, v in ipairs(_msgHeroData.soulPos) do local soulPrint = {equipId = v.equipId, position = v.position} - SoulPrintManager.AddSoulPrintUpHeroDynamicId(v.equipId,heroData.dynamicId) + --SoulPrintManager.AddSoulPrintUpHeroDynamicId(v.equipId,heroData.dynamicId) table.insert(soulPrintList, soulPrint) end heroData.soulPrintList = soulPrintList diff --git a/Assets/ManagedResources/~Lua/Modules/SurpriseBox/SurpriseBoxPanel.lua b/Assets/ManagedResources/~Lua/Modules/SurpriseBox/SurpriseBoxPanel.lua index b0255ee042..85eaa53cc8 100644 --- a/Assets/ManagedResources/~Lua/Modules/SurpriseBox/SurpriseBoxPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SurpriseBox/SurpriseBoxPanel.lua @@ -43,10 +43,12 @@ function SurpriseBox:BindEvent() end --添加事件监听(用于子类重写) function SurpriseBox:AddListener() + Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityProgressStateChange,self.Refresh,self) end --移除事件监听(用于子类重写) function SurpriseBox:RemoveListener() + Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityProgressStateChange,self.Refresh,self) end local fun diff --git a/Assets/ManagedResources/~Lua/Modules/TeHuiShenZhuang/TeHuiShenZhuangPanel.lua b/Assets/ManagedResources/~Lua/Modules/TeHuiShenZhuang/TeHuiShenZhuangPanel.lua index 19cf2ea3b3..08ab2031a4 100644 --- a/Assets/ManagedResources/~Lua/Modules/TeHuiShenZhuang/TeHuiShenZhuangPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TeHuiShenZhuang/TeHuiShenZhuangPanel.lua @@ -48,10 +48,12 @@ function TeHuiShenZhuang:BindEvent() end --添加事件监听(用于子类重写) function TeHuiShenZhuang:AddListener() + Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityProgressStateChange,self.Refresh,self) end --移除事件监听(用于子类重写) function TeHuiShenZhuang:RemoveListener() + Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityProgressStateChange,self.Refresh,self) end function TeHuiShenZhuang:OnSortingOrderChange()