From 41fda9501c93707267534787cb22d87912859008 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Sun, 29 Dec 2024 18:56:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=91=E5=A5=B3=E5=9B=BE=E7=89=87=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BG/UI/1All/X1_shouzha_yeqian_03.png.meta | 13 +- .../BG/UI/1All/X1_shouzha_yeqian_04.png.meta | 13 +- .../UI/GeneralPanel/GeneralBigPopup.prefab | 196 +++++++++--------- .../UI/Guild/Aid/GuildAidMainPopup.prefab | 6 +- .../GuildTranscriptRewardSortPanel.prefab | 48 ++--- .../UI/Mail/MainSingleInfoPanel.prefab | 40 +++- .../UI/SecretBox/SecretBoxBuyTenPanel.prefab | 54 +---- .../UI/SecretBox/WishEquipBuyTenPanel.prefab | 56 +---- .../UI/SecretBox/WishGemBuyTenPanel.prefab | 10 +- 9 files changed, 197 insertions(+), 239 deletions(-) diff --git a/Assets/ManagedResources/BG/UI/1All/X1_shouzha_yeqian_03.png.meta b/Assets/ManagedResources/BG/UI/1All/X1_shouzha_yeqian_03.png.meta index 19bb2591e0..c0a2a5443d 100644 --- a/Assets/ManagedResources/BG/UI/1All/X1_shouzha_yeqian_03.png.meta +++ b/Assets/ManagedResources/BG/UI/1All/X1_shouzha_yeqian_03.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 37, y: 0, z: 39, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -91,6 +91,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/BG/UI/1All/X1_shouzha_yeqian_04.png.meta b/Assets/ManagedResources/BG/UI/1All/X1_shouzha_yeqian_04.png.meta index 4cd427fbda..9cf9caa4bd 100644 --- a/Assets/ManagedResources/BG/UI/1All/X1_shouzha_yeqian_04.png.meta +++ b/Assets/ManagedResources/BG/UI/1All/X1_shouzha_yeqian_04.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 51, y: 0, z: 23, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -91,6 +91,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 62e7372ad6..64c043f5cc 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -1294,7 +1294,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: -257.43, y: 90.5} + m_AnchoredPosition: {x: -219, y: 222} m_SizeDelta: {x: 261.66, y: 154} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &401547588 @@ -6335,7 +6335,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 112, y: -0.000015259} - m_SizeDelta: {x: 306, y: 414} + m_SizeDelta: {x: 532, y: 433} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1984799550 CanvasRenderer: @@ -7993,7 +7993,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: 71162a8d1456dde45a156c169aeccf54, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9529,7 +9529,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 330, y: -100} + m_AnchoredPosition: {x: 330, y: -178} m_SizeDelta: {x: 600, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3596436011982854297 @@ -11045,9 +11045,9 @@ RectTransform: m_Father: {fileID: 7494134846245643573} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 36, y: -18} m_SizeDelta: {x: 253, y: 65} m_Pivot: {x: 0, y: 1} --- !u!222 &7283828727127792768 @@ -15987,8 +15987,8 @@ RectTransform: m_Father: {fileID: 2894983281350594748} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 400, y: 0} m_SizeDelta: {x: 800, y: 40} m_Pivot: {x: 0.5, y: 1} @@ -17017,7 +17017,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 1971, y: -1052} - m_SizeDelta: {x: 860, y: 120} + m_SizeDelta: {x: 860, y: 198} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4827792396798163766 CanvasRenderer: @@ -19453,10 +19453,10 @@ RectTransform: m_Father: {fileID: 2984406637957294576} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 50} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 104, y: -35.085} + m_SizeDelta: {x: 148, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8901599938845851609 CanvasRenderer: @@ -21046,7 +21046,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6207233311855498205 RectTransform: m_ObjectHideFlags: 0 @@ -21957,9 +21957,9 @@ RectTransform: m_Father: {fileID: 3670451248567414134} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 728.75, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 728.75, y: -43.1} m_SizeDelta: {x: 139.5, y: 50.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1420070111345050450 @@ -25034,7 +25034,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -343.17004, y: 366.2} - m_SizeDelta: {x: 259.06, y: 74} + m_SizeDelta: {x: 259.06, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4917275001162307674 CanvasRenderer: @@ -25064,8 +25064,8 @@ 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: 6ff20609e8c68014394e6b730e1c7948, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5ce4cf7c6a156d64ca117ce0caf6a53b, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -25248,8 +25248,8 @@ RectTransform: m_Father: {fileID: 8863448297139295757} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 428.5, y: -573.75} m_SizeDelta: {x: 865, y: 387.5} m_Pivot: {x: 0.5, y: 0.5} @@ -25704,10 +25704,10 @@ RectTransform: m_Father: {fileID: 4377485161549588996} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 524, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7938110807914979896 CanvasRenderer: @@ -28188,8 +28188,8 @@ RectTransform: m_Father: {fileID: 8863448297139295757} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 428.5, y: -850.5} m_SizeDelta: {x: 865, y: 266} m_Pivot: {x: 0.5, y: 1} @@ -29938,7 +29938,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: -239.59998, y: 90.5} + m_AnchoredPosition: {x: -274, y: 265} m_SizeDelta: {x: 402, y: 234} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &516528688259841840 @@ -30302,7 +30302,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 84, y: 0.000061035156} - m_SizeDelta: {x: 354, y: 470} + m_SizeDelta: {x: 532, y: 433} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2762100461216322547 CanvasRenderer: @@ -31643,7 +31643,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 330, y: -90} + m_AnchoredPosition: {x: 330, y: -129} m_SizeDelta: {x: 600, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &158801954867338518 @@ -32629,9 +32629,9 @@ RectTransform: m_Father: {fileID: 6569955877061403001} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 36, y: -14} m_SizeDelta: {x: 253, y: 65} m_Pivot: {x: 0, y: 1} --- !u!222 &8860581549276122775 @@ -33727,8 +33727,8 @@ RectTransform: 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: 0.00003631129} - m_SizeDelta: {x: 916, y: 0} + m_AnchoredPosition: {x: 0, y: -0.000024572533} + m_SizeDelta: {x: 916, y: 51} m_Pivot: {x: 0.5, y: 1} --- !u!114 &5918842748614186787 MonoBehaviour: @@ -34033,10 +34033,10 @@ RectTransform: m_Father: {fileID: 4377485161549588996} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 692, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9123156298422617933 CanvasRenderer: @@ -34225,10 +34225,10 @@ RectTransform: m_Father: {fileID: 4377485161549588996} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 356, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3360686523141670100 CanvasRenderer: @@ -35587,10 +35587,10 @@ RectTransform: m_Father: {fileID: 4377485161549588996} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 188, y: -50} + m_SizeDelta: {x: 88, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2874496421868159407 CanvasRenderer: @@ -36208,8 +36208,8 @@ RectTransform: m_Father: {fileID: 8863448297139295757} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 432, y: -338.5} m_SizeDelta: {x: 872, y: 83} m_Pivot: {x: 0.5, y: 0.5} @@ -36440,9 +36440,9 @@ RectTransform: m_Father: {fileID: 2548671354063583576} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 116.66667, y: -100} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6665704931721194040 @@ -37968,8 +37968,8 @@ 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: 6ff20609e8c68014394e6b730e1c7948, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5ce4cf7c6a156d64ca117ce0caf6a53b, type: 3} + m_Type: 1 m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 @@ -38321,9 +38321,9 @@ RectTransform: m_Father: {fileID: 7574061302513504735} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 400, y: -32.04} m_SizeDelta: {x: 280.5, y: 64.08} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7029800598340588143 @@ -39244,7 +39244,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 123.99011} - m_SizeDelta: {x: 800, y: 0} + m_SizeDelta: {x: 800, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1835962887133524766 CanvasRenderer: @@ -39355,9 +39355,9 @@ RectTransform: m_Father: {fileID: 2548671354063583576} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 583.3334, y: -100} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &977875292258055025 @@ -39621,8 +39621,8 @@ 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: b204bd77afb57e14e830d912e88eb357, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 8938c410d98136f4e9b081060e0025fd, type: 3} + m_Type: 1 m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 @@ -40433,7 +40433,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: -239.59998, y: 90.5} + m_AnchoredPosition: {x: -276, y: 258} m_SizeDelta: {x: 402, y: 234} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7430131331850631422 @@ -42195,8 +42195,8 @@ RectTransform: m_Father: {fileID: 8863448297139295757} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 425.865, y: -188} m_SizeDelta: {x: 859.73, y: 218} m_Pivot: {x: 0.5, y: 0.5} @@ -43026,7 +43026,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 540, y: -357} - m_SizeDelta: {x: 800, y: 0} + m_SizeDelta: {x: 800, y: 64.08} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &181288018036704300 CanvasRenderer: @@ -43253,9 +43253,9 @@ RectTransform: m_Father: {fileID: 3670451248567414134} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 36, y: -18} m_SizeDelta: {x: 253, y: 65} m_Pivot: {x: 0, y: 1} --- !u!222 &329854717992448988 @@ -47058,9 +47058,9 @@ RectTransform: m_Father: {fileID: 2548671354063583576} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 350, y: -100} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &773993077155745798 @@ -47612,8 +47612,8 @@ RectTransform: m_Father: {fileID: 8863448297139295757} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 432, y: -809} m_SizeDelta: {x: 872, y: 83} m_Pivot: {x: 0.5, y: 0.5} @@ -48058,10 +48058,10 @@ RectTransform: m_Father: {fileID: 2984406637957294576} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 50} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 493, y: -35.085} + m_SizeDelta: {x: 650, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4164081279567279265 CanvasRenderer: @@ -49306,9 +49306,9 @@ RectTransform: m_Father: {fileID: 2428012996653233923} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 295, y: -37} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8675641990459156184 @@ -52891,7 +52891,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 336.7, y: 366.2} - m_SizeDelta: {x: 260, y: 74} + m_SizeDelta: {x: 260, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3808822587560079590 CanvasRenderer: @@ -52921,8 +52921,8 @@ 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: b204bd77afb57e14e830d912e88eb357, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 8938c410d98136f4e9b081060e0025fd, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -57054,8 +57054,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: 107, y: 0.000061035156} - m_SizeDelta: {x: 354, y: 470} + m_AnchoredPosition: {x: 139, y: 0.000061035156} + m_SizeDelta: {x: 532, y: 433} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8204373685354974930 CanvasRenderer: @@ -57779,9 +57779,9 @@ RectTransform: m_Father: {fileID: 3648020101574332683} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: -26} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 447.97, y: -26} m_SizeDelta: {x: 819.94, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &435024635268583513 @@ -59534,10 +59534,10 @@ RectTransform: m_Father: {fileID: 2428012996653233923} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 50} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 162.5, y: -37} + m_SizeDelta: {x: 265, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6340918513921812379 CanvasRenderer: @@ -59959,8 +59959,8 @@ RectTransform: m_Father: {fileID: 8863448297139295757} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 432, y: -39.5} m_SizeDelta: {x: 872, y: 79} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab index 5103ac7ee3..c833de15f6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab @@ -3769,8 +3769,8 @@ 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: 6ff20609e8c68014394e6b730e1c7948, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5ce4cf7c6a156d64ca117ce0caf6a53b, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4337,7 +4337,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 44 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptRewardSortPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptRewardSortPanel.prefab index 9c413cc85f..244ef78116 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptRewardSortPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptRewardSortPanel.prefab @@ -18,7 +18,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6059924033030963745 RectTransform: m_ObjectHideFlags: 0 @@ -130,7 +130,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: 3, y: -1.3000116} + m_AnchoredPosition: {x: 11.4, y: -1.3000116} m_SizeDelta: {x: 304.56, y: 156.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3072718624127343226 @@ -154,14 +154,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.23921569} 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: 21300000, guid: 3c01a305eb51c04478b39d3060aceefe, type: 3} + m_Sprite: {fileID: 21300000, guid: b53765073d7f9cd47bcfcdba0bc1b5d1, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -253,8 +253,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: 1.6, y: 5.41} - m_SizeDelta: {x: 113, y: 109} + m_AnchoredPosition: {x: 12.4, y: 5.41} + m_SizeDelta: {x: 97, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3072718624676571640 CanvasRenderer: @@ -284,7 +284,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: b820efb98f5ab8b41b849b61ce847d1c, type: 3} + m_Sprite: {fileID: 21300000, guid: 4b2837bc0a9ae994685de1a6d275968e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -361,7 +361,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 50 + m_FontSize: 55 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -385,7 +385,7 @@ MonoBehaviour: m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_EffectColor: {r: 0.8431373, g: 0.3254902, b: 0.37254903, a: 0.5} + m_EffectColor: {r: 0.3490566, g: 0.16629584, b: 0.18291043, a: 0.5} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 --- !u!1 &3072718625678100041 @@ -423,8 +423,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: 1.7, y: 5.47} - m_SizeDelta: {x: 113, y: 109} + m_AnchoredPosition: {x: 12.500049, y: -4} + m_SizeDelta: {x: 100, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3072718625678100042 CanvasRenderer: @@ -454,7 +454,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: ff1ea38c6a43ad140a8087dd633b04cf, type: 3} + m_Sprite: {fileID: 21300000, guid: b37c43f2d9c4066438c633d8abe8dc35, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -498,8 +498,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: 1.5, y: 5.4725} - m_SizeDelta: {x: 113, y: 109} + m_AnchoredPosition: {x: 12.300049, y: 0} + m_SizeDelta: {x: 98, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3072718626162022703 CanvasRenderer: @@ -529,7 +529,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: 318e45416aeb9cf4fa121a165a1c2dc6, type: 3} + m_Sprite: {fileID: 21300000, guid: b9bde0066cef0ce44a6f80af962d7585, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1794,8 +1794,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: 408.51, y: 0} - m_SizeDelta: {x: 603.34, y: 80} + m_AnchoredPosition: {x: 387.17, y: 0} + m_SizeDelta: {x: 596.48, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2564657265453114624 CanvasRenderer: @@ -1852,7 +1852,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7409603301948171676 RectTransform: m_ObjectHideFlags: 0 @@ -1967,8 +1967,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: -303.4, y: 497.7} - m_SizeDelta: {x: 284.62, y: 80} + m_AnchoredPosition: {x: -323.78, y: 497.7} + m_SizeDelta: {x: 243.86, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4918064858392888319 CanvasRenderer: @@ -1998,7 +1998,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: 3adbc0e9123c8104993737f9d12c7856, type: 3} + m_Sprite: {fileID: 21300000, guid: 15c50ece49e64744f8a1b1f2ba91ed8a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2025,7 +2025,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6003865097336225491 RectTransform: m_ObjectHideFlags: 0 @@ -2232,8 +2232,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: 707.2, y: 0} - m_SizeDelta: {x: 96.23, y: 80} + m_AnchoredPosition: {x: 702.7, y: 0} + m_SizeDelta: {x: 131.75, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3732310262108085685 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Mail/MainSingleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mail/MainSingleInfoPanel.prefab index 59357b0fe2..34934c5b77 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mail/MainSingleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mail/MainSingleInfoPanel.prefab @@ -1014,7 +1014,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 51.99829, y: 0.00004875168} + m_AnchoredPosition: {x: 51.99829, y: -0.000012009705} m_SizeDelta: {x: 837.9, y: 0} m_Pivot: {x: -9.313226e-10, y: -0.00000009685755} --- !u!114 &114856704771779596 @@ -1228,6 +1228,7 @@ GameObject: - component: {fileID: 224844119586139480} - component: {fileID: 222020114320664264} - component: {fileID: 3081948793912735} + - component: {fileID: 5643305689453551623} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -1297,6 +1298,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u9886\u53D6" LanguageIndex: 0 +--- !u!114 &5643305689453551623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1718980963654646} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1871565725321798 GameObject: m_ObjectHideFlags: 0 @@ -1579,6 +1595,7 @@ GameObject: - component: {fileID: 3635776725646956425} - component: {fileID: 8807674708746483729} - component: {fileID: 4078240510986758300} + - component: {fileID: 6075562007494224246} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -1626,7 +1643,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.23137257, g: 0.23137257, b: 0.23137257, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1648,6 +1665,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5220\u9664" LanguageIndex: 0 +--- !u!114 &6075562007494224246 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1678823524648710643} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &5594717824785830915 GameObject: m_ObjectHideFlags: 0 @@ -1683,7 +1715,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -0.000061035156, y: -0.000061035156} + m_AnchoredPosition: {x: -0.000061035156, y: 0.000061035156} m_SizeDelta: {x: 675.2, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &4820645118571433122 @@ -2033,7 +2065,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: 71162a8d1456dde45a156c169aeccf54, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyTenPanel.prefab b/Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyTenPanel.prefab index c5c5cfaf81..dd31135d1e 100644 --- a/Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyTenPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyTenPanel.prefab @@ -5165,11 +5165,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} -<<<<<<< HEAD m_AnchoredPosition: {x: -251, y: 400} -======= - m_AnchoredPosition: {x: -251, y: 300} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &8767859160231561064 @@ -14903,11 +14899,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 288, y: -685} -<<<<<<< HEAD m_SizeDelta: {x: 330, y: 100} -======= - m_SizeDelta: {x: 320, y: 100} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2071023575904302304 CanvasRenderer: @@ -15352,11 +15344,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} -<<<<<<< HEAD m_AnchoredPosition: {x: -253, y: 110} -======= - m_AnchoredPosition: {x: -253, y: 0} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &4063215560518484095 @@ -20177,11 +20165,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} -<<<<<<< HEAD m_AnchoredPosition: {x: 300, y: 110} -======= - m_AnchoredPosition: {x: 300, y: 0} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &2820964594388480401 @@ -39845,11 +39829,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -222.7, y: -685} -<<<<<<< HEAD m_SizeDelta: {x: 330, y: 100} -======= - m_SizeDelta: {x: 320, y: 100} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3670961514325298762 CanvasRenderer: @@ -44937,22 +44917,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} -<<<<<<< HEAD m_Color: {r: 0.6132076, g: 0.6045301, b: 0.6045301, a: 1} -======= - m_Color: {r: 0.44705883, g: 0.44705883, b: 0.44705883, a: 1} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 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 -<<<<<<< HEAD m_Sprite: {fileID: 21300000, guid: 42d1064404f76134c9d4e24e570cbc36, type: 3} -======= - m_Sprite: {fileID: 21300000, guid: 06dd8360f45c66340bc98829b1e28631, type: 3} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -55472,7 +55444,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: 0, y: 115} + m_AnchoredPosition: {x: 0, y: 0.0000019073486} m_SizeDelta: {x: 2000, y: 2000} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5431197398673504690 @@ -65305,11 +65277,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} -<<<<<<< HEAD m_AnchoredPosition: {x: 32, y: 110} -======= - m_AnchoredPosition: {x: 32, y: 0} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1691989418268791621 @@ -74970,11 +74938,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} -<<<<<<< HEAD m_AnchoredPosition: {x: -95, y: -180} -======= - m_AnchoredPosition: {x: -95, y: -300} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &7936547699123439436 @@ -94501,7 +94465,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: 162, y: 600} + m_AnchoredPosition: {x: 162, y: 684} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &6924641415001655371 @@ -109539,11 +109503,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} -<<<<<<< HEAD m_AnchoredPosition: {x: 181, y: -180} -======= - m_AnchoredPosition: {x: 181, y: -300} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1329985395783344784 @@ -114551,7 +114511,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: -112, y: 600} + m_AnchoredPosition: {x: -112, y: 684} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &3159450624219653591 @@ -114645,11 +114605,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} -<<<<<<< HEAD m_AnchoredPosition: {x: 302, y: 400} -======= - m_AnchoredPosition: {x: 302, y: 300} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &3327256818197168143 @@ -119745,11 +119701,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} -<<<<<<< HEAD m_AnchoredPosition: {x: 30, y: 400} -======= - m_AnchoredPosition: {x: 30, y: 300} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1696884089255400881 diff --git a/Assets/ManagedResources/Prefabs/UI/SecretBox/WishEquipBuyTenPanel.prefab b/Assets/ManagedResources/Prefabs/UI/SecretBox/WishEquipBuyTenPanel.prefab index 6e9cfb43d8..96843e29b1 100644 --- a/Assets/ManagedResources/Prefabs/UI/SecretBox/WishEquipBuyTenPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SecretBox/WishEquipBuyTenPanel.prefab @@ -29528,11 +29528,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} -<<<<<<< HEAD m_AnchoredPosition: {x: -253, y: 160} -======= - m_AnchoredPosition: {x: -253, y: 0} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &573731420 @@ -29855,11 +29851,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} -<<<<<<< HEAD m_AnchoredPosition: {x: 300, y: 160} -======= - m_AnchoredPosition: {x: 300, y: 0} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &683206835 @@ -29915,11 +29907,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} -<<<<<<< HEAD m_AnchoredPosition: {x: 181, y: -120} -======= - m_AnchoredPosition: {x: 181, y: -300} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &705096410 @@ -30055,11 +30043,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} -<<<<<<< HEAD m_AnchoredPosition: {x: 32, y: 160} -======= - m_AnchoredPosition: {x: 32, y: 0} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &746494627 @@ -45141,11 +45125,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} -<<<<<<< HEAD m_AnchoredPosition: {x: -251, y: 430} -======= - m_AnchoredPosition: {x: -251, y: 300} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1132342848 @@ -45201,11 +45181,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} -<<<<<<< HEAD m_AnchoredPosition: {x: 302, y: 430} -======= - m_AnchoredPosition: {x: 302, y: 300} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1152538764 @@ -54942,11 +54918,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} -<<<<<<< HEAD m_AnchoredPosition: {x: -95, y: -120} -======= - m_AnchoredPosition: {x: -95, y: -300} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1269410241 @@ -55150,11 +55122,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} -<<<<<<< HEAD m_AnchoredPosition: {x: 162, y: 705} -======= - m_AnchoredPosition: {x: 162, y: 600} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1298667291 @@ -79818,11 +79786,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} -<<<<<<< HEAD m_AnchoredPosition: {x: 30, y: 430} -======= - m_AnchoredPosition: {x: 30, y: 300} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1664439421 @@ -99933,7 +99897,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: 0, y: 70} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 2000, y: 2000} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &670265803275701683 @@ -123993,22 +123957,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} -<<<<<<< HEAD m_Color: {r: 0.6117647, g: 0.6039216, b: 0.6039216, a: 1} -======= - m_Color: {r: 0.44705883, g: 0.44705883, b: 0.44705883, a: 1} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 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 -<<<<<<< HEAD m_Sprite: {fileID: 21300000, guid: 6f4ec78b196b7f143b905fced5cca6e7, type: 3} -======= - m_Sprite: {fileID: 21300000, guid: af12f6c0672e7a244851abeaa5fb4cdf, type: 3} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -128816,11 +128772,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} -<<<<<<< HEAD m_AnchoredPosition: {x: -112, y: 705} -======= - m_AnchoredPosition: {x: -112, y: 600} ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &95702871535070054 @@ -134516,7 +134468,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -87} - m_SizeDelta: {x: 500, y: 80} + m_SizeDelta: {x: 500, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6939557388515857276 CanvasRenderer: @@ -135194,11 +135146,11 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 40 m_FontStyle: 1 m_BestFit: 0 - m_MinSize: 0 + m_MinSize: 4 m_MaxSize: 43 m_Alignment: 4 m_AlignByGeometry: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/SecretBox/WishGemBuyTenPanel.prefab b/Assets/ManagedResources/Prefabs/UI/SecretBox/WishGemBuyTenPanel.prefab index 54cd61cec6..57e6f60942 100644 --- a/Assets/ManagedResources/Prefabs/UI/SecretBox/WishGemBuyTenPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SecretBox/WishGemBuyTenPanel.prefab @@ -98818,15 +98818,15 @@ RectTransform: m_GameObject: {fileID: 1668380028768362} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 2, z: 1} m_Children: [] m_Father: {fileID: 224711616911079510} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1188, y: 2112} + m_SizeDelta: {x: 1820, y: 1520} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222895832948764372 CanvasRenderer: @@ -98856,7 +98856,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: 4eb6bdcc8846059428859e94eb5a05ef, type: 3} + m_Sprite: {fileID: 21300000, guid: 051fb976639bd02428f5e3d00c3ce43e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1