共鸣宝物报错强化修改提交

dev_chengFeng
jiaoyangna 2021-09-13 16:17:38 +08:00
parent 7cff74a295
commit d55dd4c59d
3 changed files with 12 additions and 7 deletions

View File

@ -3747,7 +3747,8 @@ function this.CheckIsUpTreasure(Did,index)
isMax = curEquipData.lv == curEquipData.maxLv
items,isMatEnough = this.GetCostItems(curEquipData,curEquipData.strongConfig)
isMatEnough = isMatEnough and
not (HarmonyManager.IsInfo(curEquipData.upHeroDid) and HarmonyManager.GetSingleAdditions(indexType) ~= -1)
--not (HarmonyManager.IsInfo(curEquipData.upHeroDid) and HarmonyManager.GetSingleAdditions(indexType) ~= -1)
not (HarmonyManager.IsInfo(curEquipData.upHeroDid))
elseif index == 2 then
isMax = curEquipData.refineLv == curEquipData.maxRefineLv
items,isMatEnough = this.GetCostItems(curEquipData,curEquipData.refineConfig)
@ -3757,7 +3758,8 @@ function this.CheckIsUpTreasure(Did,index)
if not isMatEnough then
items,isMatEnough = this.GetCostItems(curEquipData,curEquipData.strongConfig)
isMatEnough = isMatEnough and
not (HarmonyManager.IsInfo(curEquipData.upHeroDid) and HarmonyManager.GetSingleAdditions(indexType) ~= -1)
--not (HarmonyManager.IsInfo(curEquipData.upHeroDid) and HarmonyManager.GetSingleAdditions(indexType) ~= -1)
not (HarmonyManager.IsInfo(curEquipData.upHeroDid))
end
end
local teamHero=FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_NORMAL)

View File

@ -368,8 +368,8 @@ function EquipTreasureStrongPopup:SetWindShow(_index)
end
end
isGongMing = false
local index = curEquipData.equipType == 1 and HarmonyAddType.HunSoulPrint or HarmonyAddType.LingSoulPrint
if HarmonyManager.IsInfo(curEquipData.upHeroDid) and HarmonyManager.GetSingleAdditions(index) ~= -1 and _index == 1 then
--if HarmonyManager.IsInfo(curEquipData.upHeroDid) and HarmonyManager.GetSingleAdditions(index) ~= -1 and _index == 1 then
if HarmonyManager.IsInfo(curEquipData.upHeroDid) and _index == 1 then
isGongMing = true
this.hintTxt.text = "共鸣中的宝物无法强化"
this.hintTxt.gameObject:SetActive(true)

View File

@ -639,9 +639,11 @@ function this:SingleDataShow(go,index)
mask.gameObject:SetActive(false)
this.equipPreList2[go]:OnOpen(false,{curEquipTreasureDatas[index].id,0}, 1, false, false, false, 0,curEquipTreasureDatas[index].idDyn)
--鸿蒙阵 共享数据判断
if HarmonyManager.IsInfo(curEquipTreasureDatas[index].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint) ~= -1 and curEquipTreasureDatas[index].equipType == 1 then
if HarmonyManager.IsInfo(curEquipTreasureDatas[index].upHeroDid) and curEquipTreasureDatas[index].equipType == 1 then
--if HarmonyManager.IsInfo(curEquipTreasureDatas[index].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint) ~= -1 and curEquipTreasureDatas[index].equipType == 1 then
Util.GetGameObject(go.transform, "HongMenging"):SetActive(true)
elseif HarmonyManager.IsInfo(curEquipTreasureDatas[index].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.LingSoulPrint) ~= -1 and curEquipTreasureDatas[index].equipType == 2 then
elseif HarmonyManager.IsInfo(curEquipTreasureDatas[index].upHeroDid) and curEquipTreasureDatas[index].equipType == 2 then
--elseif HarmonyManager.IsInfo(curEquipTreasureDatas[index].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.LingSoulPrint) ~= -1 and curEquipTreasureDatas[index].equipType == 2 then
Util.GetGameObject(go.transform, "HongMenging"):SetActive(true)
else
Util.GetGameObject(go.transform, "HongMenging"):SetActive(false)
@ -1016,7 +1018,8 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi
this.ShowHeroEquip()
--上阵刷新红点
this.allEquipUpRedPoint:SetActive(isUpZhen and
((#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 and not (HarmonyManager.IsInfo(curHeroData.dynamicId) and HarmonyManager.GetSingleAdditions(HarmonyAddType.AddEquip) ~= -1)) or
--((#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 and not (HarmonyManager.IsInfo(curHeroData.dynamicId) and HarmonyManager.GetSingleAdditions(HarmonyAddType.AddEquip) ~= -1)) or
((#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 and not (HarmonyManager.IsInfo(curHeroData.dynamicId))) or
(isCanUpEquipTreasure and #HeroManager.GetHeroIsUpTreasure(curHeroData.dynamicId,0) > 0)
))
this:OnClickTabBtn(indexBtnNum)