Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
9965f8e079
|
@ -79,19 +79,16 @@ function RewardGemSingleShowPopup:BindEvent()
|
||||||
end)
|
end)
|
||||||
Util.AddClick(this.btnJump, function()--合成
|
Util.AddClick(this.btnJump, function()--合成
|
||||||
if this.openType == 2 then--命格界面中
|
if this.openType == 2 then--命格界面中
|
||||||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.GemCompound,itemSid,this.position,function ()
|
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.GemCompound,itemSid,this.position)
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
|
||||||
elseif this.openType == 1 then--背包中
|
elseif this.openType == 1 then--背包中
|
||||||
local num = BagManager.GetTotalItemNum(itemSid)
|
local num = BagManager.GetTotalItemNum(itemSid)
|
||||||
if num/gemConfig[itemSid].UpgradeNum >= 2 then
|
if num/gemConfig[itemSid].UpgradeNum >= 2 then
|
||||||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.GemMoreCom,itemSid,num,function ()
|
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.GemMoreCom,itemSid,num)
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
|
||||||
else
|
else
|
||||||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.GemCompound,itemSid,nil,function ()
|
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.GemCompound,itemSid,nil)
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
Loading…
Reference in New Issue