Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
d593bab16b
|
@ -109,8 +109,13 @@ function this.StateChange(isOpen)
|
||||||
this.btnRecord:SetActive(isOpen and isJoin)
|
this.btnRecord:SetActive(isOpen and isJoin)
|
||||||
this.btnTeamRank:SetActive(isOpen and isJoin)
|
this.btnTeamRank:SetActive(isOpen and isJoin)
|
||||||
this.btnFightDetail:SetActive(isOpen and isJoin and baseData.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_END)
|
this.btnFightDetail:SetActive(isOpen and isJoin and baseData.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_END)
|
||||||
this.orggroup:SetActive(not isOpen and not isOver)
|
-- this.orggroup:SetActive(not isOpen and not isOver)
|
||||||
this.Demons:SetActive(not isOpen and not isOver)
|
-- this.Demons:SetActive(not isOpen and not isOver)
|
||||||
|
this.orggroup:SetActive(not isOpen or (isOpen and isOver))
|
||||||
|
this.Demons:SetActive(not isOpen or (isOpen and isOver))
|
||||||
|
if not isOpen or (isOpen and isOver) then
|
||||||
|
this.FreshTeam()
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -152,6 +152,10 @@ end
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function RoleListPanel:OnShow()
|
function RoleListPanel:OnShow()
|
||||||
|
|
||||||
|
--检测成员红点
|
||||||
|
LogRed(" 检测成员红点 ")
|
||||||
|
CheckRedPointStatus(RedPointType.Role)
|
||||||
|
|
||||||
tarHero=HeroManager.GetAllHeroDatas()
|
tarHero=HeroManager.GetAllHeroDatas()
|
||||||
teamHero=FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_NORMAL)
|
teamHero=FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_NORMAL)
|
||||||
this.isFirstOpen=true
|
this.isFirstOpen=true
|
||||||
|
|
|
@ -133,7 +133,8 @@ function this:OnOpen(context)
|
||||||
end
|
end
|
||||||
-- 刷新显示状态
|
-- 刷新显示状态
|
||||||
self:RefreshBtnState()
|
self:RefreshBtnState()
|
||||||
|
--检测成员红点
|
||||||
|
CheckRedPointStatus(RedPointType.Role)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:RefreshBtnState()
|
function this:RefreshBtnState()
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue