From 70d753cce51118e6da3ac5ba4eb5d37bb99e61ad Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 13 Jan 2022 16:41:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9E=81=E9=80=9F=E6=8E=A2=E7=B4=A2=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=A2=9C=E8=89=B2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Fight/FightAreaRewardFullPopup.prefab | 24 +++++++++---------- .../Modules/Fight/FastExploreInfoPopup.lua | 2 ++ .../Fight/FightAreaRewardFullPopup.lua | 2 ++ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardFullPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardFullPopup.prefab index 548979a00e..9bbe77b7d0 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardFullPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardFullPopup.prefab @@ -17048,10 +17048,10 @@ RectTransform: m_Father: {fileID: 8202835805184689050} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 540, y: -570.755} - m_SizeDelta: {x: 100, y: 1141.51} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6789327400057080525 MonoBehaviour: @@ -17111,9 +17111,9 @@ RectTransform: m_Father: {fileID: 8202835805184689050} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 540, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5308692693333480346 @@ -17407,7 +17407,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -17592,7 +17592,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -62.4} - m_SizeDelta: {x: 1080, y: 1141.51} + m_SizeDelta: {x: 1080, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7098667520991281316 CanvasRenderer: @@ -23148,9 +23148,9 @@ RectTransform: m_Father: {fileID: 8202835805184689050} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 540, y: -1141.51} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8222462628204784580 diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua index bbbe5a35c3..f7819ea49a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua @@ -173,6 +173,8 @@ function this.RefreshItemNum() this.crystalNum.text = string.format("%s", "#FFFFFFFF", 0) end + Util.SetGray(this.btnFastExplore, fastBuyNum == 0 and freeTimes == 0) + local isActive = PrivilegeManager.GetPrivilegeOpenStatusById(33) Util.SetGray(this.privilegeIcon, not isActive) this.privilegeTimeBg:SetActive(isActive) diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua index 662b1c94a3..a8aca2fed4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua @@ -137,6 +137,8 @@ function FightAreaRewardFullPopup:OnOpen(...) end this.time.text = TimeToHMS(curTime) this.map.text = GetLanguageStrById(config.Name) + -- + Util.SetGray(this.getBtn, false) local index = 0 for _, reward in ipairs(AdventureManager.HangOnReward) do --(config.RewardShowMin) do