diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index c01ca61b25..534b2e8035 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -941,58 +941,60 @@ end --英雄身上魂印属性计算 local function CalculateSoulPrintAddVal(_heroId) - -- local allSoulPrintAddWarPowerVal = 0 - -- local curHeroData = HeroManager.GetSingleHeroData(_heroId) - -- if curHeroData then - -- if (table.nums(curHeroData.soulPrintList) >= 1) then - -- for i = 1, #curHeroData.soulPrintList do - -- LogError(_heroId) - -- local cursoulPrintConfig = equipConfig[curHeroData.soulPrintList[i].equipId] - -- if cursoulPrintConfig then - -- allSoulPrintAddWarPowerVal = allSoulPrintAddWarPowerVal + cursoulPrintConfig.Score - -- end - -- end - -- end - -- end - -- return allSoulPrintAddWarPowerVal - local addAllProVal = {} - local singleHeroProVal,lvProVal,allHeroProVal,specialProVal + local allSoulPrintAddWarPowerVal = 0 local curHeroData = HeroManager.GetSingleHeroData(_heroId) if curHeroData then - if(table.nums(curHeroData.soulPrintList) >= 1) then - for i = 1, #curHeroData.soulPrintList do - local cursoulPrintConfig = equipConfig[curHeroData.soulPrintList[i].equipId] - if cursoulPrintConfig then - --基础属性计算 - local soulPrintPropertyList = cursoulPrintConfig.Property - if soulPrintPropertyList and #soulPrintPropertyList > 0 then - for i,v in pairs(soulPrintPropertyList) do - if(addAllProVal[v[1]]) then - addAllProVal[v[1]]=v[2]+addAllProVal[v[1]] - else - addAllProVal[v[1]]=v[2] - end - end - end - --被动技能计算 - if cursoulPrintConfig.PassiveSkill then - --单体加成 --单体等级限制加成 --团体加成 --减乘 - singleHeroProVal,lvProVal,allHeroProVal,specialProVal = this.CalculatePassiveSkillsValList(WarPowerType.SoulPrint,cursoulPrintConfig.PassiveSkill) - end - end - end - end + if (table.nums(curHeroData.soulPrintList) >= 1) then + for i = 1, #curHeroData.soulPrintList do + -- LogError(_heroId) + local cursoulPrintConfig = equipConfig[curHeroData.soulPrintList[i].equipId] + if cursoulPrintConfig then + allSoulPrintAddWarPowerVal = allSoulPrintAddWarPowerVal + cursoulPrintConfig.Score + end + end + end end - if singleHeroProVal and LengthOfTable(singleHeroProVal) > 0 then - for i,v in pairs(singleHeroProVal) do - if addAllProVal[i] then - addAllProVal[i] = addAllProVal[i] + v - else - addAllProVal[i] = v - end - end - end - return addAllProVal,lvProVal,allHeroProVal,specialProVal + return allSoulPrintAddWarPowerVal + + + -- local addAllProVal = {} + -- local singleHeroProVal,lvProVal,allHeroProVal,specialProVal + -- local curHeroData = HeroManager.GetSingleHeroData(_heroId) + -- if curHeroData then + -- if(table.nums(curHeroData.soulPrintList) >= 1) then + -- for i = 1, #curHeroData.soulPrintList do + -- local cursoulPrintConfig = equipConfig[curHeroData.soulPrintList[i].equipId] + -- if cursoulPrintConfig then + -- --基础属性计算 + -- local soulPrintPropertyList = cursoulPrintConfig.Property + -- if soulPrintPropertyList and #soulPrintPropertyList > 0 then + -- for i,v in pairs(soulPrintPropertyList) do + -- if(addAllProVal[v[1]]) then + -- addAllProVal[v[1]]=v[2]+addAllProVal[v[1]] + -- else + -- addAllProVal[v[1]]=v[2] + -- end + -- end + -- end + -- --被动技能计算 + -- if cursoulPrintConfig.PassiveSkill then + -- --单体加成 --单体等级限制加成 --团体加成 --减乘 + -- singleHeroProVal,lvProVal,allHeroProVal,specialProVal = this.CalculatePassiveSkillsValList(WarPowerType.SoulPrint,cursoulPrintConfig.PassiveSkill) + -- end + -- end + -- end + -- end + -- end + -- if singleHeroProVal and LengthOfTable(singleHeroProVal) > 0 then + -- for i,v in pairs(singleHeroProVal) do + -- if addAllProVal[i] then + -- addAllProVal[i] = addAllProVal[i] + v + -- else + -- addAllProVal[i] = v + -- end + -- end + -- end + -- return addAllProVal,lvProVal,allHeroProVal,specialProVal end --英雄身上宝器属性计算 local function CalculateEquipTreaSureAddVal(_heroId) @@ -1583,7 +1585,8 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt -- end --end --魂印的属性加成 - local singleHeroSoulPrintProVal,lvSoulPrintProVal,allHeroSoulPrintProVal,specialSoulPrintProVal = CalculateSoulPrintAddVal(curHeroData.dynamicId) + -- local singleHeroSoulPrintProVal,lvSoulPrintProVal,allHeroSoulPrintProVal,specialSoulPrintProVal = CalculateSoulPrintAddVal(curHeroData.dynamicId) + local allSoulPrintAddWarPowerVal = CalculateSoulPrintAddVal(curHeroData.dynamicId) -- LogError("魂印的单体属性加成 "..allSoulPrintAddWarPowerVal) --宝器加成 宝器本身属性 + 宝器激活的强化共鸣 和 精炼共鸣 local equipTreasureAddPro = CalculateEquipTreaSureAddVal(curHeroData.dynamicId) @@ -1627,19 +1630,19 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt this.DoubleTableCompound(allAddProVal, allPokemonPeiJianAddPro) this.DoubleTableCompound(allAddProVal, guildSkillAllProAdd) this.DoubleTableCompound(allAddProVal, falismanSingleHeroProVal) - this.DoubleTableCompound(allAddProVal,singleHeroSoulPrintProVal) + -- this.DoubleTableCompound(allAddProVal,singleHeroSoulPrintProVal) this.DoubleTableCompound(allAddProVal, playerDcorateAdd) this.DoubleTableCompound(allAddProVal, heroSkillSingleHeroProVal) this.DoubleTableCompound(allAddProVal, equipTreasureAddPro) this.DoubleTableCompound(allAddProVal, vipAddPro) --100等级所有属性合并 this.DoubleTableCompound(lvProVal, falismanLvProVal) - this.DoubleTableCompound(lvProVal,lvSoulPrintProVal) + -- this.DoubleTableCompound(lvProVal,lvSoulPrintProVal) this.DoubleTableCompound(lvProVal, heroSkillLvProVal) --团体所有属性合并 if not _isAllHeroProVal then this.DoubleTableCompound(allHeroProVal, falismanAllHeroProVal) - this.DoubleTableCompound(allHeroProVal,allHeroSoulPrintProVal) + -- this.DoubleTableCompound(allHeroProVal,allHeroSoulPrintProVal) this.DoubleTableCompound(allHeroProVal, heroSkillAllHeroProVal) this.DoubleTableCompound(allHeroProVal, teamAddPro) end @@ -1650,7 +1653,7 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt -- end --4公式特殊(减乘)所有属性加成 this.DoubleTableCompound(specialProVal, falismanSpecialProVal) - this.DoubleTableCompound(specialProVal,specialSoulPrintProVal) + -- this.DoubleTableCompound(specialProVal,specialSoulPrintProVal) this.DoubleTableCompound(specialProVal, heroSkillSpecialProVal) --100等级所有属性合并 local forNum = curLvNum - 100 @@ -1766,10 +1769,10 @@ curHeroData.MLSproList={} if _type == 1 then --最后加魂印战力 allAddProVal[HeroProType.WarPower] = - allEquipScore + CalculateWarForce(allAddProVal) + allEquipScore + CalculateWarForce(allAddProVal) + allSoulPrintAddWarPowerVal elseif _type == 2 then allAddProVal[HeroProType.WarPower] = - allEquipScore + CalculateWarForce(allAddProVal) + allEquipScore + CalculateWarForce(allAddProVal) + allSoulPrintAddWarPowerVal --最后加魂印战力 end --for i, v in pairs(allAddProVal) do