diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index f1bdb65119..823b5eee39 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -3727,6 +3727,7 @@ function this.CheckIsUpTreasure(Did,index) if index == 1 then isMax = curEquipData.lv == curEquipData.maxLv items,isMatEnough = this.GetCostItems(curEquipData,curEquipData.strongConfig) + isMatEnough = isMatEnough and not (HarmonyManager.IsInfo(curEquipData.upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint) ~= -1) elseif index == 2 then isMax = curEquipData.refineLv == curEquipData.maxRefineLv items,isMatEnough = this.GetCostItems(curEquipData,curEquipData.refineConfig) @@ -3735,6 +3736,7 @@ function this.CheckIsUpTreasure(Did,index) items,isMatEnough = this.GetCostItems(curEquipData,curEquipData.refineConfig) if not isMatEnough then items,isMatEnough = this.GetCostItems(curEquipData,curEquipData.strongConfig) + isMatEnough = isMatEnough and not (HarmonyManager.IsInfo(curEquipData.upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint) ~= -1) 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 d109278b28..055c7957cf 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua @@ -12,6 +12,7 @@ local isMax=false local isEnough = false local curIndex local datas +local isGongMing = false --初始化组件(用于子类重写) function EquipTreasureStrongPopup:InitComponent() this.spLoader = SpriteLoader.New() @@ -73,7 +74,7 @@ function EquipTreasureStrongPopup:BindEvent() end) --强化按钮 Util.AddClick(this.btnStrong, function() - if HarmonyManager.IsInfo(curEquipData.upHeroDid) then + if isGongMing then return end --如果强化界面 强化到最高等级谈提示 精炼界面 就切界面 @@ -353,8 +354,10 @@ function EquipTreasureStrongPopup:SetWindShow(_index,delta) this.hintTxt.text=Language[11782] end end - - if HarmonyManager.IsInfo(curEquipData.upHeroDid) and _index == 1 then + 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 + isGongMing = true this.hintTxt.text = "共鸣中的宝物无法强化" this.hintTxt.gameObject:SetActive(true) this.Image2.gameObject:SetActive(false) @@ -376,8 +379,7 @@ function EquipTreasureStrongPopup:CostShow(items) this.costItemPreList = {} end --显示消耗物品 - if items and isMax==false then - this.costItemGrid.gameObject:SetActive(true) + if items then for i = 1,math.max(#items,#this.costItemPreList) do if not items[i] then this.costItemPreList[i].gameObject:SetActive(false) @@ -419,7 +421,7 @@ function EquipTreasureStrongPopup:SetPropertyShow(_infos) return end this.propertyGrid.gameObject:SetActive(true) - if type == 1 and HarmonyManager.IsInfo(curEquipData.upHeroDid) then + if isGongMing then for i = 0, #this.properList do this.properList[i].go.gameObject:SetActive(false) end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua index 225f01b660..7fffcd3afb 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua @@ -186,9 +186,8 @@ function RoleEquipTreasureChangePopup:OnOpen(_openThisPanel,_type,_curHeroData,_ curEquipData = _curEquipData nextEquipData = _nextEquipData position = _position - - - if HarmonyManager.IsInfo(curEquipData.upHeroDid) then + local index = curEquipData.equipType == 1 and HarmonyAddType.HunSoulPrint or HarmonyAddType.LingSoulPrint + if HarmonyManager.IsInfo(curEquipData.upHeroDid) and HarmonyManager.GetSingleAdditions(index) ~= -1 then -- bod isGongMing = true Util.SetGray(this.curEquipBtnStrong, true) @@ -196,8 +195,6 @@ function RoleEquipTreasureChangePopup:OnOpen(_openThisPanel,_type,_curHeroData,_ else isGongMing = false Util.SetGray(this.curEquipBtnStrong, false) - - end end function RoleEquipTreasureChangePopup:OnShow()