diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua b/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua index 8e172edbce..f3abd1a6c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua @@ -191,23 +191,36 @@ Hero_Prop_Func = { --LogError("equip id============================ id=="..id.." value=="..value) if id~=0 and id~=nil then if addAllProVal[id] then - addAllProVal[id] = addAllProVal[id] + value + if potencyAdd>0 and propertyConfig[id].Style == 1 then + addAllProVal[id] = addAllProVal[id] + math.floor(value*(1+potencyAdd)+0.5) + else + addAllProVal[id] = addAllProVal[id] + value + end + else - addAllProVal[id] = value - end - if propertyConfig[id].Style == 1 then--摘星阁加持 - --摘星阁加成先注释 - --addAllProVal[id] = addAllProVal[id] + math.ceil(addAllProVal[id] * HomeLandManager.GetHeroEquipPropAdd(_heroData.dId,curEquip.position)/10000) - --英雄潜能加成 - --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]) + if potencyAdd>0 and propertyConfig[id].Style == 1 then + addAllProVal[id] = math.floor(value*(1+potencyAdd)+0.5) + else + addAllProVal[id] = value + end + end + -- if propertyConfig[id].Style == 1 then--摘星阁加持 + -- --摘星阁加成先注释 + -- --addAllProVal[id] = addAllProVal[id] + math.ceil(addAllProVal[id] * HomeLandManager.GetHeroEquipPropAdd(_heroData.dId,curEquip.position)/10000) + -- --英雄潜能加成 + -- --LogError("addAllProVal[id]================================"..addAllProVal[id].." curEquip.potencyAdd=="..potencyAdd) + -- addAllProVal[id] = math.floor(value*(1+potencyAdd)+0.5) --+ math.ceil(addAllProVal[id] * HomeLandManager.GetHeroEquipPropAdd(_heroData.dId,curEquip.position)/10000) + -- --LogError("addAllProVal[id]后 ================================"..addAllProVal[id]) + -- end end end end end + -- for k, v in pairs(addAllProVal) do + -- LogError("k==============="..k.." v=========="..v) + -- end --屏蔽装备套装属性 -- if equipSuit and #equipSuit > 0 then -- for i, v in ipairs(equipSuit) do