From 65efa9336c3c150523e4f9d7b0180410c260c7bb Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 23 Sep 2021 20:59:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E9=AD=82=E5=8D=B0=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A5=9E=E5=B0=86=E6=81=AD=E9=80=81=E5=90=8E?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=87=8D=E7=BD=AE=E9=AD=82=E5=8D=B0=E7=9A=84?= =?UTF-8?q?=E7=A9=BF=E6=88=B4=E7=8A=B6=E6=80=81=EF=BC=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E5=8A=9B=E6=88=98=E4=B9=8B=E8=BA=AF=E9=AD=82=E5=8D=B0=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=A9=BF=E6=88=B4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index ca85ad383b..7aa7de8b92 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -513,6 +513,14 @@ function this.DeleteHeroDatas(heroDIds) -- end --end + -- 清除佩戴的魂印 + local soulPrintList = heroDatas[heroDIds[i]].soulPrintList + for i = 1, #soulPrintList do + if soulPrintList[i] then + SoulPrintManager.DelSoulPrintUpHeroDynamicId(soulPrintList[i].equipId, heroDIds[i]) + end + end + --清楚编队上的英雄 FormationManager.AllFormationDeleCurHeroId(heroDIds[i]) --清除英雄魂印上挂载的英雄did From 2473fb149a6d5a3da0a82aca02212c0cca541ef7 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 24 Sep 2021 10:17:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90ID1018513=E3=80=91=E3=80=90?= =?UTF-8?q?=E9=AD=82=E5=8D=B0=E5=88=86=E8=A7=A3=E3=80=91=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E9=AD=82=E5=8D=B0=E5=88=86=E8=A7=A3=E6=97=B6?= =?UTF-8?q?=E5=B0=B1=E7=AE=97=E7=B4=AB=E8=89=B2=E4=B9=9F=E4=BC=9A=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=80=89=E6=8B=A9=E4=BA=86=E9=87=91=E8=89=B2=EF=BC=8C?= =?UTF-8?q?=E5=8D=95=E4=B8=AA=E9=AD=82=E5=8D=B0=E5=88=86=E8=A7=A3=E6=97=B6?= =?UTF-8?q?=E5=B0=B1=E7=AE=97=E7=99=BD=E9=87=91=E4=B9=9F=E4=B8=8D=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=20=E3=80=90ID1018512=E3=80=91=E3=80=90=E9=AD=82?= =?UTF-8?q?=E5=8D=B0=E5=88=86=E8=A7=A3=E3=80=91=E5=88=97=E8=A1=A8=E6=8B=96?= =?UTF-8?q?=E5=8A=A8=E5=88=B0=E5=BA=95=E9=83=A8=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=A1=B5=E7=AD=BE=EF=BC=8C=E4=B8=8D=E5=9B=9E?= =?UTF-8?q?=E5=BC=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resolve/HeroAndEquipResolvePanel.lua | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua index a77fcb08a6..dad17e3355 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua @@ -69,9 +69,11 @@ function HeroAndEquipResolvePanel:InitComponent() soulPrintEndBtns[i]=Util.GetGameObject(self.transform, "endTabs/btnSoulPrintGrid/btnSoulPrintGrid/Btn"..i) Util.AddClick( soulPrintEndBtns[i], function() if tabSortType == i+3 then + isTop = true this.SortTypeClick(0,equipEndBtns[i])--全部 else tabSortType = i+3 + isTop = true this.SortTypeClick(tabSortType,soulPrintEndBtns[i]) end end) @@ -296,11 +298,11 @@ function this.SortTypeClick(_sortType,_btn) isTop = false end --特效层级重设 - for i=1,#list do - Util.AddParticleSortLayer(list[i], this.sortingOrder - orginLayer2) - end - orginLayer2 = this.sortingOrder - orginLayer = this.sortingOrder + for i=1,#list do + Util.AddParticleSortLayer(list[i], this.sortingOrder - orginLayer2) + end + orginLayer2 = this.sortingOrder + orginLayer = this.sortingOrder end end @@ -490,10 +492,6 @@ function this.SendBackResolveReCallBack(drop) local soulPrint= SoulPrintManager.GetSoulPrintQualityDataByType(this.soulPrintChooseType) soulPrintData=SoulPrintManager.GetSoulPrintAndSort(soulPrint) this.selectText.text = Language[11728].."0/"..#soulPrintData - --this.SortSoulPrintData(soulPrintData) - --this.ScrollView3:SetData(soulPrintData, function (index, go) - -- this:SetSoulPrintData(go, soulPrintData[index],index) - --end) end this.CleanSelectList() --刷新界面 @@ -518,8 +516,8 @@ function this.ResolveBtnClickEvent() temp[chooseIdList[i]] = 1 end if not isSoulPrintShowSure then - for i=1,#soulPrintData do - if soulPrintData[i].id == chooseIdList[i] and soulPrintData[i].quality >= 4 then + for x=1,#soulPrintData do + if soulPrintData[x].id == chooseIdList[i] and soulPrintData[x].quality > 4 then isSoulPrintShowSure=true break end