Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
skuld 2020-07-30 14:30:15 +08:00
commit 1c2196d750
2 changed files with 6 additions and 5 deletions

View File

@ -40,7 +40,7 @@ function GuildCarDelayFindBossPopup:OnShow()
local monsterGroupConfig = ConfigManager.GetConfigData(ConfigName.MonsterGroup,ConfigManager.GetConfigData(ConfigName.WorldBossConfig,curMonsterId).MonsterId)
if monsterGroupConfig then
for i = 1, #heroListGo do
if monsterGroupConfig.Contents[1][i] then
if monsterGroupConfig.Contents[1][i] and monsterGroupConfig.Contents[1][i] ~= 0 then
this.SetCardSingleData(heroListGo[i],monsterGroupConfig.Contents[1][i],i)
heroListGo[i]:SetActive(true)
else

View File

@ -114,10 +114,10 @@ function GuildCarDelayMainPanel:BindEvent()
Util.AddClick(this.HelpBtn, function()
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.GuildCarDelay,this.helpPosition.x,this.helpPosition.y)
end)
--boss详情
Util.AddClick(this.live2dRoot, function()
UIManager.OpenPanel(UIName.GuildCarDelayFindBossPopup)
end)
-- --boss详情
-- Util.AddClick(this.live2dRoot, function()
-- UIManager.OpenPanel(UIName.GuildCarDelayFindBossPopup)
-- end)
end
--添加事件监听(用于子类重写)
@ -412,6 +412,7 @@ end
function this.RefrePanelRedPoint()
Util.GetGameObject(this.challengeBtn,"redPoint"):SetActive(GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Challenge))
Util.GetGameObject(this.lootBtn,"redPoint"):SetActive(GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Loot))
--CheckRedPointStatus(RedPointType.LegendExplore)
Util.SetGray(Util.GetGameObject(this.challengeBtn,"redPoint"),false)
Util.SetGray(Util.GetGameObject(this.lootBtn,"redPoint"),false)
end