Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan
commit
d851e761c3
|
@ -171,9 +171,13 @@ function RewardItemPopup:OnOpen(...)
|
||||||
this.btnResult:SetActive(haveRecord and args[5])
|
this.btnResult:SetActive(haveRecord and args[5])
|
||||||
this.btnBattleBack:SetActive(haveRecord and args[5] and BattleManager.GetLastBattleType() ~= BATTLE_TYPE.MAP_FIGHT and
|
this.btnBattleBack:SetActive(haveRecord and args[5] and BattleManager.GetLastBattleType() ~= BATTLE_TYPE.MAP_FIGHT and
|
||||||
not GuideManager.IsInMainGuide() and not MapManager.Mapping and
|
not GuideManager.IsInMainGuide() and not MapManager.Mapping and
|
||||||
BattleManager.GetLastBattleType() ~= BATTLE_TYPE.TASUILINGXIAO)
|
BattleManager.GetLastBattleType() ~= BATTLE_TYPE.TASUILINGXIAO)
|
||||||
this.btnFightNext:SetActive(BattleManager.GetLastBattleType() == BATTLE_TYPE.STORY_FIGHT and haveRecord and args[5] and
|
if BattleManager.GetLastBattleType() == BATTLE_TYPE.STORY_FIGHT then
|
||||||
not GuideManager.IsInMainGuide() and not MapManager.Mapping)
|
local isOk, tip, btnTxt, lockState = FightPointPassManager.CheckFightOpenRule(FightPointPassManager.curOpenFight)
|
||||||
|
this.btnFightNext:SetActive(haveRecord and args[5] and not GuideManager.IsInMainGuide() and not MapManager.Mapping and isOk)
|
||||||
|
else
|
||||||
|
this.btnFightNext:SetActive(false)
|
||||||
|
end
|
||||||
this.expeditionGo:SetActive(compShowType == 5)
|
this.expeditionGo:SetActive(compShowType == 5)
|
||||||
this.guildDeathPos:SetActive(compShowType == 4) --十绝阵
|
this.guildDeathPos:SetActive(compShowType == 4) --十绝阵
|
||||||
this.guildTranscript:SetActive(compShowType == 6)
|
this.guildTranscript:SetActive(compShowType == 6)
|
||||||
|
|
Loading…
Reference in New Issue