Merge remote-tracking branch 'origin/china/dev' into china/test
commit
c61f3eec6f
|
@ -246,7 +246,6 @@ function LingShouBaoGe:refreshBtnShow()
|
||||||
end
|
end
|
||||||
|
|
||||||
function LingShouBaoGe:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,freeTimesId,recruitType)
|
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
|
local num = id%2 == 0 and 1 or 10
|
||||||
--是否超过每日最大上限
|
--是否超过每日最大上限
|
||||||
if PrivilegeManager.GetPrivilegeRemainValue(RecruitMaxtimesId) < num then
|
if PrivilegeManager.GetPrivilegeRemainValue(RecruitMaxtimesId) < num then
|
||||||
|
@ -260,7 +259,7 @@ function LingShouBaoGe:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,freeTim
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if itemId == 16 and state == 0 then
|
if itemId == 16 and state == 0 then
|
||||||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,self.tenRecruit.Id,
|
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,id,
|
||||||
function()
|
function()
|
||||||
RecruitManager.RecruitRequest(id,function(msg)
|
RecruitManager.RecruitRequest(id,function(msg)
|
||||||
PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,num)
|
PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,num)
|
||||||
|
|
|
@ -105,7 +105,7 @@ function IncarnationPanel:BindEvent()
|
||||||
local singData = {}
|
local singData = {}
|
||||||
singData.title = ""
|
singData.title = ""
|
||||||
singData.pro = {}
|
singData.pro = {}
|
||||||
singData.tip = string.format("说明:每获得一种化身,全体神将获得如下属性加成:%s",IncarnationManager.SingleIncarnationProDes)
|
singData.tip = string.format("<size=30>说明:每获得一种化身,全体神将获得如下属性加成:\n%s</size>",IncarnationManager.SingleIncarnationProDes)
|
||||||
table.insert(data,singData)
|
table.insert(data,singData)
|
||||||
-- for i = 1 ,#data do
|
-- for i = 1 ,#data do
|
||||||
-- LogGreen("data[i]:"..data[i].title.." #pro:"..#data[i].pro)
|
-- LogGreen("data[i]:"..data[i].title.." #pro:"..#data[i].pro)
|
||||||
|
|
Loading…
Reference in New Issue