From e5b42a084069083a41407c2fa521e702dfd5f10c Mon Sep 17 00:00:00 2001 From: JieLing Date: Mon, 28 Sep 2020 11:33:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AC=AC=E5=9B=9B=E5=91=A8?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BA=8C=E7=BA=A7=E5=BC=B9=E7=AA=97=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/GeneralPopup_RecruitConfirm.lua | 42 ++++++++++++------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua index ddaf7e0ef3..2d3b5d2427 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua @@ -48,26 +48,36 @@ function this:OnShow(_parent,...) var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten local d=RecruitManager.GetExpendData(RecruitType.Single) this.rootText.text = string.format(Language[12373],d[2]) - elseif _args[1] == RecruitType.QianKunBoxSingle then - var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen - local d=RecruitManager.GetExpendData(RecruitType.QianKunBoxSingle) - this.rootText.text = string.format(Language[12374],d[2]) - elseif _args[1] == RecruitType.TimeLimitSingle then - var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen - local d=RecruitManager.GetExpendData(RecruitType.TimeLimitSingle) - this.rootText.text = string.format(Language[12375],d[2]) elseif _args[1] == RecruitType.Ten then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten local d=RecruitManager.GetExpendData(RecruitType.Ten) this.rootText.text = string.format(Language[12376],d[2]) - elseif _args[1] == RecruitType.QianKunBoxTen then - var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen - local d=RecruitManager.GetExpendData(RecruitType.QianKunBoxTen) - this.rootText.text = string.format(Language[12377],d[2]) - elseif _args[1] == RecruitType.TimeLimitTen then - var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen - local d=RecruitManager.GetExpendData(RecruitType.TimeLimitTen) - this.rootText.text = string.format(Language[12378],d[2]) + else + LogBlue("_args[1]:".._args[1]) + local data = ConfigManager.GetConfigData(ConfigName.LotterySetting,_args[1]) + LogBlue("data.PerCount:"..data.PerCount) + LogBlue("data.ActivityId:"..data.ActivityId) + local activityData + if data.LotteryType == 3 then + activityData = ConfigManager.GetConfigData(ConfigName.GlobalActivity,data.ActivityId) + if activityData.Type == ActivityTypeDef.FindFairy then + var = PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen + local d = RecruitManager.GetExpendData(data.Id) + if data.PerCount == 1 then + this.rootText.text = string.format(Language[12375],d[2]) + else + this.rootText.text = string.format(Language[12378],d[2]) + end + elseif activityData.Type == ActivityTypeDef.QianKunBox then + var = PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen + local d=RecruitManager.GetExpendData(data.Id) + if data.PerCount == 1 then + this.rootText.text = string.format(Language[12374],d[2]) + else + this.rootText.text = string.format(Language[12377],d[2]) + end + end + end end Util.AddOnceClick(this.btn,function()