diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua index 8ddaca9abc..7c4af36d03 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua @@ -533,17 +533,17 @@ function this.CalculateWarForce(Did) curTreasure = MonsterCampManager.GetSingleTreasureByIdDyn(Did) end if not curTreasure then - curTreasure = ExpeditionManager.GetSingleTreasureByIdDyn(Did) + curTreasure = ExpeditionManager.GetSingleTreasureByIdDyn(Did) end if not curTreasure then - GoodFriendManager.GetSingleTreasureByIdDyn(Did) + curTreasure = GoodFriendManager.GetSingleTreasureByIdDyn(Did) end if curTreasure then - return this.CalculateWarForceBase(curTreasure.id, curTreasure.lv, curTreasure.refineLv, curTreasure.treeLv) + return this.CalculateWarForceBase(curTreasure.id, curTreasure.lv, curTreasure.refineLv, curTreasure.treeLv,curTreasure) end return 0 end -function this.CalculateWarForceBase(sId, lv, rlv, tlv) +function this.CalculateWarForceBase(sId, lv, rlv, tlv,curTreasure) -- LogGreen("sId:"..sId.." lv:"..lv.." rlv:"..rlv.." tlv:"..tlv) local curEuipTreaSureConfig = ConfigManager.GetConfigData(ConfigName.JewelConfig, sId) if curEuipTreaSureConfig then @@ -583,7 +583,7 @@ function this.CalculateWarForceBase(sId, lv, rlv, tlv) configInfo.PoolID == curEuipTreaSureConfig.GodHoodPool and configInfo.Type == 3 and configInfo.Level == tlv then - for j = 1, SacredTreeManager.CulAttri() do + for j = 1, SacredTreeManager.CulAttri(curTreasure) do if addAllProVal[configInfo.Property[j][1]] then addAllProVal[configInfo.Property[j][1]] = addAllProVal[configInfo.Property[j][1]] + configInfo.Property[j][2]