Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-07-05 15:18:07 +08:00
commit b7447f8d0e
4 changed files with 12 additions and 2 deletions

View File

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

View File

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

View File

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

View File

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