From eea23a9ddade89c21e6f00ffa3bfb173a9c8180c Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 7 Jan 2022 13:58:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=94=B6=E7=9B=8A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NewCarbon/ExploreRewardPopup.prefab | 22 +++++++++++++++---- .../~Lua/View/PlayerLiveView.lua | 2 +- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreRewardPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreRewardPopup.prefab index f2ecd87913..b15d2be90b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreRewardPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/ExploreRewardPopup.prefab @@ -1307,6 +1307,7 @@ GameObject: - component: {fileID: 4813483788473036272} - component: {fileID: 1415097990844297663} - component: {fileID: 3440154202895056111} + - component: {fileID: 4360686384245885689} m_Layer: 5 m_Name: reward m_TagString: Untagged @@ -1331,10 +1332,10 @@ RectTransform: m_Father: {fileID: 2725026369425992905} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -521.2} - m_SizeDelta: {x: 0, y: -1772} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 540, y: -521.2} + m_SizeDelta: {x: 1080, y: 148} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1415097990844297663 MonoBehaviour: @@ -1373,6 +1374,19 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!114 &4360686384245885689 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6908410587164142902} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7fdc50ec1a2f1534f93155e67c3708ab, type: 3} + m_Name: + m_EditorClassIdentifier: + bgList: [] --- !u!1 &7128061193219181249 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua index 510c817e67..0a9d950034 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua @@ -589,7 +589,7 @@ function PlayerLiveView:SetEffectScale(effectScale) end function PlayerLiveView:GetSelfTagLayer() local cursortingorder = sortingorder - 1 - if UIManager.IsOpen(UIName.FightPointPassMainPanel) then--挂机界面特殊处理 + if UIManager.IsOpen(UIName.FightPointPassMainPanel) or UIManager.IsOpen(UIName.ExplorePanel) then--挂机界面特殊处理 cursortingorder = 0 end return cursortingorder