diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua index cad39d4170..4e02452246 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua @@ -61,7 +61,7 @@ end function this:Refresh(isTop,isAni) local data = tonumber(specialConfig[119].Value) - if RecruitManager.drawTimes[1] < data then + if not RecruitManager.drawTimes[1] or RecruitManager.drawTimes[1] < data then self.parent:ClosePanel() end self.selectBtn:GetComponent("RectTransform").localPosition = self.tabListObj[self.curSelect]:GetComponent("RectTransform").localPosition diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua index 4fa07f0a28..9d73a6fc95 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua @@ -96,10 +96,14 @@ function RecruitPanel:BindEvent() --心愿抽卡界面 Util.AddClick(this.wishBtn, function() local data = tonumber(specialConfig[119].Value) - if RecruitManager.drawTimes[1] >= data then - UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.WishDraw) + if RecruitManager.drawTimes[1] then + if RecruitManager.drawTimes[1] >= data then + UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.WishDraw) + else + PopupTipPanel.ShowTip(string.format("%s次神将召唤后,开启心愿抽卡!",data - RecruitManager.drawTimes[1])) + end else - PopupTipPanel.ShowTip(string.format("%s次神将召唤后,开启心愿抽卡!",data - RecruitManager.drawTimes[1])) + PopupTipPanel.ShowTip(string.format("%s次神将召唤后,开启心愿抽卡!",data)) end end) end