Merge branch 'china/dev' into china/test
commit
3ebe1d8d04
|
@ -390,7 +390,9 @@ function this.SetScrollPre(root,data)
|
||||||
local pos=this.GetPos()--位置
|
local pos=this.GetPos()--位置
|
||||||
local oldPower = HeroManager.GetSingleHeroData(curHeroData.dynamicId).warPower
|
local oldPower = HeroManager.GetSingleHeroData(curHeroData.dynamicId).warPower
|
||||||
UIManager.OpenPanel(UIName.GodPrintPopUp,1,curHeroData.dynamicId,data.id,pos,function()
|
UIManager.OpenPanel(UIName.GodPrintPopUp,1,curHeroData.dynamicId,data.id,pos,function()
|
||||||
|
if curHeroData.dynamicId then
|
||||||
PopupTipPanel.ShowTip(Language[11526])
|
PopupTipPanel.ShowTip(Language[11526])
|
||||||
|
end
|
||||||
this.RefreshShow()
|
this.RefreshShow()
|
||||||
--对比战力并更新战力值 播放战力变更动画
|
--对比战力并更新战力值 播放战力变更动画
|
||||||
HeroManager.CompareWarPower1(curHeroData.dynamicId,oldPower)
|
HeroManager.CompareWarPower1(curHeroData.dynamicId,oldPower)
|
||||||
|
@ -491,7 +493,10 @@ function this.GetCurHeroSoulPrintState(id)
|
||||||
for k=1,#curHeroData.godPrintList do
|
for k=1,#curHeroData.godPrintList do
|
||||||
local _id=curHeroData.godPrintList[k].equipId
|
local _id=curHeroData.godPrintList[k].equipId
|
||||||
|
|
||||||
if equipConfig[_id].SuiteID==equipConfig[id].SuiteID then
|
-- if equipConfig[_id].SuiteID==equipConfig[id].SuiteID then
|
||||||
|
-- return true
|
||||||
|
-- end
|
||||||
|
if equipConfig[_id].Id==equipConfig[id].Id then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -93,7 +93,10 @@ function GodPrintPopUp:BindEvent()
|
||||||
end)
|
end)
|
||||||
--提升品阶
|
--提升品阶
|
||||||
Util.AddClick(self.upStarBtn, function()
|
Util.AddClick(self.upStarBtn, function()
|
||||||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.GodPrintUp,soulId,pos,heroId,callback)
|
if curType~=2 then
|
||||||
|
heroId=nil
|
||||||
|
end
|
||||||
|
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.GodPrintUp,soulId,pos,heroId,nil)
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
--穿戴
|
--穿戴
|
||||||
|
@ -103,6 +106,7 @@ function GodPrintPopUp:BindEvent()
|
||||||
if curHeroData and curHeroData.godPrintList and #curHeroData.godPrintList > 0 then
|
if curHeroData and curHeroData.godPrintList and #curHeroData.godPrintList > 0 then
|
||||||
for i = 1, #curHeroData.godPrintList do
|
for i = 1, #curHeroData.godPrintList do
|
||||||
if curHeroData.godPrintList[i].equipId == soulId then
|
if curHeroData.godPrintList[i].equipId == soulId then
|
||||||
|
LogError("11111111111")
|
||||||
PopupTipPanel.ShowTip(Language[11524])
|
PopupTipPanel.ShowTip(Language[11524])
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue