From 48d8f3887b030b1d3d24cc5aad27dc0de8f7e9fa Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 13 Aug 2020 10:28:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A5=9E=E5=B0=86=E5=90=88?= =?UTF-8?q?=E6=88=90=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompoundHero/CompoundHeroFirstUpStarListPanel.lua | 6 +++--- .../Modules/CompoundHero/CompoundHeroUpStarListPanel.lua | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua index 02d528a06a..7a55a150cf 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua @@ -126,8 +126,8 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) local formationMask = Util.GetGameObject(go.transform, "formationMask") -- formationMask:SetActive(false) - formationMask:SetActive((heroData.isFormation ~= "" and heroData.isFormation ~= Language[11108]) or heroData.lockState == 1) - Util.GetGameObject(formationMask.transform, "formationImage"):SetActive(heroData.isFormation ~= "" ) + formationMask:SetActive( #heroData.formationList ~= 0 or heroData.lockState == 1) + Util.GetGameObject(formationMask.transform, "formationImage"):SetActive(heroData.formationList ~= 0 ) Util.GetGameObject(formationMask.transform, "lockImage"):SetActive( heroData.lockState == 1) Util.GetGameObject(go.transform, "noumenon"):SetActive( heroData.id == curHeroData.id ) local starGrid = Util.GetGameObject(go.transform, "star") @@ -194,7 +194,7 @@ end function CompoundHeroFirstUpStarListPanel:AutoSelectHero() curSelectHeroList = {} for i = 1, #heroDataList do - if LengthOfTable(curSelectHeroList) < curNeedRoleNum and heroDataList[i].isFormation == "" and heroDataList[i].lockState == 0 then-- + if LengthOfTable(curSelectHeroList) < curNeedRoleNum and heroDataList[i].formationList == 0 and heroDataList[i].lockState == 0 then-- curSelectHeroList[heroDataList[i].dynamicId]=heroDataList[i] end end diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua index 7f927e3aee..31828ad4c0 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua @@ -139,8 +139,8 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) local formationMask = Util.GetGameObject(go.transform, "formationMask") -- formationMask:SetActive(false) - formationMask:SetActive((heroData.isFormation ~= "" and heroData.isFormation ~= Language[11108]) or heroData.lockState == 1) - Util.GetGameObject(formationMask.transform, "formationImage"):SetActive(heroData.isFormation ~= "" ) + formationMask:SetActive( #heroData.formationList ~= 0 or heroData.lockState == 1)--(heroData.isFormation ~= "" and heroData.isFormation ~= Language[11108]) + Util.GetGameObject(formationMask.transform, "formationImage"):SetActive(#heroData.formationList ~= 0) Util.GetGameObject(formationMask.transform, "lockImage"):SetActive( heroData.lockState == 1) Util.GetGameObject(go.transform, "noumenon"):SetActive( heroData.id == curHeroData.Id ) local starGrid = Util.GetGameObject(go.transform, "star") @@ -209,7 +209,7 @@ function CompoundHeroUpStarListPanel:AutoSelectHero() LogGreen("sssssssssssssssssssss") curSelectHeroList = {} for i = 1, #heroDataList do - if LengthOfTable(curSelectHeroList) < curNeedRoleNum and heroDataList[i].isFormation == "" and heroDataList[i].lockState == 0 then-- + if LengthOfTable(curSelectHeroList) < curNeedRoleNum and #heroDataList[i].formationList == 0 and heroDataList[i].lockState == 0 then-- LogGreen("heroDataList[i].dynamicId "..heroDataList[i].dynamicId) curSelectHeroList[heroDataList[i].dynamicId]=heroDataList[i] end