From 548e43b486251e4a0c26dc721fe0c3440190a55b Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 29 Jul 2021 14:33:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B1=E9=B8=A3=E4=B8=AD=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E4=B8=80=E9=94=AE=E8=A3=85=E5=A4=87=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/RoleInfo/RoleEquipPanel.lua | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index 0509243457..42cf1cd852 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -1092,7 +1092,10 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi --刷新界面 this.ShowHeroEquip() --上阵刷新红点 - this.allEquipUpRedPoint:SetActive((#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 or (isCanUpEquipTreasure and #HeroManager.GetHeroIsUpTreasure(curHeroData.dynamicId,0) > 0)) and isUpZhen) + this.allEquipUpRedPoint:SetActive(isUpZhen and + ((#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 and not (HarmonyManager.IsInfo(curHeroData.dynamicId) and HarmonyManager.GetSingleAdditions(HarmonyAddType.AddEquip) ~= -1)) or + (isCanUpEquipTreasure and #HeroManager.GetHeroIsUpTreasure(curHeroData.dynamicId,0) > 0) + )) this:OnClickTabBtn(indexBtnNum) -- --刷新当前英雄可穿装备 -- if indexBtnNum == PosIdConst.All then @@ -1191,7 +1194,11 @@ end function this:SortEquipDatas(_equipDatas) if teamHero[curHeroData.dynamicId] then isUpZhen = true - this.allEquipUpRedPoint:SetActive((#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 or (isCanUpEquipTreasure and #HeroManager.GetHeroIsUpTreasure(curHeroData.dynamicId,0) > 0)) and isUpZhen) + --上阵刷新红点 + this.allEquipUpRedPoint:SetActive(isUpZhen and + ((#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0 and not (HarmonyManager.IsInfo(curHeroData.dynamicId) and HarmonyManager.GetSingleAdditions(HarmonyAddType.AddEquip) ~= -1)) or + (isCanUpEquipTreasure and #HeroManager.GetHeroIsUpTreasure(curHeroData.dynamicId,0) > 0) + )) curHeroCanUpEquipTabs = HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) else isUpZhen = false