From 55bdc21a9961f06db96b00d94c12e4a81ab20a59 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 30 Jun 2021 12:01:39 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BF=83=E6=84=BF=E6=8A=BD=E5=8D=A1?= =?UTF-8?q?=E3=80=91=E5=A2=9E=E5=8A=A0=E5=88=9D=E5=A7=8B=E5=8C=96=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GeneralPanel/View/GeneralBigPopup_WishDraw.lua | 2 +- .../~Lua/Modules/Recruit/RecruitPanel.lua | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) 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