From c206f6487ea9e8b2ac2d612364dba5f596c700ee Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 2 Nov 2020 10:59:17 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E3=80=91=20=E6=BC=8F=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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]