diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua index 74b5db9193..763ef8421a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua @@ -573,6 +573,7 @@ function this.UpdateHeroDatas(_msgHeroData) this.SetEquipTreasureUpHeroDid(heroData.jewels,heroData.dynamicId) this.SetTalismanLv(heroData.dynamicId,heroData.talismanList) ExpeditionManager.InitHeroHpValue(heroData.dynamicId) + heroData.warPower = HeroManager.CalculateHeroAllProValList(1, heroData, false)[HeroProType.WarPower] --this.SetSoulPrintUpHeroDid(heroData.soulPrintList,heroData.dynamicId) --this.GetSingleProScoreVal() end diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index d3a473eaf8..07c0104dbb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -67,7 +67,7 @@ function this.InitHeroData(_msgHeroList) end this.UpdateHeroLvEnd() --赋值每个星级的英雄等级上限 - this.UpdateHeroPower() + -- this.UpdateHeroPower() --赋值英雄战力 end @@ -155,6 +155,7 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook) if isFindHandBook then --图鉴 PlayerManager.SetHeroHandBookListData(heroData.id, heroData.star) end + heroData.warPower = this.CalculateHeroAllProValList(1, heroData.dynamicId, false)[HeroProType.WarPower] --远征初始化血量 --ExpeditionManager.InitHeroHpValue(heroData) end diff --git a/data_execl/base_data/ActivityRewardConfig.xlsx b/data_execl/base_data/ActivityRewardConfig.xlsx index 6e184d5ffa..cd8cccfb3c 100644 Binary files a/data_execl/base_data/ActivityRewardConfig.xlsx and b/data_execl/base_data/ActivityRewardConfig.xlsx differ diff --git a/data_execl/base_data/ItemConfig.xlsx b/data_execl/base_data/ItemConfig.xlsx index 7fc8121e15..292f9cf430 100644 Binary files a/data_execl/base_data/ItemConfig.xlsx and b/data_execl/base_data/ItemConfig.xlsx differ diff --git a/data_execl/base_data/MazeTreasure.xlsx b/data_execl/base_data/MazeTreasure.xlsx index ca4dbe86cd..6bcbee6952 100644 Binary files a/data_execl/base_data/MazeTreasure.xlsx and b/data_execl/base_data/MazeTreasure.xlsx differ diff --git a/data_execl/base_data/RewardItemConfig.xlsx b/data_execl/base_data/RewardItemConfig.xlsx index 1f8413297e..4e3abf9473 100644 Binary files a/data_execl/base_data/RewardItemConfig.xlsx and b/data_execl/base_data/RewardItemConfig.xlsx differ