【灵兽系统】 漏合
parent
8f71eb7672
commit
c206f6487e
|
@ -15,6 +15,7 @@ local pinjieImage={"r_hero_pinjiebiao_01","r_hero_pinjiebiao_02"} --该死的品
|
||||||
|
|
||||||
local orginLayer2 = 0
|
local orginLayer2 = 0
|
||||||
local orginLayer = 0
|
local orginLayer = 0
|
||||||
|
local formationHeroNum = nil
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function RoleInfoPopup:InitComponent()
|
function RoleInfoPopup:InitComponent()
|
||||||
|
|
||||||
|
@ -151,6 +152,7 @@ function RoleInfoPopup:OnOpen(...)
|
||||||
curHeroData = arg[1]
|
curHeroData = arg[1]
|
||||||
this.isOther = arg[2]
|
this.isOther = arg[2]
|
||||||
choosedList = arg[3] or nil
|
choosedList = arg[3] or nil
|
||||||
|
formationHeroNum = arg[4] or nil
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||||
|
@ -267,9 +269,9 @@ function this.RoleInfo1()
|
||||||
if choosedList then
|
if choosedList then
|
||||||
--local formationList = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL)
|
--local formationList = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL)
|
||||||
local allHeroTeamAddProVal = HeroManager.GetAllHeroTeamAddProVal(choosedList,curHeroData.dynamicId)
|
local allHeroTeamAddProVal = HeroManager.GetAllHeroTeamAddProVal(choosedList,curHeroData.dynamicId)
|
||||||
allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false,nil,nil,true,allHeroTeamAddProVal)
|
allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false,nil,nil,true,allHeroTeamAddProVal,formationHeroNum)
|
||||||
else
|
else
|
||||||
allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false)
|
allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false,nil,nil,false,{},formationHeroNum)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
this.atk.text = allAddProVal[HeroProType.Attack]
|
this.atk.text = allAddProVal[HeroProType.Attack]
|
||||||
|
|
Loading…
Reference in New Issue