From 853db67d9ab56a7d95946ac5829fc72d0bff1c99 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 19 Mar 2021 18:00:46 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8C=96=E8=99=9A=E5=9D=9B=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=B1=8F=E8=94=BD=E7=A5=9E=E5=B0=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab | 8 ++++---- .../Modules/CompoundHero/view/CompoundHero_Compound.lua | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab b/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab index 34e821e281..053b8e4da9 100644 --- a/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab @@ -1171,8 +1171,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 260, y: -66} - m_SizeDelta: {x: 73.9, y: 42.04} + m_AnchoredPosition: {x: 282.91, y: -66} + m_SizeDelta: {x: 196.12, y: 42.04} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &5392566829970465375 CanvasRenderer: @@ -1251,8 +1251,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 275.9, y: -1.7999873} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 310.59998, y: -1.7999873} + m_SizeDelta: {x: 210.65, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4408025784198771826 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua index 71345a759a..e99019b37f 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua @@ -557,7 +557,7 @@ function this.GetAllHeroCompoundData(index) upSortHeroList,downSoryHeroList = HeroManager.ByCompoundHeroGetAllHeros() allCompoundHeroConFigData = {} for _, configInfo in ConfigPairs(ConfigManager.GetConfig(ConfigName.HeroConfig)) do - if (configInfo.Star == 4 or configInfo.Star == 5) and (index == 0 or configInfo.PropertyName == index)then + if (configInfo.Star == 4 or configInfo.Star == 5) and (index == 0 or configInfo.PropertyName == index) and configInfo.Hide == 0 then local curHeroCompoundData = {} curHeroCompoundData.star = configInfo.Star + 1 curHeroCompoundData.config = configInfo