From b0d10a29d2d577693a3231b35e3bacc702fcaa58 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 22 Jul 2021 17:41:01 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=AC=E4=BC=9A=E3=80=91=E5=85=AC?= =?UTF-8?q?=E4=BC=9A=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Guild/GuildMainCityPanel.prefab | 6 +++--- .../~Lua/Modules/Guild/GuildMainCityPanel.lua | 12 ++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildMainCityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildMainCityPanel.prefab index 34dac868d8..70fc77167d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildMainCityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildMainCityPanel.prefab @@ -2770,7 +2770,7 @@ 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: -41, y: -730.4} + m_AnchoredPosition: {x: 323, y: -744} m_SizeDelta: {x: 248.2, y: 277.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2030871931 @@ -4180,7 +4180,7 @@ 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: -147, y: 36} + m_AnchoredPosition: {x: 0, y: 36} m_SizeDelta: {x: 71, y: 290} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082977241631064926 @@ -5440,7 +5440,7 @@ 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: 163, y: -102} + m_AnchoredPosition: {x: 181, y: -137} m_SizeDelta: {x: 71, y: 221} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082977242500346120 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua index 5139b8f869..889bd70d0a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua @@ -55,10 +55,18 @@ local _GuildBuildConfig = { }, [GUILD_MAP_BUILD_TYPE.CARDELAY] = { --车迟斗法 isOpen = true, - rpType = RedPointType.Guild_CarDeleay, + rpType = RedPointType.LegendExplore, btnName = "btnCarDelay", btnFunc = function() - UIManager.OpenPanel(UIName.GuildCarDelayMainPanel) + if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.CARDELAY) then + if PlayerManager.familyId == 0 then + PopupTipPanel.ShowTip(Language[10278]) + return + end + UIManager.OpenPanel(UIName.GuildCarDelayMainPanel) + else + PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.CARDELAY)) + end end, }, [GUILD_MAP_BUILD_TYPE.AID] = { --援助