diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua index 6f0620345e..c6658acae2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua @@ -1024,8 +1024,8 @@ function this.GetMapTeamPower() Log("heroData is not exist! error Did:" .. curFormation[i].heroId) return end - - if curFormation[i].allProVal[2] > 0 then + local hp = FormationManager.GetFormationHeroHp(FormationTypeDef.FORMATION_ENDLESS_MAP, curFormation[i].heroId) + if hp and hp > 0 then powerNum = powerNum + HeroPowerManager.GetHeroPower(heroData.dynamicId) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua index 127fb34bcb..35dfb7e234 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua @@ -69,7 +69,7 @@ end function this.Init(pos,num) local u, v = Map_Pos2UV(pos) --(角色身上的数据, 主要是位置信息) - this.leaderMapData = TileMapView.GetMapData() + this.leaderMapData = TileMapView.GetMapData():GetMapData(u, v) MapManager.curMapBornPos = Map_UV2Pos(this.leaderMapData.u, this.leaderMapData.v) -- LogRed("NUM"..num)