diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index cb8899029a..5466873d0e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -15,6 +15,7 @@ local pinjieImage={"r_hero_pinjiebiao_01","r_hero_pinjiebiao_02"} --该死的品 local orginLayer2 = 0 local orginLayer = 0 +local formationHeroNum = nil --初始化组件(用于子类重写) function RoleInfoPopup:InitComponent() @@ -151,6 +152,7 @@ function RoleInfoPopup:OnOpen(...) curHeroData = arg[1] this.isOther = arg[2] choosedList = arg[3] or nil + formationHeroNum = arg[4] or nil end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) @@ -267,9 +269,9 @@ function this.RoleInfo1() if choosedList then --local formationList = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL) 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 - allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false) + allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false,nil,nil,false,{},formationHeroNum) end end this.atk.text = allAddProVal[HeroProType.Attack]