From e3ceaaccc4fdd164c574d02efd2fdf1e0f274a60 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 11 Jan 2021 19:44:59 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E5=9B=9E=E6=94=BE?= =?UTF-8?q?=E3=80=91=20=E5=BC=BA=E5=88=B6=E6=96=B0=E6=89=8B=E5=BC=95?= =?UTF-8?q?=E5=AF=BC=E5=B1=8F=E8=94=BD=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 8d5d222639b6b94169531f2c49ea6b9e6a267e6b) --- Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua index 3071eae7d6..0a70542370 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua @@ -89,7 +89,7 @@ function BattleFailPopup:OnOpen(battlePanel, showRecord, backPanel,_fightType) FightPointPassManager.FightBattleEnd() Util.GetGameObject(this.btnClose, "record"):SetActive(m_showRecord) Util.GetGameObject(this.btnClose,"tip"):SetActive(not fightType ==12)--副本内无法点击招募 - if fightType == BATTLE_TYPE.MAP_FIGHT then--地图 + if fightType == BATTLE_TYPE.MAP_FIGHT or GuideManager.IsInMainGuide then--地图 this.btnBattleBack:SetActive(false) else this.btnBattleBack:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 44d25d7641..3adcffac9d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -145,7 +145,7 @@ function RewardItemPopup:OnOpen(...) end local haveRecord = BattleRecordManager.isHaveRecord() this.btnResult:SetActive(haveRecord and args[5]) - this.btnBattleBack:SetActive(haveRecord and args[5] and BattleManager.GetLastBattleType() ~= BATTLE_TYPE.MAP_FIGHT) + this.btnBattleBack:SetActive(haveRecord and args[5] and BattleManager.GetLastBattleType() ~= BATTLE_TYPE.MAP_FIGHT and not GuideManager.IsInMainGuide) this.btnResultMax:SetActive(haveRecord and args[5]) -- 设置背景遮罩的显隐 local isHideBG = args[6]