From b9d362b333ef06a77b981e0766cc1a54bda88a90 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 17 May 2021 14:32:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=B1=8F=E5=B9=95=E9=80=82?= =?UTF-8?q?=E9=85=8D=E3=80=91=E6=B4=BB=E5=8A=A8=E9=80=82=E9=85=8D=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicActicity/ActivityMainPanel.prefab | 4 ++-- .../UI/NewActivity/CommonActPage.prefab | 12 +++++----- .../Prefabs/UI/NewActivity/ExpertPage.prefab | 24 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab index b05d678228..f0c1298268 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.000030517578, y: 0} + m_AnchoredPosition: {x: 0.0000000046529207, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &455843809901100221 @@ -612,7 +612,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: d9eb47e7e33ca8a4aa13a0de17b927ab, type: 3} + m_Sprite: {fileID: 21300000, guid: a2405fced91d3d443befb9c81440a05b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonActPage.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonActPage.prefab index bcd8d5ec5f..7890b27975 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonActPage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonActPage.prefab @@ -77,9 +77,9 @@ RectTransform: m_Father: {fileID: 2384432804281337260} m_RootOrder: 2 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: 0, y: 412.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -547.5} m_SizeDelta: {x: 584, y: 84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6415175731582749822 @@ -310,9 +310,9 @@ RectTransform: m_Father: {fileID: 8478406734519293774} m_RootOrder: 0 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: 0, y: 645} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -315} m_SizeDelta: {x: 1080, y: 471} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4265271028047851161 diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab index d7e1c0c871..679521a9a5 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab @@ -4776,7 +4776,7 @@ ParticleSystem: --- !u!199 &4010243669292641170 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9479,7 +9479,7 @@ ParticleSystem: --- !u!199 &2550128951490885228 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14096,7 +14096,7 @@ ParticleSystem: --- !u!199 &1131291321758900697 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14303,9 +14303,9 @@ RectTransform: m_Father: {fileID: 2542118471955123022} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -232} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 728} m_SizeDelta: {x: 1080, y: 464} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7798801616929473648 @@ -19029,7 +19029,7 @@ ParticleSystem: --- !u!199 &7463275731368259045 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -24211,7 +24211,7 @@ ParticleSystem: --- !u!199 &1536422324374035914 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -29057,7 +29057,7 @@ ParticleSystem: --- !u!199 &3638165982301261779 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33755,7 +33755,7 @@ ParticleSystem: --- !u!199 &1979518599288404074 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -38716,7 +38716,7 @@ ParticleSystem: --- !u!199 &4969675192407024493 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -43546,7 +43546,7 @@ ParticleSystem: --- !u!199 &3302761565201920090 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} From e76fb1dede22161184f456804cab333917d47c72 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 17 May 2021 15:49:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E7=A4=BE=E7=A8=B7=E5=A4=A7?= =?UTF-8?q?=E5=85=B8=E3=80=91=E4=BF=AE=E5=A4=8D=E6=9C=AA=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E5=85=AC=E4=BC=9A=E6=97=B6=EF=BC=8C=E5=8F=96=E6=B6=88=E6=97=A0?= =?UTF-8?q?=E9=99=90=E5=BE=AA=E7=8E=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/View/GeneralPopup_SheJiCheckGuild.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_SheJiCheckGuild.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_SheJiCheckGuild.lua index e260a7e99f..8e970f8d75 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_SheJiCheckGuild.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_SheJiCheckGuild.lua @@ -13,6 +13,7 @@ function this:BindEvent() Util.AddClick(this.btnCancel,function() parent:ClosePanel() --UIManager.OpenPanel(UIName.DynamicActivityPanel) + DynamicActivityManager.RemoveUIList() JumpManager.GoJump(40007) end)