From d55dd4c59d1f1f6d87181e71dd4c0863c61f05c5 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 13 Sep 2021 16:17:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B1=E9=B8=A3=E5=AE=9D=E7=89=A9=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E5=BC=BA=E5=8C=96=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 6 ++++-- .../~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua | 4 ++-- .../~Lua/Modules/RoleInfo/RoleEquipPanel.lua | 9 ++++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 2f12be1c06..b1ec061c18 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -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) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua index 2a4356248c..30d01b087b 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua @@ -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) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index 82baa1dc0f..42f462d7a8 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -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)