From 5894babbf07ad8b50ceb3b24c1f41c73982982c1 Mon Sep 17 00:00:00 2001 From: jiaoyangna <17610272109@lianjingshidai.com> Date: Thu, 23 Jul 2020 16:26:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E9=9B=84=E7=8C=AE=E7=A5=AD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Data/ConfigData.lua | 1 + Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua index da58429fa4..fef6baa1a3 100644 --- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua +++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua @@ -156,6 +156,7 @@ ConfigName = { ArenaBattleReward = "ArenaBattleReward", RaceTowerConfig = "RaceTowerConfig", RaceTowerRewardConfig = "RaceTowerRewardConfig", + HeroSacrifice = "HeroSacrifice", } require "Framework/GameDataBase" diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index c52ff35341..25c994c4f6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2164,18 +2164,18 @@ function this.GetHeroReturnItems(selectHeroData, type) end else if v.breakId > 0 then - local heroRankUpConfig = ConfigManager.GetConfigData(ConfigName.HeroRankupConfig, v.breakId) + local heroRankUpConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroSacrifice,"Type",2,"Key",v.breakId) if heroRankUpConfig then - local sumConsume = heroRankUpConfig.SumConsume + local sumConsume = heroRankUpConfig.Value for i = 1, #sumConsume do table.insert(ShowItemlist, {sumConsume[i][1], sumConsume[i][2] * specificValue}) end end end if v.upStarId > 0 then - local heroRankUpConfig = ConfigManager.GetConfigData(ConfigName.HeroRankupConfig, v.upStarId) + local heroRankUpConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroSacrifice,"Type",1,"Key",v.upStarId) if heroRankUpConfig then - local sumConsume = heroRankUpConfig.SumConsume + local sumConsume = heroRankUpConfig.Value for i = 1, #sumConsume do table.insert(ShowItemlist, {sumConsume[i][1], sumConsume[i][2] * specificValue}) end