diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua b/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua index 8d8bd49717..4504e02462 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua @@ -182,12 +182,12 @@ Hero_Prop_Func = { for i = 1, #equipIdList do local curEquip = _heroData.equipList[i] local potencyAdd=HeroManager.GetHeroPotencyAddByType(curHeroData.dId,curEquip.position) - LogError("装备 potencyAdd==================="..potencyAdd) + --LogError("装备 potencyAdd==================="..potencyAdd) if curEquip then for index, prop in ipairs(curEquip.mainAttribute) do local id = prop.propertyId local value = prop.propertyValue - LogError("equip id============================ id=="..id.." value=="..value) + --LogError("equip id============================ id=="..id.." value=="..value) if id~=0 and id~=nil then if addAllProVal[id] then addAllProVal[id] = addAllProVal[id] + value @@ -198,27 +198,28 @@ Hero_Prop_Func = { --摘星阁加成先注释 --addAllProVal[id] = addAllProVal[id] + math.ceil(addAllProVal[id] * HomeLandManager.GetHeroEquipPropAdd(_heroData.dId,curEquip.position)/10000) --英雄潜能加成 - LogError("addAllProVal[id]================================"..addAllProVal[id].." curEquip.potencyAdd=="..potencyAdd) + --LogError("addAllProVal[id]================================"..addAllProVal[id].." curEquip.potencyAdd=="..potencyAdd) addAllProVal[id] = math.floor(addAllProVal[id]*(1+potencyAdd)+0.5) --+ math.ceil(addAllProVal[id] * HomeLandManager.GetHeroEquipPropAdd(_heroData.dId,curEquip.position)/10000) - LogError("addAllProVal[id]后 ================================"..addAllProVal[id]) + --LogError("addAllProVal[id]后 ================================"..addAllProVal[id]) end end end end end - if equipSuit and #equipSuit > 0 then - for i, v in ipairs(equipSuit) do - local curSuitConfig = equipsuite[i] - local curProId = equipSuit[i][2][2] - local curProVal = equipSuit[i][2][3] - if addAllProVal[curProId] then - addAllProVal[curProId] = addAllProVal[curProId] + curProVal - else - addAllProVal[curProId] = curProVal - end - end - end + --屏蔽装备套装属性 + -- if equipSuit and #equipSuit > 0 then + -- for i, v in ipairs(equipSuit) do + -- local curSuitConfig = equipsuite[i] + -- local curProId = equipSuit[i][2][2] + -- local curProVal = equipSuit[i][2][3] + -- if addAllProVal[curProId] then + -- addAllProVal[curProId] = addAllProVal[curProId] + curProVal + -- else + -- addAllProVal[curProId] = curProVal + -- end + -- end + -- end end return addAllProVal end,