From beacff1d2097d9b757bfffc2ce81bbc88bf17ead Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 29 Jul 2021 11:53:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B1=E9=B8=A3=E4=B8=AD=E7=9A=84=E5=AE=9D?= =?UTF-8?q?=E7=89=A9=E5=8E=BB=E6=8E=89=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 7 +++++-- .../~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index aa82ebcc7d..6d5704c103 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -3726,10 +3726,12 @@ function this.CheckIsUpTreasure(Did,index) end local curEquipData = EquipTreasureManager.GetSingleEquipTreasreData(Did) local isMax,isMatEnough,items + local indexType = curEquipData.equipType == 1 and HarmonyAddType.HunSoulPrint or HarmonyAddType.LingSoulPrint 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) + isMatEnough = isMatEnough and + not (HarmonyManager.IsInfo(curEquipData.upHeroDid) and HarmonyManager.GetSingleAdditions(indexType) ~= -1) elseif index == 2 then isMax = curEquipData.refineLv == curEquipData.maxRefineLv items,isMatEnough = this.GetCostItems(curEquipData,curEquipData.refineConfig) @@ -3738,7 +3740,8 @@ 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) + isMatEnough = isMatEnough and + not (HarmonyManager.IsInfo(curEquipData.upHeroDid) and HarmonyManager.GetSingleAdditions(indexType) ~= -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 8639b702f8..d665cb0e92 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua @@ -243,7 +243,7 @@ function EquipTreasureStrongPopup:OnShow() end) this:ShowTopDataList(datas) this:SetWindShow(type,0.2) - this:RefreshRedPoint(0.2,true) + this:RefreshRedPoint(0.5,true) end function EquipTreasureStrongPopup:GetHeroIsMainFormation(HeroId) @@ -306,7 +306,7 @@ function EquipTreasureStrongPopup:SetScrollPre(go,data,_index) end --设置界面显示 1.强化 2.精炼 -function EquipTreasureStrongPopup:SetWindShow(_index,delta) +function EquipTreasureStrongPopup:SetWindShow(_index) haveTreasures = {} type = _index curEquipData = EquipTreasureManager.GetSingleEquipTreasreData(curEquipData.idDyn)