From 2b200672392111204904100e70a91ae933037723 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Tue, 31 Dec 2024 10:46:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= 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 +- .../Pocket/Bg_hz_beibao_pinjise_01.png.meta | 2 +- .../UI/Guild/Aid/GuildAidMainPopup.prefab | 185 ++++++++++++------ .../GuildTranscriptRewardSortPanel.prefab | 36 ++-- 5 files changed, 173 insertions(+), 76 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..e6cf1b38c9 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: 73, y: 0, z: 44, 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..8c9b6ddbd9 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: 59, y: 0, z: 29, 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/Pocket/Bg_hz_beibao_pinjise_01.png.meta b/Assets/ManagedResources/BG/UI/Pocket/Bg_hz_beibao_pinjise_01.png.meta index 016f193b53..f0455a6261 100644 --- a/Assets/ManagedResources/BG/UI/Pocket/Bg_hz_beibao_pinjise_01.png.meta +++ b/Assets/ManagedResources/BG/UI/Pocket/Bg_hz_beibao_pinjise_01.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: 0, y: 0, z: 902, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab index 539b18d44f..fe45140ec2 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab @@ -946,8 +946,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 82, y: -52.5} - m_SizeDelta: {x: 667.05, y: 85} + m_AnchoredPosition: {x: 152, y: -52.5} + m_SizeDelta: {x: 592, y: 85} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6133593333049017995 CanvasRenderer: @@ -1184,8 +1184,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: -30.9, y: -264.5} - m_SizeDelta: {x: 836.1, y: 133.8} + m_AnchoredPosition: {x: -45, y: 0} + m_SizeDelta: {x: 795, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8490609879275614091 CanvasRenderer: @@ -1208,15 +1208,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.8003112, b: 0.6273585, 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: 21300000, guid: adb5d654a91f0c041b2e97440c7e9740, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 48b69449aa377b94aa90be9331fe0162, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1259,7 +1259,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: 371, y: 287} + m_AnchoredPosition: {x: 431.7, y: 44} m_SizeDelta: {x: 405, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4980819517309648897 @@ -1404,7 +1404,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: 2.7, y: 0.05} + m_AnchoredPosition: {x: 1, y: 0.05} m_SizeDelta: {x: 161.67, y: 50.06} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3381836307131825562 @@ -2034,8 +2034,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 82, y: -52.5} - m_SizeDelta: {x: 683.05, y: 85} + m_AnchoredPosition: {x: 152, y: -52.5} + m_SizeDelta: {x: 592, y: 85} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7021782205684878474 CanvasRenderer: @@ -2448,7 +2448,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8959720258564428655 RectTransform: m_ObjectHideFlags: 0 @@ -2467,8 +2467,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 401.025, y: -192.5} - m_SizeDelta: {x: 782.05, y: 185} + m_AnchoredPosition: {x: 537.45, y: -172.5} + m_SizeDelta: {x: 1054.9, y: 185} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2627485671992849492 CanvasRenderer: @@ -2513,7 +2513,7 @@ MonoBehaviour: m_Spacing: 15 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 + m_ChildControlWidth: 0 m_ChildControlHeight: 1 --- !u!1 &1579523779098236789 GameObject: @@ -3375,7 +3375,7 @@ RectTransform: m_Children: - {fileID: 8461693662743656931} m_Father: {fileID: 4080728017189381547} - m_RootOrder: 1 + 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} @@ -3769,7 +3769,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: e0d70e0322fd03b4bbf550d673a7cc5d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4023,7 +4023,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: 2.7, y: 0.05} + m_AnchoredPosition: {x: -1.8, y: 1.7} m_SizeDelta: {x: 161.67, y: 50.06} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4612563921768516295 @@ -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 @@ -4532,12 +4532,12 @@ RectTransform: m_Children: - {fileID: 4872216247650864337} m_Father: {fileID: 4080728017189381547} - m_RootOrder: 0 + m_RootOrder: 1 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: -2, y: -50.1} - m_SizeDelta: {x: 834.6, y: 1057.6} + m_AnchoredPosition: {x: 0.27, y: -45.11} + m_SizeDelta: {x: 813.63, y: 1047.63} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3770032720140774713 MonoBehaviour: @@ -4927,7 +4927,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: 10, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4158573116788488559 @@ -5064,7 +5064,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &9154857134814570856 RectTransform: m_ObjectHideFlags: 0 @@ -5083,8 +5083,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 401.025, y: -381.5} - m_SizeDelta: {x: 782.05, y: 193} + m_AnchoredPosition: {x: 545.45, y: -361.5} + m_SizeDelta: {x: 1070.9, y: 193} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5069444784871372176 CanvasRenderer: @@ -5129,7 +5129,7 @@ MonoBehaviour: m_Spacing: 15 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 + m_ChildControlWidth: 0 m_ChildControlHeight: 1 --- !u!1 &4552825705831014136 GameObject: @@ -5167,8 +5167,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 261.025, y: -52.5} - m_SizeDelta: {x: 442.05, y: 105} + m_AnchoredPosition: {x: 397.45, y: -52.5} + m_SizeDelta: {x: 714.9, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9050691566869355540 CanvasRenderer: @@ -5205,7 +5205,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 82 + m_Left: 152 m_Right: -323 m_Top: 10 m_Bottom: 10 @@ -5213,7 +5213,7 @@ MonoBehaviour: m_Spacing: 10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 + m_ChildControlWidth: 0 m_ChildControlHeight: 1 --- !u!1 &4740747647566745406 GameObject: @@ -5268,7 +5268,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4872216247291729306 RectTransform: m_ObjectHideFlags: 0 @@ -5287,8 +5287,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: 5, y: -0.000061035156} - m_SizeDelta: {x: 802.05, y: 508} + m_AnchoredPosition: {x: 5, y: 0} + m_SizeDelta: {x: 802.05, y: 110} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4872216247291729287 CanvasRenderer: @@ -5313,7 +5313,7 @@ MonoBehaviour: m_Padding: m_Left: 10 m_Right: 10 - m_Top: 100 + m_Top: 80 m_Bottom: 30 m_ChildAlignment: 0 m_Spacing: 0 @@ -5371,8 +5371,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: -3, y: -27.5} - m_SizeDelta: {x: 819.3, y: 1155} + m_AnchoredPosition: {x: 1.2, y: 5.5} + m_SizeDelta: {x: 810.8, y: 1036.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4872216247650864336 MonoBehaviour: @@ -5429,7 +5429,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3995650248301756071 RectTransform: m_ObjectHideFlags: 0 @@ -5495,7 +5495,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: 286.15, y: -7.4275} + m_AnchoredPosition: {x: 286.15, y: -12.6} m_SizeDelta: {x: 165.09, y: 54.145} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3245582057619280687 @@ -5568,7 +5568,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: e0d70e0322fd03b4bbf550d673a7cc5d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5611,8 +5611,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: -215, y: 5} - m_SizeDelta: {x: 384.31, y: 64.41} + m_AnchoredPosition: {x: -190, y: 0} + m_SizeDelta: {x: 384.31, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3427522316698604551 CanvasRenderer: @@ -5643,7 +5643,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: 42 m_FontStyle: 0 m_BestFit: 0 @@ -5767,8 +5767,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 238.025, y: -52.5} - m_SizeDelta: {x: 426.05, y: 105} + m_AnchoredPosition: {x: 397.45, y: -52.5} + m_SizeDelta: {x: 714.9, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &576979799029071381 CanvasRenderer: @@ -5805,7 +5805,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 82 + m_Left: 152 m_Right: -323 m_Top: 10 m_Bottom: 10 @@ -5813,7 +5813,7 @@ MonoBehaviour: m_Spacing: 10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 + m_ChildControlWidth: 0 m_ChildControlHeight: 1 --- !u!1 &5403037727204387952 GameObject: @@ -5850,8 +5850,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: -42.4, y: -329} - m_SizeDelta: {x: 815.9, y: 262.8} + m_AnchoredPosition: {x: -45, y: 0} + m_SizeDelta: {x: 795, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &412768021461167158 CanvasRenderer: @@ -5874,15 +5874,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.8, b: 0.627451, 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: 21300000, guid: adb5d654a91f0c041b2e97440c7e9740, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 48b69449aa377b94aa90be9331fe0162, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -6264,8 +6264,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: -219, y: -1.3000183} - m_SizeDelta: {x: 384.31, y: 64.41} + m_AnchoredPosition: {x: -190, y: 0} + m_SizeDelta: {x: 384.31, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3062479705841984410 CanvasRenderer: @@ -7212,6 +7212,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 5082601188418219996} - {fileID: 3770032720140774718} - {fileID: 8794447579046382433} m_Father: {fileID: 2384741869561909548} @@ -8782,6 +8783,80 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: '[17:25:30]' +--- !u!1 &8665655796901585339 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5082601188418219996} + - component: {fileID: 5641657213635547987} + - component: {fileID: 6734341834151526346} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5082601188418219996 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8665655796901585339} + 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_Children: [] + m_Father: {fileID: 4080728017189381547} + 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.82, y: -42.99} + m_SizeDelta: {x: 829.62, y: 1066.97} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5641657213635547987 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8665655796901585339} + m_CullTransparentMesh: 0 +--- !u!114 &6734341834151526346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8665655796901585339} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: 21300000, guid: a8f530feeafc0954db3b66a08004edf3, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &8749876425041740946 GameObject: m_ObjectHideFlags: 0 @@ -9214,7 +9289,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: 371, y: 287} + m_AnchoredPosition: {x: 431.7, y: 44.1} m_SizeDelta: {x: 405, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3495972953117958656 diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptRewardSortPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptRewardSortPanel.prefab index 9c413cc85f..934de8eb85 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 @@ -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.60784316} 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 @@ -254,7 +254,7 @@ RectTransform: 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_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,8 +361,8 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 50 - m_FontStyle: 0 + m_FontSize: 60 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 74 @@ -424,7 +424,7 @@ RectTransform: 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_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 @@ -499,7 +499,7 @@ RectTransform: 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_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: 406.14, y: 0} + m_SizeDelta: {x: 598.6, 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 @@ -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: 704.52, y: 0} + m_SizeDelta: {x: 96.64, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3732310262108085685 CanvasRenderer: