修复大闹天宫招募带有宝物的英雄会导致登陆卡死的问题,针对装备丢失添加判空操作避免登陆卡死
parent
4c9db13851
commit
e9159cc1ca
|
@ -100,12 +100,12 @@ function this.InitExpeditionData(msg)
|
||||||
--if msg.removesHeroIds then
|
--if msg.removesHeroIds then
|
||||||
-- this.DeleteHeroDatas(msg.removesHeroIds)
|
-- this.DeleteHeroDatas(msg.removesHeroIds)
|
||||||
--end
|
--end
|
||||||
--招募的英雄
|
|
||||||
this.InitHeroDatas(msg.heroList)
|
|
||||||
--装备
|
--装备
|
||||||
this.InitEquipData(msg.equip)
|
this.InitEquipData(msg.equip)
|
||||||
--宝器
|
--宝器
|
||||||
this.InitBaoDatas(msg.soulEquip)
|
this.InitBaoDatas(msg.soulEquip)
|
||||||
|
--招募的英雄
|
||||||
|
this.InitHeroDatas(msg.heroList)
|
||||||
|
|
||||||
--猎妖开启时间
|
--猎妖开启时间
|
||||||
this.startTime = msg.startTime
|
this.startTime = msg.startTime
|
||||||
|
|
|
@ -1069,52 +1069,54 @@ local function CalculateEquipTreaSureAddVal(_heroId)
|
||||||
local curEuipTreaSureData =
|
local curEuipTreaSureData =
|
||||||
EquipTreasureManager.GetSingleTreasureByIdDyn(did) or
|
EquipTreasureManager.GetSingleTreasureByIdDyn(did) or
|
||||||
ExpeditionManager.GetSingleTreasureByIdDyn(did)
|
ExpeditionManager.GetSingleTreasureByIdDyn(did)
|
||||||
local curEuipTreaSureConfig = jewelConfig[curEuipTreaSureData.id]
|
if curEuipTreaSureData then
|
||||||
for _, configInfo in ConfigPairs(jewelRankupConfig) do
|
local curEuipTreaSureConfig = jewelConfig[curEuipTreaSureData.id]
|
||||||
--强化的属性
|
for _, configInfo in ConfigPairs(jewelRankupConfig) do
|
||||||
if
|
--强化的属性
|
||||||
configInfo.PoolID == curEuipTreaSureConfig.LevelupPool and configInfo.Type == 1 and
|
if
|
||||||
configInfo.Level == curEuipTreaSureData.lv
|
configInfo.PoolID == curEuipTreaSureConfig.LevelupPool and configInfo.Type == 1 and
|
||||||
then
|
configInfo.Level == curEuipTreaSureData.lv
|
||||||
for j = 1, #configInfo.Property do
|
then
|
||||||
if addAllProVal[configInfo.Property[j][1]] then
|
for j = 1, #configInfo.Property do
|
||||||
addAllProVal[configInfo.Property[j][1]] =
|
if addAllProVal[configInfo.Property[j][1]] then
|
||||||
addAllProVal[configInfo.Property[j][1]] + configInfo.Property[j][2]
|
addAllProVal[configInfo.Property[j][1]] =
|
||||||
else
|
addAllProVal[configInfo.Property[j][1]] + configInfo.Property[j][2]
|
||||||
addAllProVal[configInfo.Property[j][1]] = configInfo.Property[j][2]
|
else
|
||||||
|
addAllProVal[configInfo.Property[j][1]] = configInfo.Property[j][2]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
--精炼的属性
|
||||||
|
if
|
||||||
|
configInfo.PoolID == curEuipTreaSureConfig.RankupPool and configInfo.Type == 2 and
|
||||||
|
configInfo.Level == curEuipTreaSureData.refineLv
|
||||||
|
then
|
||||||
|
for j = 1, #configInfo.Property do
|
||||||
|
if addAllProVal[configInfo.Property[j][1]] then
|
||||||
|
addAllProVal[configInfo.Property[j][1]] =
|
||||||
|
addAllProVal[configInfo.Property[j][1]] + configInfo.Property[j][2]
|
||||||
|
else
|
||||||
|
addAllProVal[configInfo.Property[j][1]] = configInfo.Property[j][2]
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
--精炼的属性
|
if #curHeroData.jewels > 1 then
|
||||||
if
|
--取 强化 精炼 最小值
|
||||||
configInfo.PoolID == curEuipTreaSureConfig.RankupPool and configInfo.Type == 2 and
|
if minLv then
|
||||||
configInfo.Level == curEuipTreaSureData.refineLv
|
if curEuipTreaSureData.lv < minLv then
|
||||||
then
|
minLv = curEuipTreaSureData.lv
|
||||||
for j = 1, #configInfo.Property do
|
|
||||||
if addAllProVal[configInfo.Property[j][1]] then
|
|
||||||
addAllProVal[configInfo.Property[j][1]] =
|
|
||||||
addAllProVal[configInfo.Property[j][1]] + configInfo.Property[j][2]
|
|
||||||
else
|
|
||||||
addAllProVal[configInfo.Property[j][1]] = configInfo.Property[j][2]
|
|
||||||
end
|
end
|
||||||
end
|
else
|
||||||
end
|
|
||||||
end
|
|
||||||
if #curHeroData.jewels > 1 then
|
|
||||||
--取 强化 精炼 最小值
|
|
||||||
if minLv then
|
|
||||||
if curEuipTreaSureData.lv < minLv then
|
|
||||||
minLv = curEuipTreaSureData.lv
|
minLv = curEuipTreaSureData.lv
|
||||||
end
|
end
|
||||||
else
|
if mainRefineLv then
|
||||||
minLv = curEuipTreaSureData.lv
|
if curEuipTreaSureData.refineLv < mainRefineLv then
|
||||||
end
|
mainRefineLv = curEuipTreaSureData.refineLv
|
||||||
if mainRefineLv then
|
end
|
||||||
if curEuipTreaSureData.refineLv < mainRefineLv then
|
else
|
||||||
mainRefineLv = curEuipTreaSureData.refineLv
|
mainRefineLv = curEuipTreaSureData.refineLv
|
||||||
end
|
end
|
||||||
else
|
|
||||||
mainRefineLv = curEuipTreaSureData.refineLv
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue