From 5883b66fcaf84ae0e1f5fd913bd253c7203ba95f Mon Sep 17 00:00:00 2001 From: JieLing Date: Sat, 27 Mar 2021 16:46:42 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8D=81=E7=BB=9D=E9=98=B5=E3=80=91?= =?UTF-8?q?=E5=BC=80=E6=9C=8D3=E5=A4=A9=E5=86=85=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=BE=A1=E4=BB=A4=E8=8E=B7=E5=8F=96=E9=80=94?= =?UTF-8?q?=E5=BE=84=E5=8F=AF=E4=BB=A5=E8=BF=9B=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Player/JumpManager.lua | 7 +++++ .../Popup/RewardItemSingleShowPopup.lua | 27 ++++++++++--------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index a730428b10..23a5b2b94f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -500,6 +500,13 @@ local jumpDic = { if PlayerManager.familyId == 0 then UIManager.OpenPanel(UIName.GuildFindPopup) else + if DeathPosManager.status==DeathPosStatus.Death then + PopupTipPanel.ShowTip(Language[10909]) + return + elseif DeathPosManager.status==DeathPosStatus.Close then + PopupTipPanel.ShowTip(Language[10910]) + return + end if UIManager.IsOpen(UIName.GuildMainCityPanel) then UIManager.OpenPanel(UIName.DeathPosPanel) else diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index b0c117d2c0..f755fc9819 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -294,20 +294,21 @@ function RewardItemSingleShowPopup:OnShow() end for i = 1, #jumpSortData do if jumpSortData[i].id > 0 then - if JumpConfig[jumpSortData[i].id].Type < 10000 then - if not ActTimeCtrlManager.SingleFuncState(JumpConfig[jumpSortData[i].id].Type) then break end - end - if not RECHARGEABLE then--(是否开启充值) - if this.isRewardItemPop == true or itemConfigData.Id == 61 or itemConfigData.Id == 19 or itemConfigData.ItemType == 17 then - SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,false,self) + -- type 大于 10000为活动 直接显示按钮,如果小于1000 为功能 开启才显示 + if JumpConfig[jumpSortData[i].id].Type >= 10000 or ActTimeCtrlManager.SingleFuncState(JumpConfig[jumpSortData[i].id].Type) then + -- if not ActTimeCtrlManager.SingleFuncState(JumpConfig[jumpSortData[i].id].Type) then break end + if not RECHARGEABLE then--(是否开启充值) + if this.isRewardItemPop == true or itemConfigData.Id == 61 or itemConfigData.Id == 19 or itemConfigData.ItemType == 17 then + SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,false,self) + else + SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,true,self) + end else - SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,true,self) - end - else - if this.isRewardItemPop == true or itemConfigData.ItemType == 17 then - SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,false,self) - else - SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,true,self) + if this.isRewardItemPop == true or itemConfigData.ItemType == 17 then + SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,false,self) + else + SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,true,self) + end end end end