diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index 1e2305ad47..cf4754ddc3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -442,7 +442,7 @@ function this.DeleBackPatFaceDaqta() end function this.GetcurCanPatFace() if this.isLogin then return false end--登录界面不拍 - if MapManager.Mapping or UIManager.IsOpen(UIName.BattlePanel) or UIManager.IsOpen(UIName.SurpriseBoxPanel) then return false end--在关卡里 副本里不拍 + if MapManager.Mapping or UIManager.IsOpen(UIName.BattlePanel) or UIManager.IsOpen(UIName.SurpriseBoxPanel) or UIManager.IsOpen(UIName.RewardItemSingleShowPopup) then return false end--在关卡里 副本里不拍 if GuideManager.IsFunctionGuideExist() or GuideManager.IsInMainGuide() then return false end--引导不拍 if UIManager.IsOpen(UIName.SingleRecruitPanel) or UIManager.IsOpen(UIName.TenRecruitPanel) or UIManager.IsOpen(UIName.RecruitPanel) then return false end--抽卡界面不拍 if UIManager.IsOpen(UIName.PatFacePanel) then return false end--正在拍脸 diff --git a/Assets/ManagedResources/~Lua/View/JumpViewNew.lua b/Assets/ManagedResources/~Lua/View/JumpViewNew.lua index b0067229b1..e0a0d6b109 100644 --- a/Assets/ManagedResources/~Lua/View/JumpViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/JumpViewNew.lua @@ -215,7 +215,9 @@ function JumpViewNew:GoToJumpData() end end end - DynamicActivityManager.SetSelectIndex(DataType.Direct,goodIdList) + DynamicActivityManager.SetSelectIndex(DataType.Direct,goodIdList) + elseif (self.jumpSData.type ~= JumpType.firstRecharge or self.jumpSData.type ~= JumpType.ZhiZunJiangShi) then + PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout2 = false end JumpManager.GoJump(self.jumpSData.Id,function(isOpen) if isOpen then