From 1c78654a42d64cbb18843911391fa076f9f5943d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 6 Jan 2021 10:38:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1007750=E3=80=91=E3=80=90=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E9=9D=92=E9=BE=99=E7=A7=98=E5=AE=9D=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 02d655c394847de7f02bee6345b37988767d8f6e) --- .../UI/Mission/MissionDailyPanel.prefab | 30 +++++++++++++++++++ ...ssionDailyPanel_QingLongSecretTreasure.lua | 9 +++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab index 975b81fbc8..205171d9d9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab @@ -4322,6 +4322,7 @@ GameObject: m_Component: - component: {fileID: 1918779212796953291} - component: {fileID: 1918779212796953290} + - component: {fileID: 929416685835704539} m_Layer: 5 m_Name: treasureList m_TagString: Untagged @@ -4357,6 +4358,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1918779212796953288} m_CullTransparentMesh: 0 +--- !u!114 &929416685835704539 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1918779212796953288} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &1918779212887374028 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua index e020e6864f..5d60da1fec 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua @@ -99,6 +99,13 @@ function this:OnShow(_parent,...) end function this:OnSortingOrderChange(sortingOrder) + for i, v in pairs(itemsList) do + for j = 1, #itemsList[i] do + if itemsList[i][j] and itemsList[i][j].gameObject then + itemsList[i][j]:SetEffectLayer(sortingOrder) + end + end + end Util.SetParticleSortLayer(this.canOpenExtra, sortingOrder) Util.SetParticleSortLayer(this.openExtra, sortingOrder) end @@ -277,7 +284,7 @@ function this:SingleTask(rewardItem, rewardSingleData) end itemsList[rewardItem][i].gameObject:GetComponent("RectTransform").localPosition = Vector3.zero itemsList[rewardItem][i].gameObject:SetActive(true) - itemsList[rewardItem][i]:OnOpen(false, rewardSingleData.Reward[i].item, 0.8, false) + itemsList[rewardItem][i]:OnOpen(false, rewardSingleData.Reward[i].item, 0.8,false,false,false,sortingOrder) SetMask(rewardItem,i,rewardSingleData.Reward[i].type) else