resolve hero commit
parent
0a19c1dd82
commit
4ab47f9a01
|
@ -2172,17 +2172,22 @@ function this.GetHeroReturnItems(selectHeroData, type)
|
||||||
--val=itemConfig.ResolveReward+heroLevelConfig.SumConsume else val=HeroRankupConfig.SumConsume+heroLevelConfig.SumConsume
|
--val=itemConfig.ResolveReward+heroLevelConfig.SumConsume else val=HeroRankupConfig.SumConsume+heroLevelConfig.SumConsume
|
||||||
--1裸角色卡(没有突破过的角色卡)熔炼后返还的材料=当前等级返还升级材料+item表返还材料
|
--1裸角色卡(没有突破过的角色卡)熔炼后返还的材料=当前等级返还升级材料+item表返还材料
|
||||||
--2有过突破的卡 =当前等级返还升级材料+突破表返还材料+升星返还材料
|
--2有过突破的卡 =当前等级返还升级材料+突破表返还材料+升星返还材料
|
||||||
|
local curHeroData = heroDatas[i]
|
||||||
|
if not curHeroData then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
local ShowItemlist = {}
|
local ShowItemlist = {}
|
||||||
|
|
||||||
local pId
|
local pId
|
||||||
if v.breakId == 0 then
|
if curHeroData.breakId == 0 then
|
||||||
pId=0
|
pId=0
|
||||||
else
|
else
|
||||||
pId= heroRankUpConfig[v.breakId].Phase[2]
|
pId= heroRankUpConfig[curHeroData.breakId].Phase[2]
|
||||||
end
|
end
|
||||||
|
|
||||||
if pId == 0 and v.upStarId == 0 then
|
if pId == 0 and curHeroData.upStarId == 0 then
|
||||||
local rewardGroupId = tonumber(itemConfig[v.id].ResolveReward)
|
local rewardGroupId = tonumber(itemConfig[curHeroData.id].ResolveReward)
|
||||||
if rewardGroupId and rewardGroup[rewardGroupId] then
|
if rewardGroupId and rewardGroup[rewardGroupId] then
|
||||||
local showItem = rewardGroup[rewardGroupId].ShowItem
|
local showItem = rewardGroup[rewardGroupId].ShowItem
|
||||||
if showItem and LengthOfTable(showItem) > 0 then
|
if showItem and LengthOfTable(showItem) > 0 then
|
||||||
|
@ -2200,11 +2205,11 @@ function this.GetHeroReturnItems(selectHeroData, type)
|
||||||
table.insert(ShowItemlist, {sumConsume[i][1], sumConsume[i][2] * specificValue})
|
table.insert(ShowItemlist, {sumConsume[i][1], sumConsume[i][2] * specificValue})
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
LogRed("pId:"..pId.." v.breakId:"..v.breakId.." v.id:"..v.id)
|
LogRed("pId:"..pId.." curHeroData.breakId:"..curHeroData.breakId.." curHeroData.id:"..curHeroData.id)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if v.star > 0 then
|
if curHeroData.star > 1 then
|
||||||
local heroRankUpConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroSacrifice,"Type",1,"Key",v.star)
|
local heroRankUpConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroSacrifice,"Type",1,"Key",curHeroData.star)
|
||||||
if heroRankUpConfig then
|
if heroRankUpConfig then
|
||||||
local sumConsume = heroRankUpConfig.Value
|
local sumConsume = heroRankUpConfig.Value
|
||||||
for i = 1, #sumConsume do
|
for i = 1, #sumConsume do
|
||||||
|
@ -2212,20 +2217,34 @@ function this.GetHeroReturnItems(selectHeroData, type)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
LogRed("v.star :"..v.star)
|
LogRed("curHeroData.star :"..curHeroData.star)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
local rewardShowStr2 = {}
|
local temp = {}
|
||||||
rewardShowStr2 = ConfigManager.GetConfigData(ConfigName.HeroLevelConfig, v.lv).SumConsume
|
if curHeroData.talismanList > 1 then
|
||||||
if rewardShowStr2 then
|
local temp1 =tonumber(ConfigManager.GetConfigData(ConfigName.HeroConfig, curHeroData.id).EquipTalismana[2])
|
||||||
for i = 1, #rewardShowStr2 do
|
LogRed(temp1)
|
||||||
if rewardShowStr2[i] and rewardShowStr2[i][1] then
|
for i = 1, curHeroData.talismanList - 1 do
|
||||||
table.insert(ShowItemlist, {rewardShowStr2[i][1], rewardShowStr2[i][2] * specificValue})
|
temp = ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana,"TalismanaId",temp1,"Level",i).RankupBasicMaterial
|
||||||
|
for i = 1,#temp do
|
||||||
|
table.insert(ShowItemlist, {temp[i][1], temp[i][2] * specificValue})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if curHeroData.lv > 1 then
|
||||||
|
local rewardShowStr2 = {}
|
||||||
|
rewardShowStr2 = ConfigManager.GetConfigData(ConfigName.HeroLevelConfig, curHeroData.lv).SumConsume
|
||||||
|
if rewardShowStr2 then
|
||||||
|
for i = 1, #rewardShowStr2 do
|
||||||
|
if rewardShowStr2[i] and rewardShowStr2[i][1] then
|
||||||
|
table.insert(ShowItemlist, {rewardShowStr2[i][1], rewardShowStr2[i][2] * specificValue})
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
this.GetHeroReturnItems2(ShowItemlist, allRewardData)
|
this.GetHeroReturnItems2(ShowItemlist, allRewardData)
|
||||||
end
|
end
|
||||||
|
|
||||||
local dropList = {}
|
local dropList = {}
|
||||||
for k, v in pairs(allRewardData) do
|
for k, v in pairs(allRewardData) do
|
||||||
v.num = math.floor(v.num)
|
v.num = math.floor(v.num)
|
||||||
|
|
Loading…
Reference in New Issue