神将合成bug

dev_chengFeng
zhangqiang 2020-08-26 19:44:29 +08:00
parent f47dc8f441
commit 86361419cc
2 changed files with 16 additions and 8 deletions

View File

@ -84,6 +84,7 @@ end
function this.HeroCompoundBtnClick(_btn,_curIndex)
curIndex = _curIndex
this.SetBtnSelect(_btn)
curSelectHeroConfig = nil
this.ShowCurrPosHeroCompound()
end
--显示当前阵营的英雄
@ -270,6 +271,7 @@ function this.SetShowHeroListData(upStarConsumeMaterial,curHeroList,isFirstPos)-
end
return curList
end
--升星选择祭品后刷新界面
function this.AutoSelectUpStarHeroList(_curUpStarData)
local curUpStarData= _curUpStarData.upStarMaterialsData
@ -570,7 +572,7 @@ function this.GetAllHeroCompoundData(index)
if curSelectHeroConfig and curSelectHeroConfig.config and curSelectHeroConfig.config.Id == curHeroCompoundData.config.Id then
curSelectHeroConfig = curHeroCompoundData
end
LogGreen("curHeroCompoundData.needNum "..curHeroCompoundData.needNum.." "..LengthOfTable(curHeroCompoundData.haveHeroList2))
-- LogGreen("curHeroCompoundData.needNum "..curHeroCompoundData.needNum.." "..LengthOfTable(curHeroCompoundData.haveHeroList2))
table.insert(allCompoundHeroConFigData,curHeroCompoundData)
end
end

View File

@ -1523,27 +1523,27 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
heroSkillSingleHeroProVal, heroSkillLvProVal, heroSkillAllHeroProVal, heroSkillSpecialProVal =
CalculateHeroPassiveSkillProAddVal(_type, curHeroData.dynamicId, _breakId, _upStarId)
end
--if heroSkillSingleHeroProVal and LengthOfTable(heroSkillSingleHeroProVal) > 0 then
-- if heroSkillSingleHeroProVal and LengthOfTable(heroSkillSingleHeroProVal) > 0 then
-- for i, v in pairs(heroSkillSingleHeroProVal) do
-- if v > 0 then
-- LogError("英雄被动技的单体属性加成 "..i.." "..v)
-- end
-- end
--end
--if heroSkillLvProVal and LengthOfTable(heroSkillLvProVal) > 0 then
-- end
-- if heroSkillLvProVal and LengthOfTable(heroSkillLvProVal) > 0 then
-- for i, v in pairs(heroSkillLvProVal) do
-- if v > 0 then
-- LogError("英雄被动技的等极限值属性加成 "..i.." "..v)
-- end
-- end
--end
--if heroSkillAllHeroProVal and LengthOfTable(heroSkillAllHeroProVal) > 0 then
-- end
-- if heroSkillAllHeroProVal and LengthOfTable(heroSkillAllHeroProVal) > 0 then
-- for i, v in pairs(heroSkillAllHeroProVal) do
-- if v > 0 then
-- LogError("英雄被动技的团体属性加成 "..i.." "..v)
-- end
-- end
--end
-- end
--法宝的属性加成 falismanProAdd
local falismanSingleHeroProVal, falismanLvProVal, falismanAllHeroProVal, falismanSpecialProVal = {}, {}, {}, {}
if _type == 1 then
@ -2904,7 +2904,13 @@ function this.ByCompoundHeroGetAllHeros()
local downSoryHeroList = {}
for i, v in pairs(heroDatas) do
if v.star == 4 or v.star == 5 or v.star == 3 then--四星 五星 才能加 3星 是狗粮
v.isFormation = ""
if #v.formationList ~= 0 then
local text = ""
for index, value in ipairs(v.formationList) do
text = HeroManager.GetHeroFormationStr(index)
end
v.isFormation = text
end
table.insert(upSortHeroList,v)
table.insert(downSoryHeroList,v)
end