From f4fe1555337b120970ecfa8b1be700080b94091d Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 19 Jun 2021 17:47:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=9C=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/NewActivity/UpStarPre.prefab | 8 ++++---- .../~Lua/Modules/DynamicActivity/ActivityMainPanel.lua | 3 +++ .../~Lua/Modules/Map/View/EndLessMapView.lua | 3 +++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarPre.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarPre.prefab index 6c210a8276..c1fbcaa1fc 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarPre.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarPre.prefab @@ -129,7 +129,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: -209.615, y: 71.95} + m_AnchoredPosition: {x: -199.25002, y: 71.95} m_SizeDelta: {x: 0, y: 144} m_Pivot: {x: 0, y: 1.0000001} --- !u!114 &8585533787268794185 @@ -159,7 +159,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 27 + m_Left: 3 m_Right: 0 m_Top: 0 m_Bottom: 0 @@ -15432,8 +15432,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: 48.62, y: -0.049988} - m_SizeDelta: {x: 419.23, y: 144.1} + m_AnchoredPosition: {x: 59, y: -0.049988} + m_SizeDelta: {x: 398.5, y: 144.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2850623819429736862 MonoBehaviour: diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index d9efbbb52f..d9abee3b31 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -286,6 +286,9 @@ end --界面关闭时调用(用于子类重写) function ActivityMainPanel:OnClose() + if UIManager.IsOpen(UIName.RewardItemSingleShowPopup) then + UIManager.ClosePanel(UIName.RewardItemSingleShowPopup) + end --清除红点 for k,v in pairs(redPointTypeList) do ClearRedPointObject(k,v) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua index aad0358e5c..6fdee688b5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua @@ -785,6 +785,9 @@ function EndLessMapView:OnClose() if UIManager.IsOpen(UIName.HelpPopup) then UIManager.ClosePanel(UIName.HelpPopup) end + if UIManager.IsOpen(UIName.ShowEnemyInfoPanel) then + UIManager.ClosePanel(UIName.ShowEnemyInfoPanel) + end end function EndLessMapView:OnDestroy()