From 07adb6916563d5a171fd2cd72bf5096de2af2c14 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 10 Mar 2021 18:03:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Hero/HeroManager.lua | 3 ++- .../~Lua/Modules/MonsterCamp/MonsterCampManager.lua | 13 +++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 5e0fef49fe..1d48303f59 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -637,12 +637,12 @@ function this.UpdateHeroSingleSoulPrint(heroDId, hasEquipSoulPrintId) end --获取单个英雄数据 function this.GetSingleHeroData(heroDId) + LogGreen("heroDId"..tostring(heroDId)) if heroDatas[heroDId] then return heroDatas[heroDId] elseif ExpeditionManager.GetSingleHeroData(heroDId) then return ExpeditionManager.GetSingleHeroData(heroDId) elseif MonsterCampManager.GetSingleHeroData(heroDId) then - LogGreen(heroDId) return MonsterCampManager.GetSingleHeroData(heroDId) else return nil @@ -1655,6 +1655,7 @@ end --_type==1 计算当前英雄的所有属性 _type==2 根据_heroDid之后_breakId传过来的值进行计算 _isAllHeroProVal==true 团体加成综合 用字段_allHeroProVal function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upStarId, _isAllHeroProVal, _allHeroProVal,formationHeroNum) local curHeroData = this.GetSingleHeroData(_heroDid) or _heroDid + LogGreen("curHeroData:"..tostring(curHeroData).." curHeroData.dynamicId:"..tostring(curHeroData.dynamicId)) local curLvNum = curHeroData.lv -- heroLevelConfig[curHeroData.lv].CharacterLevelPara --local speedNum = heroLevelConfig[curHeroData.lv].SpeedLevelPara --if _type == 1 then diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua index 999143e219..b645ae671c 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua @@ -418,7 +418,7 @@ function this.GetFriendHelpHeros(trailType,func) local tempdata = {} tempdata.player = v tempdata.hero = this.UpdateHeroDatas(v.hero) - LogGreen("好友的助战数据 v.trailType:"..v.trailType.." v.hero.id:"..v.hero.id) + LogGreen("好友的助战数据 v.trailType:"..v.trailType.." v.hero.id:"..v.hero.id .. " v.hero.dynamicId:" ..v.hero.id) table.insert(this.friendHelpHeros[v.trailType],tempdata) end if func then @@ -530,9 +530,14 @@ end --获取一个英雄信息 function this.GetSingleHeroData(did) - for k,v in pairs(this.friendHelpHero) do - if v and v.hero and v.hero.dynamicId == did then - return v.hero + if not this.friendHelpHeros then + this.friendHelpHeros = {} + end + for _,v in pairs(this.friendHelpHeros) do + for i = 1 ,#v do + if v[i] and v[i].hero and v[i].hero.dynamicId == did then + return v[i].hero + end end end return nil