Merge branch 'TCX_dev_realOne' into tcx_xiyou_dev

tcx_xiyou_test
wangzhenxing 2023-12-29 16:29:12 +08:00
commit 978462344e
2 changed files with 30 additions and 15 deletions

View File

@ -1360,18 +1360,26 @@ local function CalculateHeroUpEquipsProAddVal(_heroId)
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]
-- LogError("套装激活 curProId "..curProId .." "..curProVal)
if addAllProVal[curProId] then
addAllProVal[curProId] = addAllProVal[curProId] + curProVal
else
addAllProVal[curProId] = curProVal
local curProId
if equipSuit[i] and equipSuit[i][2] and equipSuit[i][2][2] then
curProId = equipSuit[i][2][2]
end
local curProVal
if equipSuit[i] and equipSuit[i][2] and equipSuit[i][2][3] then
curProVal = equipSuit[i][2][3]
end
if curProId and curProVal then
if addAllProVal[curProId] then
addAllProVal[curProId] = addAllProVal[curProId] + curProVal
else
addAllProVal[curProId] = curProVal
end
end
end
end
end
@ -1585,10 +1593,12 @@ end
--英雄身上宝器属性计算
local function CalculateEquipTreaSureAddVal(_heroId)
local addAllProVal = {}
local minLv
local mainRefineLv
local minLv=0
local mainRefineLv=0
local curHeroData = HeroManager.GetSingleHeroData(_heroId)
LogError("_heroId===========================".._heroId)
if curHeroData then
LogError("#curHeroData.jewels > 0=="..#curHeroData.jewels)
if #curHeroData.jewels > 0 then
for i = 1, #curHeroData.jewels do
local did = curHeroData.jewels[i]
@ -1596,6 +1606,9 @@ local function CalculateEquipTreaSureAddVal(_heroId)
EquipTreasureManager.GetSingleTreasureByIdDyn(did) or
ExpeditionManager.GetSingleTreasureByIdDyn(did) or
MonsterCampManager.GetSingleTreasureByIdDyn(did)
if curEuipTreaSureData==nil then
LogError("curEuipTreaSureData==nil")
end
if curEuipTreaSureData then
local curEuipTreaSureConfig = jewelConfig[curEuipTreaSureData.id]
for _, configInfo in ConfigPairs(jewelRankupConfig) do
@ -1644,8 +1657,10 @@ local function CalculateEquipTreaSureAddVal(_heroId)
-- end
-- end
end
if #curHeroData.jewels > 1 then
--取 强化 精炼 最小值
LogError("curEuipTreaSureData.lv=="..curEuipTreaSureData.lv)
if minLv then
if curEuipTreaSureData.lv < minLv then
minLv = curEuipTreaSureData.lv
@ -1660,6 +1675,7 @@ local function CalculateEquipTreaSureAddVal(_heroId)
else
mainRefineLv = curEuipTreaSureData.refineLv
end
LogError("curEuipTreaSureData.refineLv=="..curEuipTreaSureData.refineLv)
end
end
end
@ -1696,6 +1712,7 @@ local function CalculateEquipTreaSureAddVal(_heroId)
end
--
if lvjewelResonanceConfig then
LogError("lvjewelResonanceConfig")
for j = 1, #lvjewelResonanceConfig.Property do
if addAllProVal[lvjewelResonanceConfig.Property[j][1]] then
addAllProVal[lvjewelResonanceConfig.Property[j][1]] =
@ -1707,6 +1724,7 @@ local function CalculateEquipTreaSureAddVal(_heroId)
end
end
if refineLvjewelResonanceConfig then
LogError("refineLvjewelResonanceConfig")
for j = 1, #refineLvjewelResonanceConfig.Property do
if addAllProVal[refineLvjewelResonanceConfig.Property[j][1]] then
addAllProVal[refineLvjewelResonanceConfig.Property[j][1]] =
@ -1721,10 +1739,7 @@ local function CalculateEquipTreaSureAddVal(_heroId)
end
end
end
-- LogError("11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111")
-- for k, v in pairs(addAllProVal) do
-- LogError("111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111宝物 k====="..k.." v=="..v)
-- end
return addAllProVal
end

View File

@ -196,7 +196,7 @@ function this.PlayerInfoRequest(func)
-- 当前波次
MonsterCampManager.SetMonsterCampCurWave(msg.monsterAttackTime)
MonsterCampManager.SetRewardWave(msg.DemonsTrialRewardInfo)
MonsterCampManager. SetFriendHelpHero(msg.helpFightList)
MonsterCampManager.SetFriendHelpHero(msg.helpFightList)
OperatingManager.SetSignInData(msg.SignInInfo)
-- 月卡初始化数据