diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua index 718937aea7..ade48e1f26 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua @@ -112,6 +112,9 @@ function this.SingleHeroDataShow(_go, _heroData) Util.GetGameObject(go, "yuanImage"):SetActive(heroData.createtype == 1) --剩余血量 无尽副本才显示 local hpExp = Util.GetGameObject(go, "hpExp") + if not ExpeditionManager.heroInfo[heroData.dynamicId] then + ExpeditionManager.InitHeroHpValue(heroData.dynamicId) + end local heroHp = ExpeditionManager.heroInfo[heroData.dynamicId].remainHp local starGrid = Util.GetGameObject(go, "star") SetHeroStars(starGrid, heroData.star) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua index 269f3d01c2..c8c0054c93 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua @@ -158,7 +158,10 @@ function this.SingleHeroDataShow(_go, _heroData) Util.GetGameObject(go, "yuanImage"):SetActive(heroData.createtype == 1) --剩余血量 无尽副本才显示 local hpExp = Util.GetGameObject(go, "info/hpExp") - local heroHp = ExpeditionManager.heroInfo[heroData.dynamicId].remainHp + if not ExpeditionManager.heroInfo[heroData.dynamicId] then + ExpeditionManager.InitHeroHpValue(heroData.dynamicId) + end + local heroHp = ExpeditionManager.heroInfo[heroData.dynamicId].remainHp local starGrid = Util.GetGameObject(go, "info/star") SetHeroStars(starGrid, heroData.star) this.SetHeroBlood(hpExp, heroHp, go) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua index 8390233793..01f7246d19 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua @@ -595,11 +595,11 @@ end --获取所有英雄信息 function this.GetAllHeroDatas(heros,_lvLimit) local lvLimit = 0 - local allUpZhenHeroList = FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_ENDLESS_MAP) + --local allUpZhenHeroList = FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_ENDLESS_MAP) if _lvLimit then lvLimit = _lvLimit end --local heros = {} for i, v in pairs(heroDatas) do - if v.lv >= lvLimit or allUpZhenHeroList[v.dynamicId] then + if v.lv >= lvLimit then--or allUpZhenHeroList[v.dynamicId] then table.insert(heros,v) end end @@ -610,7 +610,7 @@ end --通过属性筛选英雄 function this.GetHeroDataByProperty(heros,_property,_lvLimit) local lvLimit = 0 - local allUpZhenHeroList = FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_ENDLESS_MAP) + --local allUpZhenHeroList = FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_ENDLESS_MAP) if _lvLimit then lvLimit = _lvLimit end local index = 1 if heros and #heros > 0 then @@ -618,7 +618,7 @@ function this.GetHeroDataByProperty(heros,_property,_lvLimit) end for i, v in pairs(heroDatas) do if v.property == _property then - if v.lv >= lvLimit or allUpZhenHeroList[v.dynamicId] then + if v.lv >= lvLimit then--or allUpZhenHeroList[v.dynamicId] then heros[index] = v index = index + 1 end @@ -626,6 +626,7 @@ function this.GetHeroDataByProperty(heros,_property,_lvLimit) end return heros end + --获取单个英雄数据 function this.GetSingleHeroData(heroDId) if heroDatas[heroDId] then