Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan

PC-202302260912\Administrator 2025-03-18 16:20:24 +08:00
commit 0321a7e46a
2 changed files with 4 additions and 4 deletions

View File

@ -254,7 +254,6 @@ function this.ShowBattleResultByStoryFight(drop)
-- 再刷新一便关卡信息
NetManager.InitFightPointLevelInfo()
if isFightNext then
LogError("dddddddddddddddddd")
FightPointPassManager.oldLevel = PlayerManager.level
local MonsterGroupId = FightPointPassManager.GetBattleMonsterGroup()
FightPointPassManager.enterFightBattle = true

View File

@ -172,7 +172,8 @@ function RewardItemPopup:OnOpen(...)
this.btnBattleBack:SetActive(haveRecord and args[5] and BattleManager.GetLastBattleType() ~= BATTLE_TYPE.MAP_FIGHT and
not GuideManager.IsInMainGuide() and not MapManager.Mapping and
BattleManager.GetLastBattleType() ~= BATTLE_TYPE.TASUILINGXIAO)
this.btnFightNext:SetActive(BattleManager.GetLastBattleType() == BATTLE_TYPE.STORY_FIGHT)
this.btnFightNext:SetActive(BattleManager.GetLastBattleType() == BATTLE_TYPE.STORY_FIGHT and haveRecord and args[5] and
not GuideManager.IsInMainGuide() and not MapManager.Mapping)
this.expeditionGo:SetActive(compShowType == 5)
this.guildDeathPos:SetActive(compShowType == 4) --十绝阵
this.guildTranscript:SetActive(compShowType == 6)
@ -666,9 +667,9 @@ function RewardItemPopup:OnClose()
compShowType = 0
if func and not isPopGetSSR then
if fightConFigData and fightConFigData.PicShow == 1 and FightPointPassManager.isOpenNewChapter then
func(isBackBattle,isFightNext)
func(isBackBattle, isFightNext)
else
func(isBackBattle,isFightNext)
func(isBackBattle, isFightNext)
end
end