From 73aeaf3d898c97056223d7fb46525253a23ba681 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 29 Dec 2020 14:24:45 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8A=BD=E5=8D=A1=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E3=80=91=E5=85=AD=E4=B8=AA=E6=8A=BD=E5=8D=A1=E5=88=86=E5=88=AB?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E5=A6=96=E6=99=B6=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 15 +++++++-- .../Modules/DynamicActivity/LingShouBaoGe.lua | 16 ++++----- .../LingShouBaoGeOneResultPanel.lua | 19 ++++++++--- .../LingShouBaoGeTenResultPanel.lua | 19 ++++++++--- .../Modules/DynamicActivity/QianKunBox.lua | 8 ++--- .../DynamicActivity/QianKunBoxBuyOnePanel.lua | 23 +++++++++---- .../DynamicActivity/QianKunBoxBuyTenPanel.lua | 23 +++++++++---- .../DynamicActivity/TimeLimitedCall.lua | 8 ++--- .../DynamicActivity/XiangYaoDuoBao.lua | 10 +++--- .../Pokemon/PokemonSingleResultPanel.lua | 10 +++--- .../Pokemon/PokemonSummonOneResultPanel.lua | 30 ++++++++++++----- .../Modules/Pokemon/PokemonSummonPanel.lua | 18 +++++----- .../Pokemon/PokemonSummonTenResultPanel.lua | 27 ++++++++++----- .../View/GeneralPopup_RecruitConfirm.lua | 33 +++++++++++++++---- .../~Lua/Modules/Recruit/RecruitPanel.lua | 4 +-- .../Modules/Recruit/SingleRecruitPanel.lua | 10 +++--- .../~Lua/Modules/Recruit/TenRecruitPanel.lua | 8 +++-- 17 files changed, 191 insertions(+), 90 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index a7162364f3..a3275361a7 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1943,16 +1943,25 @@ RecruitType = { Ten = 11, --钻石招募十连(神将召唤) Single = 12, --钻石招募单抽(神将召唤) - TimeLimitTen=14, --限时招募十连 QianKunBoxTen=16, --乾坤宝囊十连 + QianKunBoxSingle=17, --乾坤宝盒单抽 FriendTen=23, --友情招募 多次 FriendSingle=24, --友情招募 单次 NormalTen=25, --普通招募 多次 NormalSingle=26, --普通招募 单次 RecruitBox=27,--仙缘招募 - LingShowSingle = 42, --零售单抽 - LingShowTen = 43, --零售十连 + LingShowSingle = 42, --灵兽单抽 + LingShowTen = 43, --灵兽十连 + + TimeLimitSingle = 44, --限时召唤单抽 + TimeLimitTen = 45, --限时召唤十连 + + BaoGeSingle = 46, --灵兽宝阁单抽 + BaoGeTen = 47, --灵兽宝阁十连 + + XiangYaoSingle = 48, --降妖夺宝单抽 + XiangYaoTen = 49, --降妖夺宝十连 } ItemBaseType = { Special = 1, --特殊 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua index 7eb37be7b6..08c72ba05b 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua @@ -216,22 +216,22 @@ function LingShouBaoGe:refreshBtnShow() end Util.AddOnceClick(btn,function() - local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.LingShowTen) + local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.BaoGeTen) if n == bType.Btn1 then if isFree then - self:Recruit(type,maxtimesId,0,0,state,freeTimesId) + self:Recruit(type,maxtimesId,0,0,state,freeTimesId,{RecruitType.BaoGeSingle,RecruitType.LingShowTen}) else - self:Recruit(type,maxtimesId,itemId,itemNum,state,freeTimesId) + self:Recruit(type,maxtimesId,itemId,itemNum,state,freeTimesId,{RecruitType.BaoGeSingle,RecruitType.LingShowTen}) end elseif n==bType.Btn10 then - self:Recruit(type,maxtimesId,itemId,itemNum,state,freeTimesId) + self:Recruit(type,maxtimesId,itemId,itemNum,state,freeTimesId,{RecruitType.BaoGeTen,RecruitType.BaoGeTen}) end end) end end -function LingShouBaoGe:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,freeTimesId) - local generalType = id%2 == 0 and RecruitType.LingShowSingle or RecruitType.LingShowTen +function LingShouBaoGe:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,freeTimesId,recruitType) + local generalType = id%2 == 0 and RecruitType.BaoGeSingle or RecruitType.BaoGeTen local num = id%2 == 0 and 1 or 10 --是否超过每日最大上限 if PrivilegeManager.GetPrivilegeRemainValue(RecruitMaxtimesId) < num then @@ -249,7 +249,7 @@ function LingShouBaoGe:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,freeTim function() RecruitManager.RecruitRequest(id,function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,num) - UIManager.OpenPanel(UIName.PokemonSingleResultPanel,id,msg.drop,activityId,function () + UIManager.OpenPanel(UIName.PokemonSingleResultPanel,id,msg.drop,activityId,recruitType,function () this:Refresh() end) end,freeTimesId,itemId,itemNum) @@ -257,7 +257,7 @@ function LingShouBaoGe:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,freeTim else RecruitManager.RecruitRequest(id, function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,num) - UIManager.OpenPanel(UIName.PokemonSingleResultPanel,id,msg.drop,activityId,function () + UIManager.OpenPanel(UIName.PokemonSingleResultPanel,id,msg.drop,activityId,recruitType,function () this:Refresh() end) end,freeTimesId,itemId,itemNum) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua index f79586c38b..2cd99db88e 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua @@ -13,6 +13,7 @@ local freeTimesId = 0 local activityId = nil local singleRecruit = nil local tenRecruit = nil +local recType={} --活动抽卡类型(动态的数据) local drawtType={ FindFairySingle=0, @@ -46,6 +47,7 @@ function LingShouBaoGeOneResultPanel:BindEvent() end) Util.AddClick(this.openOneAgainButton, function () --是否超过每日最大上限 + local d=RecruitManager.GetExpendData(this.recruitType) if PrivilegeManager.GetPrivilegeRemainValue(RecruitMaxtimesId) < 1 then PopupTipPanel.ShowTip(Language[11760]) return @@ -56,10 +58,18 @@ function LingShouBaoGeOneResultPanel:BindEvent() return end end - RecruitManager.RecruitRequest(this.recruitType, function(msg) - PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,1)--记录抽卡次数 - UIManager.OpenPanel(UIName.PokemonSingleResultPanel,this.recruitType,msg.drop,activityId) - end,freeTimesId,itemId,itemNum) + local recruitOne = function() + RecruitManager.RecruitRequest(this.recruitType, function(msg) + PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,1)--记录抽卡次数 + UIManager.OpenPanel(UIName.PokemonSingleResultPanel,this.recruitType,msg.drop,activityId,recType) + end,freeTimesId,itemId,itemNum) + end + local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..recType[2]) + if state==0 and d[1] == 16 then + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,this.recruitType,recruitOne) + else + recruitOne() + end end) end @@ -87,6 +97,7 @@ function LingShouBaoGeOneResultPanel:OnOpen(...) this.drop=args[1] this.recruitType = args[2] activityId = args[3] + recType = args[4] this.detailImage:SetActive(false) this.content3:SetActive(true) --获取免费次数 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua index 02fd0d1dac..8ef16ba9f8 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua @@ -8,6 +8,7 @@ local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig) local itemId=0 local itemNum=0 --抽卡小号道具数量 +local recType={} local activityId = nil local singleRecruit = nil @@ -55,6 +56,7 @@ function LingShouBaoGeTenResultPanel:BindEvent() self:ClosePanel() end) Util.AddClick(this.openTenAgainButton, function () + local d=RecruitManager.GetExpendData(this.recruitType) local maxTimesId = lotterySetting[singleRecruit.Id].MaxTimes local freeTimesId = lotterySetting[singleRecruit.Id].FreeTimes --是否超过每日最大上限 @@ -67,10 +69,18 @@ function LingShouBaoGeTenResultPanel:BindEvent() PopupTipPanel.ShowTip(ItemConfig[itemId].Name..Language[10492]) return end - RecruitManager.RecruitRequest(this.recruitType, function(msg) - PrivilegeManager.RefreshPrivilegeUsedTimes(maxTimesId,10)--记录抽卡次数 - UIManager.OpenPanel(UIName.PokemonSingleResultPanel,this.recruitType,msg.drop,activityId) - end,freeTimesId,itemId,itemNum) + local recruitTen = function() + RecruitManager.RecruitRequest(this.recruitType, function(msg) + PrivilegeManager.RefreshPrivilegeUsedTimes(maxTimesId,10)--记录抽卡次数 + UIManager.OpenPanel(UIName.PokemonSingleResultPanel,this.recruitType,msg.drop,activityId,recType) + end,freeTimesId,itemId,itemNum) + end + local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..recType[2]) + if state==0 and d[1] == 16 then + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,this.recruitType,recruitTen) + else + recruitTen() + end end) end @@ -105,6 +115,7 @@ function LingShouBaoGeTenResultPanel:OnOpen(...) this.drop=args[1] this.recruitType = args[2] activityId = args[3] + recType = args[4] this.detailImage:SetActive(false) this.content1:SetActive(false) this.content2:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index 0f3413595e..db4614fe0c 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -179,7 +179,7 @@ function QianKunBox:refreshBtnShow() local recruitOne = function() RecruitManager.RecruitRequest(singleRecruit.Id, function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,1)--记录抽卡次数 - UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel, msg.drop,singleRecruit.Id) + UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel, msg.drop,singleRecruit.Id,{RecruitType.QianKunBoxSingle,RecruitType.QianKunBoxTen}) CheckRedPointStatus(RedPointType.QianKunBox) end,freeTimesId) end @@ -194,9 +194,9 @@ function QianKunBox:refreshBtnShow() return end local recruitTen = function() - RecruitManager.RecruitRequest(tenRecruit.Id, function(msg) - PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,10)--记录抽卡次数 - UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel, msg.drop,tenRecruit.Id) + RecruitManager.RecruitRequest(tenRecruit.Id, function(msg) + PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,10)--记录抽卡次数 + UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel, msg.drop,tenRecruit.Id,{RecruitType.QianKunBoxTen,RecruitType.QianKunBoxTen}) CheckRedPointStatus(RedPointType.QianKunBox) end,freeTimesId) end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua index a9ba89cf87..54b6080b6e 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua @@ -8,6 +8,7 @@ local iconsData = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotteryRewardC local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig) local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) +local recType = {} --活动抽卡类型(动态的数据) local drawtType={ @@ -54,15 +55,24 @@ function QianKunBoxBuyOnePanel:BindEvent() self:ClosePanel() end) Util.AddClick(this.openOneAgainButton, function () + local d=RecruitManager.GetExpendData(this.recruitType) local maxtimesId=lotterySetting[this.recruitType].MaxTimes local freeTimesId=lotterySetting[this.recruitType].FreeTimes if(BagManager.GetItemCountById(1002)>=1 or BagManager.GetItemCountById(16)>=200) then - self:ClosePanel() - RecruitManager.RecruitRequest(this.recruitType, function(msg) - PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,1)--记录抽卡次数 - UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel,msg.drop,this.recruitType) - CheckRedPointStatus(RedPointType.QianKunBox) - end,freeTimesId) + local recruitOne = function() + self:ClosePanel() + RecruitManager.RecruitRequest(this.recruitType, function(msg) + PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,1)--记录抽卡次数 + UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel,msg.drop,this.recruitType,recType) + CheckRedPointStatus(RedPointType.QianKunBox) + end,freeTimesId) + end + local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..recType[2]) + if state==0 and d[1] == 16 then + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,this.recruitType,recruitOne) + else + recruitOne() + end else --UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = UpViewRechargeType.DemonCrystal })--应跳到充值界面,现在是用之前的货币换取妖晶 PopupTipPanel.ShowTip(Language[11139]) @@ -95,6 +105,7 @@ function QianKunBoxBuyOnePanel:OnOpen(...) local args = { ... } this.drop=args[1] this.recruitType = args[2] + recType = args[3] this.detailImage:SetActive(true) this.content1:SetActive(false) this.content2:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua index e0e9232b4c..1c9c1b29ea 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua @@ -6,6 +6,7 @@ local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local gameSetting=ConfigManager.GetConfig(ConfigName.GameSetting) local lotterySetting = ConfigManager.GetConfig(ConfigName.LotterySetting) local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) +local recType = {} --活动抽卡类型(动态的数据) local drawtType={ @@ -64,15 +65,24 @@ function QianKunBoxBuyTenPanel:BindEvent() self:ClosePanel() end) Util.AddClick(this.openTenAgainButton, function () + local d=RecruitManager.GetExpendData(this.recruitType) local maxtimesId=lotterySetting[this.recruitType].MaxTimes local freeTimesId=lotterySetting[this.recruitType].FreeTimes if(BagManager.GetItemCountById(1003)>=10 or BagManager.GetItemCountById(16>=2000)) then - self:ClosePanel() - RecruitManager.RecruitRequest(this.recruitType, function(msg) - PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,10)--记录抽卡次数 - UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel,msg.drop,this.recruitType) - CheckRedPointStatus(RedPointType.QianKunBox) - end,freeTimesId) + local recruitTen = function() + self:ClosePanel() + RecruitManager.RecruitRequest(this.recruitType, function(msg) + PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,10)--记录抽卡次数 + UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel,msg.drop,this.recruitType,recType) + CheckRedPointStatus(RedPointType.QianKunBox) + end,freeTimesId) + end + local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..recType[2]) + if state==0 and d[1] == 16 then + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,this.recruitType,recruitTen) + else + recruitTen() + end else --UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = UpViewRechargeType.DemonCrystal })--应跳到充值界面,现在是用之前的货币换取妖晶 PopupTipPanel.ShowTip(Language[11139]) @@ -111,6 +121,7 @@ function QianKunBoxBuyTenPanel:OnOpen(...) local args = { ... } this.drop=args[1] this.recruitType = args[2] + recType = args[3] this.detailImage:SetActive(true) this.content1:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index 27545a7c67..3cf721b0d7 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -467,7 +467,7 @@ function TimeLimitedCall:RefreshGetHeroTimes() local recruitOne = function() RecruitManager.RecruitRequest(singleRecruit.Id, function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,1)--记录抽卡次数 - UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],singleRecruit.Id,bType.Btn1) + UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],singleRecruit.Id,bType.Btn1,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen}) CheckRedPointStatus(RedPointType.TimeLimited) end,freeTimesId) end @@ -483,9 +483,9 @@ function TimeLimitedCall:RefreshGetHeroTimes() return end local recruitTen = function() - RecruitManager.RecruitRequest(tenRecruit.Id, function(msg) - PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,10)--记录抽卡次数 - UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, tenRecruit.Id,bType.Btn10) + RecruitManager.RecruitRequest(tenRecruit.Id, function(msg) + PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,10)--记录抽卡次数 + UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, tenRecruit.Id,bType.Btn10,{RecruitType.TimeLimitTen,RecruitType.TimeLimitTen}) CheckRedPointStatus(RedPointType.TimeLimited) end,freeTimesId) end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua index 8eb4371812..ebab89656b 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua @@ -201,7 +201,7 @@ function XiangYaoDuoBao:refreshBtnShow() return end end - local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten) + local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.XiangYaoTen) if n==bType.Btn1 then if PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)+1>privilegeConfig[maxtimesId].Condition[1][2] then PopupTipPanel.ShowTip(Language[11760]) @@ -222,13 +222,13 @@ function XiangYaoDuoBao:refreshBtnShow() if not isFree and d[1] == 16 then PrivilegeManager.RefreshPrivilegeUsedTimes(singleRecruit.MoneyTimes,1)--记录妖晶抽卡次数 end - UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],singleRecruit.Id,bType.Btn1) + UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],singleRecruit.Id,bType.Btn1,{RecruitType.XiangYaoSingle,RecruitType.XiangYaoTen}) CheckRedPointStatus(RedPointType.XiangYaoDuoBao) end,freeTimesId) end,1.2):Start() end if state==0 and d[1] == 16 and not isFree then - UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.Single,recruitOne) + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.XiangYaoSingle,recruitOne) else recruitOne() end @@ -253,13 +253,13 @@ function XiangYaoDuoBao:refreshBtnShow() if d[1] == 16 then PrivilegeManager.RefreshPrivilegeUsedTimes(singleRecruit.MoneyTimes,10)--记录妖晶抽卡次数 end - UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero,tenRecruit.Id,bType.Btn10) + UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero,tenRecruit.Id,bType.Btn10,{RecruitType.XiangYaoTen,RecruitType.XiangYaoTen}) CheckRedPointStatus(RedPointType.XiangYaoDuoBao) end,freeTimesId) end,1.2):Start() end if state==0 and d[1] ==16 and not isFree then - UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.Ten,recruitTen) + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.XiangYaoTen,recruitTen) else recruitTen() end diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua index b40fb543f7..52f02b6670 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua @@ -15,6 +15,7 @@ local timeNum3--第三个特效等待播放的时间 local type --抽卡类型 local index=0 --十连抽索引 local activityId--活动id +local recType = {} local orginLayer local heroStaticData @@ -77,6 +78,7 @@ function PokemonSingleResultPanel:OnOpen(...) type = args[1] drop = args[2] activityId = args[3] + recType = args[4] _heroTable = drop.pokemon end @@ -142,16 +144,16 @@ function PokemonSingleResultPanel:OnClose() local array = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySetting,"ActivityId",activityId) singleRecruit = array[1] if type == singleRecruit.Id then - UIManager.OpenPanel(UIName.LingShouBaoGeOneResultPanel, drop,type,activityId) + UIManager.OpenPanel(UIName.LingShouBaoGeOneResultPanel, drop,type,activityId,recType) else - UIManager.OpenPanel(UIName.LingShouBaoGeTenResultPanel, drop,type,activityId) + UIManager.OpenPanel(UIName.LingShouBaoGeTenResultPanel, drop,type,activityId,recType) end else--灵兽山抽卡 if type == RecruitType.LingShowSingle then - UIManager.OpenPanel(UIName.PokemonSummonOneResultPanel, drop,type) + UIManager.OpenPanel(UIName.PokemonSummonOneResultPanel, drop,type,recType) else - UIManager.OpenPanel(UIName.PokemonSummonTenResultPanel, drop,type) + UIManager.OpenPanel(UIName.PokemonSummonTenResultPanel, drop,type,recType) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua index e36730ea5a..1d7885305c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua @@ -10,6 +10,7 @@ local isFree=false local itemId = 0 local RecruitMaxtimesId = 0 local freeTimesId = 0 +local recType = {} --活动抽卡类型(动态的数据) local drawtType={ FindFairySingle=0, @@ -26,7 +27,7 @@ function PokemonSummonOneResultPanel:InitComponent() screenAdapte(self.bg) this.btnBack=Util.GetGameObject(self.gameObject, "bottom/backButton") this.openOneAgainButton=Util.GetGameObject(self.gameObject, "bottom/openOneAgainButton") - + this.content3=Util.GetGameObject(self.gameObject,"bottom/openOneAgainButton/Content3") this.itemIcon3=Util.GetGameObject(this.content3, "icon"):GetComponent("Image") this.itemNum3=Util.GetGameObject(this.content3, "num"):GetComponent("Text") @@ -45,6 +46,7 @@ function PokemonSummonOneResultPanel:BindEvent() end) Util.AddClick(this.openOneAgainButton, function () --是否超过每日最大上限 + local d=RecruitManager.GetExpendData(this.recruitType) if PrivilegeManager.GetPrivilegeRemainValue(RecruitMaxtimesId) < 1 then PopupTipPanel.ShowTip(Language[11760]) return @@ -62,14 +64,23 @@ function PokemonSummonOneResultPanel:BindEvent() return end end - RecruitManager.RecruitRequest(this.recruitType, function(msg) - PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,1)--记录抽卡次数 - if itemId == 16 and not isFree then - PrivilegeManager.RefreshPrivilegeUsedTimes(YaojingCallPrivilegeId,1)--记录妖晶抽卡次数 - end - UIManager.OpenPanel(UIName.PokemonSingleResultPanel,this.recruitType,msg.drop) - --CheckRedPointStatus(RedPointType.QianKunBox) - end,freeTimesId,itemId,itemNum) + local recruitOne = function() + RecruitManager.RecruitRequest(this.recruitType, function(msg) + PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,1)--记录抽卡次数 + if itemId == 16 and not isFree then + PrivilegeManager.RefreshPrivilegeUsedTimes(YaojingCallPrivilegeId,1)--记录妖晶抽卡次数 + end + UIManager.OpenPanel(UIName.PokemonSingleResultPanel,this.recruitType,msg.drop,nil,recType) + --CheckRedPointStatus(RedPointType.QianKunBox) + end,freeTimesId,itemId,itemNum) + end + + local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..recType[2]) + if state==0 and d[1] == 16 and not isFree then + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,this.recruitType,recruitOne,itemNum) + else + recruitOne() + end end) end @@ -96,6 +107,7 @@ function PokemonSummonOneResultPanel:OnOpen(...) local args = { ... } this.drop=args[1] this.recruitType = args[2] + recType = args[3] this.detailImage:SetActive(true) this.content3:SetActive(true) --获取免费次数 diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua index f6e64841ca..f9e8897041 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua @@ -150,18 +150,18 @@ function PokemonSummonPanel:refreshBtnShow() local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.LingShowTen) if n == bType.Btn1 then if isFree then - self:Recruit(RecruitType.LingShowSingle,maxtimesId,0,0,state,freeTimesId) + self:Recruit(RecruitType.LingShowSingle,maxtimesId,0,0,state,freeTimesId,{RecruitType.LingShowSingle,RecruitType.LingShowTen}) else - self:Recruit(RecruitType.LingShowSingle,maxtimesId,itemId,itemNum,state,freeTimesId) + self:Recruit(RecruitType.LingShowSingle,maxtimesId,itemId,itemNum,state,freeTimesId,{RecruitType.LingShowSingle,RecruitType.LingShowTen}) end elseif n==bType.Btn10 then - self:Recruit(RecruitType.LingShowTen,maxtimesId,itemId,itemNum,state,freeTimesId) + self:Recruit(RecruitType.LingShowTen,maxtimesId,itemId,itemNum,state,freeTimesId,{RecruitType.LingShowTen,RecruitType.LingShowTen}) end end) end end -function PokemonSummonPanel:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,freeTimesId) +function PokemonSummonPanel:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,freeTimesId,recruitType) local num = 0 if id == RecruitType.LingShowSingle then num = 1 @@ -201,9 +201,8 @@ function PokemonSummonPanel:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,fr self.changZhuEffect:SetActive(true) PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,num)--记录抽卡次数 PrivilegeManager.RefreshPrivilegeUsedTimes(YaojingCallPrivilegeId,num)--记录妖晶抽卡次数 - UIManager.OpenPanel(UIName.PokemonSingleResultPanel,id,msg.drop) - --CheckRedPointStatus(RedPointType.QianKunBox) - end,1.2):Start() + UIManager.OpenPanel(UIName.PokemonSingleResultPanel,id,msg.drop,nil,recruitType) + end,1.2):Start() end, freeTimesId,itemId,itemNum) end, @@ -221,9 +220,8 @@ function PokemonSummonPanel:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,fr if itemId == 16 then PrivilegeManager.RefreshPrivilegeUsedTimes(YaojingCallPrivilegeId,num)--记录妖晶抽卡次数 end - UIManager.OpenPanel(UIName.PokemonSingleResultPanel,id,msg.drop) - end,1.2):Start() - --CheckRedPointStatus(RedPointType.QianKunBox) + UIManager.OpenPanel(UIName.PokemonSingleResultPanel,id,msg.drop,nil,recruitType) + end,1.2):Start() end,freeTimesId,itemId,itemNum) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua index 0042bd2751..1984fa689b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua @@ -8,6 +8,7 @@ local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig) local itemId=0 local itemNum=0 --抽卡小号道具数量 +local recType = {} --活动抽卡类型(动态的数据) -- local drawtType={ -- FindFairySingle=0, @@ -64,6 +65,7 @@ function PokemonSummonTenResultPanel:BindEvent() local maxTimesId = lotterySetting[RecruitType.LingShowSingle].MaxTimes local freeTimesId = lotterySetting[RecruitType.LingShowSingle].FreeTimes --是否超过每日最大上限 + local d=RecruitManager.GetExpendData(this.recruitType) if PrivilegeManager.GetPrivilegeRemainValue(maxTimesId) < 10 then LogGreen("maxTimesId:"..maxTimesId.." times:"..PrivilegeManager.GetPrivilegeRemainValue(maxTimesId)) PopupTipPanel.ShowTip(Language[11760]) @@ -81,14 +83,22 @@ function PokemonSummonTenResultPanel:BindEvent() PopupTipPanel.ShowTip(ItemConfig[itemId].Name..Language[10492]) return end - RecruitManager.RecruitRequest(this.recruitType, function(msg) - PrivilegeManager.RefreshPrivilegeUsedTimes(maxTimesId,10)--记录抽卡次数 - if itemId == 16 then - PrivilegeManager.RefreshPrivilegeUsedTimes(YaojingCallPrivilegeId,10)--记录妖晶抽卡次数 + local recruitTen = function() + RecruitManager.RecruitRequest(this.recruitType, function(msg) + PrivilegeManager.RefreshPrivilegeUsedTimes(maxTimesId,10)--记录抽卡次数 + if itemId == 16 then + PrivilegeManager.RefreshPrivilegeUsedTimes(YaojingCallPrivilegeId,10)--记录妖晶抽卡次数 + end + UIManager.OpenPanel(UIName.PokemonSingleResultPanel,this.recruitType,msg.drop,nil,recType) + --CheckRedPointStatus(RedPointType.QianKunBox) + end,freeTimesId,itemId,itemNum) + end + local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..recType[2]) + if state==0 and d[1] == 16 then + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,this.recruitType,recruitTen,itemNum) + else + recruitTen() end - UIManager.OpenPanel(UIName.PokemonSingleResultPanel,this.recruitType,msg.drop) - --CheckRedPointStatus(RedPointType.QianKunBox) - end,freeTimesId,itemId,itemNum) end) end @@ -123,13 +133,14 @@ function PokemonSummonTenResultPanel:OnOpen(...) local args = { ... } this.drop=args[1] this.recruitType = args[2] + recType = args[3] this.detailImage:SetActive(true) this.content1:SetActive(false) this.content2:SetActive(false) this.content3:SetActive(true) local d - d = RecruitManager.GetExpendData(this.recruitType) + d = RecruitManager.GetExpendData(this.recruitType) itemId = d[1] itemNum = d[2] this.itemIcon3.sprite=Util.LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua index 56c3910061..9abf68690c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua @@ -44,6 +44,7 @@ function this:OnShow(_parent,...) this.titleText.text=Language[11351] local go=Util.GetGameObject(this.btn,"Go") local var + --点将台抽卡 if _args[1] == RecruitType.Single then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten local d=RecruitManager.GetExpendData(RecruitType.Single) @@ -52,17 +53,17 @@ function this:OnShow(_parent,...) 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.LingShowSingle then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.LingShowTen this.rootText.text = string.format("确认花费%s妖晶进行1次灵兽召唤?",_args[3]) elseif _args[1] == RecruitType.LingShowTen then var = PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.LingShowTen this.rootText.text = string.format("确认花费%s妖晶进行10次灵兽召唤?",_args[3]) - else + else--在主题活动里面的抽卡 local data = ConfigManager.GetConfigData(ConfigName.LotterySetting,_args[1]) - local activityData - if data.LotteryType == 3 then - activityData = ConfigManager.GetConfigData(ConfigName.GlobalActivity,data.ActivityId) + local activityData = ConfigManager.GetConfigData(ConfigName.GlobalActivity,data.ActivityId) + if data.LotteryType == 3 then--限时招募 if activityData.Type == ActivityTypeDef.FindFairy then var = PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen local d = RecruitManager.GetExpendData(data.Id) @@ -71,15 +72,35 @@ function this:OnShow(_parent,...) else this.rootText.text = string.format(Language[12378],d[2]) end - elseif activityData.Type == ActivityTypeDef.QianKunBox then + elseif activityData.Type == ActivityTypeDef.QianKunBox then--乾坤宝盒 var = PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen local d=RecruitManager.GetExpendData(data.Id) - if data.PerCount == 1 then + 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 + elseif data.LotteryType == 10 then--灵兽宝阁 + if activityData.Type == ActivityTypeDef.LingShouBaoGe then + var = PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.BaoGeTen + local d = RecruitManager.GetExpendData(data.Id) + if data.PerCount == 1 then + this.rootText.text = string.format("确认花费%s妖晶进行1次灵兽召唤?",d[2]) + else + this.rootText.text = string.format("确认花费%s妖晶进行10次灵兽召唤?",d[2]) + end + end + elseif data.LotteryType == 11 then--降妖夺宝 + if activityData.Type == ActivityTypeDef.XiangYaoDuoBao then + var = PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.XiangYaoTen + local d = RecruitManager.GetExpendData(data.Id) + if data.PerCount == 1 then + this.rootText.text = string.format("确认花费%s妖晶进行1次降妖夺宝?",d[2]) + else + this.rootText.text = string.format("确认花费%s妖晶进行10次降妖夺宝?",d[2]) + end + end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua index 9045849ff3..fe5a0156a0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua @@ -205,7 +205,7 @@ function this.UpdatePanelData() local recruitOne = function() RecruitManager.RecruitRequest(m.type, function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(maxTimesId,1)--记录抽卡次数 - UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],m.type,bType.Btn1) + UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],m.type,bType.Btn1,{RecruitType.Single,RecruitType.Ten}) end,v.privilegeId) end if state==0 and d[1] ==16 and not isFree then @@ -223,7 +223,7 @@ function this.UpdatePanelData() local recruitTen = function() RecruitManager.RecruitRequest(m.type, function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(maxTimesId,10)--记录抽卡次数 - UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, m.type,bType.Btn10) + UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, m.type,bType.Btn10,{RecruitType.Ten,RecruitType.Ten}) if m.type == 11 then RecruitManager.isTenRecruit = 1 end diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua index 939f2b2d3d..0293be3d56 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua @@ -15,6 +15,7 @@ local timeNum2--第二个特效等待播放的时间 local timeNum3--第三个特效等待播放的时间 local heroData--展示界面需要的单个英雄数据 local type--抽卡类型 +local recruitType={}--前端显示用 抽卡类型 local state --1单抽 2多抽 local index=0 --十连抽索引 local orginLayer @@ -94,9 +95,9 @@ function SingleRecruitPanel:BindEvent() end end,maxTimesId) end - local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten) + local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..recruitType[2]) if state==0 and d[1] == 16 then - UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.Single,recruitOne) + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,type,recruitOne) else recruitOne() end @@ -111,7 +112,7 @@ function SingleRecruitPanel:BindEvent() Util.AddClick(self.jumpBtn, function() isFirst=true self:ClosePanel() - UIManager.OpenPanel(UIName.TenRecruitPanel,heroData,type) + UIManager.OpenPanel(UIName.TenRecruitPanel,heroData,type,recruitType) end) --确定按钮 Util.AddClick(self.goBtn,function() @@ -124,7 +125,7 @@ function SingleRecruitPanel:BindEvent() if index>=LengthOfTable(_heroTable) then isFirst=true self:ClosePanel() - UIManager.OpenPanel(UIName.TenRecruitPanel,heroData,type) + UIManager.OpenPanel(UIName.TenRecruitPanel,heroData,type,recruitType) else self:TenOpenPanel(heroData) end @@ -161,6 +162,7 @@ function SingleRecruitPanel:OnOpen(...) heroData=data[1] type=data[2] state=data[3] + recruitType=data[4] end function SingleRecruitPanel:OnShow() maxTimesId=lotterySetting[type].MaxTimes --特权上限ID diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua index 6385234b79..c802992da7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua @@ -9,6 +9,7 @@ local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig) local type --抽卡类型 +local recruitType={}--前端显示用 抽卡类型 local maxTimesId--特权id上限(今日召唤上限) --初始化组件(用于子类重写) function TenRecruitPanel:InitComponent() @@ -58,13 +59,13 @@ function TenRecruitPanel:BindEvent() PrivilegeManager.RefreshPrivilegeUsedTimes(lotterySetting[type].MoneyTimes,10)--记录妖晶限购抽卡次数 end PrivilegeManager.RefreshPrivilegeUsedTimes(maxTimesId,10)--记录抽卡次数 - UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, type,2) + UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, type,2,recruitType) end,maxTimesId) end - local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten) + local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..recruitType[2]) if state==0 and d[1] == 16 then - UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.Ten,recruitTen) + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,type,recruitTen) else recruitTen() end @@ -97,6 +98,7 @@ function TenRecruitPanel:OnOpen(...) local data = { ... } local _roleDatas = data[1] type=data[2] + recruitType=data[3] for i = 1, #_roleDatas do cardList[i]:OnOpen(_roleDatas[i].id,false,false,-1,self.sortingOrder) local heorConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig,_roleDatas[i].heroId)