From 249e9fba505ed86044335a0534bb23af66d016d2 Mon Sep 17 00:00:00 2001 From: lorenzo-ranciaffi Date: Wed, 8 Jan 2025 16:10:31 +0100 Subject: [PATCH 001/273] wip sidebar button --- .../DCL/FeatureFlags/FeatureFlagsStrings.cs | 1 + Explorer/Assets/DCL/Friends/Animations.meta | 8 + .../DCL/Friends/Animations/Sidebar.meta | 8 + .../Friends/Animations/Sidebar/Active.anim | 359 +++++++++ .../Animations/Sidebar/Active.anim.meta | 8 + .../DCL/Friends/Animations/Sidebar/Empty.anim | 359 +++++++++ .../Animations/Sidebar/Empty.anim.meta | 8 + ...uttonOverrideController.overrideController | 19 + ...OverrideController.overrideController.meta | 8 + .../DCL/Friends/Animations/Sidebar/Hover.anim | 610 +++++++++++++++ .../Animations/Sidebar/Hover.anim.meta | 8 + .../Friends/Animations/Sidebar/Unhover.anim | 723 ++++++++++++++++++ .../Animations/Sidebar/Unhover.anim.meta | 8 + Explorer/Assets/DCL/Friends/Textures.meta | 8 + .../DCL/Friends/Textures/Friends off.png | 3 + .../DCL/Friends/Textures/Friends off.png.meta | 127 +++ .../DCL/Friends/Textures/Friends on.png | 3 + .../DCL/Friends/Textures/Friends on.png.meta | 127 +++ .../DCL/PluginSystem/Global/SidebarPlugin.cs | 8 +- .../DCL/UI/Sidebar/SidebarController.cs | 17 +- .../Assets/DCL/UI/Sidebar/SidebarUI.prefab | 157 ++++ Explorer/Assets/DCL/UI/Sidebar/SidebarView.cs | 1 + .../Scripts/Global/AppArgs/AppArgsFlags.cs | 1 + .../Global/Dynamic/DynamicWorldContainer.cs | 7 +- 24 files changed, 2581 insertions(+), 5 deletions(-) create mode 100644 Explorer/Assets/DCL/Friends/Animations.meta create mode 100644 Explorer/Assets/DCL/Friends/Animations/Sidebar.meta create mode 100644 Explorer/Assets/DCL/Friends/Animations/Sidebar/Active.anim create mode 100644 Explorer/Assets/DCL/Friends/Animations/Sidebar/Active.anim.meta create mode 100644 Explorer/Assets/DCL/Friends/Animations/Sidebar/Empty.anim create mode 100644 Explorer/Assets/DCL/Friends/Animations/Sidebar/Empty.anim.meta create mode 100644 Explorer/Assets/DCL/Friends/Animations/Sidebar/FriendsSidebarButtonOverrideController.overrideController create mode 100644 Explorer/Assets/DCL/Friends/Animations/Sidebar/FriendsSidebarButtonOverrideController.overrideController.meta create mode 100644 Explorer/Assets/DCL/Friends/Animations/Sidebar/Hover.anim create mode 100644 Explorer/Assets/DCL/Friends/Animations/Sidebar/Hover.anim.meta create mode 100644 Explorer/Assets/DCL/Friends/Animations/Sidebar/Unhover.anim create mode 100644 Explorer/Assets/DCL/Friends/Animations/Sidebar/Unhover.anim.meta create mode 100644 Explorer/Assets/DCL/Friends/Textures.meta create mode 100644 Explorer/Assets/DCL/Friends/Textures/Friends off.png create mode 100644 Explorer/Assets/DCL/Friends/Textures/Friends off.png.meta create mode 100644 Explorer/Assets/DCL/Friends/Textures/Friends on.png create mode 100644 Explorer/Assets/DCL/Friends/Textures/Friends on.png.meta diff --git a/Explorer/Assets/DCL/FeatureFlags/FeatureFlagsStrings.cs b/Explorer/Assets/DCL/FeatureFlags/FeatureFlagsStrings.cs index df27b7374b..95d2424d13 100644 --- a/Explorer/Assets/DCL/FeatureFlags/FeatureFlagsStrings.cs +++ b/Explorer/Assets/DCL/FeatureFlags/FeatureFlagsStrings.cs @@ -22,5 +22,6 @@ public static class FeatureFlagsStrings public const string VIDEO_PRIORITIZATION = "alfa-video-prioritization"; public const string CAMERA_REEL = "alpha-camera-reel"; + public const string FRIENDS = "alpha-friends"; } } diff --git a/Explorer/Assets/DCL/Friends/Animations.meta b/Explorer/Assets/DCL/Friends/Animations.meta new file mode 100644 index 0000000000..cb829f81b8 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e53159a76585240068264c0da33d0827 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar.meta b/Explorer/Assets/DCL/Friends/Animations/Sidebar.meta new file mode 100644 index 0000000000..5614eb9af7 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/Animations/Sidebar.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a9e5e897ceb7548d09bb2eb77ed2309a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/Active.anim b/Explorer/Assets/DCL/Friends/Animations/Sidebar/Active.anim new file mode 100644 index 0000000000..03374d7d1b --- /dev/null +++ b/Explorer/Assets/DCL/Friends/Animations/Sidebar/Active.anim @@ -0,0 +1,359 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Active + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Background + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedBackground + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: UnselectedText + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: UnselectedImage + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedText + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedImage + classID: 1 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 4080383872 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3146825030 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3779823699 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 847614765 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 78225181 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2734955949 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Background + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedBackground + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: UnselectedText + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: UnselectedImage + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedText + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedImage + classID: 1 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/Active.anim.meta b/Explorer/Assets/DCL/Friends/Animations/Sidebar/Active.anim.meta new file mode 100644 index 0000000000..078f52ea1f --- /dev/null +++ b/Explorer/Assets/DCL/Friends/Animations/Sidebar/Active.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d1c1bf5d54df4834bb6491d335628df +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/Empty.anim b/Explorer/Assets/DCL/Friends/Animations/Sidebar/Empty.anim new file mode 100644 index 0000000000..913794feb2 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/Animations/Sidebar/Empty.anim @@ -0,0 +1,359 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Empty + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Background + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedBackground + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedImage + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedText + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: UnselectedImage + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: UnselectedText + classID: 1 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 4080383872 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3146825030 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2734955949 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 78225181 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 847614765 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3779823699 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Background + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedBackground + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedImage + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedText + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: UnselectedImage + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: UnselectedText + classID: 1 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/Empty.anim.meta b/Explorer/Assets/DCL/Friends/Animations/Sidebar/Empty.anim.meta new file mode 100644 index 0000000000..e24a9995c7 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/Animations/Sidebar/Empty.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4eec9ea443fac45a6b90653ecebefcc3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/FriendsSidebarButtonOverrideController.overrideController b/Explorer/Assets/DCL/Friends/Animations/Sidebar/FriendsSidebarButtonOverrideController.overrideController new file mode 100644 index 0000000000..cc9bde1c20 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/Animations/Sidebar/FriendsSidebarButtonOverrideController.overrideController @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!221 &22100000 +AnimatorOverrideController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FriendsSidebarButtonOverrideController + m_Controller: {fileID: 9100000, guid: 29515e57a75974c4480e658f7421d023, type: 2} + m_Clips: + - m_OriginalClip: {fileID: 7400000, guid: 43e9f4fd4bce23e46b692fbe72981b78, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 4eec9ea443fac45a6b90653ecebefcc3, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: ea61896d50f57c949b869912b2e72b67, type: 2} + m_OverrideClip: {fileID: 7400000, guid: ef6117aeccd2a42ed85e0b9f1c17ee4b, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: 3935cf9ff713f5e4badf081a136f96bb, type: 2} + m_OverrideClip: {fileID: 7400000, guid: fb39db421463a44baa5bedf9fe548fc8, type: 2} + - m_OriginalClip: {fileID: 7400000, guid: b0a045939fb100b438fdb51c4b59789e, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 2d1c1bf5d54df4834bb6491d335628df, type: 2} diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/FriendsSidebarButtonOverrideController.overrideController.meta b/Explorer/Assets/DCL/Friends/Animations/Sidebar/FriendsSidebarButtonOverrideController.overrideController.meta new file mode 100644 index 0000000000..b39e3b8002 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/Animations/Sidebar/FriendsSidebarButtonOverrideController.overrideController.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e775e2c5fdd5241f6a3255c8cf678e8e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 22100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/Hover.anim b/Explorer/Assets/DCL/Friends/Animations/Sidebar/Hover.anim new file mode 100644 index 0000000000..216b760421 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/Animations/Sidebar/Hover.anim @@ -0,0 +1,610 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Hover + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.016666668 + value: {x: 0.9, y: 0.9, z: 0.9} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HoverSprites + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: UnselectedImage + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: HoverSprites + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: UnhoverSprites + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedImage + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedBackground + classID: 1 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 6e68f3c0e96070343bd5cf728a7b71b6, type: 3} + - time: 0.016666668 + value: {fileID: 21300000, guid: b43b5fcfcc150c54f92f636382e4689b, type: 3} + - time: 0.033333335 + value: {fileID: 21300000, guid: 3343c1b5f72dad5499ef23cc1a9ab1b2, type: 3} + - time: 0.05 + value: {fileID: 21300000, guid: e06c9b7d56e09b7459721426f18a083b, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: d2d799980d619ad419ec8a5c349c8a0d, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: 32f04f2d2c33fcf4cb5aa91b66e4d685, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: c00071f2220312c42ac98c1a255edbc1, type: 3} + - time: 0.11666667 + value: {fileID: 21300000, guid: e8e624351eea1674ba0df4b7ccf22e22, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: 2fd5aa0b3c663314ebe7e60f0a9b32b1, type: 3} + - time: 0.15 + value: {fileID: 21300000, guid: d4feb679bd4fdb74caf66e750565213a, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 6cd7fbfd1d1334b42aa6c00aec4e2464, type: 3} + - time: 0.18333334 + value: {fileID: 21300000, guid: a70a4f998da82e34e863bcfa50061c7b, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: 6673fe2d2206e584e8c37141b476f0c3, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: 1dd53ae314a26f44a9640f0fd9d233f3, type: 3} + - time: 0.23333333 + value: {fileID: 21300000, guid: 2419882a93253bb4e97eced138e4b0e6, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 78fc6eec067088e44bc1ccffa6425266, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: 651a83d3f63a6ca42aca746475705fe6, type: 3} + - time: 0.28333333 + value: {fileID: 21300000, guid: 02f8a135865471a4d93f37b447d08c99, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: c031c284db2dca94ba8bddc540af9484, type: 3} + - time: 0.31666666 + value: {fileID: 21300000, guid: 779ae1fe7a482674d957b5cc166b7aa9, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 7574758803d042c4797d254ed4153ac5, type: 3} + - time: 0.35 + value: {fileID: 21300000, guid: 641bdafd76f227f42a2f58a9ec9a4f9d, type: 3} + - time: 0.36666667 + value: {fileID: 21300000, guid: 76ef1a614441cae469773a6e10952af4, type: 3} + - time: 0.38333333 + value: {fileID: 21300000, guid: 8d25708ecc0a1964c8689ea4d9bc5caa, type: 3} + - time: 0.4 + value: {fileID: 21300000, guid: c1dfffce53ecd574aa71be1dee4a1231, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: 964e7e39d19d879419b2e82acf43e3c3, type: 3} + - time: 0.43333334 + value: {fileID: 21300000, guid: a6fdd390d63850248b948d097e02abd0, type: 3} + - time: 0.45 + value: {fileID: 21300000, guid: 8e0021a936000f74db2913f93b1e3c40, type: 3} + - time: 0.46666667 + value: {fileID: 21300000, guid: 610190fee08cdf942882098d9b1710d8, type: 3} + - time: 0.48333332 + value: {fileID: 21300000, guid: 6ecfca2465a7b6843be20ec1b648fac1, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 812bd7fb0f30f6d4998946cc169bda9f, type: 3} + - time: 0.51666665 + value: {fileID: 21300000, guid: 5c867a976f9d62e48ac5bb41db21f5a3, type: 3} + - time: 0.53333336 + value: {fileID: 21300000, guid: 4b77ca340f2c54648807a906aef66273, type: 3} + - time: 0.55 + value: {fileID: 21300000, guid: 3fd61f07b75a2594f97050c2d746b9fd, type: 3} + - time: 0.56666666 + value: {fileID: 21300000, guid: e91fe25149057244da754198fd67f626, type: 3} + - time: 0.5833333 + value: {fileID: 21300000, guid: 482eb65378087384f8c771542e75ed02, type: 3} + - time: 0.6 + value: {fileID: 21300000, guid: 3a35ca86f9a0bb5419a3b25c5032bdd5, type: 3} + - time: 0.6166667 + value: {fileID: 21300000, guid: ab188b459e1375a41b33406de166e470, type: 3} + - time: 0.6333333 + value: {fileID: 21300000, guid: b1e23a904b7400f48853432b6770c672, type: 3} + - time: 0.65 + value: {fileID: 21300000, guid: 593fe93bae4562547a988e3eacbe017d, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: f32d2fe256178244987bf252d76c93fb, type: 3} + - time: 0.68333334 + value: {fileID: 21300000, guid: 4815ffe22b7378540b1a735779986430, type: 3} + attribute: m_Sprite + path: HoverSprites + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 3541911651 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 847614765 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3541911651 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 922705709 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2734955949 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3146825030 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3541911651 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 6e68f3c0e96070343bd5cf728a7b71b6, type: 3} + - {fileID: 21300000, guid: b43b5fcfcc150c54f92f636382e4689b, type: 3} + - {fileID: 21300000, guid: 3343c1b5f72dad5499ef23cc1a9ab1b2, type: 3} + - {fileID: 21300000, guid: e06c9b7d56e09b7459721426f18a083b, type: 3} + - {fileID: 21300000, guid: d2d799980d619ad419ec8a5c349c8a0d, type: 3} + - {fileID: 21300000, guid: 32f04f2d2c33fcf4cb5aa91b66e4d685, type: 3} + - {fileID: 21300000, guid: c00071f2220312c42ac98c1a255edbc1, type: 3} + - {fileID: 21300000, guid: e8e624351eea1674ba0df4b7ccf22e22, type: 3} + - {fileID: 21300000, guid: 2fd5aa0b3c663314ebe7e60f0a9b32b1, type: 3} + - {fileID: 21300000, guid: d4feb679bd4fdb74caf66e750565213a, type: 3} + - {fileID: 21300000, guid: 6cd7fbfd1d1334b42aa6c00aec4e2464, type: 3} + - {fileID: 21300000, guid: a70a4f998da82e34e863bcfa50061c7b, type: 3} + - {fileID: 21300000, guid: 6673fe2d2206e584e8c37141b476f0c3, type: 3} + - {fileID: 21300000, guid: 1dd53ae314a26f44a9640f0fd9d233f3, type: 3} + - {fileID: 21300000, guid: 2419882a93253bb4e97eced138e4b0e6, type: 3} + - {fileID: 21300000, guid: 78fc6eec067088e44bc1ccffa6425266, type: 3} + - {fileID: 21300000, guid: 651a83d3f63a6ca42aca746475705fe6, type: 3} + - {fileID: 21300000, guid: 02f8a135865471a4d93f37b447d08c99, type: 3} + - {fileID: 21300000, guid: c031c284db2dca94ba8bddc540af9484, type: 3} + - {fileID: 21300000, guid: 779ae1fe7a482674d957b5cc166b7aa9, type: 3} + - {fileID: 21300000, guid: 7574758803d042c4797d254ed4153ac5, type: 3} + - {fileID: 21300000, guid: 641bdafd76f227f42a2f58a9ec9a4f9d, type: 3} + - {fileID: 21300000, guid: 76ef1a614441cae469773a6e10952af4, type: 3} + - {fileID: 21300000, guid: 8d25708ecc0a1964c8689ea4d9bc5caa, type: 3} + - {fileID: 21300000, guid: c1dfffce53ecd574aa71be1dee4a1231, type: 3} + - {fileID: 21300000, guid: 964e7e39d19d879419b2e82acf43e3c3, type: 3} + - {fileID: 21300000, guid: a6fdd390d63850248b948d097e02abd0, type: 3} + - {fileID: 21300000, guid: 8e0021a936000f74db2913f93b1e3c40, type: 3} + - {fileID: 21300000, guid: 610190fee08cdf942882098d9b1710d8, type: 3} + - {fileID: 21300000, guid: 6ecfca2465a7b6843be20ec1b648fac1, type: 3} + - {fileID: 21300000, guid: 812bd7fb0f30f6d4998946cc169bda9f, type: 3} + - {fileID: 21300000, guid: 5c867a976f9d62e48ac5bb41db21f5a3, type: 3} + - {fileID: 21300000, guid: 4b77ca340f2c54648807a906aef66273, type: 3} + - {fileID: 21300000, guid: 3fd61f07b75a2594f97050c2d746b9fd, type: 3} + - {fileID: 21300000, guid: e91fe25149057244da754198fd67f626, type: 3} + - {fileID: 21300000, guid: 482eb65378087384f8c771542e75ed02, type: 3} + - {fileID: 21300000, guid: 3a35ca86f9a0bb5419a3b25c5032bdd5, type: 3} + - {fileID: 21300000, guid: ab188b459e1375a41b33406de166e470, type: 3} + - {fileID: 21300000, guid: b1e23a904b7400f48853432b6770c672, type: 3} + - {fileID: 21300000, guid: 593fe93bae4562547a988e3eacbe017d, type: 3} + - {fileID: 21300000, guid: f32d2fe256178244987bf252d76c93fb, type: 3} + - {fileID: 21300000, guid: 4815ffe22b7378540b1a735779986430, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.7 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: UnselectedImage + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: HoverSprites + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: UnhoverSprites + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedImage + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedBackground + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: HoverSprites + classID: 224 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: HoverSprites + classID: 224 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: HoverSprites + classID: 224 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/Hover.anim.meta b/Explorer/Assets/DCL/Friends/Animations/Sidebar/Hover.anim.meta new file mode 100644 index 0000000000..12598b334f --- /dev/null +++ b/Explorer/Assets/DCL/Friends/Animations/Sidebar/Hover.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ef6117aeccd2a42ed85e0b9f1c17ee4b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/Unhover.anim b/Explorer/Assets/DCL/Friends/Animations/Sidebar/Unhover.anim new file mode 100644 index 0000000000..90293276fc --- /dev/null +++ b/Explorer/Assets/DCL/Friends/Animations/Sidebar/Unhover.anim @@ -0,0 +1,723 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Unhover + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.9, y: 0.9, z: 0.9} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HoverSprites + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.016666668 + value: {x: 0.9, y: 0.9, z: 0.9} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: UnhoverSprites + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: HoverSprites + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: UnhoverSprites + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.23333333 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: UnselectedImage + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedImage + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedBackground + classID: 1 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 54db90b513f86ff46a6aa6f6676cd48b, type: 3} + - time: 0.016666668 + value: {fileID: 21300000, guid: 593fe93bae4562547a988e3eacbe017d, type: 3} + - time: 0.033333335 + value: {fileID: 21300000, guid: c136fe4a977b99d47957e44605684e78, type: 3} + - time: 0.05 + value: {fileID: 21300000, guid: 1c5d8e721ba22d34387b777bb78ae45e, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: 6fad4fe67df884843b2cb3bca9e322b2, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: e9287774bb3511d48b382b90e268a530, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: e1408aa259a57594bab89fd02f2832a0, type: 3} + - time: 0.11666667 + value: {fileID: 21300000, guid: 02f8a135865471a4d93f37b447d08c99, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: 78fc6eec067088e44bc1ccffa6425266, type: 3} + - time: 0.15 + value: {fileID: 21300000, guid: a70a4f998da82e34e863bcfa50061c7b, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: d4feb679bd4fdb74caf66e750565213a, type: 3} + - time: 0.18333334 + value: {fileID: 21300000, guid: e8e624351eea1674ba0df4b7ccf22e22, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: e06c9b7d56e09b7459721426f18a083b, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: b43b5fcfcc150c54f92f636382e4689b, type: 3} + attribute: m_Sprite + path: UnhoverSprites + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 4815ffe22b7378540b1a735779986430, type: 3} + attribute: m_Sprite + path: HoverSprites + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 922705709 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3541911651 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 922705709 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 847614765 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2734955949 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3146825030 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 922705709 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3541911651 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3541911651 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 54db90b513f86ff46a6aa6f6676cd48b, type: 3} + - {fileID: 21300000, guid: 593fe93bae4562547a988e3eacbe017d, type: 3} + - {fileID: 21300000, guid: c136fe4a977b99d47957e44605684e78, type: 3} + - {fileID: 21300000, guid: 1c5d8e721ba22d34387b777bb78ae45e, type: 3} + - {fileID: 21300000, guid: 6fad4fe67df884843b2cb3bca9e322b2, type: 3} + - {fileID: 21300000, guid: e9287774bb3511d48b382b90e268a530, type: 3} + - {fileID: 21300000, guid: e1408aa259a57594bab89fd02f2832a0, type: 3} + - {fileID: 21300000, guid: 02f8a135865471a4d93f37b447d08c99, type: 3} + - {fileID: 21300000, guid: 78fc6eec067088e44bc1ccffa6425266, type: 3} + - {fileID: 21300000, guid: a70a4f998da82e34e863bcfa50061c7b, type: 3} + - {fileID: 21300000, guid: d4feb679bd4fdb74caf66e750565213a, type: 3} + - {fileID: 21300000, guid: e8e624351eea1674ba0df4b7ccf22e22, type: 3} + - {fileID: 21300000, guid: e06c9b7d56e09b7459721426f18a083b, type: 3} + - {fileID: 21300000, guid: b43b5fcfcc150c54f92f636382e4689b, type: 3} + - {fileID: 21300000, guid: 4815ffe22b7378540b1a735779986430, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.23333333 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: HoverSprites + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: UnhoverSprites + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.23333333 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: UnselectedImage + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedImage + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SelectedBackground + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: HoverSprites + classID: 224 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: HoverSprites + classID: 224 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: HoverSprites + classID: 224 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: UnhoverSprites + classID: 224 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: UnhoverSprites + classID: 224 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.016666668 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: UnhoverSprites + classID: 224 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/Unhover.anim.meta b/Explorer/Assets/DCL/Friends/Animations/Sidebar/Unhover.anim.meta new file mode 100644 index 0000000000..c03fe1b36c --- /dev/null +++ b/Explorer/Assets/DCL/Friends/Animations/Sidebar/Unhover.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fb39db421463a44baa5bedf9fe548fc8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/DCL/Friends/Textures.meta b/Explorer/Assets/DCL/Friends/Textures.meta new file mode 100644 index 0000000000..355d2bbcfd --- /dev/null +++ b/Explorer/Assets/DCL/Friends/Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 932ef5c0b7e1e4f75b5416b8bfeec1ea +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/DCL/Friends/Textures/Friends off.png b/Explorer/Assets/DCL/Friends/Textures/Friends off.png new file mode 100644 index 0000000000..f6746daa58 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/Textures/Friends off.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:831bec702de9773d45582e2e7627038d762381a289b22dc5d1942cb018a9d0ee +size 525 diff --git a/Explorer/Assets/DCL/Friends/Textures/Friends off.png.meta b/Explorer/Assets/DCL/Friends/Textures/Friends off.png.meta new file mode 100644 index 0000000000..6cf6ff7a68 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/Textures/Friends off.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 664d8ada18433407bbc74c6bee347d43 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/DCL/Friends/Textures/Friends on.png b/Explorer/Assets/DCL/Friends/Textures/Friends on.png new file mode 100644 index 0000000000..4c75c89171 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/Textures/Friends on.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e51d6e4059fe56437c1e00e324af5c4fe1dbcca3367d4a81b077ed6f8ffdd919 +size 625 diff --git a/Explorer/Assets/DCL/Friends/Textures/Friends on.png.meta b/Explorer/Assets/DCL/Friends/Textures/Friends on.png.meta new file mode 100644 index 0000000000..df144da433 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/Textures/Friends on.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 86dbb279b12d344ddb61ec75d52123b4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/DCL/PluginSystem/Global/SidebarPlugin.cs b/Explorer/Assets/DCL/PluginSystem/Global/SidebarPlugin.cs index 67fb7ee6bd..deaa5395d3 100644 --- a/Explorer/Assets/DCL/PluginSystem/Global/SidebarPlugin.cs +++ b/Explorer/Assets/DCL/PluginSystem/Global/SidebarPlugin.cs @@ -43,6 +43,7 @@ public class SidebarPlugin : IDCLGlobalPlugin private readonly Arch.Core.World world; private readonly Entity playerEntity; private readonly bool includeCameraReel; + private readonly bool includeFriends; public SidebarPlugin( IAssetsProvisioner assetsProvisioner, @@ -61,7 +62,8 @@ public SidebarPlugin( ChatEntryConfigurationSO chatEntryConfigurationSo, Arch.Core.World world, Entity playerEntity, - bool includeCameraReel) + bool includeCameraReel, + bool includeFriends) { this.assetsProvisioner = assetsProvisioner; this.mvcManager = mvcManager; @@ -80,6 +82,7 @@ public SidebarPlugin( this.world = world; this.playerEntity = playerEntity; this.includeCameraReel = includeCameraReel; + this.includeFriends = includeFriends; } public void Dispose() { } @@ -107,7 +110,8 @@ public async UniTask InitializeAsync(SidebarSettings settings, CancellationToken web3IdentityCache, profileRepository, webBrowser, - includeCameraReel + includeCameraReel, + includeFriends )); } diff --git a/Explorer/Assets/DCL/UI/Sidebar/SidebarController.cs b/Explorer/Assets/DCL/UI/Sidebar/SidebarController.cs index 0526a35533..19d8e4ca64 100644 --- a/Explorer/Assets/DCL/UI/Sidebar/SidebarController.cs +++ b/Explorer/Assets/DCL/UI/Sidebar/SidebarController.cs @@ -30,6 +30,7 @@ public class SidebarController : ControllerBase private readonly IWeb3IdentityCache identityCache; private readonly IWebBrowser webBrowser; private readonly bool includeCameraReel; + private readonly bool includeFriends; private CancellationTokenSource profileWidgetCts = new (); private CancellationTokenSource systemMenuCts = new (); @@ -50,7 +51,8 @@ public SidebarController( IWeb3IdentityCache identityCache, IProfileRepository profileRepository, IWebBrowser webBrowser, - bool includeCameraReel) + bool includeCameraReel, + bool includeFriends) : base(viewFactory) { this.mvcManager = mvcManager; @@ -64,6 +66,7 @@ public SidebarController( this.profileRepository = profileRepository; this.webBrowser = webBrowser; this.includeCameraReel = includeCameraReel; + this.includeFriends = includeFriends; } public override void Dispose() @@ -101,6 +104,11 @@ protected override void OnViewInstantiated() viewInstance.cameraReelButton.gameObject.SetActive(false); viewInstance.InWorldCameraButton.gameObject.SetActive(false); } + + if (includeFriends) + viewInstance.friendsButton.onClick.AddListener(OpenFriendsPanel); + else + viewInstance.friendsButton.gameObject.SetActive(false); } private void OnHelpButtonClicked() @@ -191,6 +199,13 @@ private void OpenNotificationsPanel() notificationsMenuController.ToggleNotificationsPanel(false); } + private void OpenFriendsPanel() + { + CloseAllWidgets(); + sidebarBus.BlockSidebar(); + // notificationsMenuController.ToggleNotificationsPanel(false); + } + private void OpenExplorePanelInSection(ExploreSections section, BackpackSections backpackSection = BackpackSections.Avatar) { CloseAllWidgets(); diff --git a/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab b/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab index 14ff3e370b..42bcec18f1 100644 --- a/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab +++ b/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab @@ -227,6 +227,7 @@ MonoBehaviour: k__BackingField: {fileID: 7310006030576766240} k__BackingField: {fileID: 3655238427613538003} k__BackingField: {fileID: 9220203987770033458} + k__BackingField: {fileID: 2156236093003474023} k__BackingField: {fileID: 1441228183698799381} k__BackingField: {fileID: 2506691189012929090} k__BackingField: {fileID: 6705180925666095888} @@ -858,6 +859,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} insertIndex: -1 addedObject: {fileID: 3531244294086588118} + - targetCorrespondingSourceObject: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} + insertIndex: -1 + addedObject: {fileID: 3426011414991243565} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} --- !u!114 &1734187727223042766 stripped @@ -1294,3 +1298,156 @@ MonoBehaviour: k__BackingField: {fileID: 11400000, guid: cbbd6a003fc75e24da47c13feacd92c7, type: 2} k__BackingField: {fileID: 11400000, guid: 59da234351971c0498a566fb811b0c36, type: 2} k__BackingField: {fileID: 2817631124620323997} +--- !u!1001 &4874593898509792536 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6256374512070760242} + m_Modifications: + - target: {fileID: 295338025792269447, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_Name + value: FriendsButton + objectReference: {fileID: 0} + - target: {fileID: 1843191261321601065, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_text + value: Friends + objectReference: {fileID: 0} + - target: {fileID: 1929141281310645375, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2424964013850637101, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 664d8ada18433407bbc74c6bee347d43, type: 3} + - target: {fileID: 4142706560060308361, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 86dbb279b12d344ddb61ec75d52123b4, type: 3} + - target: {fileID: 4639725417050255205, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5071853757552137966, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_SizeDelta.x + value: 50.76 + objectReference: {fileID: 0} + - target: {fileID: 5071853757552137966, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_SizeDelta.y + value: 16.95 + objectReference: {fileID: 0} + - target: {fileID: 5557610074570603611, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_SizeDelta.x + value: 70 + objectReference: {fileID: 0} + - target: {fileID: 5866597470322327693, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_SizeDelta.x + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_SizeDelta.y + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7831964781794064005, guid: a04b1390c1d67044daee0000800dff26, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 22100000, guid: e775e2c5fdd5241f6a3255c8cf678e8e, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a04b1390c1d67044daee0000800dff26, type: 3} +--- !u!114 &2156236093003474023 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6794370666879471999, guid: a04b1390c1d67044daee0000800dff26, type: 3} + m_PrefabInstance: {fileID: 4874593898509792536} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &3426011414991243565 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + m_PrefabInstance: {fileID: 4874593898509792536} + m_PrefabAsset: {fileID: 0} diff --git a/Explorer/Assets/DCL/UI/Sidebar/SidebarView.cs b/Explorer/Assets/DCL/UI/Sidebar/SidebarView.cs index ef11bd0c33..b6abb9ec8f 100644 --- a/Explorer/Assets/DCL/UI/Sidebar/SidebarView.cs +++ b/Explorer/Assets/DCL/UI/Sidebar/SidebarView.cs @@ -29,6 +29,7 @@ public class SidebarView : ViewBase, IView [field: SerializeField] internal Button backpackButton { get; private set; } [field: SerializeField] internal Button cameraReelButton { get; private set; } [field: SerializeField] internal Button settingsButton { get; private set; } + [field: SerializeField] internal Button friendsButton { get; private set; } [field: Header("Sidebar Settings")] diff --git a/Explorer/Assets/Scripts/Global/AppArgs/AppArgsFlags.cs b/Explorer/Assets/Scripts/Global/AppArgs/AppArgsFlags.cs index 57c29840a5..371f7a55f6 100644 --- a/Explorer/Assets/Scripts/Global/AppArgs/AppArgsFlags.cs +++ b/Explorer/Assets/Scripts/Global/AppArgs/AppArgsFlags.cs @@ -20,6 +20,7 @@ public static class AppArgsFlags public const string SELF_PREVIEW_WEARABLES = "self-preview-wearables"; public const string CAMERA_REEL = "camera-reel"; + public const string FRIENDS = "friends"; public const string FORCE_TEXTURE_COMPRESSION = "force-texture-compression"; diff --git a/Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs b/Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs index 945dd1da53..59bd4a82a7 100644 --- a/Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs +++ b/Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs @@ -558,6 +558,7 @@ static IMultiPool MultiPoolFactory() => ISystemClipboard clipboard = new UnityClipboard(); bool includeCameraReel = staticContainer.FeatureFlagsCache.Configuration.IsEnabled(FeatureFlagsStrings.CAMERA_REEL) || (appArgs.HasDebugFlag() && appArgs.HasFlag(AppArgsFlags.CAMERA_REEL)) || Application.isEditor; + bool includeFriends = staticContainer.FeatureFlagsCache.Configuration.IsEnabled(FeatureFlagsStrings.FRIENDS) || (appArgs.HasDebugFlag() && appArgs.HasFlag(AppArgsFlags.FRIENDS)) || Application.isEditor; var globalPlugins = new List { @@ -623,7 +624,7 @@ static IMultiPool MultiPoolFactory() => dynamicWorldDependencies.Web3Authenticator, userInAppInAppInitializationFlow, profileCache, sidebarBus, chatEntryConfiguration, - globalWorld, playerEntity, includeCameraReel), + globalWorld, playerEntity, includeCameraReel, includeFriends), new ErrorPopupPlugin(mvcManager, assetsProvisioner), connectionStatusPanelPlugin, new MinimapPlugin(mvcManager, minimap), @@ -742,7 +743,6 @@ static IMultiPool MultiPoolFactory() => playerEntity, includeCameraReel ), - new FriendsPlugin(bootstrapContainer.DecentralandUrlsSource) }; globalPlugins.AddRange(staticContainer.SharedPlugins); @@ -775,6 +775,9 @@ static IMultiPool MultiPoolFactory() => globalWorld, debugBuilder)); + if (includeFriends) + globalPlugins.Add(new FriendsPlugin(bootstrapContainer.DecentralandUrlsSource)); + if (dynamicWorldParams.EnableAnalytics) globalPlugins.Add(new AnalyticsPlugin( bootstrapContainer.Analytics!, From 05bdf0b9e603b485b5ff152fba26cd759e7d17e5 Mon Sep 17 00:00:00 2001 From: lorenzo-ranciaffi Date: Thu, 9 Jan 2025 11:11:22 +0100 Subject: [PATCH 002/273] wip friends panel --- .../Assets/DCL/Friends/DCL.Friends.asmdef | 3 +- Explorer/Assets/DCL/Friends/UI.meta | 8 ++ .../DCL/Friends/{ => UI}/Animations.meta | 0 .../Friends/{ => UI}/Animations/Sidebar.meta | 0 .../{ => UI}/Animations/Sidebar/Active.anim | 0 .../Animations/Sidebar/Active.anim.meta | 0 .../{ => UI}/Animations/Sidebar/Empty.anim | 0 .../Animations/Sidebar/Empty.anim.meta | 0 ...uttonOverrideController.overrideController | 0 ...OverrideController.overrideController.meta | 0 .../{ => UI}/Animations/Sidebar/Hover.anim | 0 .../Animations/Sidebar/Hover.anim.meta | 0 .../{ => UI}/Animations/Sidebar/Unhover.anim | 0 .../Animations/Sidebar/Unhover.anim.meta | 0 .../DCL/Friends/UI/FriendsPanelController.cs | 35 +++++ .../Friends/UI/FriendsPanelController.cs.meta | 3 + .../DCL/Friends/UI/FriendsPanelParameter.cs | 7 + .../Friends/UI/FriendsPanelParameter.cs.meta | 3 + .../Assets/DCL/Friends/UI/FriendsPanelView.cs | 11 ++ .../DCL/Friends/UI/FriendsPanelView.cs.meta | 3 + Explorer/Assets/DCL/Friends/UI/Prefabs.meta | 8 ++ .../Friends/UI/Prefabs/FriendsPanel.prefab | 124 +++++++++++++++++ .../UI/Prefabs/FriendsPanel.prefab.meta | 7 + .../DCL/PluginSystem/Global/FriendsPlugin.cs | 14 +- .../DCL/UI/Sidebar/SidebarController.cs | 6 +- .../Assets/DCL/UI/Sidebar/SidebarUI.prefab | 127 +++++++++++++++++- Explorer/Assets/DCL/UI/Sidebar/SidebarView.cs | 5 +- .../Assets/DCL/UI/Sidebar/UI.Sidebar.asmdef | 3 +- .../Global/Dynamic/DynamicWorldContainer.cs | 2 +- 29 files changed, 360 insertions(+), 9 deletions(-) create mode 100644 Explorer/Assets/DCL/Friends/UI.meta rename Explorer/Assets/DCL/Friends/{ => UI}/Animations.meta (100%) rename Explorer/Assets/DCL/Friends/{ => UI}/Animations/Sidebar.meta (100%) rename Explorer/Assets/DCL/Friends/{ => UI}/Animations/Sidebar/Active.anim (100%) rename Explorer/Assets/DCL/Friends/{ => UI}/Animations/Sidebar/Active.anim.meta (100%) rename Explorer/Assets/DCL/Friends/{ => UI}/Animations/Sidebar/Empty.anim (100%) rename Explorer/Assets/DCL/Friends/{ => UI}/Animations/Sidebar/Empty.anim.meta (100%) rename Explorer/Assets/DCL/Friends/{ => UI}/Animations/Sidebar/FriendsSidebarButtonOverrideController.overrideController (100%) rename Explorer/Assets/DCL/Friends/{ => UI}/Animations/Sidebar/FriendsSidebarButtonOverrideController.overrideController.meta (100%) rename Explorer/Assets/DCL/Friends/{ => UI}/Animations/Sidebar/Hover.anim (100%) rename Explorer/Assets/DCL/Friends/{ => UI}/Animations/Sidebar/Hover.anim.meta (100%) rename Explorer/Assets/DCL/Friends/{ => UI}/Animations/Sidebar/Unhover.anim (100%) rename Explorer/Assets/DCL/Friends/{ => UI}/Animations/Sidebar/Unhover.anim.meta (100%) create mode 100644 Explorer/Assets/DCL/Friends/UI/FriendsPanelController.cs create mode 100644 Explorer/Assets/DCL/Friends/UI/FriendsPanelController.cs.meta create mode 100644 Explorer/Assets/DCL/Friends/UI/FriendsPanelParameter.cs create mode 100644 Explorer/Assets/DCL/Friends/UI/FriendsPanelParameter.cs.meta create mode 100644 Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs create mode 100644 Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs.meta create mode 100644 Explorer/Assets/DCL/Friends/UI/Prefabs.meta create mode 100644 Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab create mode 100644 Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab.meta diff --git a/Explorer/Assets/DCL/Friends/DCL.Friends.asmdef b/Explorer/Assets/DCL/Friends/DCL.Friends.asmdef index 4d701a7b4a..1cb04b2111 100644 --- a/Explorer/Assets/DCL/Friends/DCL.Friends.asmdef +++ b/Explorer/Assets/DCL/Friends/DCL.Friends.asmdef @@ -5,7 +5,8 @@ "GUID:e56a0d6a94c144c784012e63b6043100", "GUID:8322ea9340a544c59ddc56d4793eac74", "GUID:3c7b57a14671040bd8c549056adc04f5", - "GUID:f51ebe6a0ceec4240a699833d6309b23" + "GUID:f51ebe6a0ceec4240a699833d6309b23", + "GUID:45f6fff651a0a514f8edfdaf9cce45af" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Explorer/Assets/DCL/Friends/UI.meta b/Explorer/Assets/DCL/Friends/UI.meta new file mode 100644 index 0000000000..e39edeadb9 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 67d138b6cc8c94498bfb3bb5cb609d23 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/DCL/Friends/Animations.meta b/Explorer/Assets/DCL/Friends/UI/Animations.meta similarity index 100% rename from Explorer/Assets/DCL/Friends/Animations.meta rename to Explorer/Assets/DCL/Friends/UI/Animations.meta diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar.meta b/Explorer/Assets/DCL/Friends/UI/Animations/Sidebar.meta similarity index 100% rename from Explorer/Assets/DCL/Friends/Animations/Sidebar.meta rename to Explorer/Assets/DCL/Friends/UI/Animations/Sidebar.meta diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/Active.anim b/Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/Active.anim similarity index 100% rename from Explorer/Assets/DCL/Friends/Animations/Sidebar/Active.anim rename to Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/Active.anim diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/Active.anim.meta b/Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/Active.anim.meta similarity index 100% rename from Explorer/Assets/DCL/Friends/Animations/Sidebar/Active.anim.meta rename to Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/Active.anim.meta diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/Empty.anim b/Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/Empty.anim similarity index 100% rename from Explorer/Assets/DCL/Friends/Animations/Sidebar/Empty.anim rename to Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/Empty.anim diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/Empty.anim.meta b/Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/Empty.anim.meta similarity index 100% rename from Explorer/Assets/DCL/Friends/Animations/Sidebar/Empty.anim.meta rename to Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/Empty.anim.meta diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/FriendsSidebarButtonOverrideController.overrideController b/Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/FriendsSidebarButtonOverrideController.overrideController similarity index 100% rename from Explorer/Assets/DCL/Friends/Animations/Sidebar/FriendsSidebarButtonOverrideController.overrideController rename to Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/FriendsSidebarButtonOverrideController.overrideController diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/FriendsSidebarButtonOverrideController.overrideController.meta b/Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/FriendsSidebarButtonOverrideController.overrideController.meta similarity index 100% rename from Explorer/Assets/DCL/Friends/Animations/Sidebar/FriendsSidebarButtonOverrideController.overrideController.meta rename to Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/FriendsSidebarButtonOverrideController.overrideController.meta diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/Hover.anim b/Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/Hover.anim similarity index 100% rename from Explorer/Assets/DCL/Friends/Animations/Sidebar/Hover.anim rename to Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/Hover.anim diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/Hover.anim.meta b/Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/Hover.anim.meta similarity index 100% rename from Explorer/Assets/DCL/Friends/Animations/Sidebar/Hover.anim.meta rename to Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/Hover.anim.meta diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/Unhover.anim b/Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/Unhover.anim similarity index 100% rename from Explorer/Assets/DCL/Friends/Animations/Sidebar/Unhover.anim rename to Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/Unhover.anim diff --git a/Explorer/Assets/DCL/Friends/Animations/Sidebar/Unhover.anim.meta b/Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/Unhover.anim.meta similarity index 100% rename from Explorer/Assets/DCL/Friends/Animations/Sidebar/Unhover.anim.meta rename to Explorer/Assets/DCL/Friends/UI/Animations/Sidebar/Unhover.anim.meta diff --git a/Explorer/Assets/DCL/Friends/UI/FriendsPanelController.cs b/Explorer/Assets/DCL/Friends/UI/FriendsPanelController.cs new file mode 100644 index 0000000000..e1a0d77eee --- /dev/null +++ b/Explorer/Assets/DCL/Friends/UI/FriendsPanelController.cs @@ -0,0 +1,35 @@ +using Cysharp.Threading.Tasks; +using MVC; +using System.Threading; + +namespace DCL.Friends.UI +{ + public class FriendsPanelController : ControllerBase + { + private readonly IFriendsService friendsService; + private readonly IFriendsEventBus friendEventBus; + + public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.Overlay; + + public FriendsPanelController(ViewFactoryMethod viewFactory, + IFriendsService friendsService, + IFriendsEventBus friendEventBus) : base(viewFactory) + { + this.friendsService = friendsService; + this.friendEventBus = friendEventBus; + } + + protected override void OnViewInstantiated() + { + base.OnViewInstantiated(); + } + + public override void Dispose() + { + base.Dispose(); + } + + protected override UniTask WaitForCloseIntentAsync(CancellationToken ct) => + viewInstance!.CloseButton.OnClickAsync(ct); + } +} diff --git a/Explorer/Assets/DCL/Friends/UI/FriendsPanelController.cs.meta b/Explorer/Assets/DCL/Friends/UI/FriendsPanelController.cs.meta new file mode 100644 index 0000000000..b350290f29 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/UI/FriendsPanelController.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2193768f47fd498c89cb723a23fd5b44 +timeCreated: 1736414183 \ No newline at end of file diff --git a/Explorer/Assets/DCL/Friends/UI/FriendsPanelParameter.cs b/Explorer/Assets/DCL/Friends/UI/FriendsPanelParameter.cs new file mode 100644 index 0000000000..e6778ab482 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/UI/FriendsPanelParameter.cs @@ -0,0 +1,7 @@ +namespace DCL.Friends.UI +{ + public struct FriendsPanelParameter + { + + } +} diff --git a/Explorer/Assets/DCL/Friends/UI/FriendsPanelParameter.cs.meta b/Explorer/Assets/DCL/Friends/UI/FriendsPanelParameter.cs.meta new file mode 100644 index 0000000000..3830c4b7d2 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/UI/FriendsPanelParameter.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9e686568608448389fb3e96a5be1f4ad +timeCreated: 1736414927 \ No newline at end of file diff --git a/Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs b/Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs new file mode 100644 index 0000000000..a903f3bdd9 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs @@ -0,0 +1,11 @@ +using MVC; +using UnityEngine; +using UnityEngine.UI; + +namespace DCL.Friends.UI +{ + public class FriendsPanelView: ViewBaseWithAnimationElement, IView + { + [field: SerializeField] public Button CloseButton { get; private set; } + } +} diff --git a/Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs.meta b/Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs.meta new file mode 100644 index 0000000000..88185804f1 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 26e50f2edc85447e96fcb896c52dfd87 +timeCreated: 1736414178 \ No newline at end of file diff --git a/Explorer/Assets/DCL/Friends/UI/Prefabs.meta b/Explorer/Assets/DCL/Friends/UI/Prefabs.meta new file mode 100644 index 0000000000..95c2d1ad26 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/UI/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f6e93aeefd498499088344a3acb72d9e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab b/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab new file mode 100644 index 0000000000..3237f17497 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab @@ -0,0 +1,124 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2614828898816641466 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7771671466614427538} + - component: {fileID: 4566563994291803658} + - component: {fileID: 332660972209890747} + - component: {fileID: 1291235699983939453} + - component: {fileID: 3538348039145732992} + - component: {fileID: 1856855778101277456} + m_Layer: 5 + m_Name: FriendsPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7771671466614427538 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2614828898816641466} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 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_Pivot: {x: 0, y: 0} +--- !u!223 &4566563994291803658 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2614828898816641466} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &332660972209890747 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2614828898816641466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1291235699983939453 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2614828898816641466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26e50f2edc85447e96fcb896c52dfd87, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 4566563994291803658} + k__BackingField: {fileID: 332660972209890747} + k__BackingField: {fileID: 3538348039145732992} + k__BackingField: {fileID: 0} +--- !u!114 &3538348039145732992 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2614828898816641466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38b1c5e9144d4ef39861c60d5bc3c592, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: 0.3 + k__BackingField: {fileID: 1856855778101277456} +--- !u!225 &1856855778101277456 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2614828898816641466} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 diff --git a/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab.meta b/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab.meta new file mode 100644 index 0000000000..2f4529956c --- /dev/null +++ b/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 05e6ec17311e94dfbb4c3e08aaea0891 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/DCL/PluginSystem/Global/FriendsPlugin.cs b/Explorer/Assets/DCL/PluginSystem/Global/FriendsPlugin.cs index 1d3e966018..943b37eaa6 100644 --- a/Explorer/Assets/DCL/PluginSystem/Global/FriendsPlugin.cs +++ b/Explorer/Assets/DCL/PluginSystem/Global/FriendsPlugin.cs @@ -2,18 +2,28 @@ using CommunicationData.URLHelpers; using Cysharp.Threading.Tasks; using DCL.Friends; +using DCL.Friends.UI; using DCL.Multiplayer.Connections.DecentralandUrls; +using DCL.UI.MainUI; +using MVC; using System.Threading; namespace DCL.PluginSystem.Global { public class FriendsPlugin : IDCLGlobalPlugin { + private readonly MainUIView mainUIView; private readonly IDecentralandUrlsSource dclUrlSource; + private readonly IMVCManager mvcManager; - public FriendsPlugin(IDecentralandUrlsSource dclUrlSource) + public FriendsPlugin( + MainUIView mainUIView, + IDecentralandUrlsSource dclUrlSource, + IMVCManager mvcManager) { + this.mainUIView = mainUIView; this.dclUrlSource = dclUrlSource; + this.mvcManager = mvcManager; } public void Dispose() @@ -31,7 +41,7 @@ public async UniTask InitializeAsync(FriendsPluginSettings settings, Cancellatio IFriendsService friendsService = new RPCFriendsService(URLAddress.FromString(dclUrlSource.Url(DecentralandUrl.ApiFriends)), friendEventBus); - // TODO: add the rest of the ui + mvcManager.RegisterController(new FriendsPanelController(() => mainUIView.SidebarView.FriendsPanelView, friendsService, friendEventBus)); } } diff --git a/Explorer/Assets/DCL/UI/Sidebar/SidebarController.cs b/Explorer/Assets/DCL/UI/Sidebar/SidebarController.cs index 19d8e4ca64..cfaa725ed4 100644 --- a/Explorer/Assets/DCL/UI/Sidebar/SidebarController.cs +++ b/Explorer/Assets/DCL/UI/Sidebar/SidebarController.cs @@ -2,6 +2,7 @@ using DCL.Browser; using DCL.Chat; using DCL.ExplorePanel; +using DCL.Friends.UI; using DCL.Multiplayer.Connections.DecentralandUrls; using DCL.Notifications.NotificationsMenu; using DCL.NotificationsBusController.NotificationsBus; @@ -104,7 +105,7 @@ protected override void OnViewInstantiated() viewInstance.cameraReelButton.gameObject.SetActive(false); viewInstance.InWorldCameraButton.gameObject.SetActive(false); } - + if (includeFriends) viewInstance.friendsButton.onClick.AddListener(OpenFriendsPanel); else @@ -203,7 +204,8 @@ private void OpenFriendsPanel() { CloseAllWidgets(); sidebarBus.BlockSidebar(); - // notificationsMenuController.ToggleNotificationsPanel(false); + + mvcManager.ShowAsync(FriendsPanelController.IssueCommand(new FriendsPanelParameter())).Forget(); } private void OpenExplorePanelInSection(ExploreSections section, BackpackSections backpackSection = BackpackSections.Avatar) diff --git a/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab b/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab index 42bcec18f1..b443dfff5a 100644 --- a/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab +++ b/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab @@ -228,6 +228,7 @@ MonoBehaviour: k__BackingField: {fileID: 3655238427613538003} k__BackingField: {fileID: 9220203987770033458} k__BackingField: {fileID: 2156236093003474023} + k__BackingField: {fileID: 6417551113947809372} k__BackingField: {fileID: 1441228183698799381} k__BackingField: {fileID: 2506691189012929090} k__BackingField: {fileID: 6705180925666095888} @@ -1432,7 +1433,10 @@ PrefabInstance: objectReference: {fileID: 22100000, guid: e775e2c5fdd5241f6a3255c8cf678e8e, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + insertIndex: -1 + addedObject: {fileID: 2539567014096830131} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a04b1390c1d67044daee0000800dff26, type: 3} --- !u!114 &2156236093003474023 stripped @@ -1451,3 +1455,124 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} m_PrefabInstance: {fileID: 4874593898509792536} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5252565763958370593 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3426011414991243565} + m_Modifications: + - target: {fileID: 2614828898816641466, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_Name + value: FriendsPanel + objectReference: {fileID: 0} + - target: {fileID: 2614828898816641466, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3210873959894397382, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} +--- !u!224 &2539567014096830131 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + m_PrefabInstance: {fileID: 5252565763958370593} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6417551113947809372 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1291235699983939453, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + m_PrefabInstance: {fileID: 5252565763958370593} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26e50f2edc85447e96fcb896c52dfd87, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Explorer/Assets/DCL/UI/Sidebar/SidebarView.cs b/Explorer/Assets/DCL/UI/Sidebar/SidebarView.cs index b6abb9ec8f..71e66bdde4 100644 --- a/Explorer/Assets/DCL/UI/Sidebar/SidebarView.cs +++ b/Explorer/Assets/DCL/UI/Sidebar/SidebarView.cs @@ -1,4 +1,5 @@ using DCL.EmotesWheel; +using DCL.Friends.UI; using DCL.Notifications.NotificationsMenu; using DCL.UI.ProfileElements; using MVC; @@ -29,8 +30,10 @@ public class SidebarView : ViewBase, IView [field: SerializeField] internal Button backpackButton { get; private set; } [field: SerializeField] internal Button cameraReelButton { get; private set; } [field: SerializeField] internal Button settingsButton { get; private set; } - [field: SerializeField] internal Button friendsButton { get; private set; } + [field: Header("Friends")] + [field: SerializeField] internal Button friendsButton { get; private set; } + [field: SerializeField] public FriendsPanelView FriendsPanelView { get; private set; } [field: Header("Sidebar Settings")] [field: SerializeField] internal Button sidebarSettingsButton { get; private set; } diff --git a/Explorer/Assets/DCL/UI/Sidebar/UI.Sidebar.asmdef b/Explorer/Assets/DCL/UI/Sidebar/UI.Sidebar.asmdef index c8a90032ad..9703650a82 100644 --- a/Explorer/Assets/DCL/UI/Sidebar/UI.Sidebar.asmdef +++ b/Explorer/Assets/DCL/UI/Sidebar/UI.Sidebar.asmdef @@ -23,7 +23,8 @@ "GUID:52421c42d33594c47a6fbd48b45b1259", "GUID:df934776371151c45b473e9aa39efd1b", "GUID:ca4e81cdd6a34d1aa54c32ad41fc5b3b", - "GUID:8322ea9340a544c59ddc56d4793eac74" + "GUID:8322ea9340a544c59ddc56d4793eac74", + "GUID:ead265f036164eb7899edc341131f4d5" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs b/Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs index 59bd4a82a7..5ea55242ec 100644 --- a/Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs +++ b/Explorer/Assets/Scripts/Global/Dynamic/DynamicWorldContainer.cs @@ -776,7 +776,7 @@ static IMultiPool MultiPoolFactory() => debugBuilder)); if (includeFriends) - globalPlugins.Add(new FriendsPlugin(bootstrapContainer.DecentralandUrlsSource)); + globalPlugins.Add(new FriendsPlugin(mainUIView, bootstrapContainer.DecentralandUrlsSource, mvcManager)); if (dynamicWorldParams.EnableAnalytics) globalPlugins.Add(new AnalyticsPlugin( From 656c1b727d6afd1fc51656c28e69bf3cfa53bf9b Mon Sep 17 00:00:00 2001 From: lorenzo-ranciaffi Date: Thu, 9 Jan 2025 11:53:33 +0100 Subject: [PATCH 003/273] basic friends panel --- .../Friends/UI/Prefabs/FriendsPanel.prefab | 280 +++++++++++++++++- .../Assets/DCL/UI/Sidebar/SidebarUI.prefab | 10 +- 2 files changed, 280 insertions(+), 10 deletions(-) diff --git a/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab b/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab index 3237f17497..67e60e2eb8 100644 --- a/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab +++ b/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab @@ -1,5 +1,40 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1327413241983037674 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6157441159932093341} + m_Layer: 5 + m_Name: Body + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6157441159932093341 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1327413241983037674} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7771671466614427538} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -46} + m_SizeDelta: {x: 400, y: 644} + m_Pivot: {x: 0, y: 1} --- !u!1 &2614828898816641466 GameObject: m_ObjectHideFlags: 0 @@ -14,6 +49,8 @@ GameObject: - component: {fileID: 1291235699983939453} - component: {fileID: 3538348039145732992} - component: {fileID: 1856855778101277456} + - component: {fileID: 1722219322123592525} + - component: {fileID: 8075796096775614886} m_Layer: 5 m_Name: FriendsPanel m_TagString: Untagged @@ -30,9 +67,11 @@ RectTransform: m_GameObject: {fileID: 2614828898816641466} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 3983238816125641453} + - {fileID: 6157441159932093341} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -95,7 +134,7 @@ MonoBehaviour: k__BackingField: {fileID: 4566563994291803658} k__BackingField: {fileID: 332660972209890747} k__BackingField: {fileID: 3538348039145732992} - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 7574615442871783476} --- !u!114 &3538348039145732992 MonoBehaviour: m_ObjectHideFlags: 0 @@ -122,3 +161,238 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!222 &1722219322123592525 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2614828898816641466} + m_CullTransparentMesh: 1 +--- !u!114 &8075796096775614886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2614828898816641466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.78431374} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 12dd1efc4e826764f9b02be515a9a033, 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 + m_PixelsPerUnitMultiplier: 2 +--- !u!1 &3814090047816400399 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3983238816125641453} + - component: {fileID: 726821208807092963} + - component: {fileID: 6529406168949918486} + m_Layer: 5 + m_Name: Header + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3983238816125641453 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3814090047816400399} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2587140035264304326} + m_Father: {fileID: 7771671466614427538} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 400, y: 46} + m_Pivot: {x: 0, y: 1} +--- !u!222 &726821208807092963 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3814090047816400399} + m_CullTransparentMesh: 1 +--- !u!114 &6529406168949918486 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3814090047816400399} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.49803922} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0777b27ffb579410cbb9d7bd29774538, 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 + m_PixelsPerUnitMultiplier: 2 +--- !u!1001 &7069652480801276888 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3983238816125641453} + m_Modifications: + - target: {fileID: 2988973775201219658, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_SizeDelta.x + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 2988973775201219658, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_SizeDelta.y + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_SizeDelta.x + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_SizeDelta.y + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_AnchoredPosition.x + value: 392 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_AnchoredPosition.y + value: -7 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6959189544949296242, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_Name + value: Button_Close + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} +--- !u!224 &2587140035264304326 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + m_PrefabInstance: {fileID: 7069652480801276888} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7574615442871783476 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 793200768551293932, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + m_PrefabInstance: {fileID: 7069652480801276888} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab b/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab index b443dfff5a..9843ad4bd1 100644 --- a/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab +++ b/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab @@ -1471,10 +1471,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 3210873959894397382, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} - propertyPath: m_PresetInfoIsWorld - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} propertyPath: m_Pivot.x value: 0 @@ -1501,11 +1497,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 400 objectReference: {fileID: 0} - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 690 objectReference: {fileID: 0} - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} propertyPath: m_LocalPosition.x @@ -1537,7 +1533,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 56 objectReference: {fileID: 0} - target: {fileID: 7771671466614427538, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} propertyPath: m_AnchoredPosition.y From e92850b8243dc09a85672b6a13e1c20d121dbad5 Mon Sep 17 00:00:00 2001 From: lorenzo-ranciaffi Date: Thu, 9 Jan 2025 12:23:11 +0100 Subject: [PATCH 004/273] wip scrollview --- .../Friends/UI/Prefabs/FriendsPanel.prefab | 724 +++++++++++++++++- 1 file changed, 723 insertions(+), 1 deletion(-) diff --git a/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab b/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab index 67e60e2eb8..7fa134877e 100644 --- a/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab +++ b/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab @@ -1,5 +1,208 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &66522278751897465 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 583989740942076061} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &583989740942076061 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 66522278751897465} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4264185560458399035} + m_Father: {fileID: 3942398066578153479} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -0.00013525735} + m_SizeDelta: {x: 0, y: 90} + m_Pivot: {x: 0, y: 1} +--- !u!1 &104228390634797894 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8374700098275164393} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8374700098275164393 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 104228390634797894} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5500869105293626277} + m_Father: {fileID: 4319314400155609772} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &161077877769149661 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3808574116331258688} + - component: {fileID: 642803805007031059} + - component: {fileID: 5413712449878618861} + - component: {fileID: 1635948660204683605} + - component: {fileID: 5426848382744531652} + m_Layer: 5 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3808574116331258688 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161077877769149661} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3942398066578153479} + - {fileID: 4319314400155609772} + m_Father: {fileID: 6157441159932093341} + 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: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &642803805007031059 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161077877769149661} + m_CullTransparentMesh: 1 +--- !u!114 &5413712449878618861 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161077877769149661} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1635948660204683605 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161077877769149661} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 583989740942076061} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 3942398066578153479} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 6101530236487223055} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 1 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &5426848382744531652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161077877769149661} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e190d043ef387ee4fad4acea6146931e, type: 3} + m_Name: + m_EditorClassIdentifier: + mItemPrefabDataList: + - mItemPrefab: {fileID: 8024052685001253916} + mPadding: 3 + mInitCreateCount: 0 + mStartPosOffset: 0 + mArrangeType: 0 + mSupportScrollBar: 1 + mItemSnapEnable: 1 + mViewPortSnapPivot: {x: 0, y: 0} + mItemSnapPivot: {x: 0, y: 0} --- !u!1 &1327413241983037674 GameObject: m_ObjectHideFlags: 0 @@ -27,7 +230,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 3808574116331258688} m_Father: {fileID: 7771671466614427538} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -275,6 +479,297 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 2 +--- !u!1 &4096378622912382546 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4319314400155609772} + - component: {fileID: 2035488086741304482} + - component: {fileID: 6038698472599601371} + - component: {fileID: 6101530236487223055} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4319314400155609772 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4096378622912382546} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8374700098275164393} + m_Father: {fileID: 3808574116331258688} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 15, y: -1} + m_SizeDelta: {x: 10, y: -22} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &2035488086741304482 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4096378622912382546} + m_CullTransparentMesh: 1 +--- !u!114 &6038698472599601371 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4096378622912382546} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 5 +--- !u!114 &6101530236487223055 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4096378622912382546} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2768165371807623030} + m_HandleRect: {fileID: 5500869105293626277} + m_Direction: 2 + m_Value: 1 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &4725361903501829779 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3942398066578153479} + - component: {fileID: 4504603049250438822} + - component: {fileID: 6608676321555643568} + - component: {fileID: 576082350355806735} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3942398066578153479 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4725361903501829779} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 583989740942076061} + m_Father: {fileID: 3808574116331258688} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &4504603049250438822 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4725361903501829779} + m_CullTransparentMesh: 1 +--- !u!114 &6608676321555643568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4725361903501829779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!114 &576082350355806735 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4725361903501829779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 0.003921569} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6424087529998673915 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5500869105293626277} + - component: {fileID: 2177013544553503690} + - component: {fileID: 2768165371807623030} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5500869105293626277 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6424087529998673915} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8374700098275164393} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2177013544553503690 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6424087529998673915} + m_CullTransparentMesh: 1 +--- !u!114 &2768165371807623030 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6424087529998673915} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7b9d8b2a13149489fac02d8d802c41b6, 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 + m_PixelsPerUnitMultiplier: 2 --- !u!1001 &7069652480801276888 PrefabInstance: m_ObjectHideFlags: 0 @@ -396,3 +891,230 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &7922278235019339378 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 583989740942076061} + m_Modifications: + - target: {fileID: 192176438896886382, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_Name + value: Notification + objectReference: {fileID: 0} + - target: {fileID: 1567337761639426577, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1567337761639426577, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1567337761639426577, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1567337761639426577, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1567337761639426577, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1620580781955228551, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1620580781955228551, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1620580781955228551, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1620580781955228551, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1620580781955228551, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1626829344947425582, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_Color.a + value: 0.019607844 + objectReference: {fileID: 0} + - target: {fileID: 1626829344947425582, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1626829344947425582, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1626829344947425582, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5240276204343513172, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.000019073486 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_SizeDelta.x + value: 380 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_SizeDelta.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchoredPosition.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7905128217778718002, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7905128217778718002, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7905128217778718002, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7905128217778718002, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7905128217778718002, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 412555183507639957, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + insertIndex: -1 + addedObject: {fileID: 2877928298444831938} + - targetCorrespondingSourceObject: {fileID: 666065365387648528, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + insertIndex: -1 + addedObject: {fileID: 4639550725195112860} + m_SourcePrefab: {fileID: 100100000, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} +--- !u!224 &4264185560458399035 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6259150501965458249, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + m_PrefabInstance: {fileID: 7922278235019339378} + m_PrefabAsset: {fileID: 0} +--- !u!1 &7264236925811030114 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 666065365387648528, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + m_PrefabInstance: {fileID: 7922278235019339378} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4639550725195112860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7264236925811030114} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eddc1fbd4bd796345832996a9560b9bd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &7514298671334877415 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 412555183507639957, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + m_PrefabInstance: {fileID: 7922278235019339378} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2877928298444831938 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7514298671334877415} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eddc1fbd4bd796345832996a9560b9bd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &8024052685001253916 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 192176438896886382, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} + m_PrefabInstance: {fileID: 7922278235019339378} + m_PrefabAsset: {fileID: 0} From 29f77eede97902afa5dc36794b891df2823498b0 Mon Sep 17 00:00:00 2001 From: lorenzo-ranciaffi Date: Thu, 9 Jan 2025 14:38:27 +0100 Subject: [PATCH 005/273] added notification badge --- .../Assets/DCL/Friends/DCL.Friends.asmdef | 3 +- .../Assets/DCL/Friends/UI/FriendsPanelView.cs | 1 + .../Friends/UI/NotificationIndicatorView.cs | 16 + .../UI/NotificationIndicatorView.cs.meta | 3 + .../UI/Prefabs/NotificationIndicator.prefab | 319 ++++++++++++++++++ .../Prefabs/NotificationIndicator.prefab.meta | 7 + .../Assets/DCL/UI/Sidebar/SidebarUI.prefab | 120 +++++++ 7 files changed, 468 insertions(+), 1 deletion(-) create mode 100644 Explorer/Assets/DCL/Friends/UI/NotificationIndicatorView.cs create mode 100644 Explorer/Assets/DCL/Friends/UI/NotificationIndicatorView.cs.meta create mode 100644 Explorer/Assets/DCL/Friends/UI/Prefabs/NotificationIndicator.prefab create mode 100644 Explorer/Assets/DCL/Friends/UI/Prefabs/NotificationIndicator.prefab.meta diff --git a/Explorer/Assets/DCL/Friends/DCL.Friends.asmdef b/Explorer/Assets/DCL/Friends/DCL.Friends.asmdef index 1cb04b2111..f49ccdad94 100644 --- a/Explorer/Assets/DCL/Friends/DCL.Friends.asmdef +++ b/Explorer/Assets/DCL/Friends/DCL.Friends.asmdef @@ -6,7 +6,8 @@ "GUID:8322ea9340a544c59ddc56d4793eac74", "GUID:3c7b57a14671040bd8c549056adc04f5", "GUID:f51ebe6a0ceec4240a699833d6309b23", - "GUID:45f6fff651a0a514f8edfdaf9cce45af" + "GUID:45f6fff651a0a514f8edfdaf9cce45af", + "GUID:6055be8ebefd69e48b49212b09b47b2f" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs b/Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs index a903f3bdd9..a45f9697c1 100644 --- a/Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs +++ b/Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs @@ -7,5 +7,6 @@ namespace DCL.Friends.UI public class FriendsPanelView: ViewBaseWithAnimationElement, IView { [field: SerializeField] public Button CloseButton { get; private set; } + [field: SerializeField] public NotificationIndicatorView NotificationIndicator { get; private set; } } } diff --git a/Explorer/Assets/DCL/Friends/UI/NotificationIndicatorView.cs b/Explorer/Assets/DCL/Friends/UI/NotificationIndicatorView.cs new file mode 100644 index 0000000000..815f835a0e --- /dev/null +++ b/Explorer/Assets/DCL/Friends/UI/NotificationIndicatorView.cs @@ -0,0 +1,16 @@ +using TMPro; +using UnityEngine; + +namespace DCL.Friends.UI +{ + public class NotificationIndicatorView : MonoBehaviour + { + [field: SerializeField] public TMP_Text NotificationText { get; private set; } + + public void SetNotificationCount(int count) + { + NotificationText.SetText($"{count}"); + NotificationText.gameObject.SetActive(count > 0); + } + } +} diff --git a/Explorer/Assets/DCL/Friends/UI/NotificationIndicatorView.cs.meta b/Explorer/Assets/DCL/Friends/UI/NotificationIndicatorView.cs.meta new file mode 100644 index 0000000000..9878eb9a54 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/UI/NotificationIndicatorView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c445fb9b7035494ba43c3fc672a920f3 +timeCreated: 1736424164 \ No newline at end of file diff --git a/Explorer/Assets/DCL/Friends/UI/Prefabs/NotificationIndicator.prefab b/Explorer/Assets/DCL/Friends/UI/Prefabs/NotificationIndicator.prefab new file mode 100644 index 0000000000..628cba8944 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/UI/Prefabs/NotificationIndicator.prefab @@ -0,0 +1,319 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2241343828835497358 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1679078014158236800} + - component: {fileID: 8913096730105594364} + - component: {fileID: 1870711698821515763} + m_Layer: 5 + m_Name: RedBackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1679078014158236800 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2241343828835497358} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 94932550049558447} + m_Father: {fileID: 5315339567973788977} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 6.25, y: -6.25} + m_SizeDelta: {x: 11, y: 11} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8913096730105594364 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2241343828835497358} + m_CullTransparentMesh: 1 +--- !u!114 &1870711698821515763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2241343828835497358} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 12dd1efc4e826764f9b02be515a9a033, 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 + m_PixelsPerUnitMultiplier: 2.2 +--- !u!1 &3076032502904695219 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5315339567973788977} + - component: {fileID: 830068483065227984} + - component: {fileID: 2081822500595216257} + - component: {fileID: 917712345357714737} + m_Layer: 5 + m_Name: NotificationIndicator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5315339567973788977 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3076032502904695219} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1679078014158236800} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 29.650051, y: -12.189941} + m_SizeDelta: {x: 12.5, y: 12.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &830068483065227984 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3076032502904695219} + m_CullTransparentMesh: 1 +--- !u!114 &2081822500595216257 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3076032502904695219} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 12dd1efc4e826764f9b02be515a9a033, 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 + m_PixelsPerUnitMultiplier: 2.2 +--- !u!114 &917712345357714737 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3076032502904695219} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c445fb9b7035494ba43c3fc672a920f3, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 1465399142383621682} +--- !u!1 &7059392752294594669 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 94932550049558447} + - component: {fileID: 6965110416511390044} + - component: {fileID: 1465399142383621682} + - component: {fileID: 6163225655136816393} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &94932550049558447 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7059392752294594669} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1679078014158236800} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 5.5, y: 0} + m_SizeDelta: {x: 4.98, y: 9.69} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6965110416511390044 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7059392752294594669} + m_CullTransparentMesh: 1 +--- !u!114 &1465399142383621682 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7059392752294594669} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 2 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 96ae0a2159a39234f858ea23bdcc74ad, type: 2} + m_sharedMaterial: {fileID: 735423033564544980, guid: 96ae0a2159a39234f858ea23bdcc74ad, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294769916 + m_fontColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 0 + m_fontSizeMax: 14 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 1 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &6163225655136816393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7059392752294594669} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 diff --git a/Explorer/Assets/DCL/Friends/UI/Prefabs/NotificationIndicator.prefab.meta b/Explorer/Assets/DCL/Friends/UI/Prefabs/NotificationIndicator.prefab.meta new file mode 100644 index 0000000000..2eb217d6e4 --- /dev/null +++ b/Explorer/Assets/DCL/Friends/UI/Prefabs/NotificationIndicator.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 21d891fe070fe479ebac513ad5a9ce71 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab b/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab index 9843ad4bd1..7f08a0d137 100644 --- a/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab +++ b/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab @@ -881,6 +881,119 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} m_PrefabInstance: {fileID: 2314334691772897964} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3108838291228789003 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3426011414991243565} + m_Modifications: + - target: {fileID: 3076032502904695219, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_Name + value: NotificationIndicator + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_SizeDelta.x + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_SizeDelta.y + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchoredPosition.x + value: 29.650051 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchoredPosition.y + value: -12.189941 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} +--- !u!114 &2853190275568405562 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 917712345357714737, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + m_PrefabInstance: {fileID: 3108838291228789003} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c445fb9b7035494ba43c3fc672a920f3, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &7126716442823943226 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + m_PrefabInstance: {fileID: 3108838291228789003} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4203936450024229999 PrefabInstance: m_ObjectHideFlags: 0 @@ -1437,6 +1550,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} insertIndex: -1 addedObject: {fileID: 2539567014096830131} + - targetCorrespondingSourceObject: {fileID: 7795073894138444853, guid: a04b1390c1d67044daee0000800dff26, type: 3} + insertIndex: -1 + addedObject: {fileID: 7126716442823943226} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a04b1390c1d67044daee0000800dff26, type: 3} --- !u!114 &2156236093003474023 stripped @@ -1463,6 +1579,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3426011414991243565} m_Modifications: + - target: {fileID: 1291235699983939453, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} + propertyPath: k__BackingField + value: + objectReference: {fileID: 2853190275568405562} - target: {fileID: 2614828898816641466, guid: 05e6ec17311e94dfbb4c3e08aaea0891, type: 3} propertyPath: m_Name value: FriendsPanel From 70d9e380712902d85185044da7b1e3a8e6463c67 Mon Sep 17 00:00:00 2001 From: lorenzo-ranciaffi Date: Thu, 9 Jan 2025 17:55:30 +0100 Subject: [PATCH 006/273] added panel tabs --- .../DCL/Friends/UI/FriendsPanelController.cs | 28 +- .../Assets/DCL/Friends/UI/FriendsPanelView.cs | 13 + .../Friends/UI/Prefabs/FriendsPanel.prefab | 1260 ++++++++++++++++- 3 files changed, 1281 insertions(+), 20 deletions(-) diff --git a/Explorer/Assets/DCL/Friends/UI/FriendsPanelController.cs b/Explorer/Assets/DCL/Friends/UI/FriendsPanelController.cs index e1a0d77eee..82f69b3b12 100644 --- a/Explorer/Assets/DCL/Friends/UI/FriendsPanelController.cs +++ b/Explorer/Assets/DCL/Friends/UI/FriendsPanelController.cs @@ -6,6 +6,13 @@ namespace DCL.Friends.UI { public class FriendsPanelController : ControllerBase { + private enum FriendsPanelTab + { + FRIENDS, + REQUESTS, + BLOCKED + } + private readonly IFriendsService friendsService; private readonly IFriendsEventBus friendEventBus; @@ -19,14 +26,31 @@ public FriendsPanelController(ViewFactoryMethod viewFactory, this.friendEventBus = friendEventBus; } + public override void Dispose() + { + base.Dispose(); + + viewInstance!.FriendsTabButton.onClick.RemoveAllListeners(); + viewInstance.RequestsTabButton.onClick.RemoveAllListeners(); + viewInstance.BlockedTabButton.onClick.RemoveAllListeners(); + } + protected override void OnViewInstantiated() { base.OnViewInstantiated(); + + viewInstance!.FriendsTabButton.onClick.AddListener(() => ToggleTabs(FriendsPanelTab.FRIENDS)); + viewInstance.RequestsTabButton.onClick.AddListener(() => ToggleTabs(FriendsPanelTab.REQUESTS)); + viewInstance.BlockedTabButton.onClick.AddListener(() => ToggleTabs(FriendsPanelTab.BLOCKED)); + + ToggleTabs(FriendsPanelTab.FRIENDS); } - public override void Dispose() + private void ToggleTabs(FriendsPanelTab tab) { - base.Dispose(); + viewInstance!.FriendsTabSelected.SetActive(tab == FriendsPanelTab.FRIENDS); + viewInstance.RequestsTabSelected.SetActive(tab == FriendsPanelTab.REQUESTS); + viewInstance.BlockedTabSelected.SetActive(tab == FriendsPanelTab.BLOCKED); } protected override UniTask WaitForCloseIntentAsync(CancellationToken ct) => diff --git a/Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs b/Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs index a45f9697c1..780595a2a3 100644 --- a/Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs +++ b/Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs @@ -8,5 +8,18 @@ public class FriendsPanelView: ViewBaseWithAnimationElement, IView { [field: SerializeField] public Button CloseButton { get; private set; } [field: SerializeField] public NotificationIndicatorView NotificationIndicator { get; private set; } + [field: SerializeField] public NotificationIndicatorView TabNotificationIndicator { get; private set; } + + [field: Header("Friends tab")] + [field: SerializeField] public Button FriendsTabButton { get; private set; } + [field: SerializeField] public GameObject FriendsTabSelected { get; private set; } + + [field: Header("Requests tab")] + [field: SerializeField] public Button RequestsTabButton { get; private set; } + [field: SerializeField] public GameObject RequestsTabSelected { get; private set; } + + [field: Header("Blocked tab")] + [field: SerializeField] public Button BlockedTabButton { get; private set; } + [field: SerializeField] public GameObject BlockedTabSelected { get; private set; } } } diff --git a/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab b/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab index 7fa134877e..c6b5b53a0b 100644 --- a/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab +++ b/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab @@ -33,7 +33,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.00013525735} + m_AnchoredPosition: {x: 0, y: 0.000015258789} m_SizeDelta: {x: 0, y: 90} m_Pivot: {x: 0, y: 1} --- !u!1 &104228390634797894 @@ -239,6 +239,44 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -46} m_SizeDelta: {x: 400, y: 644} m_Pivot: {x: 0, y: 1} +--- !u!1 &1674804218537520253 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3962011404306273975} + m_Layer: 5 + m_Name: Tabs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3962011404306273975 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674804218537520253} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6369359471497089151} + - {fileID: 7237534117086765066} + - {fileID: 3427734558202975585} + m_Father: {fileID: 3983238816125641453} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -20, y: 0} + m_SizeDelta: {x: -40, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2614828898816641466 GameObject: m_ObjectHideFlags: 0 @@ -339,6 +377,14 @@ MonoBehaviour: k__BackingField: {fileID: 332660972209890747} k__BackingField: {fileID: 3538348039145732992} k__BackingField: {fileID: 7574615442871783476} + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 8917639088263567752} + k__BackingField: {fileID: 7787606427768405980} + k__BackingField: {fileID: 7393858782328466687} + k__BackingField: {fileID: 7592478089342681655} + k__BackingField: {fileID: 8507033878163480090} + k__BackingField: {fileID: 6288680843426865698} + k__BackingField: {fileID: 5191179959291050160} --- !u!114 &3538348039145732992 MonoBehaviour: m_ObjectHideFlags: 0 @@ -403,6 +449,264 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 2 +--- !u!1 &2668237817297664512 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6369359471497089151} + - component: {fileID: 8584502183289403870} + - component: {fileID: 3786079732482604275} + - component: {fileID: 7787606427768405980} + m_Layer: 5 + m_Name: FriendsButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6369359471497089151 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2668237817297664512} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8367568353567310741} + - {fileID: 5354714456424185835} + m_Father: {fileID: 3962011404306273975} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 60, y: -23} + m_SizeDelta: {x: 120, y: 46} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8584502183289403870 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2668237817297664512} + m_CullTransparentMesh: 1 +--- !u!114 &3786079732482604275 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2668237817297664512} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0777b27ffb579410cbb9d7bd29774538, 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 + m_PixelsPerUnitMultiplier: 2 +--- !u!114 &7787606427768405980 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2668237817297664512} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3786079732482604275} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &3273665169769204844 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1389027778685455746} + - component: {fileID: 2137934051363275396} + - component: {fileID: 7012226241224761704} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1389027778685455746 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3273665169769204844} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7237534117086765066} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2137934051363275396 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3273665169769204844} + m_CullTransparentMesh: 1 +--- !u!114 &7012226241224761704 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3273665169769204844} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: REQUESTS + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} + m_sharedMaterial: {fileID: 1701868249614554837, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294769916 + m_fontColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 13 + m_fontSizeBase: 13 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3814090047816400399 GameObject: m_ObjectHideFlags: 0 @@ -434,6 +738,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2587140035264304326} + - {fileID: 3962011404306273975} m_Father: {fileID: 7771671466614427538} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -599,7 +904,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2768165371807623030} m_HandleRect: {fileID: 5500869105293626277} m_Direction: 2 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -695,6 +1000,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5191179959291050160 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7681051458564141317} + - component: {fileID: 1663958112926434748} + - component: {fileID: 6644573272714307765} + m_Layer: 5 + m_Name: Selected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7681051458564141317 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5191179959291050160} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3427734558202975585} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 1.5} + m_SizeDelta: {x: 100, y: 3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1663958112926434748 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5191179959291050160} + m_CullTransparentMesh: 1 +--- !u!114 &6644573272714307765 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5191179959291050160} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.1764706, b: 0.33333334, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &6424087529998673915 GameObject: m_ObjectHideFlags: 0 @@ -770,23 +1150,690 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 2 ---- !u!1001 &7069652480801276888 -PrefabInstance: +--- !u!1 &7393858782328466687 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 3983238816125641453} - m_Modifications: - - target: {fileID: 2988973775201219658, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} - propertyPath: m_SizeDelta.x - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 2988973775201219658, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} - propertyPath: m_SizeDelta.y - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5354714456424185835} + - component: {fileID: 8992611802674468728} + - component: {fileID: 1278269221428188782} + m_Layer: 5 + m_Name: Selected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5354714456424185835 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7393858782328466687} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6369359471497089151} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 1.5} + m_SizeDelta: {x: 100, y: 3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8992611802674468728 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7393858782328466687} + m_CullTransparentMesh: 1 +--- !u!114 &1278269221428188782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7393858782328466687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.1764706, b: 0.33333334, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7988071071643376119 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5895906265801629096} + - component: {fileID: 9103641159780315258} + - component: {fileID: 1294965165583501887} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5895906265801629096 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7988071071643376119} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3427734558202975585} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9103641159780315258 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7988071071643376119} + m_CullTransparentMesh: 1 +--- !u!114 &1294965165583501887 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7988071071643376119} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: BLOCKED + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} + m_sharedMaterial: {fileID: 1701868249614554837, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294769916 + m_fontColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 13 + m_fontSizeBase: 13 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8507033878163480090 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1361056879772964240} + - component: {fileID: 5983180489866037121} + - component: {fileID: 322428961335328484} + m_Layer: 5 + m_Name: Selected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1361056879772964240 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8507033878163480090} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7237534117086765066} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 1.5} + m_SizeDelta: {x: 100, y: 3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5983180489866037121 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8507033878163480090} + m_CullTransparentMesh: 1 +--- !u!114 &322428961335328484 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8507033878163480090} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.1764706, b: 0.33333334, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8870999380030647451 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8367568353567310741} + - component: {fileID: 1143523538241303245} + - component: {fileID: 8765131627814885068} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8367568353567310741 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8870999380030647451} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6369359471497089151} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1143523538241303245 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8870999380030647451} + m_CullTransparentMesh: 1 +--- !u!114 &8765131627814885068 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8870999380030647451} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: FRIENDS + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} + m_sharedMaterial: {fileID: 1701868249614554837, guid: 35aa85d68d15435418848a03a2db81ec, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294769916 + m_fontColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 13 + m_fontSizeBase: 13 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8984989351379679196 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7237534117086765066} + - component: {fileID: 450077220090228756} + - component: {fileID: 4322855822584710002} + - component: {fileID: 7592478089342681655} + m_Layer: 5 + m_Name: RequestsButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7237534117086765066 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8984989351379679196} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1389027778685455746} + - {fileID: 1361056879772964240} + - {fileID: 4521172194502963592} + m_Father: {fileID: 3962011404306273975} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 180, y: -23} + m_SizeDelta: {x: 120, y: 46} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &450077220090228756 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8984989351379679196} + m_CullTransparentMesh: 1 +--- !u!114 &4322855822584710002 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8984989351379679196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0777b27ffb579410cbb9d7bd29774538, 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 + m_PixelsPerUnitMultiplier: 2 +--- !u!114 &7592478089342681655 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8984989351379679196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4322855822584710002} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &9140608506225497544 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3427734558202975585} + - component: {fileID: 5175838149351496248} + - component: {fileID: 7071173310186169425} + - component: {fileID: 6288680843426865698} + m_Layer: 5 + m_Name: BlockedButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3427734558202975585 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9140608506225497544} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5895906265801629096} + - {fileID: 7681051458564141317} + m_Father: {fileID: 3962011404306273975} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 300, y: -23} + m_SizeDelta: {x: 120, y: 46} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5175838149351496248 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9140608506225497544} + m_CullTransparentMesh: 1 +--- !u!114 &7071173310186169425 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9140608506225497544} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0777b27ffb579410cbb9d7bd29774538, 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 + m_PixelsPerUnitMultiplier: 2 +--- !u!114 &6288680843426865698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9140608506225497544} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7071173310186169425} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1001 &7069652480801276888 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3983238816125641453} + m_Modifications: + - target: {fileID: 2988973775201219658, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_SizeDelta.x + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 2988973775201219658, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} + propertyPath: m_SizeDelta.y + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 4754443713931925278, guid: 7842eaf6eb5af984291ecacc1280f742, type: 3} propertyPath: m_Pivot.x value: 1 objectReference: {fileID: 0} @@ -1118,3 +2165,180 @@ GameObject: m_CorrespondingSourceObject: {fileID: 192176438896886382, guid: 1c5c866a014f04911bbd4469d35b92a6, type: 3} m_PrefabInstance: {fileID: 7922278235019339378} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8610195313235270841 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7237534117086765066} + m_Modifications: + - target: {fileID: 94932550049558447, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 94932550049558447, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 94932550049558447, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_SizeDelta.x + value: 4.98 + objectReference: {fileID: 0} + - target: {fileID: 94932550049558447, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_SizeDelta.y + value: 9.69 + objectReference: {fileID: 0} + - target: {fileID: 94932550049558447, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1679078014158236800, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1679078014158236800, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1679078014158236800, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1679078014158236800, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1679078014158236800, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_SizeDelta.x + value: 17.5 + objectReference: {fileID: 0} + - target: {fileID: 1679078014158236800, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_SizeDelta.y + value: 17.5 + objectReference: {fileID: 0} + - target: {fileID: 1679078014158236800, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1679078014158236800, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1870711698821515763, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_Color.b + value: 0.33333334 + objectReference: {fileID: 0} + - target: {fileID: 1870711698821515763, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_Color.g + value: 0.1764706 + objectReference: {fileID: 0} + - target: {fileID: 3076032502904695219, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_Name + value: NotificationIndicator + objectReference: {fileID: 0} + - target: {fileID: 3076032502904695219, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_SizeDelta.x + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_SizeDelta.y + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchoredPosition.x + value: 107 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_AnchoredPosition.y + value: -22.7 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} +--- !u!224 &4521172194502963592 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + m_PrefabInstance: {fileID: 8610195313235270841} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8917639088263567752 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 917712345357714737, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} + m_PrefabInstance: {fileID: 8610195313235270841} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c445fb9b7035494ba43c3fc672a920f3, type: 3} + m_Name: + m_EditorClassIdentifier: From db9e3fe0c9e26c7c53f33b2f99fa481535251c96 Mon Sep 17 00:00:00 2001 From: lorenzo-ranciaffi Date: Fri, 10 Jan 2025 16:31:18 +0100 Subject: [PATCH 007/273] panel refactor --- .../Assets/DCL/Friends/DCL.Friends.asmdef | 3 +- .../DCL/Friends/UI/FriendsPanelController.cs | 19 +- .../Assets/DCL/Friends/UI/FriendsPanelView.cs | 1 + .../Friends/UI/Prefabs/FriendsPanel.prefab | 122 ++ .../DCL/PluginSystem/Global/FriendsPlugin.cs | 1 - .../DCL/PluginSystem/Global/SidebarPlugin.cs | 9 + .../DCL/UI/Sidebar/SidebarController.cs | 16 +- .../Assets/DCL/UI/Sidebar/SidebarUI.prefab | 1454 +++++++++-------- Explorer/Assets/DCL/UI/Sidebar/SidebarView.cs | 2 +- .../Global/Dynamic/DynamicWorldContainer.cs | 9 +- 10 files changed, 929 insertions(+), 707 deletions(-) diff --git a/Explorer/Assets/DCL/Friends/DCL.Friends.asmdef b/Explorer/Assets/DCL/Friends/DCL.Friends.asmdef index f49ccdad94..deeffb8d50 100644 --- a/Explorer/Assets/DCL/Friends/DCL.Friends.asmdef +++ b/Explorer/Assets/DCL/Friends/DCL.Friends.asmdef @@ -7,7 +7,8 @@ "GUID:3c7b57a14671040bd8c549056adc04f5", "GUID:f51ebe6a0ceec4240a699833d6309b23", "GUID:45f6fff651a0a514f8edfdaf9cce45af", - "GUID:6055be8ebefd69e48b49212b09b47b2f" + "GUID:6055be8ebefd69e48b49212b09b47b2f", + "GUID:fa7b3fdbb04d67549916da7bd2af58ab" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Explorer/Assets/DCL/Friends/UI/FriendsPanelController.cs b/Explorer/Assets/DCL/Friends/UI/FriendsPanelController.cs index 82f69b3b12..0da07f93e5 100644 --- a/Explorer/Assets/DCL/Friends/UI/FriendsPanelController.cs +++ b/Explorer/Assets/DCL/Friends/UI/FriendsPanelController.cs @@ -1,6 +1,7 @@ using Cysharp.Threading.Tasks; using MVC; using System.Threading; +using Utility; namespace DCL.Friends.UI { @@ -16,7 +17,9 @@ private enum FriendsPanelTab private readonly IFriendsService friendsService; private readonly IFriendsEventBus friendEventBus; - public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.Overlay; + private CancellationTokenSource friendsPanelCts = new (); + + public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.Popup; public FriendsPanelController(ViewFactoryMethod viewFactory, IFriendsService friendsService, @@ -33,6 +36,13 @@ public override void Dispose() viewInstance!.FriendsTabButton.onClick.RemoveAllListeners(); viewInstance.RequestsTabButton.onClick.RemoveAllListeners(); viewInstance.BlockedTabButton.onClick.RemoveAllListeners(); + friendsPanelCts.SafeCancelAndDispose(); + } + + protected override void OnBeforeViewShow() + { + base.OnBeforeViewShow(); + friendsPanelCts = friendsPanelCts.SafeRestart(); } protected override void OnViewInstantiated() @@ -42,6 +52,8 @@ protected override void OnViewInstantiated() viewInstance!.FriendsTabButton.onClick.AddListener(() => ToggleTabs(FriendsPanelTab.FRIENDS)); viewInstance.RequestsTabButton.onClick.AddListener(() => ToggleTabs(FriendsPanelTab.REQUESTS)); viewInstance.BlockedTabButton.onClick.AddListener(() => ToggleTabs(FriendsPanelTab.BLOCKED)); + viewInstance.CloseButton.onClick.AddListener(Close); + viewInstance.BackgroundCloseButton.onClick.AddListener(Close); ToggleTabs(FriendsPanelTab.FRIENDS); } @@ -53,7 +65,10 @@ private void ToggleTabs(FriendsPanelTab tab) viewInstance.BlockedTabSelected.SetActive(tab == FriendsPanelTab.BLOCKED); } + private void Close() => + HideViewAsync(friendsPanelCts.Token).Forget(); + protected override UniTask WaitForCloseIntentAsync(CancellationToken ct) => - viewInstance!.CloseButton.OnClickAsync(ct); + UniTask.Never(ct); } } diff --git a/Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs b/Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs index 780595a2a3..d79a2a642c 100644 --- a/Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs +++ b/Explorer/Assets/DCL/Friends/UI/FriendsPanelView.cs @@ -7,6 +7,7 @@ namespace DCL.Friends.UI public class FriendsPanelView: ViewBaseWithAnimationElement, IView { [field: SerializeField] public Button CloseButton { get; private set; } + [field: SerializeField] public Button BackgroundCloseButton { get; private set; } [field: SerializeField] public NotificationIndicatorView NotificationIndicator { get; private set; } [field: SerializeField] public NotificationIndicatorView TabNotificationIndicator { get; private set; } diff --git a/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab b/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab index c6b5b53a0b..785c58ca60 100644 --- a/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab +++ b/Explorer/Assets/DCL/Friends/UI/Prefabs/FriendsPanel.prefab @@ -277,6 +277,126 @@ RectTransform: m_AnchoredPosition: {x: -20, y: 0} m_SizeDelta: {x: -40, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2123801389717114634 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3937869376768271841} + - component: {fileID: 5302915556590993981} + - component: {fileID: 5666971784301662856} + - component: {fileID: 8068558347246313209} + m_Layer: 5 + m_Name: BackgroundCloseButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3937869376768271841 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2123801389717114634} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7771671466614427538} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -1750, y: 943} + m_SizeDelta: {x: 3000, y: 2000} + m_Pivot: {x: 0, y: 1} +--- !u!222 &5302915556590993981 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2123801389717114634} + m_CullTransparentMesh: 1 +--- !u!114 &5666971784301662856 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2123801389717114634} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8068558347246313209 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2123801389717114634} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5666971784301662856} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &2614828898816641466 GameObject: m_ObjectHideFlags: 0 @@ -312,6 +432,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 3937869376768271841} - {fileID: 3983238816125641453} - {fileID: 6157441159932093341} m_Father: {fileID: 0} @@ -377,6 +498,7 @@ MonoBehaviour: k__BackingField: {fileID: 332660972209890747} k__BackingField: {fileID: 3538348039145732992} k__BackingField: {fileID: 7574615442871783476} + k__BackingField: {fileID: 8068558347246313209} k__BackingField: {fileID: 0} k__BackingField: {fileID: 8917639088263567752} k__BackingField: {fileID: 7787606427768405980} diff --git a/Explorer/Assets/DCL/PluginSystem/Global/FriendsPlugin.cs b/Explorer/Assets/DCL/PluginSystem/Global/FriendsPlugin.cs index 943b37eaa6..6b82ca450c 100644 --- a/Explorer/Assets/DCL/PluginSystem/Global/FriendsPlugin.cs +++ b/Explorer/Assets/DCL/PluginSystem/Global/FriendsPlugin.cs @@ -41,7 +41,6 @@ public async UniTask InitializeAsync(FriendsPluginSettings settings, Cancellatio IFriendsService friendsService = new RPCFriendsService(URLAddress.FromString(dclUrlSource.Url(DecentralandUrl.ApiFriends)), friendEventBus); - mvcManager.RegisterController(new FriendsPanelController(() => mainUIView.SidebarView.FriendsPanelView, friendsService, friendEventBus)); } } diff --git a/Explorer/Assets/DCL/PluginSystem/Global/SidebarPlugin.cs b/Explorer/Assets/DCL/PluginSystem/Global/SidebarPlugin.cs index 4cbb24caa8..6cd14c939d 100644 --- a/Explorer/Assets/DCL/PluginSystem/Global/SidebarPlugin.cs +++ b/Explorer/Assets/DCL/PluginSystem/Global/SidebarPlugin.cs @@ -5,6 +5,8 @@ using DCL.Backpack; using DCL.Browser; using DCL.Chat; +using DCL.Friends; +using DCL.Friends.UI; using DCL.Notifications; using DCL.Notifications.NotificationsMenu; using DCL.NotificationsBusController.NotificationsBus; @@ -41,6 +43,8 @@ public class SidebarPlugin : IDCLGlobalPlugin private readonly IUserInAppInitializationFlow userInAppInitializationFlow; private readonly IProfileCache profileCache; private readonly ISidebarBus sidebarBus; + private readonly IFriendsService friendsService; + private readonly IFriendsEventBus friendEventBus; private readonly ChatEntryConfigurationSO chatEntryConfigurationSo; private readonly Arch.Core.World world; private readonly Entity playerEntity; @@ -61,6 +65,8 @@ public SidebarPlugin( IUserInAppInitializationFlow userInAppInitializationFlow, IProfileCache profileCache, ISidebarBus sidebarBus, + IFriendsService friendsService, + IFriendsEventBus friendEventBus, ChatEntryConfigurationSO chatEntryConfigurationSo, Arch.Core.World world, Entity playerEntity, @@ -80,6 +86,8 @@ public SidebarPlugin( this.userInAppInitializationFlow = userInAppInitializationFlow; this.profileCache = profileCache; this.sidebarBus = sidebarBus; + this.friendsService = friendsService; + this.friendEventBus = friendEventBus; this.chatEntryConfigurationSo = chatEntryConfigurationSo; this.world = world; this.playerEntity = playerEntity; @@ -108,6 +116,7 @@ public async UniTask InitializeAsync(SidebarSettings settings, CancellationToken new ProfileWidgetController(() => mainUIView.SidebarView.ProfileWidget, web3IdentityCache, profileRepository, webRequestController), new ProfileMenuController(() => mainUIView.SidebarView.ProfileMenuView, web3IdentityCache, profileRepository, webRequestController, world, playerEntity, webBrowser, web3Authenticator, userInAppInitializationFlow, profileCache, mvcManager, chatEntryConfigurationSo), new SkyboxMenuController(() => mainUIView.SidebarView.SkyboxMenuView, settings.SkyboxSettingsAsset), + new FriendsPanelController(() => mainUIView.SidebarView.FriendsPanelView, friendsService, friendEventBus), sidebarBus, chatEntryConfigurationSo, web3IdentityCache, diff --git a/Explorer/Assets/DCL/UI/Sidebar/SidebarController.cs b/Explorer/Assets/DCL/UI/Sidebar/SidebarController.cs index 5ebc87ef1b..5835ffa51d 100644 --- a/Explorer/Assets/DCL/UI/Sidebar/SidebarController.cs +++ b/Explorer/Assets/DCL/UI/Sidebar/SidebarController.cs @@ -29,6 +29,7 @@ public class SidebarController : ControllerBase private readonly NotificationsMenuController notificationsMenuController; private readonly ProfileMenuController profileMenuController; private readonly SkyboxMenuController skyboxMenuController; + private readonly FriendsPanelController friendsPanelController; private readonly ChatEntryConfigurationSO chatEntryConfiguration; private readonly IProfileRepository profileRepository; private readonly IWeb3IdentityCache identityCache; @@ -51,6 +52,7 @@ public SidebarController( ProfileWidgetController profileIconWidgetController, ProfileMenuController profileMenuMenuWidgetController, SkyboxMenuController skyboxMenuController, + FriendsPanelController friendsPanelController, ISidebarBus sidebarBus, ChatEntryConfigurationSO chatEntryConfiguration, IWeb3IdentityCache identityCache, @@ -67,6 +69,7 @@ public SidebarController( this.notificationsBusController = notificationsBusController; this.notificationsMenuController = notificationsMenuController; this.skyboxMenuController = skyboxMenuController; + this.friendsPanelController = friendsPanelController; this.chatEntryConfiguration = chatEntryConfiguration; this.identityCache = identityCache; this.profileRepository = profileRepository; @@ -104,6 +107,7 @@ protected override void OnViewInstantiated() viewInstance.sidebarSettingsWidget.OnViewHidden += OnSidebarSettingsClosed; viewInstance.skyboxButton.Button.onClick.AddListener(OpenSkyboxSettings); viewInstance.SkyboxMenuView.OnViewHidden += OnSkyboxSettingsClosed; + viewInstance.FriendsPanelView.OnViewHidden += OnFriendsPanelClosed; if (includeCameraReel) viewInstance.cameraReelButton.onClick.AddListener(() => OpenExplorePanelInSection(ExploreSections.CameraReel)); @@ -114,7 +118,7 @@ protected override void OnViewInstantiated() } if (includeFriends) - viewInstance.friendsButton.onClick.AddListener(OpenFriendsPanel); + viewInstance.friendsButton.Button.onClick.AddListener(OpenFriendsPanel); else viewInstance.friendsButton.gameObject.SetActive(false); } @@ -135,6 +139,7 @@ private void CloseAllWidgets() systemMenuCts = systemMenuCts.SafeRestart(); if (profileMenuController.State is ControllerState.ViewFocused or ControllerState.ViewBlurred) { profileMenuController.HideViewAsync(systemMenuCts.Token).Forget(); } if (skyboxMenuController.State is ControllerState.ViewFocused or ControllerState.ViewBlurred) { skyboxMenuController.HideViewAsync(systemMenuCts.Token).Forget(); } + if (friendsPanelController.State is ControllerState.ViewFocused or ControllerState.ViewBlurred) { friendsPanelController.HideViewAsync(systemMenuCts.Token).Forget(); } notificationsMenuController.ToggleNotificationsPanel(true); viewInstance!.sidebarSettingsWidget.CloseElement(); sidebarBus.UnblockSidebar(); @@ -228,8 +233,15 @@ private void OpenFriendsPanel() { CloseAllWidgets(); sidebarBus.BlockSidebar(); + systemMenuCts = systemMenuCts.SafeRestart(); + + friendsPanelController.LaunchViewLifeCycleAsync(new CanvasOrdering(CanvasOrdering.SortingLayer.Overlay, 0), new FriendsPanelParameter(), systemMenuCts.Token).Forget(); + } - mvcManager.ShowAsync(FriendsPanelController.IssueCommand(new FriendsPanelParameter())).Forget(); + private void OnFriendsPanelClosed() + { + sidebarBus.UnblockSidebar(); + viewInstance!.friendsButton.SetSelected(false); } private void OpenExplorePanelInSection(ExploreSections section, BackpackSections backpackSection = BackpackSections.Avatar) diff --git a/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab b/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab index d9ebccc77c..98306b061f 100644 --- a/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab +++ b/Explorer/Assets/DCL/UI/Sidebar/SidebarUI.prefab @@ -227,10 +227,10 @@ MonoBehaviour: k__BackingField: {fileID: 7310006030576766240} k__BackingField: {fileID: 3655238427613538003} k__BackingField: {fileID: 9220203987770033458} + k__BackingField: {fileID: 5722880971170343471} + k__BackingField: {fileID: 6417551113947809372} k__BackingField: {fileID: 6608129208367220506} k__BackingField: {fileID: 8821864330962428420} - k__BackingField: {fileID: 2156236093003474023} - k__BackingField: {fileID: 6417551113947809372} k__BackingField: {fileID: 1441228183698799381} k__BackingField: {fileID: 2506691189012929090} k__BackingField: {fileID: 6705180925666095888} @@ -305,6 +305,94 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &8216406631173675080 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2768351681630811847} + - component: {fileID: 2515002006607732723} + - component: {fileID: 5886938436471051923} + - component: {fileID: 6552190237207670494} + m_Layer: 0 + m_Name: FriendsWidget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2768351681630811847 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8216406631173675080} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6820201340569722914} + - {fileID: 2539567014096830131} + m_Father: {fileID: 6256374512070760242} + 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: 32, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &2515002006607732723 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8216406631173675080} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 1 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &5886938436471051923 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8216406631173675080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!222 &6552190237207670494 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8216406631173675080} + m_CullTransparentMesh: 1 --- !u!1001 &1089184277027898555 PrefabInstance: m_ObjectHideFlags: 0 @@ -313,378 +401,303 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 9164904624699036997} m_Modifications: - - target: {fileID: 327198572831187187, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 327198572831187187, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 327198572831187187, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 327198572831187187, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 327198572831187187, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 327198572831187187, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 327198572831187187, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 327198572831187187, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 753630656185560868, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 753630656185560868, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_Name value: UpperLayout objectReference: {fileID: 0} - - target: {fileID: 753630656185560868, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 753630656185560868, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 1134998193861742370, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 1134998193861742370, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1134998193861742370, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 1134998193861742370, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1134998193861742370, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 1134998193861742370, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1134998193861742370, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 1134998193861742370, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1453666765052253396, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 1453666765052253396, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1453666765052253396, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 1453666765052253396, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1453666765052253396, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 1453666765052253396, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1453666765052253396, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 1453666765052253396, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2706417837005350393, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 2706417837005350393, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_SizeDelta.x value: 71.82 objectReference: {fileID: 0} - - target: {fileID: 2706417837005350393, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 2706417837005350393, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_SizeDelta.y value: 16.95 objectReference: {fileID: 0} - - target: {fileID: 2706417837005350393, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 2706417837005350393, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.x value: 43 objectReference: {fileID: 0} - - target: {fileID: 3372457639009423180, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 3372457639009423180, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_SizeDelta.x value: 86 objectReference: {fileID: 0} - - target: {fileID: 3372457639009423180, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 3372457639009423180, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.x value: 34 objectReference: {fileID: 0} - - target: {fileID: 3377716543326700699, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 3377716543326700699, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 3428356476637866364, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 3428356476637866364, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3428356476637866364, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 3428356476637866364, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3428356476637866364, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 3428356476637866364, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3428356476637866364, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 3428356476637866364, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3439292905778670262, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 3439292905778670262, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3439292905778670262, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 3439292905778670262, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3439292905778670262, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 3439292905778670262, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3439292905778670262, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 3439292905778670262, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4796034050072095939, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 4796034050072095939, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4796034050072095939, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 4796034050072095939, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4796034050072095939, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 4796034050072095939, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4796034050072095939, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 4796034050072095939, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMax.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_SizeDelta.y value: -800 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.y value: 400 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5619806891425674774, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5619806891425674774, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5619806891425674774, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5619806891425674774, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5619806891425674774, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5619806891425674774, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5619806891425674774, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 5619806891425674774, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6343332045173302481, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 6343332045173302481, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6343332045173302481, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 6343332045173302481, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6343332045173302481, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 6343332045173302481, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6343332045173302481, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 6343332045173302481, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6539358469415291720, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 6539358469415291720, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6539358469415291720, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 6539358469415291720, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6539358469415291720, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 6539358469415291720, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6539358469415291720, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 6539358469415291720, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6752160793399028054, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 6752160793399028054, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} - - target: {fileID: 7490815415717683088, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 7490815415717683088, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_Name value: GalleryButton objectReference: {fileID: 0} - - target: {fileID: 7490815415717683088, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 7490815415717683088, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 7953449017702476265, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 7953449017702476265, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7953449017702476265, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 7953449017702476265, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7953449017702476265, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 7953449017702476265, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7953449017702476265, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 7953449017702476265, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8234683020808998410, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 8234683020808998410, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_SizeDelta.x value: 84.5 objectReference: {fileID: 0} - - target: {fileID: 8234683020808998410, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 8234683020808998410, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_SizeDelta.y value: 16.95 objectReference: {fileID: 0} - - target: {fileID: 8730324042609602408, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 8730324042609602408, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8825274197710312254, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + - target: {fileID: 8825274197710312254, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} propertyPath: m_text value: Gallery [K] objectReference: {fileID: 0} @@ -695,14 +708,12 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} --- !u!1 &617051157247145518 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 544297384457663125, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + m_CorrespondingSourceObject: {fileID: 544297384457663125, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} m_PrefabInstance: {fileID: 1089184277027898555} m_PrefabAsset: {fileID: 0} --- !u!114 &713957529403070190 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 501574953908916821, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + m_CorrespondingSourceObject: {fileID: 501574953908916821, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} m_PrefabInstance: {fileID: 1089184277027898555} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -713,8 +724,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!114 &822488252307644781 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 321901688867448278, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + m_CorrespondingSourceObject: {fileID: 321901688867448278, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} m_PrefabInstance: {fileID: 1089184277027898555} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -725,8 +735,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!114 &1441228183698799381 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1953940129153662894, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + m_CorrespondingSourceObject: {fileID: 1953940129153662894, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} m_PrefabInstance: {fileID: 1089184277027898555} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -737,8 +746,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!114 &2506691189012929090 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3302265589590384377, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + m_CorrespondingSourceObject: {fileID: 3302265589590384377, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} m_PrefabInstance: {fileID: 1089184277027898555} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -749,8 +757,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!114 &2978611201982790949 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2759484254438996382, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + m_CorrespondingSourceObject: {fileID: 2759484254438996382, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} m_PrefabInstance: {fileID: 1089184277027898555} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -761,8 +768,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!114 &3655238427613538003 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4442674242960712296, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + m_CorrespondingSourceObject: {fileID: 4442674242960712296, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} m_PrefabInstance: {fileID: 1089184277027898555} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -773,14 +779,12 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!224 &4817722374049450153 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + m_CorrespondingSourceObject: {fileID: 5604293973387185170, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} m_PrefabInstance: {fileID: 1089184277027898555} m_PrefabAsset: {fileID: 0} --- !u!114 &6705180925666095888 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5913254704669603755, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + m_CorrespondingSourceObject: {fileID: 5913254704669603755, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} m_PrefabInstance: {fileID: 1089184277027898555} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -791,8 +795,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!114 &7310006030576766240 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7669582428751366555, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + m_CorrespondingSourceObject: {fileID: 7669582428751366555, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} m_PrefabInstance: {fileID: 1089184277027898555} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -803,8 +806,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!114 &7474329147563909817 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7541182562930353666, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + m_CorrespondingSourceObject: {fileID: 7541182562930353666, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} m_PrefabInstance: {fileID: 1089184277027898555} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -815,14 +817,12 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!1 &7805156087351757482 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 7155361432440409617, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + m_CorrespondingSourceObject: {fileID: 7155361432440409617, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} m_PrefabInstance: {fileID: 1089184277027898555} m_PrefabAsset: {fileID: 0} --- !u!114 &8108662634941636583 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 9194748314017176412, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + m_CorrespondingSourceObject: {fileID: 9194748314017176412, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} m_PrefabInstance: {fileID: 1089184277027898555} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -833,8 +833,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!114 &8183886167291671765 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 9119382768320999534, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + m_CorrespondingSourceObject: {fileID: 9119382768320999534, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} m_PrefabInstance: {fileID: 1089184277027898555} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -845,8 +844,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!114 &9096970311108952280 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8152466508641780835, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + m_CorrespondingSourceObject: {fileID: 8152466508641780835, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} m_PrefabInstance: {fileID: 1089184277027898555} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 617051157247145518} @@ -857,8 +855,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!114 &9220203987770033458 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8136089148690530697, guid: a78bfe36c05846b438aaf25abbe523cc, - type: 3} + m_CorrespondingSourceObject: {fileID: 8136089148690530697, guid: a78bfe36c05846b438aaf25abbe523cc, type: 3} m_PrefabInstance: {fileID: 1089184277027898555} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -875,223 +872,180 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 9164904624699036997} m_Modifications: - - target: {fileID: 717765978264897833, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 717765978264897833, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_Padding.m_Bottom value: 16 objectReference: {fileID: 0} - - target: {fileID: 750104256498992424, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 750104256498992424, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 750104256498992424, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 750104256498992424, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 750104256498992424, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 750104256498992424, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 750104256498992424, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 750104256498992424, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2316985108408266739, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 2316985108408266739, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_SizeDelta.x value: 81.31 objectReference: {fileID: 0} - - target: {fileID: 2316985108408266739, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 2316985108408266739, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_SizeDelta.y value: 16.95 objectReference: {fileID: 0} - - target: {fileID: 2543468681691954291, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 2543468681691954291, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2543468681691954291, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 2543468681691954291, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2543468681691954291, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 2543468681691954291, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2543468681691954291, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 2543468681691954291, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2749113458305455736, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 2749113458305455736, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} - - target: {fileID: 2940364398902199929, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 2940364398902199929, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_Name value: BottomLayout objectReference: {fileID: 0} - - target: {fileID: 2940364398902199929, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 2940364398902199929, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 3976426553183566224, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 3976426553183566224, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} - - target: {fileID: 5793807278663194697, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 5793807278663194697, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5793807278663194697, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 5793807278663194697, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5793807278663194697, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 5793807278663194697, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5793807278663194697, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 5793807278663194697, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_AnchorMax.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_SizeDelta.y value: -800 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_AnchoredPosition.y value: -400 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8971419458337465698, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - target: {fileID: 8971419458337465698, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - targetCorrespondingSourceObject: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} insertIndex: -1 addedObject: {fileID: 3531244294086588118} - - targetCorrespondingSourceObject: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + - targetCorrespondingSourceObject: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} insertIndex: -1 - addedObject: {fileID: 3426011414991243565} + addedObject: {fileID: 2768351681630811847} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} --- !u!114 &1734187727223042766 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4039510815974631522, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + m_CorrespondingSourceObject: {fileID: 4039510815974631522, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} m_PrefabInstance: {fileID: 2314334691772897964} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -1102,14 +1056,12 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!224 &6256374512070760242 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + m_CorrespondingSourceObject: {fileID: 8560551636243942814, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} m_PrefabInstance: {fileID: 2314334691772897964} m_PrefabAsset: {fileID: 0} --- !u!114 &6608129208367220506 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8911182902983663030, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + m_CorrespondingSourceObject: {fileID: 8911182902983663030, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} m_PrefabInstance: {fileID: 2314334691772897964} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -1120,8 +1072,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!114 &8821864330962428420 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6517735594159306920, guid: 58646341e04d9404dbdad22f4c50cf14, - type: 3} + m_CorrespondingSourceObject: {fileID: 6517735594159306920, guid: 58646341e04d9404dbdad22f4c50cf14, type: 3} m_PrefabInstance: {fileID: 2314334691772897964} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -1136,110 +1087,89 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 3426011414991243565} + m_TransformParent: {fileID: 6820201340569722914} m_Modifications: - - target: {fileID: 3076032502904695219, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 3076032502904695219, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_Name value: NotificationIndicator objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_SizeDelta.x value: 12.5 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_SizeDelta.y value: 12.5 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_AnchoredPosition.x value: 29.650051 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_AnchoredPosition.y - value: -12.189941 + value: -10 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + - target: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -1250,8 +1180,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} --- !u!114 &2853190275568405562 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 917712345357714737, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + m_CorrespondingSourceObject: {fileID: 917712345357714737, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} m_PrefabInstance: {fileID: 3108838291228789003} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -1262,8 +1191,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!224 &7126716442823943226 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, - type: 3} + m_CorrespondingSourceObject: {fileID: 5315339567973788977, guid: 21d891fe070fe479ebac513ad5a9ce71, type: 3} m_PrefabInstance: {fileID: 3108838291228789003} m_PrefabAsset: {fileID: 0} --- !u!1001 &4203936450024229999 @@ -1274,376 +1202,299 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6256374512070760242} m_Modifications: - - target: {fileID: 20029135659260774, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 20029135659260774, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_fontColor32.rgba value: 4294769916 objectReference: {fileID: 0} - - target: {fileID: 71468218957528954, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 71468218957528954, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Color.a value: 0 objectReference: {fileID: 0} - - target: {fileID: 71468218957528954, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 71468218957528954, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} - - target: {fileID: 183003218226827509, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 183003218226827509, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_AnchorMax.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 183003218226827509, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 183003218226827509, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 183003218226827509, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 183003218226827509, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 183003218226827509, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 183003218226827509, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 183003218226827509, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 183003218226827509, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 183003218226827509, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 183003218226827509, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_SizeDelta.x value: 32 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_SizeDelta.y value: 32 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_LocalScale.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_LocalScale.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 833422943994051026, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 833422943994051026, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Colors.m_NormalColor.a value: 0 objectReference: {fileID: 0} - - target: {fileID: 1883680586860276323, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 1883680586860276323, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b03add26bbd1e014d93b8b4f1723536b, - type: 3} - - target: {fileID: 2111446578221211890, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + objectReference: {fileID: 21300000, guid: b03add26bbd1e014d93b8b4f1723536b, type: 3} + - target: {fileID: 2111446578221211890, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Controller value: - objectReference: {fileID: 22100000, guid: 40f50b6fc78e2ba478f5be1178f63db3, - type: 2} - - target: {fileID: 2442755038717903830, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + objectReference: {fileID: 22100000, guid: 40f50b6fc78e2ba478f5be1178f63db3, type: 2} + - target: {fileID: 2442755038717903830, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Name value: HoverSprites objectReference: {fileID: 0} - - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Transition value: 1 objectReference: {fileID: 0} - - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_TargetGraphic value: objectReference: {fileID: 2248017243310883013} - - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Colors.m_NormalColor.a value: 0 objectReference: {fileID: 0} - - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Colors.m_PressedColor.a value: 1 objectReference: {fileID: 0} - - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Colors.m_PressedColor.b value: 0.09411765 objectReference: {fileID: 0} - - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Colors.m_PressedColor.g value: 0.08235294 objectReference: {fileID: 0} - - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Colors.m_PressedColor.r value: 0.08627451 objectReference: {fileID: 0} - - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Colors.m_HighlightedColor.a value: 1 objectReference: {fileID: 0} - - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Colors.m_HighlightedColor.b value: 0.2901961 objectReference: {fileID: 0} - - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Colors.m_HighlightedColor.g value: 0.2509804 objectReference: {fileID: 0} - - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Colors.m_HighlightedColor.r value: 0.2627451 objectReference: {fileID: 0} - - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_SpriteState.m_PressedSprite value: objectReference: {fileID: 0} - - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_SpriteState.m_DisabledSprite value: objectReference: {fileID: 0} - - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_SpriteState.m_SelectedSprite value: objectReference: {fileID: 0} - - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_SpriteState.m_HighlightedSprite value: objectReference: {fileID: 0} - - target: {fileID: 3464718153883801595, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 3464718153883801595, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Name value: Tooltip objectReference: {fileID: 0} - - target: {fileID: 3464718153883801595, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 3464718153883801595, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 4392543827313620798, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 4392543827313620798, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} - - target: {fileID: 4596462494624646587, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 4596462494624646587, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 4753231099487728027, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 4753231099487728027, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 5036061327164331713, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 5036061327164331713, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 5036061327164331713, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 5036061327164331713, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 5036061327164331713, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 5036061327164331713, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 5036061327164331713, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 5036061327164331713, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 5036061327164331713, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 5036061327164331713, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_SizeDelta.x value: 32 objectReference: {fileID: 0} - - target: {fileID: 5036061327164331713, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 5036061327164331713, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_SizeDelta.y value: 32 objectReference: {fileID: 0} - - target: {fileID: 5036061327164331713, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 5036061327164331713, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_AnchoredPosition.y value: -1 objectReference: {fileID: 0} - - target: {fileID: 6173784497767621631, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 6173784497767621631, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_SizeDelta.x value: 32 objectReference: {fileID: 0} - - target: {fileID: 6173784497767621631, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 6173784497767621631, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_SizeDelta.y value: 32 objectReference: {fileID: 0} - - target: {fileID: 6536838295727438890, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 6536838295727438890, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 00c66f380f003b141b75b3430d50772a, - type: 3} - - target: {fileID: 6794543341588572917, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + objectReference: {fileID: 21300000, guid: 00c66f380f003b141b75b3430d50772a, type: 3} + - target: {fileID: 6794543341588572917, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_SizeDelta.x value: 32 objectReference: {fileID: 0} - - target: {fileID: 6794543341588572917, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 6794543341588572917, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_SizeDelta.y value: 32 objectReference: {fileID: 0} - - target: {fileID: 8178171541332435676, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 8178171541332435676, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_Name value: EmoteWheelOpener objectReference: {fileID: 0} - - target: {fileID: 8178171541332435676, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 8178171541332435676, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 9143980598213920701, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 9143980598213920701, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_SizeDelta.x value: 32 objectReference: {fileID: 0} - - target: {fileID: 9143980598213920701, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 9143980598213920701, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_SizeDelta.y value: 32 objectReference: {fileID: 0} - - target: {fileID: 9143980598213920701, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 9143980598213920701, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9143980598213920701, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - target: {fileID: 9143980598213920701, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} @@ -1651,38 +1502,31 @@ PrefabInstance: - {fileID: 4392543827313620798, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 9143980598213920701, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - targetCorrespondingSourceObject: {fileID: 9143980598213920701, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} insertIndex: 0 addedObject: {fileID: 817830149569808908} - - targetCorrespondingSourceObject: {fileID: 9143980598213920701, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - targetCorrespondingSourceObject: {fileID: 9143980598213920701, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} insertIndex: 3 addedObject: {fileID: 5327950588846824213} m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 8178171541332435676, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - targetCorrespondingSourceObject: {fileID: 8178171541332435676, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} insertIndex: -1 addedObject: {fileID: 4917815363495259791} - - targetCorrespondingSourceObject: {fileID: 8178171541332435676, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - targetCorrespondingSourceObject: {fileID: 8178171541332435676, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} insertIndex: -1 addedObject: {fileID: 1050598597115154478} - - targetCorrespondingSourceObject: {fileID: 8178171541332435676, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + - targetCorrespondingSourceObject: {fileID: 8178171541332435676, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} insertIndex: -1 addedObject: {fileID: 465278280967926141} m_SourcePrefab: {fileID: 100100000, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} --- !u!1 &739231493000633236 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 3464718153883801595, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + m_CorrespondingSourceObject: {fileID: 3464718153883801595, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} m_PrefabInstance: {fileID: 4203936450024229999} m_PrefabAsset: {fileID: 0} --- !u!114 &2030530796887550123 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + m_CorrespondingSourceObject: {fileID: 2772674678068339908, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} m_PrefabInstance: {fileID: 4203936450024229999} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -1693,26 +1537,22 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!95 &2817631124620323997 stripped Animator: - m_CorrespondingSourceObject: {fileID: 2111446578221211890, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + m_CorrespondingSourceObject: {fileID: 2111446578221211890, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} m_PrefabInstance: {fileID: 4203936450024229999} m_PrefabAsset: {fileID: 0} --- !u!224 &3531244294086588118 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + m_CorrespondingSourceObject: {fileID: 816873455510436537, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} m_PrefabInstance: {fileID: 4203936450024229999} m_PrefabAsset: {fileID: 0} --- !u!224 &4950177294663027666 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 9143980598213920701, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + m_CorrespondingSourceObject: {fileID: 9143980598213920701, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} m_PrefabInstance: {fileID: 4203936450024229999} m_PrefabAsset: {fileID: 0} --- !u!114 &5415830858801336587 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8178401225095585124, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + m_CorrespondingSourceObject: {fileID: 8178401225095585124, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} m_PrefabInstance: {fileID: 4203936450024229999} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5416091209600265907} @@ -1723,8 +1563,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!1 &5416091209600265907 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 8178171541332435676, guid: c522d0b7573224f59a5c1fde68c734e3, - type: 3} + m_CorrespondingSourceObject: {fileID: 8178171541332435676, guid: c522d0b7573224f59a5c1fde68c734e3, type: 3} m_PrefabInstance: {fileID: 4203936450024229999} m_PrefabAsset: {fileID: 0} --- !u!114 &4917815363495259791 @@ -1774,351 +1613,568 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: