diff --git a/browser-interface/packages/config/index.ts b/browser-interface/packages/config/index.ts index ae249494d6..6c24b16446 100644 --- a/browser-interface/packages/config/index.ts +++ b/browser-interface/packages/config/index.ts @@ -3,6 +3,7 @@ import { getFeatureFlagEnabled } from 'shared/meta/selectors' import { now } from 'lib/javascript/now' import { isURL } from 'lib/javascript/isURL' import { store } from 'shared/store/isolatedStore' +import logWrapper from '../lib/logger/wrap' /** * Estimated avatar height @@ -11,6 +12,9 @@ export const playerHeight = 1.6 // Entry points export const PREVIEW: boolean = !!(globalThis as any).preview +// update logger +logWrapper() + export const WORLD_EXPLORER = !PREVIEW export const RENDERER_WS = location.search.includes('ws') @@ -54,7 +58,7 @@ export const DEBUG_ANALYTICS = location.search.includes('DEBUG_ANALYTICS') export const DEBUG_REDUX = location.search.includes('DEBUG_REDUX') export const DEBUG_REDUX_SAGAS = location.search.includes('DEBUG_REDUX_SAGAS') export const DEBUG_SCENE_LOG = DEBUG || location.search.includes('DEBUG_SCENE_LOG') -export const DEBUG_KERNEL_LOG = !PREVIEW || location.search.includes('DEBUG_KERNEL_LOG') +export const DEBUG_KERNEL_LOG = location.search.includes('DEBUG_KERNEL_LOG') export const DEBUG_WS_MESSAGES = location.search.includes('DEBUG_WS_MESSAGES') export const DEBUG_VOICE_CHAT = location.search.includes('DEBUG_VOICE_CHAT') export const DEBUG_LOGS = location.search.includes('DEBUG_LOGS') diff --git a/browser-interface/packages/lib/logger/wrap.ts b/browser-interface/packages/lib/logger/wrap.ts index cfd699a3bc..a2b10742c6 100644 --- a/browser-interface/packages/lib/logger/wrap.ts +++ b/browser-interface/packages/lib/logger/wrap.ts @@ -1,4 +1,6 @@ -export const METHODS = ['info', 'log', 'warn', 'trace'] as const +import { PREVIEW } from "../../config" + +export const METHODS = ['info', 'log', 'warn', 'trace', 'error'] as const type Method = (typeof METHODS)[number] /** @@ -7,8 +9,15 @@ type Method = (typeof METHODS)[number] */ export const _console = Object.assign({}, console) +function getPrefix(value?: string) { + if (value) return value + if (location.search.includes('DEBUG_LOGS')) return '*' + if (PREVIEW) return 'kernel:scene' + return 'kernel:scene' +} + export function wrap(testPrefix?: string) { - const prefix = testPrefix ? testPrefix : location.search.includes('DEBUG_LOGS') ? '*' : 'kernel' + const prefix = getPrefix(testPrefix) function logger(method: Method) { return function log(...args: any[]): void { const [logPrefix] = args diff --git a/browser-interface/packages/shared/comms/peers.ts b/browser-interface/packages/shared/comms/peers.ts index fceabd0c10..61171e6de0 100644 --- a/browser-interface/packages/shared/comms/peers.ts +++ b/browser-interface/packages/shared/comms/peers.ts @@ -16,6 +16,7 @@ import { positionReportToCommsPositionRfc4, squareDistanceRfc4 } from './interface/utils' +import { isBlocked } from 'shared/friends/utils' /** * peerInformationMap contains data received of the current peers that we have @@ -123,7 +124,7 @@ function sendPeerUserData(address: string) { avatarMessageObservable.notifyObservers({ type: AvatarMessageType.USER_DATA, userId: peer.ethereumAddress, - data: peer, + data: { ...peer, visible: !isBlocked(profile.userId) }, profile }) } diff --git a/browser-interface/packages/shared/portableExperiences/sagas.ts b/browser-interface/packages/shared/portableExperiences/sagas.ts index 9b69135560..1a22e89508 100644 --- a/browser-interface/packages/shared/portableExperiences/sagas.ts +++ b/browser-interface/packages/shared/portableExperiences/sagas.ts @@ -28,6 +28,7 @@ import { UPDATE_ENGINE_PX } from './actions' import { getDesiredPortableExperiences } from './selectors' +import { browserInterface } from '../../unity-interface/BrowserInterface' export function* portableExperienceSaga(): any { // List the actions that might trigger a portable experience change @@ -56,9 +57,10 @@ export function* portableExperienceSaga(): any { } export function* fetchInitialPortableExperiences() { - yield waitForMetaConfigurationInitialization() + yield call(waitForMetaConfigurationInitialization) - yield waitForAvatarSceneInitialized() + yield call(waitForAvatarSceneInitialized) + yield call(waitForRendererRpcConnection) const qs = new URLSearchParams(globalThis.location.search) const globalPortableExperiences: string[] = qs.has('GLOBAL_PX') @@ -69,6 +71,9 @@ export function* fetchInitialPortableExperiences() { for (const id of globalPortableExperiences) { try { const px: LoadableScene = yield call(getPortableExperienceFromUrn, id) + + yield browserInterface.onUserInteraction + yield put(addKernelPortableExperience(px)) } catch (err: any) { console.error(err) diff --git a/browser-interface/packages/ui/avatar/avatarSystem.ts b/browser-interface/packages/ui/avatar/avatarSystem.ts index 3b65af1e43..e0c77876fa 100644 --- a/browser-interface/packages/ui/avatar/avatarSystem.ts +++ b/browser-interface/packages/ui/avatar/avatarSystem.ts @@ -22,7 +22,7 @@ type Position = { rotationW: number } -const avatarMap = new Map() +export const avatarMap = new Map() export class AvatarEntity extends Entity { visible = true diff --git a/browser-interface/packages/ui/decentraland-ui.scene.ts b/browser-interface/packages/ui/decentraland-ui.scene.ts index d4065e3c0b..d112545563 100644 --- a/browser-interface/packages/ui/decentraland-ui.scene.ts +++ b/browser-interface/packages/ui/decentraland-ui.scene.ts @@ -1,5 +1,5 @@ import { executeTask } from '@dcl/legacy-ecs' -import { avatarMessageObservable } from './avatar/avatarSystem' +import { avatarMap, avatarMessageObservable } from './avatar/avatarSystem' declare const dcl: DecentralandInterface @@ -23,7 +23,9 @@ void executeTask(async () => { if (payload !== lastProcessed) { try { lastProcessed = payload - avatarMessageObservable.emit('message', JSON.parse(payload)) + const msg = JSON.parse(payload) + const invisible = avatarMap.get(msg.userId)?.visible === false && msg.visible === false + if (!invisible) avatarMessageObservable.emit('message', msg) } catch (err) { console.error(err) } diff --git a/unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Prefabs/Header.prefab b/unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Prefabs/Header.prefab index fe31db8544..7fd7137fc8 100644 --- a/unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Prefabs/Header.prefab +++ b/unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Prefabs/Header.prefab @@ -31,12 +31,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3514973599430430845} - m_RootOrder: 0 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: 32, y: 0} - m_SizeDelta: {x: 638, y: 38} + m_SizeDelta: {x: 655.8523, y: 38} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4021179522505976114 CanvasRenderer: @@ -66,8 +65,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: You can't take more pictures because you have reached the storage limit - of the camera reel. To make room we recommend you to download your photos and + m_text: You can't take more photos because you have reached the storage limit of + the camera reel. To make room we recommend you to download all your photos and then delete them. m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} @@ -169,7 +168,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7808565566380676151} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -204,7 +202,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Storage 57/100 photo taken + m_text: Storage 57/100 photos taken m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} @@ -307,7 +305,6 @@ RectTransform: - {fileID: 8554240609457613775} - {fileID: 8755313427840704956} m_Father: {fileID: 7808565566380676151} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -396,11 +393,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3514973599430430845} - m_RootOrder: 1 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: 10.000015, y: -0.000011444092} + m_AnchoredPosition: {x: 10, y: -0.000011444092} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8420807825748553488 @@ -472,7 +468,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8755313427840704956} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -548,7 +543,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6206378532081649024} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -624,7 +618,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8554240609457613775} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -700,13 +693,12 @@ RectTransform: - {fileID: 6286612792635787617} - {fileID: 2721695826281978811} m_Father: {fileID: 7808565566380676151} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -335.55035, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 671.1007, y: 38} - m_Pivot: {x: 0, y: 0.5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7649214072965441821 GameObject: m_ObjectHideFlags: 0 @@ -738,7 +730,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7808565566380676151} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -879,7 +870,6 @@ RectTransform: - {fileID: 6206378532081649024} - {fileID: 3514973599430430845} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -969,7 +959,6 @@ RectTransform: m_Children: - {fileID: 1511974572317269754} m_Father: {fileID: 6206378532081649024} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1006,7 +995,6 @@ RectTransform: m_Children: - {fileID: 6074696067784206898} m_Father: {fileID: 6206378532081649024} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} diff --git a/unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Scripts/CameraReelGalleryStorageView.cs b/unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Scripts/CameraReelGalleryStorageView.cs index e2aa6a7e39..67b6af608f 100644 --- a/unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Scripts/CameraReelGalleryStorageView.cs +++ b/unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Scripts/CameraReelGalleryStorageView.cs @@ -1,4 +1,4 @@ -using TMPro; +using TMPro; using UnityEngine; using UnityEngine.UI; @@ -12,7 +12,7 @@ public class CameraReelGalleryStorageView : MonoBehaviour, ICameraReelGallerySto public void UpdateStorageBar(int current, int max) { - storageText.text = $"Storage: {current}/{max} photo taken"; + storageText.text = $"Storage: {current}/{max} photos taken"; storageText.gameObject.SetActive(true); storageFullMessage.SetActive(current >= max); diff --git a/unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Scripts/ThumbnailContextMenuController.cs b/unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Scripts/ThumbnailContextMenuController.cs index 856e282519..680c56300a 100644 --- a/unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Scripts/ThumbnailContextMenuController.cs +++ b/unity-renderer/Assets/DCLFeatures/CameraReel/Gallery/Scripts/ThumbnailContextMenuController.cs @@ -76,8 +76,8 @@ async UniTaskVoid DeleteScreenshotAsync(CameraReelResponse screenshot, Cancellat } dataStore.notifications.GenericConfirmation.Set(new GenericConfirmationNotificationData( - "Are you sure you want to delete this picture?", - "This picture will be removed and you will no longer be able to access it.", + "Are you sure you want to delete this photo?", + "This photo will be removed and you will no longer be able to access it.", "NO", "YES", () => { }, diff --git a/unity-renderer/Assets/DCLFeatures/CameraReel/ScreenshotViewer/Scripts/ScreenshotViewerController.cs b/unity-renderer/Assets/DCLFeatures/CameraReel/ScreenshotViewer/Scripts/ScreenshotViewerController.cs index 6978217243..b9631bf044 100644 --- a/unity-renderer/Assets/DCLFeatures/CameraReel/ScreenshotViewer/Scripts/ScreenshotViewerController.cs +++ b/unity-renderer/Assets/DCLFeatures/CameraReel/ScreenshotViewer/Scripts/ScreenshotViewerController.cs @@ -1,4 +1,4 @@ -using Cysharp.Threading.Tasks; +using Cysharp.Threading.Tasks; using DCL; using DCL.Browser; using DCL.Tasks; @@ -144,8 +144,8 @@ async UniTaskVoid DeleteScreenshotAsync(CameraReelResponse screenshot, Cancellat } dataStore.notifications.GenericConfirmation.Set(new GenericConfirmationNotificationData( - "Are you sure you want to delete this picture?", - "This picture will be removed and you will no longer be able to access it.", + "Are you sure you want to delete this photo?", + "This photo will be removed and you will no longer be able to access it.", "NO", "YES", () => {}, diff --git a/unity-renderer/Assets/DCLServices/ScreencaptureCamera/UI/Prefabs/ScreencaptureCameraHUD.prefab b/unity-renderer/Assets/DCLServices/ScreencaptureCamera/UI/Prefabs/ScreencaptureCameraHUD.prefab index fd53ae61e8..d5fc936431 100644 --- a/unity-renderer/Assets/DCLServices/ScreencaptureCamera/UI/Prefabs/ScreencaptureCameraHUD.prefab +++ b/unity-renderer/Assets/DCLServices/ScreencaptureCamera/UI/Prefabs/ScreencaptureCameraHUD.prefab @@ -1873,7 +1873,7 @@ PrefabInstance: - target: {fileID: 1448454455420767778, guid: 0282a050c09634ed299130b8e9c2c035, type: 3} propertyPath: m_text - value: You can't take more pictures because you have reached the storage limit. + value: You can't take more photos because you have reached the storage limit. objectReference: {fileID: 0} - target: {fileID: 1448454455420767778, guid: 0282a050c09634ed299130b8e9c2c035, type: 3} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/CharacterController/Resources/Prefabs/CharacterController.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/CharacterController/Resources/Prefabs/CharacterController.prefab index e6098dfd87..f1880254fd 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/CharacterController/Resources/Prefabs/CharacterController.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/CharacterController/Resources/Prefabs/CharacterController.prefab @@ -274,7 +274,7 @@ Transform: m_GameObject: {fileID: 4323503760844960451} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -0.8, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/ExploreV2/Resources/MainMenu/Realms/RealmViewer.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/ExploreV2/Resources/MainMenu/Realms/RealmViewer.prefab index 0b01baa258..d086eaeeec 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/ExploreV2/Resources/MainMenu/Realms/RealmViewer.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/ExploreV2/Resources/MainMenu/Realms/RealmViewer.prefab @@ -346,141 +346,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1670083352848343622 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8697859243342759410} - - component: {fileID: 6299674685314815803} - - component: {fileID: 4125281595057957692} - m_Layer: 5 - m_Name: DCLTitle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8697859243342759410 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1670083352848343622} - 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: 1954072973432043684} - 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: 24, y: 0} - m_SizeDelta: {x: 116, y: 20} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &6299674685314815803 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1670083352848343622} - m_CullTransparentMesh: 1 ---- !u!114 &4125281595057957692 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1670083352848343622} - 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: Decentraland - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, 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: 16 - m_fontSizeBase: 18 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 5 - m_fontSizeMax: 16 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: -2 - 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: 1 - 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 &5160825599350431482 GameObject: m_ObjectHideFlags: 0 @@ -790,8 +655,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1954072973432043684} + - component: {fileID: 3021437548614732188} + - component: {fileID: 7418488797645291963} m_Layer: 5 - m_Name: DCLHeader + m_Name: DCLLogo m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -808,16 +675,52 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4243466400687387202} - - {fileID: 8697859243342759410} + m_Children: [] m_Father: {fileID: 3697815507797969100} 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: 124.3154, y: 20} + m_SizeDelta: {x: 141.7142, y: 22.1022} m_Pivot: {x: 0, y: 0.5} +--- !u!222 &3021437548614732188 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5882504520567619168} + m_CullTransparentMesh: 1 +--- !u!114 &7418488797645291963 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5882504520567619168} + 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: 24bad1613b3e14b969cf6086aa095ffc, type: 3} + 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 &7189112232120914191 GameObject: m_ObjectHideFlags: 0 @@ -917,8 +820,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -0.5} + m_SizeDelta: {x: 0, y: -1} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5944354059093707474 CanvasRenderer: @@ -957,7 +860,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 5 + m_PixelsPerUnitMultiplier: 3 --- !u!114 &3437855064492245449 MonoBehaviour: m_ObjectHideFlags: 0 @@ -980,9 +883,9 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} - m_HighlightedColor: {r: 0.14117648, g: 0.12941177, b: 0.14509805, a: 1} + m_HighlightedColor: {r: 0.22687627, g: 0.21635813, b: 0.24528301, a: 1} m_PressedColor: {r: 0, g: 0, b: 0, a: 1} - m_SelectedColor: {r: 0.2509804, g: 0.23529412, b: 0.29411766, a: 1} + m_SelectedColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 @@ -1040,7 +943,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 3 - m_Spacing: 4 + m_Spacing: 2 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -1097,144 +1000,3 @@ MonoBehaviour: model: text: icon: {fileID: 0} ---- !u!1001 &7896568108208677172 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1954072973432043684} - m_Modifications: - - target: {fileID: 4936655407855709455, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: model.sprite - value: - objectReference: {fileID: 21300000, guid: af3ceb136e126477f809677ea5eb67e2, - type: 3} - - target: {fileID: 5573392751968575400, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: af3ceb136e126477f809677ea5eb67e2, - type: 3} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_SizeDelta.x - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_SizeDelta.y - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6719010960977733696, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - propertyPath: m_Name - value: DCLLogo - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4849d2ed3b5a18948bf3cd46256869a4, type: 3} ---- !u!224 &4243466400687387202 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, - type: 3} - m_PrefabInstance: {fileID: 7896568108208677172} - m_PrefabAsset: {fileID: 0} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/ChatWidgetHUD/ChatHUDView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/ChatWidgetHUD/ChatHUDView.cs index ceab4eac66..59b5a1af2f 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/ChatWidgetHUD/ChatHUDView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/ChatWidgetHUD/ChatHUDView.cs @@ -34,6 +34,7 @@ public class ChatHUDView : BaseComponentView, IChatHUDComponentView [SerializeField] internal InputAction_Trigger closeMentionSuggestionsInput; [SerializeField] internal ChatMentionSuggestionComponentView chatMentionSuggestions; [SerializeField] internal WebGLIMEInput webGlImeInput; + [SerializeField] internal Button unblockButton; [SerializeField] private Model model; private readonly Dictionary entries = new (); @@ -109,7 +110,7 @@ void Action(string s) => public event Action OnMentionSuggestionSelected; public event Action OnCopyMessageRequested; public event Action OnSendMessage; - + public event Action OnUnblockUser; public int EntryCount => entries.Count; public IChatEntryFactory ChatEntryFactory { get; set; } public IComparer SortingStrategy { get; set; } @@ -127,6 +128,11 @@ public override void Awake() model.enableFadeoutMode = true; contextMenu.SetPassportOpenSource(true); + unblockButton.onClick.AddListener(() => + { + OnUnblockUser?.Invoke(model.conversationUserId); + }); + #if (UNITY_WEBGL && !UNITY_EDITOR) // WebGLInput plugin breaks many features: // @mentions navigation with ARROW keys @@ -244,6 +250,12 @@ public void HideMentionSuggestions() chatMentionSuggestions.Hide(); } + public void SetBlockedStatus(bool blocked) + { + inputField.gameObject.SetActive(!blocked); + unblockButton.gameObject.SetActive(blocked); + } + public void AddMentionToInputField(int fromIndex, int length, string userId, string userName) { string message = inputField.text; @@ -342,6 +354,11 @@ protected void Populate(ChatEntry entry, ChatEntryModel model) entry.SetFadeout(this.model.enableFadeoutMode); } + public void SetConversationUserId(string userId) + { + model.conversationUserId = userId; + } + protected void Dock(ChatEntry entry) { entry.transform.SetParent(chatEntriesContainer, false); @@ -530,6 +547,7 @@ private struct Model public string inputFieldText; public bool enableFadeoutMode; public ChatEntryModel[] entries; + public string conversationUserId; } } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/ChatWidgetHUD/IChatHUDComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/ChatWidgetHUD/IChatHUDComponentView.cs index 46650b139c..fdb9f5ee1b 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/ChatWidgetHUD/IChatHUDComponentView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/ChatWidgetHUD/IChatHUDComponentView.cs @@ -1,5 +1,4 @@ -using DCL.Social.Chat; -using DCL.Interface; +using DCL.Interface; using System; using System.Collections.Generic; @@ -17,15 +16,14 @@ public interface IChatHUDComponentView event Action OnNextChatInHistory; event Action OnMentionSuggestionSelected; event Action OnCopyMessageRequested; + event Action OnUnblockUser; int EntryCount { get; } IComparer SortingStrategy { set; } bool UseLegacySorting { set; } - void OnMessageCancelHover(); - void SetEntry(ChatEntryModel model, bool setScrollPositionToBottom = false); - + void SetConversationUserId(string userId); void Dispose(); void RemoveOldestEntry(); diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedListComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedListComponentView.cs new file mode 100644 index 0000000000..538156c932 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedListComponentView.cs @@ -0,0 +1,75 @@ +using DCL.Helpers; +using System; +using UnityEngine; + +namespace DCL.MyAccount +{ + public class BlockedListComponentView : BaseComponentView, IBlockedListComponentView + { + [Header("General")] + [SerializeField] internal GameObject mainContainer; + [SerializeField] internal GameObject loadingContainer; + [SerializeField] internal RectTransform contentTransform; + [SerializeField] internal GameObject scrollBar; + [SerializeField] internal CollapsableSortedBlockedEntryList blockedList; + + public event Action OnUnblockUser; + + public void SetupBlockedList() + { + blockedList.OnUnblockUser = OnUnblockUser; + int SortByAlphabeticalOrder(BlockedUserEntry u1, BlockedUserEntry u2) + { + return string.Compare(u1.Model.userName, u2.Model.userName, StringComparison.InvariantCultureIgnoreCase); + } + + blockedList.SortingMethod = SortByAlphabeticalOrder; + } + + public void Set(BlockedUserEntryModel user) + { + blockedList.Set(user.userId, user); + RefreshContentLayout(); + } + + public void Remove(string userId) + { + blockedList.Remove(userId); + RefreshContentLayout(); + } + + public void ClearAllEntries() + { + blockedList.Clear(); + } + + public override void Show(bool instant = false) + { + gameObject.SetActive(true); + + if (scrollBar != null) + scrollBar.SetActive(true); + } + + public override void Hide(bool instant = false) + { + gameObject.SetActive(false); + + if (scrollBar != null) + scrollBar.SetActive(false); + } + + public void SetLoadingActive(bool isActive) + { + loadingContainer.SetActive(isActive); + mainContainer.SetActive(!isActive); + } + + public void RefreshContentLayout() => + Utils.ForceRebuildLayoutImmediate(contentTransform); + + public override void RefreshControl() + { + } + } +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedListComponentView.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedListComponentView.cs.meta new file mode 100644 index 0000000000..88bd89f9e9 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedListComponentView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6f222bd2778b4bf195bb71bbaa958364 +timeCreated: 1710334795 \ No newline at end of file diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedListController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedListController.cs new file mode 100644 index 0000000000..cfd746b465 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedListController.cs @@ -0,0 +1,149 @@ +using Cysharp.Threading.Tasks; +using DCL.Social.Friends; +using DCL.Tasks; +using SocialFeaturesAnalytics; +using System; +using System.Collections.Generic; +using System.Threading; + +namespace DCL.MyAccount +{ + public class BlockedListController + { + private readonly IBlockedListComponentView view; + private readonly DataStore dataStore; + private readonly IUserProfileBridge userProfileBridge; + + private readonly IBlockedListApiBridge blockedListApiBridge; + private readonly ISocialAnalytics socialAnalytics; + private readonly IFriendsController friendsController; + + private CancellationTokenSource lifeTimeCancellationToken; + + private UserProfile ownUserProfile => userProfileBridge.GetOwn(); + + public BlockedListController( + IBlockedListComponentView view, + DataStore dataStore, + IUserProfileBridge userProfileBridge, + IBlockedListApiBridge blockedListApiBridge, + ISocialAnalytics socialAnalytics, + IFriendsController friendsController) + { + this.view = view; + this.dataStore = dataStore; + this.userProfileBridge = userProfileBridge; + this.blockedListApiBridge = blockedListApiBridge; + this.socialAnalytics = socialAnalytics; + this.friendsController = friendsController; + + dataStore.myAccount.isMyAccountSectionVisible.OnChange += OnMyAccountSectionVisibleChanged; + dataStore.myAccount.openSection.OnChange += OnMyAccountSectionTabChanged; + + ownUserProfile.OnUpdate += OnOwnUserProfileUpdated; + view.OnUnblockUser += UnblockUser; + } + + private void OnMyAccountSectionVisibleChanged(bool isVisible, bool _) + { + if (isVisible) + OpenSection(); + else + CloseSection(); + } + + private void OpenSection() + { + lifeTimeCancellationToken = lifeTimeCancellationToken.SafeRestart(); + UpdateBlockedUserList(ownUserProfile.blocked, lifeTimeCancellationToken.Token); + } + + private void OnMyAccountSectionTabChanged(string currentOpenSection, string _) + { + if (currentOpenSection != MyAccountSection.BlockedList.ToString()) + return; + } + + private void CloseSection() + { + lifeTimeCancellationToken.SafeCancelAndDispose(); + + view.ClearAllEntries(); + } + + + private void OnOwnUserProfileUpdated(UserProfile userProfile) + { + if (userProfile == null) + return; + } + + private void UnblockUser(string userId) + { + if (!ownUserProfile.IsBlocked(userId)) return; + + dataStore.notifications.GenericConfirmation.Set(GenericConfirmationNotificationData.CreateUnBlockUserData( + userProfileBridge.Get(userId)?.userName, + () => + { + ownUserProfile.Unblock(userId); + view.Remove(userId); + blockedListApiBridge.SendUnblockPlayer(userId); + socialAnalytics.SendPlayerUnblocked(friendsController.IsFriend(userId), PlayerActionSource.MyProfile, userId); + + }), true); + } + + public void Dispose() + { + dataStore.myAccount.isMyAccountSectionVisible.OnChange -= OnMyAccountSectionVisibleChanged; + dataStore.myAccount.openSection.OnChange -= OnMyAccountSectionTabChanged; + ownUserProfile.OnUpdate -= OnOwnUserProfileUpdated; + } + + private async void UpdateBlockedUserList(List blockedUsersList, CancellationToken token) + { + view.SetupBlockedList(); + + async UniTaskVoid UpdateChannelMembersAsync(IEnumerable blockedUsers, + CancellationToken cancellationToken) + { + view.SetLoadingActive(false); + + foreach (string member in blockedUsers) + { + UserProfile memberProfile = userProfileBridge.Get(member); + + try { memberProfile ??= await userProfileBridge.RequestFullUserProfileAsync(member, cancellationToken); } + catch (Exception e) when (e is not OperationCanceledException) + { + var fallbackBlockedUserEntry = new BlockedUserEntryModel + { + thumbnailUrl = "", + userId = member, + userName = member, + }; + + view.Set(fallbackBlockedUserEntry); + } + + if (memberProfile != null) + { + var userToAdd = new BlockedUserEntryModel + { + thumbnailUrl = memberProfile.face256SnapshotURL, + userId = memberProfile.userId, + userName = memberProfile.userName, + }; + + view.Set(userToAdd); + } + } + + view.SetLoadingActive(false); + } + + UpdateChannelMembersAsync(blockedUsersList, token).Forget(); + } + } +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedListController.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedListController.cs.meta new file mode 100644 index 0000000000..96bdac31de --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedListController.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0b38f2f1323448b9b1e4aeb5bb325b30 +timeCreated: 1710335931 \ No newline at end of file diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedUserEntry.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedUserEntry.cs new file mode 100644 index 0000000000..6c6fe79026 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedUserEntry.cs @@ -0,0 +1,75 @@ +using System; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +namespace DCL.MyAccount +{ + public class BlockedUserEntry : BaseComponentView, IComponentModelConfig + { + [SerializeField] private TextMeshProUGUI playerNameText; + [SerializeField] private Button unblockButton; + + [SerializeField] private ImageComponentView userThumbnail; + + [Header("Configuration")] + [SerializeField] private BlockedUserEntryModel model; + + public BlockedUserEntryModel Model => model; + + public event Action OnUnblockedClicked; + + public override void Awake() + { + base.Awake(); + + unblockButton.onClick.AddListener(() => + { + OnUnblockedClicked?.Invoke(model.userId); + }); + } + + public void Configure(BlockedUserEntryModel newModel) + { + model = newModel; + RefreshControl(); + } + + public void SetButtonAction(Action action) + { + OnUnblockedClicked = action; + } + + public override void RefreshControl() + { + SetUserId(model.userId); + SetUserName(model.userName); + SetUserThumbnail(model.thumbnailUrl); + } + + private void SetUserId(string userId) + { + model.userId = userId; + } + + private void SetUserName(string userName) + { + model.userName = userName; + + if (playerNameText == null) + return; + + playerNameText.text = userName; + } + + private void SetUserThumbnail(string thumbnailUrl) + { + model.thumbnailUrl = thumbnailUrl; + + if (userThumbnail == null) + return; + + userThumbnail.SetImage(thumbnailUrl); + } + } +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedUserEntry.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedUserEntry.cs.meta new file mode 100644 index 0000000000..a60c7c38cb --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedUserEntry.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 896f330d4d6d4610a964cf3ace1b3e88 +timeCreated: 1710341742 \ No newline at end of file diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedUserEntryModel.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedUserEntryModel.cs new file mode 100644 index 0000000000..12e5608ef3 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedUserEntryModel.cs @@ -0,0 +1,12 @@ +using System; + +namespace DCL.MyAccount +{ + [Serializable] + public class BlockedUserEntryModel : BaseComponentModel + { + public string userId; + public string userName; + public string thumbnailUrl; + } +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedUserEntryModel.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedUserEntryModel.cs.meta new file mode 100644 index 0000000000..f16b146bdc --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/BlockedUserEntryModel.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7e390177db1841729dd703f851793e37 +timeCreated: 1710341752 \ No newline at end of file diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/CollapsableSortedBlockedEntryList.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/CollapsableSortedBlockedEntryList.cs new file mode 100644 index 0000000000..a83797dee0 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/CollapsableSortedBlockedEntryList.cs @@ -0,0 +1,67 @@ +using System; +using System.Collections.Generic; +using UIComponents.CollapsableSortedList; +using UnityEngine; + +namespace DCL.MyAccount +{ + public class CollapsableSortedBlockedEntryList : CollapsableSortedListComponentView + { + private const string POOL_NAME_PREFIX = "BlockedEntryPool_"; + [SerializeField] private BlockedUserEntry entryPrefab; + + private Pool entryPool; + private readonly Dictionary pooleableEntries = new Dictionary(); + + public Action OnUnblockUser { get; set; } + + public void Clear() + { + base.Clear(); + pooleableEntries.Clear(); + } + + public override BlockedUserEntry Remove(string key) + { + if (pooleableEntries.ContainsKey(key)) + pooleableEntries[key].Release(); + pooleableEntries.Remove(key); + + return base.Remove(key); + } + + public void Set(string userId, BlockedUserEntryModel entryModel) + { + if (!Contains(entryModel.userId)) + CreateEntry(userId); + + var entry = Get(userId); + entry.Configure(entryModel); + entry.SetButtonAction(OnUnblockUser); + } + + private void CreateEntry(string userId) + { + entryPool = GetEntryPool(); + var newFriendEntry = entryPool.Get(); + pooleableEntries.Add(userId, newFriendEntry); + var entry = newFriendEntry.gameObject.GetComponent(); + Add(userId, entry); + } + + private Pool GetEntryPool() + { + var entryPool = PoolManager.i.GetPool(POOL_NAME_PREFIX + name + GetInstanceID()); + if (entryPool != null) return entryPool; + + entryPool = PoolManager.i.AddPool( + POOL_NAME_PREFIX + name + GetInstanceID(), + Instantiate(entryPrefab).gameObject, + maxPrewarmCount: 20, + isPersistent: true); + entryPool.ForcePrewarm(); + + return entryPool; + } + } +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/CollapsableSortedBlockedEntryList.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/CollapsableSortedBlockedEntryList.cs.meta new file mode 100644 index 0000000000..5d5fbea140 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/CollapsableSortedBlockedEntryList.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 70159c11957441de9d8456d4031babd9 +timeCreated: 1710342191 \ No newline at end of file diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IBlockedListApiBridge.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IBlockedListApiBridge.cs new file mode 100644 index 0000000000..b57056dcf6 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IBlockedListApiBridge.cs @@ -0,0 +1,7 @@ +namespace DCL.MyAccount +{ + public interface IBlockedListApiBridge + { + void SendUnblockPlayer(string playerId); + } +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IBlockedListApiBridge.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IBlockedListApiBridge.cs.meta new file mode 100644 index 0000000000..7b0e677e74 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IBlockedListApiBridge.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 13d446729e6d48b886206e6a8465d27d +timeCreated: 1710346201 \ No newline at end of file diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IBlockedListComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IBlockedListComponentView.cs new file mode 100644 index 0000000000..9713af7cbc --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IBlockedListComponentView.cs @@ -0,0 +1,14 @@ +using System; + +namespace DCL.MyAccount +{ + public interface IBlockedListComponentView + { + event Action OnUnblockUser; + void SetLoadingActive(bool isActive); + void Set(BlockedUserEntryModel user); + void Remove(string userId); + void ClearAllEntries(); + void SetupBlockedList(); + } +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IBlockedListComponentView.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IBlockedListComponentView.cs.meta new file mode 100644 index 0000000000..d1e9ce81d0 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IBlockedListComponentView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3e5ff646abbd43f2babe0340de181805 +timeCreated: 1710334703 \ No newline at end of file diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IMyAccountSectionHUDComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IMyAccountSectionHUDComponentView.cs index 945c78bc3b..0410c68d48 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IMyAccountSectionHUDComponentView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IMyAccountSectionHUDComponentView.cs @@ -7,6 +7,7 @@ public enum MyAccountSection { MyProfile, EmailNotifications, + BlockedList, } public interface IMyAccountSectionHUDComponentView diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountHUD.asmdef b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountHUD.asmdef index 621a83d2d8..1c87f3e896 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountHUD.asmdef +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountHUD.asmdef @@ -25,7 +25,10 @@ "GUID:b1087c5731ff68448a0a9c625bb7e52d", "GUID:55b66aa56b81d2d4cafb4a5f02bc90ca", "GUID:2995626b54c60644988f134a69a77450", - "GUID:c31f144fbfb54890960a05fca4149e56" + "GUID:c31f144fbfb54890960a05fca4149e56", + "GUID:82873c2d9c9cbe94391e6b33e5153865", + "GUID:4973650d2444c4561a15d50f24d91cd9", + "GUID:ba9b721ce33233c4da7ff4ef30d25b59" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountPlugin.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountPlugin.cs index b7ee3f2909..07c74d4f1b 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountPlugin.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountPlugin.cs @@ -1,5 +1,6 @@ using DCL.Browser; using DCL.Providers; +using DCL.Social.Friends; using DCL.Tasks; using DCLServices.Lambdas.NamesService; using DCLServices.SubscriptionsAPIService; @@ -15,6 +16,7 @@ public class MyAccountPlugin : IPlugin private MyAccountSectionHUDController myAccountSectionHUDController; private MyProfileController myProfileController; private EmailNotificationsController emailNotificationsController; + private BlockedListController blockedListController; public MyAccountPlugin() { @@ -33,22 +35,22 @@ private async void Initialize(CancellationToken ct) .GetAddressable("ProfileCountries", ct); ProfileAdditionalInfoValueListScriptableObject genderListProvider = await Environment.i.serviceLocator.Get() - .GetAddressable("ProfileGenders", ct); + .GetAddressable("ProfileGenders", ct); ProfileAdditionalInfoValueListScriptableObject sexualOrientationProvider = await Environment.i.serviceLocator.Get() - .GetAddressable("ProfileSexualOrientations", ct); + .GetAddressable("ProfileSexualOrientations", ct); ProfileAdditionalInfoValueListScriptableObject employmentStatusProvider = await Environment.i.serviceLocator.Get() - .GetAddressable("ProfileEmploymentStatus", ct); + .GetAddressable("ProfileEmploymentStatus", ct); ProfileAdditionalInfoValueListScriptableObject relationshipStatusProvider = await Environment.i.serviceLocator.Get() - .GetAddressable("ProfileRelationshipStatus", ct); + .GetAddressable("ProfileRelationshipStatus", ct); ProfileAdditionalInfoValueListScriptableObject languageListProvider = await Environment.i.serviceLocator.Get() - .GetAddressable("ProfileLanguages", ct); + .GetAddressable("ProfileLanguages", ct); ProfileAdditionalInfoValueListScriptableObject pronounListProvider = await Environment.i.serviceLocator.Get() - .GetAddressable("ProfilePronouns", ct); + .GetAddressable("ProfilePronouns", ct); var dataStore = DataStore.i; @@ -85,6 +87,14 @@ private async void Initialize(CancellationToken ct) dataStore, Environment.i.serviceLocator.Get(), socialAnalytics); + + blockedListController = new BlockedListController( + myAccountSectionView.CurrentBlockedListComponentView, + dataStore, + userProfileWebInterfaceBridge, + new WebInterfaceBlockedListApiBridge(), + socialAnalytics, + Environment.i.serviceLocator.Get()); } public void Dispose() @@ -93,6 +103,7 @@ public void Dispose() myProfileController.Dispose(); emailNotificationsController.Dispose(); myAccountSectionHUDController.Dispose(); + blockedListController.Dispose(); } } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountSectionHUDComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountSectionHUDComponentView.cs index 70f7af389e..e7c5213bbf 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountSectionHUDComponentView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountSectionHUDComponentView.cs @@ -15,6 +15,7 @@ public class MyAccountSectionHUDComponentView : BaseComponentView, IMyAccountSec [SerializeField] internal GameObject sectionsMenu; [SerializeField] internal MyProfileComponentView myProfileComponentView; [SerializeField] internal EmailNotificationsComponentView emailNotificationsComponentView; + [SerializeField] internal BlockedListComponentView blockedListComponentView; [SerializeField] internal ShowHideAnimator accountSettingsUpdatedToast; [Header("Sections Menu Configuration")] @@ -29,8 +30,15 @@ public class MyAccountSectionHUDComponentView : BaseComponentView, IMyAccountSec [SerializeField] internal GameObject emailNotificationsButtonSelected; [SerializeField] internal Image emailNotificationsButtonSelectedImage; + [SerializeField] internal Button blockedListButton; + [SerializeField] internal GameObject blockedListButtonDeselected; + [SerializeField] internal Image blockedListButtonDeselectedImage; + [SerializeField] internal GameObject blockedListButtonSelected; + [SerializeField] internal Image blockedListButtonSelectedImage; + public IMyProfileComponentView CurrentMyProfileView => myProfileComponentView; public IEmailNotificationsComponentView CurrentEmailNotificationsView => emailNotificationsComponentView; + public IBlockedListComponentView CurrentBlockedListComponentView => blockedListComponentView; private Transform thisTransform; private CancellationTokenSource showAccountSettingsCancellationToken = new (); @@ -43,6 +51,7 @@ public override void Awake() myProfileButton.onClick.AddListener(() => OpenSection(MyAccountSection.MyProfile)); emailNotificationsButton.onClick.AddListener(() => OpenSection(MyAccountSection.EmailNotifications)); + blockedListButton.onClick.AddListener(() => OpenSection(MyAccountSection.BlockedList)); OpenSection(MyAccountSection.MyProfile); } @@ -107,14 +116,26 @@ private void OpenSection(MyAccountSection section) case MyAccountSection.MyProfile: SetMyProfileButtonStatus(true); SetEmailNotificationsButtonStatus(false); + SetBlockedListButtonStatus(false); myProfileComponentView.Show(); emailNotificationsComponentView.Hide(); + blockedListComponentView.Hide(); break; case MyAccountSection.EmailNotifications: SetMyProfileButtonStatus(false); SetEmailNotificationsButtonStatus(true); + SetBlockedListButtonStatus(false); myProfileComponentView.Hide(); emailNotificationsComponentView.Show(); + blockedListComponentView.Hide(); + break; + case MyAccountSection.BlockedList: + SetMyProfileButtonStatus(false); + SetEmailNotificationsButtonStatus(false); + SetBlockedListButtonStatus(true); + myProfileComponentView.Hide(); + emailNotificationsComponentView.Hide(); + blockedListComponentView.Show(); break; } @@ -135,6 +156,13 @@ private void SetEmailNotificationsButtonStatus(bool isSelected) emailNotificationsButtonSelected.SetActive(isSelected); } + private void SetBlockedListButtonStatus(bool isSelected) + { + blockedListButton.targetGraphic = isSelected ? blockedListButtonSelectedImage : blockedListButtonDeselectedImage; + blockedListButtonDeselected.SetActive(!isSelected); + blockedListButtonSelected.SetActive(isSelected); + } + private static void DeselectButtons() { if (EventSystem.current == null) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/BlockedList.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/BlockedList.prefab new file mode 100644 index 0000000000..f69899c99a --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/BlockedList.prefab @@ -0,0 +1,2017 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &412859740412269204 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5295480723245831065} + - component: {fileID: 2773323980350041600} + - component: {fileID: 1068114917479864221} + m_Layer: 5 + m_Name: DraggableBackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5295480723245831065 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 412859740412269204} + 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: 8468668788237063841} + 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: 2000, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2773323980350041600 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 412859740412269204} + m_CullTransparentMesh: 1 +--- !u!114 &1068114917479864221 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 412859740412269204} + 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: 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 &844435832378096353 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8253108935466810716} + - component: {fileID: 4643385406498421960} + - component: {fileID: 4939365660049067660} + - component: {fileID: 889652114419130588} + m_Layer: 5 + m_Name: BlockedListDesc + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8253108935466810716 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 844435832378096353} + 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: 5335774373889312776} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 246.22, y: -121.5} + m_SizeDelta: {x: 579, y: 56.1849} + m_Pivot: {x: 0, y: 1} +--- !u!222 &4643385406498421960 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 844435832378096353} + m_CullTransparentMesh: 1 +--- !u!114 &4939365660049067660 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 844435832378096353} + 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: When you block someone, both you and that person won't be able to see each + other's avatars, messages in public or private channels, or send friend requests + to each other. + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4286344049 + m_fontColor: {r: 0.44313726, g: 0.41960785, b: 0.4862745, 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: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + 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: 1 + 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 &889652114419130588 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 844435832378096353} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &1175453653672132279 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2599418142972534689} + m_Layer: 5 + m_Name: EmptySpace + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2599418142972534689 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1175453653672132279} + 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: 7393034529258672642} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 484.5, y: -290} + m_SizeDelta: {x: 713, y: 500} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1258951972729303304 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7371513654629602714} + m_Layer: 5 + m_Name: EmptyState + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7371513654629602714 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1258951972729303304} + 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: 1809691713426738725} + m_Father: {fileID: 8637544353534832296} + 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: -16} + m_SizeDelta: {x: 713, y: 20} + m_Pivot: {x: 0, y: 1} +--- !u!1 &2042206514036462872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8637544353534832296} + - component: {fileID: 5435805453010028834} + - component: {fileID: 7228696352227108228} + - component: {fileID: 4760563189193521606} + m_Layer: 5 + m_Name: Members + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8637544353534832296 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042206514036462872} + 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: 7371513654629602714} + m_Father: {fileID: 7393034529258672642} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 484.5, y: -24} + m_SizeDelta: {x: 713, y: 0} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &5435805453010028834 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042206514036462872} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 16 + m_Bottom: 0 + m_ChildAlignment: 1 + m_Spacing: 8 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &7228696352227108228 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042206514036462872} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &4760563189193521606 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042206514036462872} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70159c11957441de9d8456d4031babd9, type: 3} + m_Name: + m_EditorClassIdentifier: + showHideAnimator: {fileID: 0} + container: {fileID: 8637544353534832296} + toggleButton: {fileID: 0} + emptyStateContainer: {fileID: 1258951972729303304} + model: + isVisible: 0 + isExpanded: 0 + entryPrefab: {fileID: 852798494167284432, guid: f9a7642fdfa777d46b5a569bb248e680, + type: 3} +--- !u!1 &2471632007817573140 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8468668788237063841} + - component: {fileID: 6597585250600119676} + - component: {fileID: 9000833933413679866} + - component: {fileID: 5199465305772749583} + m_Layer: 5 + m_Name: ContentScroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8468668788237063841 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471632007817573140} + 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: 5295480723245831065} + - {fileID: 2261570010827219655} + - {fileID: 5456373390294784083} + m_Father: {fileID: 1910703879087678311} + 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.000061035156} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6597585250600119676 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471632007817573140} + m_CullTransparentMesh: 1 +--- !u!114 &9000833933413679866 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471632007817573140} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 6878344266008480350} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 10 + m_Viewport: {fileID: 2261570010827219655} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 1 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &5199465305772749583 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471632007817573140} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b85da332798fc458595ca5a677f1bf18, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &2702040307484021543 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6684880712179643105} + - component: {fileID: 3345930943405460214} + - component: {fileID: 6603738520283055197} + - component: {fileID: 7215581139647213209} + m_Layer: 5 + m_Name: BlockedListDesc2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6684880712179643105 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2702040307484021543} + 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: 5335774373889312776} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 128, y: -200} + m_SizeDelta: {x: 713, y: 56.98} + m_Pivot: {x: 0, y: 1} +--- !u!222 &3345930943405460214 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2702040307484021543} + m_CullTransparentMesh: 1 +--- !u!114 &6603738520283055197 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2702040307484021543} + 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: You can block anyone from the menu option that appears when you click the + three dots icon within their profile card or private conversation, or when you + hover over the person's name in the channel members, chat or friends list. + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4286344049 + m_fontColor: {r: 0.44313726, g: 0.41960785, b: 0.4862745, 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: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + 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: 1 + 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 &7215581139647213209 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2702040307484021543} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &2719828401576729022 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1910703879087678311} + - component: {fileID: 807849327241068922} + - component: {fileID: 1042950625472269247} + - component: {fileID: 8611943783499202732} + m_Layer: 5 + m_Name: BlockedList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1910703879087678311 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2719828401576729022} + 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: 8468668788237063841} + - {fileID: 5087161545591994683} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 962, y: 0} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &807849327241068922 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2719828401576729022} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f222bd2778b4bf195bb71bbaa958364, type: 3} + m_Name: + m_EditorClassIdentifier: + showHideAnimator: {fileID: 0} + mainContainer: {fileID: 2471632007817573140} + loadingContainer: {fileID: 5892551484803556232} + contentTransform: {fileID: 6878344266008480350} + scrollBar: {fileID: 0} + blockedList: {fileID: 4760563189193521606} +--- !u!222 &1042950625472269247 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2719828401576729022} + m_CullTransparentMesh: 1 +--- !u!114 &8611943783499202732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2719828401576729022} + 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.19607843} + 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 &3347819050820542201 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5205272981100056552} + m_Layer: 5 + m_Name: Header + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5205272981100056552 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3347819050820542201} + 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: 3878000040698554622} + m_Father: {fileID: 7393034529258672642} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 484.5, y: -12} + m_SizeDelta: {x: 713, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3531572633473995983 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2261570010827219655} + - component: {fileID: 2647328156440122180} + - component: {fileID: 6917628031398824008} + - component: {fileID: 2085111713237823226} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2261570010827219655 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3531572633473995983} + 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: 6878344266008480350} + m_Father: {fileID: 8468668788237063841} + 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: -5, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &2647328156440122180 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3531572633473995983} + m_CullTransparentMesh: 1 +--- !u!114 &6917628031398824008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3531572633473995983} + 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: 10917, 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 &2085111713237823226 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3531572633473995983} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!1 &3716322403162866802 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5456373390294784083} + - component: {fileID: 1993293957083626822} + - component: {fileID: 4818908325367957958} + - component: {fileID: 563265014072743204} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5456373390294784083 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3716322403162866802} + 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: 3801980427916423001} + m_Father: {fileID: 8468668788237063841} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 511, y: -8} + m_SizeDelta: {x: 8, y: -94} + m_Pivot: {x: 1, y: 1} +--- !u!222 &1993293957083626822 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3716322403162866802} + m_CullTransparentMesh: 1 +--- !u!114 &4818908325367957958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3716322403162866802} + 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!114 &563265014072743204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3716322403162866802} + 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: 2072016652518326961} + m_HandleRect: {fileID: 6063887505845317227} + m_Direction: 2 + m_Value: 1 + m_Size: 0.64169675 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &4754620634628429859 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6063887505845317227} + - component: {fileID: 5946990915766919191} + - component: {fileID: 2072016652518326961} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6063887505845317227 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4754620634628429859} + 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: 3801980427916423001} + 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 &5946990915766919191 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4754620634628429859} + m_CullTransparentMesh: 1 +--- !u!114 &2072016652518326961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4754620634628429859} + 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: 1 +--- !u!1 &5255548442629117949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5335774373889312776} + - component: {fileID: 7134933172374338045} + - component: {fileID: 5054739244458482869} + m_Layer: 5 + m_Name: Header + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5335774373889312776 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5255548442629117949} + 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: 6843152809924093036} + - {fileID: 8512199263473761557} + - {fileID: 8253108935466810716} + - {fileID: 6684880712179643105} + m_Father: {fileID: 6878344266008480350} + 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: 957, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &7134933172374338045 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5255548442629117949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 246 + m_Right: 0 + m_Top: 261 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &5054739244458482869 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5255548442629117949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!1 &5750700270504794485 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3801980427916423001} + 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 &3801980427916423001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5750700270504794485} + 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: 6063887505845317227} + m_Father: {fileID: 5456373390294784083} + 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 &5892551484803556232 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5087161545591994683} + m_Layer: 5 + m_Name: LoadingContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5087161545591994683 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5892551484803556232} + 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: 8445566866548440901} + m_Father: {fileID: 1910703879087678311} + 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: -100} + m_SizeDelta: {x: 0, y: -200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6193019217436764793 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6843152809924093036} + - component: {fileID: 175258954488034872} + - component: {fileID: 5849060822845593504} + - component: {fileID: 4742603248469251470} + m_Layer: 5 + m_Name: BlockedListLogo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6843152809924093036 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6193019217436764793} + 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: 5335774373889312776} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 128, y: -80} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0, y: 1} +--- !u!222 &175258954488034872 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6193019217436764793} + m_CullTransparentMesh: 1 +--- !u!114 &5849060822845593504 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6193019217436764793} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: dea479ede2d444b17bd0c7c8c3d4c4cb, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4742603248469251470 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6193019217436764793} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &6874655982564523692 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3878000040698554622} + - component: {fileID: 4103604316074859984} + - component: {fileID: 4804637623599928411} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3878000040698554622 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6874655982564523692} + 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: 5205272981100056552} + 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 &4103604316074859984 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6874655982564523692} + m_CullTransparentMesh: 1 +--- !u!114 &4804637623599928411 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6874655982564523692} + 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: Accounts You've Blocked + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279768342 + m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, 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: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + 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: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + 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 &6989120916090162032 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6878344266008480350} + - component: {fileID: 1391736230773657485} + - component: {fileID: 5882007305432544388} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6878344266008480350 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6989120916090162032} + 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: 5335774373889312776} + - {fileID: 7393034529258672642} + m_Father: {fileID: 2261570010827219655} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000061035156, y: -0.00018310547} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1391736230773657485 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6989120916090162032} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 50 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &5882007305432544388 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6989120916090162032} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!1 &7157736774312168594 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1809691713426738725} + - component: {fileID: 4270692222376100884} + - component: {fileID: 587349266918731212} + m_Layer: 5 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1809691713426738725 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7157736774312168594} + 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: 7371513654629602714} + 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: 713, y: 20} + m_Pivot: {x: 0, y: 1} +--- !u!222 &4270692222376100884 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7157736774312168594} + m_CullTransparentMesh: 1 +--- !u!114 &587349266918731212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7157736774312168594} + 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: You have not blocked anyone yet. + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4286344049 + m_fontColor: {r: 0.44313726, g: 0.41960785, b: 0.4862745, 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: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + 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: 1 + 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 &7417956486747429064 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8512199263473761557} + - component: {fileID: 1872590228312565618} + - component: {fileID: 5276245541089048195} + - component: {fileID: 6042956672197183543} + m_Layer: 5 + m_Name: BlockedListTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8512199263473761557 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7417956486747429064} + 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: 5335774373889312776} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 246.22, y: -80.5} + m_SizeDelta: {x: 571.4103, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!222 &1872590228312565618 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7417956486747429064} + m_CullTransparentMesh: 1 +--- !u!114 &5276245541089048195 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7417956486747429064} + 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: Blocked Accounts + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279768342 + m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, 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: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + 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: 1 + 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 &6042956672197183543 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7417956486747429064} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &7956234874579038850 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7393034529258672642} + - component: {fileID: 6043631720539197103} + m_Layer: 5 + m_Name: BlockedUsers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7393034529258672642 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7956234874579038850} + 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: 5205272981100056552} + - {fileID: 8637544353534832296} + - {fileID: 2599418142972534689} + m_Father: {fileID: 6878344266008480350} + 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!225 &6043631720539197103 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7956234874579038850} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!1001 &7279277948583986842 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5087161545591994683} + m_Modifications: + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -300 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -336.96002 + objectReference: {fileID: 0} + - target: {fileID: 2336035712942851721, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_Name + value: NamesLoadingSpinner + objectReference: {fileID: 0} + - target: {fileID: 2336035712942851721, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} +--- !u!224 &8445566866548440901 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + m_PrefabInstance: {fileID: 7279277948583986842} + m_PrefabAsset: {fileID: 0} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/BlockedList.prefab.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/BlockedList.prefab.meta new file mode 100644 index 0000000000..9348e6b726 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/BlockedList.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5f07819f3bcef5a439df39438c9840f0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/BlockedUserEntry.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/BlockedUserEntry.prefab new file mode 100644 index 0000000000..9604cc38dd --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/BlockedUserEntry.prefab @@ -0,0 +1,1123 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &434402956254495305 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5456606117727073459} + - component: {fileID: 3221293148122281813} + - component: {fileID: 852798494167284432} + - component: {fileID: 7758688996308583502} + m_Layer: 5 + m_Name: BlockedUserEntry + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5456606117727073459 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 434402956254495305} + 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: 7505665153836970005} + - {fileID: 5930325920114541906} + - {fileID: 6933523995295731836} + - {fileID: 7748367149753732600} + - {fileID: 1336923013230553689} + 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: 400, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3221293148122281813 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 434402956254495305} + m_CullTransparentMesh: 0 +--- !u!114 &852798494167284432 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 434402956254495305} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 896f330d4d6d4610a964cf3ace1b3e88, type: 3} + m_Name: + m_EditorClassIdentifier: + showHideAnimator: {fileID: 0} + playerNameText: {fileID: 5460751659792233842} + unblockButton: {fileID: 6099987044322521758} + userThumbnail: {fileID: 7107657499169819023} + model: + userId: + userName: + thumbnailUrl: +--- !u!114 &7758688996308583502 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 434402956254495305} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f82e017250d074fa2a218204a7281cb0, type: 3} + m_Name: + m_EditorClassIdentifier: + targetObjects: + - {fileID: 4085369570703310644} +--- !u!1 &476136669478275824 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6933523995295731836} + - component: {fileID: 5143231410115912289} + m_Layer: 5 + m_Name: AvatarHead + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6933523995295731836 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 476136669478275824} + 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: 3208162396482114920} + - {fileID: 8537413690132117273} + m_Father: {fileID: 5456606117727073459} + 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: 10, y: 0} + m_SizeDelta: {x: 36, y: 36} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &5143231410115912289 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 476136669478275824} + m_CullTransparentMesh: 0 +--- !u!1 &834281825446427608 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3208162396482114920} + - component: {fileID: 3217224117916585149} + - component: {fileID: 2759878500656869675} + - component: {fileID: 3839301147942689596} + m_Layer: 5 + m_Name: AvatarMask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3208162396482114920 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 834281825446427608} + 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: 1847832236836700114} + - {fileID: 8166171576427526134} + m_Father: {fileID: 6933523995295731836} + 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: -2, y: -2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3217224117916585149 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 834281825446427608} + m_CullTransparentMesh: 0 +--- !u!114 &2759878500656869675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 834281825446427608} + 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: e36f3569fbdef4c609c33f7a1cebace5, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3839301147942689596 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 834281825446427608} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!1 &1331498478390116022 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8537413690132117273} + - component: {fileID: 6749979244704560273} + - component: {fileID: 1180137657974953112} + m_Layer: 5 + m_Name: Frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8537413690132117273 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331498478390116022} + 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: 6933523995295731836} + 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: 2, y: 2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6749979244704560273 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331498478390116022} + m_CullTransparentMesh: 0 +--- !u!114 &1180137657974953112 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331498478390116022} + 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.9254902, g: 0.92156863, b: 0.92941177, 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: 0d72ee801259541e5a5a33c86e6efdb9, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1594287854903375761 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7748367149753732600} + - component: {fileID: 3898557991638601270} + - component: {fileID: 5460751659792233842} + m_Layer: 5 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7748367149753732600 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1594287854903375761} + 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: 5456606117727073459} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 54, y: 0} + m_SizeDelta: {x: -190, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &3898557991638601270 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1594287854903375761} + m_CullTransparentMesh: 0 +--- !u!114 &5460751659792233842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1594287854903375761} + 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: Player Name + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279768342 + m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, 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: 15 + m_fontSizeBase: 15 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + 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: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 1 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + 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: 1 + 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 &3115487914368325722 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7505665153836970005} + - component: {fileID: 1869213292119424121} + - component: {fileID: 5577822441731050517} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7505665153836970005 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3115487914368325722} + 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: 5456606117727073459} + 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 &1869213292119424121 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3115487914368325722} + m_CullTransparentMesh: 0 +--- !u!114 &5577822441731050517 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3115487914368325722} + 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.23529412} + 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: f02af068e11cb4902a1a4faad10b890a, 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 &4085369570703310644 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5930325920114541906} + - component: {fileID: 2813743208186133248} + - component: {fileID: 712334457687682705} + m_Layer: 5 + m_Name: HighlightedBackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5930325920114541906 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4085369570703310644} + 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: 5456606117727073459} + 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 &2813743208186133248 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4085369570703310644} + m_CullTransparentMesh: 0 +--- !u!114 &712334457687682705 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4085369570703310644} + 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.9882353, g: 0.9882353, b: 0.9882353, 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: f02af068e11cb4902a1a4faad10b890a, 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 &4191259770464341065 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1847832236836700114} + - component: {fileID: 8731489368188398585} + - component: {fileID: 1832630102597187470} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1847832236836700114 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4191259770464341065} + 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: 3208162396482114920} + 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 &8731489368188398585 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4191259770464341065} + m_CullTransparentMesh: 0 +--- !u!114 &1832630102597187470 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4191259770464341065} + 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: 0} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &1319478382838870900 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5456606117727073459} + m_Modifications: + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_SizeDelta.y + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3725923502685340037, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3725923502685340037, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3725923502685340037, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3725923502685340037, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3725923502685340037, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_PixelsPerUnitMultiplier + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, + type: 2} + - target: {fileID: 4469143239268576428, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_fontStyle + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_fontColor.b + value: 0.09411765 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_fontColor.g + value: 0.08235294 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_fontColor.r + value: 0.08627451 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 1196159134475820439, guid: a02669827dd9144f39b4b164e753a21a, + type: 2} + - target: {fileID: 4469143239268576428, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_fontColor32.rgba + value: 4279768342 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Colors.m_NormalColor.a + value: 0.05882353 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Colors.m_NormalColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Colors.m_NormalColor.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Colors.m_NormalColor.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Colors.m_PressedColor.a + value: 0.15686275 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Colors.m_PressedColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Colors.m_PressedColor.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Colors.m_PressedColor.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Colors.m_SelectedColor.a + value: 0.05882353 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Colors.m_SelectedColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Colors.m_SelectedColor.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Colors.m_SelectedColor.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.a + value: 0.11764706 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5466927874646222343, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_Name + value: Button + objectReference: {fileID: 0} + - target: {fileID: 8616488889774720505, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8616488889774720505, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8616488889774720505, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8616488889774720505, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8616488889774720505, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8616488889774720505, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8616488889774720505, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1773ea34a6d37b740b50e11631032a01, type: 3} +--- !u!224 &1336923013230553689 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 54622623229548845, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + m_PrefabInstance: {fileID: 1319478382838870900} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6099987044322521758 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5109399184885072362, guid: 1773ea34a6d37b740b50e11631032a01, + type: 3} + m_PrefabInstance: {fileID: 1319478382838870900} + 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!1001 &2747755589418919040 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3208162396482114920} + m_Modifications: + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6719010960977733696, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_Name + value: Picture + objectReference: {fileID: 0} + - target: {fileID: 8638032630233208891, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4849d2ed3b5a18948bf3cd46256869a4, type: 3} +--- !u!114 &7107657499169819023 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4936655407855709455, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + m_PrefabInstance: {fileID: 2747755589418919040} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e0aaf5a1daa0c8548ba499d4a0332eb9, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &8166171576427526134 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, + type: 3} + m_PrefabInstance: {fileID: 2747755589418919040} + m_PrefabAsset: {fileID: 0} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/BlockedUserEntry.prefab.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/BlockedUserEntry.prefab.meta new file mode 100644 index 0000000000..04157fa15a --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/BlockedUserEntry.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f9a7642fdfa777d46b5a569bb248e680 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/MyAccountSectionHUD.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/MyAccountSectionHUD.prefab index 20ca18860b..7f9b77ea4f 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/MyAccountSectionHUD.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/MyAccountSectionHUD.prefab @@ -75,6 +75,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &300928667765793936 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5622623106588078457} + - component: {fileID: 161017538515445162} + - component: {fileID: 6028165466306373048} + 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 &5622623106588078457 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 300928667765793936} + 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: 744325558577697525} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 24, y: 0} + m_SizeDelta: {x: -48, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &161017538515445162 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 300928667765793936} + m_CullTransparentMesh: 1 +--- !u!114 &6028165466306373048 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 300928667765793936} + 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 Accounts + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, 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: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + 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: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + 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 &619406739866435280 GameObject: m_ObjectHideFlags: 0 @@ -140,7 +275,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: My profile + m_text: My Profile m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} @@ -659,6 +794,7 @@ RectTransform: m_Children: - {fileID: 3750537167248046599} - {fileID: 2247699559297615373} + - {fileID: 7086311860592484979} m_Father: {fileID: 9210792432472360934} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1029,82 +1165,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3513420263379420365 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7078138303469546560} - - component: {fileID: 3488039788155174616} - - component: {fileID: 4732370260649817268} - m_Layer: 5 - m_Name: Icn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7078138303469546560 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3513420263379420365} - 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: 3283626860157897344} - 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: 28, y: 0} - m_SizeDelta: {x: 26, y: 25} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3488039788155174616 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3513420263379420365} - m_CullTransparentMesh: 1 ---- !u!114 &4732370260649817268 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3513420263379420365} - 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: 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: b28c3b247e8b8b646af42e66b9741cb5, type: 3} - 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 &3588598697516932475 +--- !u!1 &3433299005380809964 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1112,31 +1173,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3750537167248046599} - - component: {fileID: 7616359460810944539} - - component: {fileID: 5765207209131397594} - - component: {fileID: 757769175592608795} + - component: {fileID: 7086311860592484979} + - component: {fileID: 2403979872318184838} + - component: {fileID: 6856318787853155121} + - component: {fileID: 4358800337081020724} m_Layer: 5 - m_Name: MyProfileButton + m_Name: BlockedListButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3750537167248046599 +--- !u!224 &7086311860592484979 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3588598697516932475} + m_GameObject: {fileID: 3433299005380809964} 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: 2369809693483100583} - - {fileID: 5629046692074579084} + - {fileID: 6798101091965482627} + - {fileID: 744325558577697525} m_Father: {fileID: 5991122243707592773} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1144,21 +1205,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 46} m_Pivot: {x: 0, y: 0} ---- !u!222 &7616359460810944539 +--- !u!222 &2403979872318184838 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3588598697516932475} + m_GameObject: {fileID: 3433299005380809964} m_CullTransparentMesh: 1 ---- !u!114 &5765207209131397594 +--- !u!114 &6856318787853155121 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3588598697516932475} + m_GameObject: {fileID: 3433299005380809964} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -1192,17 +1253,17 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 3971691480320509006} + m_TargetGraphic: {fileID: 8274449084842047341} m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!114 &757769175592608795 +--- !u!114 &4358800337081020724 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3588598697516932475} + m_GameObject: {fileID: 3433299005380809964} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4bfd0d144b6d3dd438b84fa14a062c4f, type: 3} @@ -1212,7 +1273,7 @@ MonoBehaviour: playClick: 1 playRelease: 1 extraClickEvent: {fileID: 0} ---- !u!1 &4009500309378424423 +--- !u!1 &3513420263379420365 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1220,66 +1281,324 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1042293640683670072} - - component: {fileID: 3419604521940922718} - - component: {fileID: 6597983626941363942} + - component: {fileID: 7078138303469546560} + - component: {fileID: 3488039788155174616} + - component: {fileID: 4732370260649817268} m_Layer: 5 - m_Name: Text + m_Name: Icn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1042293640683670072 +--- !u!224 &7078138303469546560 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4009500309378424423} + m_GameObject: {fileID: 3513420263379420365} 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: 8981163224422539298} + m_Father: {fileID: 3283626860157897344} 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: -133} - m_SizeDelta: {x: -110, y: 66} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &3419604521940922718 + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 28, y: 0} + m_SizeDelta: {x: 26, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3488039788155174616 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4009500309378424423} + m_GameObject: {fileID: 3513420263379420365} m_CullTransparentMesh: 1 ---- !u!114 &6597983626941363942 +--- !u!114 &4732370260649817268 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4009500309378424423} + m_GameObject: {fileID: 3513420263379420365} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + 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_Color: {r: 0.08627451, g: 0.08235294, b: 0.09411765, 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: Text... - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 6b705423dc77d4fceb4122f6d7e571d6, type: 2} + m_Sprite: {fileID: 21300000, guid: b28c3b247e8b8b646af42e66b9741cb5, type: 3} + 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 &3582123108896915995 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8717481657184900961} + - component: {fileID: 5424390291415292243} + - component: {fileID: 6309042600270281502} + m_Layer: 5 + m_Name: Icn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8717481657184900961 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3582123108896915995} + 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: 744325558577697525} + 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: 28, y: 0} + m_SizeDelta: {x: 22, y: 22} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5424390291415292243 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3582123108896915995} + m_CullTransparentMesh: 1 +--- !u!114 &6309042600270281502 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3582123108896915995} + 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.9882353, g: 0.9882353, b: 0.9882353, 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: 0fea5ecc9e83df74d8002c4b8b2191bd, type: 3} + 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 &3588598697516932475 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3750537167248046599} + - component: {fileID: 7616359460810944539} + - component: {fileID: 5765207209131397594} + - component: {fileID: 757769175592608795} + m_Layer: 5 + m_Name: MyProfileButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3750537167248046599 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3588598697516932475} + 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: 2369809693483100583} + - {fileID: 5629046692074579084} + m_Father: {fileID: 5991122243707592773} + 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: 46} + m_Pivot: {x: 0, y: 0} +--- !u!222 &7616359460810944539 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3588598697516932475} + m_CullTransparentMesh: 1 +--- !u!114 &5765207209131397594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3588598697516932475} + 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: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.8584906, g: 0.8584906, b: 0.8584906, 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: 3971691480320509006} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &757769175592608795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3588598697516932475} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4bfd0d144b6d3dd438b84fa14a062c4f, type: 3} + m_Name: + m_EditorClassIdentifier: + playHover: 1 + playClick: 1 + playRelease: 1 + extraClickEvent: {fileID: 0} +--- !u!1 &4009500309378424423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1042293640683670072} + - component: {fileID: 3419604521940922718} + - component: {fileID: 6597983626941363942} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1042293640683670072 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4009500309378424423} + 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: 8981163224422539298} + 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: -133} + m_SizeDelta: {x: -110, y: 66} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &3419604521940922718 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4009500309378424423} + m_CullTransparentMesh: 1 +--- !u!114 &6597983626941363942 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4009500309378424423} + 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: Text... + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6b705423dc77d4fceb4122f6d7e571d6, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 9d9df32282a3c40299019c36b2157d37, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -1377,6 +1696,7 @@ RectTransform: m_Children: - {fileID: 2071218490073935391} - {fileID: 8747905691023710764} + - {fileID: 8831764741795757590} - {fileID: 5991122243707592773} m_Father: {fileID: 8024335577128154959} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1636,7 +1956,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Email notifications + m_text: Email Notifications m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} @@ -1851,6 +2171,7 @@ MonoBehaviour: sectionsMenu: {fileID: 2562870807502328264} myProfileComponentView: {fileID: 4575446210914794904} emailNotificationsComponentView: {fileID: 3545138090583190189} + blockedListComponentView: {fileID: 7719902715858082827} accountSettingsUpdatedToast: {fileID: 6610558860221813516} myProfileButton: {fileID: 5765207209131397594} myProfileButtonDeselected: {fileID: 2718019705717952361} @@ -1862,11 +2183,11 @@ MonoBehaviour: emailNotificationsButtonDeselectedImage: {fileID: 5491465393681721634} emailNotificationsButtonSelected: {fileID: 6002833764150711434} emailNotificationsButtonSelectedImage: {fileID: 6372531175273281447} - confirmationModal: {fileID: 2801926067816802232} - confirmationModalLogo: {fileID: 1137234026456544787} - confirmationModalText: {fileID: 6597983626941363942} - confirmationModalNoButton: {fileID: 6283054375367079162} - confirmationModalYesButton: {fileID: 8419000464500689258} + blockedListButton: {fileID: 6856318787853155121} + blockedListButtonDeselected: {fileID: 6994146928010483699} + blockedListButtonDeselectedImage: {fileID: 8274449084842047341} + blockedListButtonSelected: {fileID: 6683440370271544649} + blockedListButtonSelectedImage: {fileID: 8908830812308336855} --- !u!1 &5472062092190438407 GameObject: m_ObjectHideFlags: 0 @@ -2100,7 +2421,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: My profile + m_text: My Profile m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} @@ -2534,7 +2855,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 2 ---- !u!1 &6589602318062871053 +--- !u!1 &6274805113413422681 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2542,27 +2863,162 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3880736322189904317} + - component: {fileID: 4244354674690364906} + - component: {fileID: 4496622966716471888} + - component: {fileID: 1640706042223836420} m_Layer: 5 - m_Name: Sliding Area + m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3880736322189904317 +--- !u!224 &4244354674690364906 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6589602318062871053} + m_GameObject: {fileID: 6274805113413422681} 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: 8047280749183032157} + m_Children: [] + m_Father: {fileID: 6798101091965482627} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 24, y: 0} + m_SizeDelta: {x: -48, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4496622966716471888 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6274805113413422681} + m_CullTransparentMesh: 1 +--- !u!114 &1640706042223836420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6274805113413422681} + 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 Accounts + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279768342 + m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, 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: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + 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: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + 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 &6589602318062871053 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3880736322189904317} + 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 &3880736322189904317 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6589602318062871053} + 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: 8047280749183032157} m_Father: {fileID: 8784170467649388825} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2645,7 +3101,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7033645233673418964 +--- !u!1 &6683440370271544649 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2653,59 +3109,59 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3283626860157897344} - - component: {fileID: 6558703757684530813} - - component: {fileID: 5491465393681721634} + - component: {fileID: 744325558577697525} + - component: {fileID: 4185536648141773121} + - component: {fileID: 8908830812308336855} m_Layer: 5 - m_Name: Deselected + m_Name: Selected m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3283626860157897344 + m_IsActive: 0 +--- !u!224 &744325558577697525 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7033645233673418964} + m_GameObject: {fileID: 6683440370271544649} 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: 7078138303469546560} - - {fileID: 4141693405581629633} - m_Father: {fileID: 2247699559297615373} + - {fileID: 8717481657184900961} + - {fileID: 5622623106588078457} + m_Father: {fileID: 7086311860592484979} 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 &6558703757684530813 +--- !u!222 &4185536648141773121 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7033645233673418964} + m_GameObject: {fileID: 6683440370271544649} m_CullTransparentMesh: 1 ---- !u!114 &5491465393681721634 +--- !u!114 &8908830812308336855 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7033645233673418964} + m_GameObject: {fileID: 6683440370271544649} 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.9882353, g: 0.9882353, b: 0.9882353, a: 1} + m_Color: {r: 1, g: 0.45490196, b: 0.22352941, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2722,7 +3178,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 2 ---- !u!1 &7490637495086527679 +--- !u!1 &6994146928010483699 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2730,134 +3186,76 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9054933368299285745} - - component: {fileID: 2721532459064095761} - - component: {fileID: 1874063066462932283} + - component: {fileID: 6798101091965482627} + - component: {fileID: 4404531439572851098} + - component: {fileID: 8274449084842047341} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Deselected m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9054933368299285745 +--- !u!224 &6798101091965482627 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7490637495086527679} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 6994146928010483699} + 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: 4343338878116032075} + m_Children: + - {fileID: 685835999710196215} + - {fileID: 4244354674690364906} + m_Father: {fileID: 7086311860592484979} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 24, y: 0} - m_SizeDelta: {x: -48, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2721532459064095761 +--- !u!222 &4404531439572851098 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7490637495086527679} + m_GameObject: {fileID: 6994146928010483699} m_CullTransparentMesh: 1 ---- !u!114 &1874063066462932283 +--- !u!114 &8274449084842047341 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7490637495086527679} + m_GameObject: {fileID: 6994146928010483699} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + 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_Color: {r: 0.9882353, g: 0.9882353, b: 0.9882353, 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: Email notifications - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, 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: 16 - m_fontSizeBase: 16 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - 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: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - 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 &7845292203091259355 + m_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, 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 &7033645233673418964 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2865,8 +3263,220 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9188305680439761446} - - component: {fileID: 5062372839470767586} + - component: {fileID: 3283626860157897344} + - component: {fileID: 6558703757684530813} + - component: {fileID: 5491465393681721634} + m_Layer: 5 + m_Name: Deselected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3283626860157897344 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7033645233673418964} + 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: 7078138303469546560} + - {fileID: 4141693405581629633} + m_Father: {fileID: 2247699559297615373} + 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 &6558703757684530813 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7033645233673418964} + m_CullTransparentMesh: 1 +--- !u!114 &5491465393681721634 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7033645233673418964} + 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.9882353, g: 0.9882353, b: 0.9882353, 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: f02af068e11cb4902a1a4faad10b890a, 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 &7490637495086527679 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9054933368299285745} + - component: {fileID: 2721532459064095761} + - component: {fileID: 1874063066462932283} + 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 &9054933368299285745 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7490637495086527679} + 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: 4343338878116032075} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 24, y: 0} + m_SizeDelta: {x: -48, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2721532459064095761 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7490637495086527679} + m_CullTransparentMesh: 1 +--- !u!114 &1874063066462932283 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7490637495086527679} + 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: Email Notifications + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, 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: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + 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: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + 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 &7845292203091259355 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9188305680439761446} + - component: {fileID: 5062372839470767586} - component: {fileID: 5008164774239658031} m_Layer: 5 m_Name: Header @@ -3158,7 +3768,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8634757159395940774 +--- !u!1 &8348992801655736351 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3166,80 +3776,155 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5874045422075732181} - - component: {fileID: 2945351776583926273} - - component: {fileID: 1892496762321696658} + - component: {fileID: 685835999710196215} + - component: {fileID: 6882042772488613295} + - component: {fileID: 8264808185604211177} m_Layer: 5 - m_Name: TextToast + m_Name: Icn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5874045422075732181 +--- !u!224 &685835999710196215 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8634757159395940774} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 8348992801655736351} + 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: 1051552430065570828} + m_Father: {fileID: 6798101091965482627} 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: 42, y: 4} - m_SizeDelta: {x: 190, y: 17} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &2945351776583926273 + m_AnchoredPosition: {x: 28, y: 0} + m_SizeDelta: {x: 22, y: 22} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6882042772488613295 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8634757159395940774} - m_CullTransparentMesh: 0 ---- !u!114 &1892496762321696658 + m_GameObject: {fileID: 8348992801655736351} + m_CullTransparentMesh: 1 +--- !u!114 &8264808185604211177 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8634757159395940774} + m_GameObject: {fileID: 8348992801655736351} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + 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_Color: {r: 0.08627451, g: 0.08235294, b: 0.09411765, 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: Account settings updated - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, 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} + m_Sprite: {fileID: 21300000, guid: 0fea5ecc9e83df74d8002c4b8b2191bd, type: 3} + 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 &8634757159395940774 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5874045422075732181} + - component: {fileID: 2945351776583926273} + - component: {fileID: 1892496762321696658} + m_Layer: 5 + m_Name: TextToast + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5874045422075732181 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8634757159395940774} + 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: 1051552430065570828} + 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: 42, y: 4} + m_SizeDelta: {x: 190, y: 17} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &2945351776583926273 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8634757159395940774} + m_CullTransparentMesh: 0 +--- !u!114 &1892496762321696658 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8634757159395940774} + 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: Account settings updated + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, 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} @@ -3662,18 +4347,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1286305281802319120} m_PrefabAsset: {fileID: 0} ---- !u!114 &6283054375367079162 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5109399184885072362, guid: df2ca57878cc0834088cff37f213e619, - type: 3} - m_PrefabInstance: {fileID: 1286305281802319120} - 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!1001 &3059097994089677664 PrefabInstance: m_ObjectHideFlags: 0 @@ -4430,18 +5103,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3620462189717440640} m_PrefabAsset: {fileID: 0} ---- !u!114 &8419000464500689258 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5109399184885072362, guid: df2ca57878cc0834088cff37f213e619, - type: 3} - m_PrefabInstance: {fileID: 3620462189717440640} - 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!1001 &5741146918857652051 PrefabInstance: m_ObjectHideFlags: 0 @@ -4460,6 +5121,31 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 3166637306679997320, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3166637306679997320, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3166637306679997320, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_SizeDelta.x + value: 700 + objectReference: {fileID: 0} + - target: {fileID: 3166637306679997320, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 350 + objectReference: {fileID: 0} + - target: {fileID: 3166637306679997320, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -53 + objectReference: {fileID: 0} - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, type: 3} propertyPath: m_Pivot.x @@ -4560,6 +5246,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4112516359022823064, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4112516359022823064, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4112516359022823064, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_SizeDelta.x + value: 700 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -4583,3 +5284,624 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 5741146918857652051} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6923321463495023985 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9210792432472360934} + m_Modifications: + - target: {fileID: 399696948000710367, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 399696948000710367, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 399696948000710367, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.x + value: 713 + objectReference: {fileID: 0} + - target: {fileID: 399696948000710367, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 484.5 + objectReference: {fileID: 0} + - target: {fileID: 399696948000710367, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -107.016495 + objectReference: {fileID: 0} + - target: {fileID: 1083349686300304154, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1083349686300304154, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1083349686300304154, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 1083349686300304154, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 472 + objectReference: {fileID: 0} + - target: {fileID: 1258951972729303304, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1380939570336208345, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1380939570336208345, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1380939570336208345, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 246 + objectReference: {fileID: 0} + - target: {fileID: 1380939570336208345, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -170 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.x + value: 962 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2043524688301574727, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2043524688301574727, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2043524688301574727, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.x + value: 713 + objectReference: {fileID: 0} + - target: {fileID: 2043524688301574727, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 484.5 + objectReference: {fileID: 0} + - target: {fileID: 2043524688301574727, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -36.49925 + objectReference: {fileID: 0} + - target: {fileID: 2599418142972534689, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2599418142972534689, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2599418142972534689, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.x + value: 713 + objectReference: {fileID: 0} + - target: {fileID: 2599418142972534689, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 484.5 + objectReference: {fileID: 0} + - target: {fileID: 2599418142972534689, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -290 + objectReference: {fileID: 0} + - target: {fileID: 2669817094073498590, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2669817094073498590, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2669817094073498590, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.x + value: 944 + objectReference: {fileID: 0} + - target: {fileID: 2719828401576729022, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_Name + value: BlockedList + objectReference: {fileID: 0} + - target: {fileID: 2719828401576729022, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2932261867673282527, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2932261867673282527, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2932261867673282527, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.x + value: 713 + objectReference: {fileID: 0} + - target: {fileID: 2932261867673282527, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 484.5 + objectReference: {fileID: 0} + - target: {fileID: 2932261867673282527, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -107.016495 + objectReference: {fileID: 0} + - target: {fileID: 3266641806548734330, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3266641806548734330, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3266641806548734330, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.x + value: 713 + objectReference: {fileID: 0} + - target: {fileID: 3266641806548734330, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 484.5 + objectReference: {fileID: 0} + - target: {fileID: 3266641806548734330, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -141.0345 + objectReference: {fileID: 0} + - target: {fileID: 4126736680530161888, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: scrollBar + value: + objectReference: {fileID: 6589602318062871053} + - target: {fileID: 4645263074570526911, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4645263074570526911, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4645263074570526911, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.x + value: 944 + objectReference: {fileID: 0} + - target: {fileID: 4645263074570526911, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 4704762013326911994, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4704762013326911994, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4704762013326911994, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.x + value: 28.38 + objectReference: {fileID: 0} + - target: {fileID: 4704762013326911994, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -8.5 + objectReference: {fileID: 0} + - target: {fileID: 5205272981100056552, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5205272981100056552, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5205272981100056552, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.x + value: 713 + objectReference: {fileID: 0} + - target: {fileID: 5205272981100056552, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 484.5 + objectReference: {fileID: 0} + - target: {fileID: 5205272981100056552, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -12 + objectReference: {fileID: 0} + - target: {fileID: 5238105329057987609, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5238105329057987609, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5238105329057987609, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.x + value: 957 + objectReference: {fileID: 0} + - target: {fileID: 5238105329057987609, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 478.5 + objectReference: {fileID: 0} + - target: {fileID: 5238105329057987609, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -544 + objectReference: {fileID: 0} + - target: {fileID: 5335774373889312776, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335774373889312776, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335774373889312776, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.x + value: 957 + objectReference: {fileID: 0} + - target: {fileID: 5335774373889312776, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.y + value: 261 + objectReference: {fileID: 0} + - target: {fileID: 5456373390294784083, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -7.9999695 + objectReference: {fileID: 0} + - target: {fileID: 6776430592985562792, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6776430592985562792, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6776430592985562792, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.x + value: 713 + objectReference: {fileID: 0} + - target: {fileID: 6776430592985562792, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 484.5 + objectReference: {fileID: 0} + - target: {fileID: 6776430592985562792, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -141.0345 + objectReference: {fileID: 0} + - target: {fileID: 6878344266008480350, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.y + value: 841 + objectReference: {fileID: 0} + - target: {fileID: 7393034529258672642, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7393034529258672642, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7393034529258672642, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.x + value: 957 + objectReference: {fileID: 0} + - target: {fileID: 7393034529258672642, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.y + value: 560 + objectReference: {fileID: 0} + - target: {fileID: 7393034529258672642, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 478.5 + objectReference: {fileID: 0} + - target: {fileID: 7393034529258672642, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -561 + objectReference: {fileID: 0} + - target: {fileID: 8253108935466810716, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.y + value: 56.185 + objectReference: {fileID: 0} + - target: {fileID: 8637544353534832296, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8637544353534832296, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8637544353534832296, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.x + value: 713 + objectReference: {fileID: 0} + - target: {fileID: 8637544353534832296, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.y + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 8637544353534832296, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 484.5 + objectReference: {fileID: 0} + - target: {fileID: 8637544353534832296, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -24 + objectReference: {fileID: 0} + - target: {fileID: 8838191951974205759, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8838191951974205759, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8838191951974205759, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.x + value: 957 + objectReference: {fileID: 0} + - target: {fileID: 8838191951974205759, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.y + value: 161.0345 + objectReference: {fileID: 0} + - target: {fileID: 8838191951974205759, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 478.5 + objectReference: {fileID: 0} + - target: {fileID: 8838191951974205759, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -779.5173 + objectReference: {fileID: 0} + - target: {fileID: 8879528974151333307, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8879528974151333307, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8879528974151333307, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.x + value: 957 + objectReference: {fileID: 0} + - target: {fileID: 8879528974151333307, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 8879528974151333307, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -209 + objectReference: {fileID: 0} + - target: {fileID: 8888058424948538135, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8888058424948538135, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8888058424948538135, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_SizeDelta.x + value: 28.38 + objectReference: {fileID: 0} + - target: {fileID: 8888058424948538135, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -8.5 + objectReference: {fileID: 0} + - target: {fileID: 9000833933413679866, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + propertyPath: m_VerticalScrollbar + value: + objectReference: {fileID: 1950547650792199863} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5f07819f3bcef5a439df39438c9840f0, type: 3} +--- !u!114 &7719902715858082827 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 807849327241068922, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + m_PrefabInstance: {fileID: 6923321463495023985} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f222bd2778b4bf195bb71bbaa958364, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &8831764741795757590 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1910703879087678311, guid: 5f07819f3bcef5a439df39438c9840f0, + type: 3} + m_PrefabInstance: {fileID: 6923321463495023985} + m_PrefabAsset: {fileID: 0} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/WebInterfaceBlockedListApiBridge.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/WebInterfaceBlockedListApiBridge.cs new file mode 100644 index 0000000000..c4e520b177 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/WebInterfaceBlockedListApiBridge.cs @@ -0,0 +1,14 @@ +using DCL.Interface; + +namespace DCL.MyAccount +{ + public class WebInterfaceBlockedListApiBridge : IBlockedListApiBridge + { + public WebInterfaceBlockedListApiBridge() { } + + public void SendUnblockPlayer(string playerId) + { + WebInterface.SendUnblockPlayer(playerId); + } + } +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/WebInterfaceBlockedListApiBridge.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/WebInterfaceBlockedListApiBridge.cs.meta new file mode 100644 index 0000000000..de1cd72944 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/WebInterfaceBlockedListApiBridge.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 92ce065c192448c191dbf343001e0f1f +timeCreated: 1710346269 \ No newline at end of file diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/Passport/PlayerInfo/PassportPlayerInfoComponentController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/Passport/PlayerInfo/PassportPlayerInfoComponentController.cs index 682f25d8df..0098712b0f 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/Passport/PlayerInfo/PassportPlayerInfoComponentController.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/Passport/PlayerInfo/PassportPlayerInfoComponentController.cs @@ -113,6 +113,9 @@ private async UniTask UpdateWithUserProfileAsync(UserProfile userProfile, Cancel { name = filteredName, isGuest = userProfile.isGuest, + userId = userProfile.userId, + isBlocked = ownUserProfile.IsBlocked(userProfile.userId), + hasBlocked = userProfile.IsBlocked(ownUserProfile.userId), }; } else diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/Resources/PlayerPassport.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/Resources/PlayerPassport.prefab index d7e844f5bb..a690f50ce1 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/Resources/PlayerPassport.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/Resources/PlayerPassport.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5926770823322623033} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -107,7 +106,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7509957416386781487} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -184,7 +182,6 @@ RectTransform: - {fileID: 1743745139732036328} - {fileID: 620867429964518819} m_Father: {fileID: 7464460673095847939} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -248,7 +245,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8571874844513924599} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -395,7 +391,6 @@ RectTransform: - {fileID: 1097541669540984116} - {fileID: 1312149564113602550} m_Father: {fileID: 678770521573999315} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -516,7 +511,6 @@ RectTransform: m_Children: - {fileID: 3468562840859419820} m_Father: {fileID: 4362405388559671923} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -657,143 +651,6 @@ MonoBehaviour: targetRectTransform: {fileID: 1743745139732036328} hoverScale: 1 normalScale: 1 ---- !u!1 &462353811804268242 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2986576457405634830} - - component: {fileID: 3778425235372837714} - - component: {fileID: 3897355853726331610} - m_Layer: 5 - m_Name: BlockedText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2986576457405634830 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 462353811804268242} - 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: 4338853027481271196} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0.000009059906} - m_SizeDelta: {x: 67, y: 25} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3778425235372837714 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 462353811804268242} - m_CullTransparentMesh: 1 ---- !u!114 &3897355853726331610 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 462353811804268242} - 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: a02669827dd9144f39b4b164e753a21a, type: 2} - m_sharedMaterial: {fileID: 1196159134475820439, guid: a02669827dd9144f39b4b164e753a21a, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, 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: 14 - m_fontSizeBase: 14 - 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: 1 - 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.11206055, y: -0.032470703, z: 0.0045776367, w: 0.5112915} - 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 &473405647493242382 GameObject: m_ObjectHideFlags: 0 @@ -829,7 +686,6 @@ RectTransform: - {fileID: 3729021012962335220} - {fileID: 8311382973572153973} m_Father: {fileID: 2796315105140180887} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -932,7 +788,6 @@ RectTransform: - {fileID: 8105776151471362163} - {fileID: 3258806515172564462} m_Father: {fileID: 145759202348997670} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1073,7 +928,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3038902425854274248} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 180, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1154,7 +1008,6 @@ RectTransform: - {fileID: 2866234400657368098} - {fileID: 4582051933308536961} m_Father: {fileID: 177195414959549119} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1253,7 +1106,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetObjects: - {fileID: 6801399652414686851} ---- !u!1 &578114385315238572 +--- !u!1 &662044542340470358 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1261,76 +1114,56 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4338853027481271196} - - component: {fileID: 4430096241540300670} - - component: {fileID: 6119502508927511745} + - component: {fileID: 2071415358176203860} + - component: {fileID: 1704851701401775891} m_Layer: 5 - m_Name: BlockedStatus + m_Name: ViewAllLoadingContainer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!224 &4338853027481271196 +--- !u!224 &2071415358176203860 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 578114385315238572} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 662044542340470358} + 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: 2986576457405634830} - m_Father: {fileID: 7464460673095847939} - m_RootOrder: 3 + - {fileID: 4761071388539711649} + m_Father: {fileID: 2796315105140180887} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 163.9, y: 70.69995} - m_SizeDelta: {x: 67, y: 25} + 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 &4430096241540300670 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 578114385315238572} - m_CullTransparentMesh: 1 ---- !u!114 &6119502508927511745 +--- !u!114 &1704851701401775891 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 578114385315238572} + m_GameObject: {fileID: 662044542340470358} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.95686275, g: 0.08627451, b: 0.08627451, 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_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, 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.6 ---- !u!1 &662044542340470358 + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &748091366439720455 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1338,56 +1171,35 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2071415358176203860} - - component: {fileID: 1704851701401775891} + - component: {fileID: 2557714013894868121} m_Layer: 5 - m_Name: ViewAllLoadingContainer + m_Name: ActionsContainer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2071415358176203860 + m_IsActive: 1 +--- !u!224 &2557714013894868121 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 662044542340470358} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 748091366439720455} + 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: 4761071388539711649} - m_Father: {fileID: 2796315105140180887} - m_RootOrder: 4 + - {fileID: 5100612425432757902} + - {fileID: 6013585962286874674} + m_Father: {fileID: 3655131486069278806} 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!114 &1704851701401775891 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 662044542340470358} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!1 &784089584796833325 GameObject: m_ObjectHideFlags: 0 @@ -1422,7 +1234,6 @@ RectTransform: - {fileID: 6934852435160735203} - {fileID: 298017798417002233} m_Father: {fileID: 2866234400657368098} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1578,7 +1389,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2866234400657368098} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1643,7 +1453,6 @@ RectTransform: m_Children: - {fileID: 4183768475003249092} m_Father: {fileID: 8824488500589969801} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1681,7 +1490,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7954715617966658305} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1821,7 +1629,6 @@ RectTransform: m_Children: - {fileID: 8351078881523327284} m_Father: {fileID: 7154242066238905131} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1916,7 +1723,7 @@ MonoBehaviour: targetRectTransform: {fileID: 8351078881523327284} hoverScale: 1 normalScale: 1 ---- !u!1 &1218106537909741069 +--- !u!1 &1125235357112120614 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1924,73 +1731,168 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8795719026956483384} - - component: {fileID: 5796471475179935003} - - component: {fileID: 1047719489084951375} + - component: {fileID: 5962995678979433584} + - component: {fileID: 7503498163640632948} + - component: {fileID: 5515716149678018264} + - component: {fileID: 3533290214799658953} m_Layer: 5 - m_Name: AddressCopiedToast + m_Name: Icon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &8795719026956483384 + m_IsActive: 1 +--- !u!224 &5962995678979433584 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1218106537909741069} + m_GameObject: {fileID: 1125235357112120614} 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: 6208471426939786281} - m_Father: {fileID: 6242256912090690840} - m_RootOrder: 2 + m_Children: [] + m_Father: {fileID: 5100612425432757902} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 169.02426, y: -69} - m_SizeDelta: {x: 136, y: 40} + m_AnchoredPosition: {x: 12, y: -12.035} + m_SizeDelta: {x: 14, y: 24.07} m_Pivot: {x: 0.5, y: 0.5} ---- !u!225 &5796471475179935003 -CanvasGroup: +--- !u!222 &7503498163640632948 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1218106537909741069} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 0 - m_BlocksRaycasts: 0 - m_IgnoreParentGroups: 0 ---- !u!114 &1047719489084951375 + m_GameObject: {fileID: 1125235357112120614} + m_CullTransparentMesh: 1 +--- !u!114 &5515716149678018264 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1218106537909741069} + m_GameObject: {fileID: 1125235357112120614} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d8b939b5bedb9494b806609faeda7d8d, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - hideOnEnable: 0 - animSpeedFactor: 2 - disableAfterFadeOut: 1 - canvasGroup: {fileID: 5796471475179935003} ---- !u!1 &1223533085651379293 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: + 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: 7539fa1b890384b749ef64eec52331bb, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3533290214799658953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1125235357112120614} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 5 + m_MinHeight: 5 + m_PreferredWidth: 14 + m_PreferredHeight: 10 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &1218106537909741069 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8795719026956483384} + - component: {fileID: 5796471475179935003} + - component: {fileID: 1047719489084951375} + m_Layer: 5 + m_Name: AddressCopiedToast + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8795719026956483384 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1218106537909741069} + 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: 6208471426939786281} + m_Father: {fileID: 6242256912090690840} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 169.02426, y: -69} + m_SizeDelta: {x: 136, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!225 &5796471475179935003 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1218106537909741069} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 0 + m_BlocksRaycasts: 0 + m_IgnoreParentGroups: 0 +--- !u!114 &1047719489084951375 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1218106537909741069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8b939b5bedb9494b806609faeda7d8d, type: 3} + m_Name: + m_EditorClassIdentifier: + hideOnEnable: 0 + animSpeedFactor: 2 + disableAfterFadeOut: 1 + canvasGroup: {fileID: 5796471475179935003} +--- !u!1 &1223533085651379293 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: - component: {fileID: 8247106742040664970} - component: {fileID: 4880162740306174287} - component: {fileID: 1529535706152726646} @@ -2017,7 +1919,6 @@ RectTransform: - {fileID: 2918596870642379555} - {fileID: 3255570261855905915} m_Father: {fileID: 4205163359284619698} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2105,283 +2006,44 @@ MonoBehaviour: 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 &8382461539747110793 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1223533085651379293} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!1 &1269658673017942781 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6522013552441445847} - - component: {fileID: 7243330985022076965} - - component: {fileID: 7635278770119939455} - - component: {fileID: 2065161310655255824} - - component: {fileID: 3386700703919681769} - - component: {fileID: 4507086455335170913} - - component: {fileID: 3978479458520506477} - - component: {fileID: 5639901908411271319} - - component: {fileID: 5600684979079571461} - - component: {fileID: 632649275322277706} - - component: {fileID: 7126940801410381578} - m_Layer: 5 - m_Name: Options - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6522013552441445847 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1269658673017942781} - 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: 2161564779954563308} - - {fileID: 1920069070755841703} - m_Father: {fileID: 7464460673095847939} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 204.2, y: 70.69995} - m_SizeDelta: {x: 0, y: 24.07} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7243330985022076965 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1269658673017942781} - m_CullTransparentMesh: 1 ---- !u!114 &7635278770119939455 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1269658673017942781} - 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: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, 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 &2065161310655255824 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1269658673017942781} - 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: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} - m_HighlightedColor: {r: 0.8509804, g: 0.8509804, b: 0.8509804, a: 1} - m_PressedColor: {r: 0.7264151, g: 0.7264151, b: 0.7264151, a: 1} - m_SelectedColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 0.9607843} - 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: 21300000, guid: f4587fb51fa334140ad8d598a3f69290, - type: 3} - 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: 3609486358049125995} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!225 &3386700703919681769 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1269658673017942781} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &4507086455335170913 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1269658673017942781} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d8b939b5bedb9494b806609faeda7d8d, type: 3} - m_Name: - m_EditorClassIdentifier: - hideOnEnable: 0 - animSpeedFactor: 1 - disableAfterFadeOut: 0 - canvasGroup: {fileID: 3386700703919681769} ---- !u!114 &3978479458520506477 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1269658673017942781} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4bfd0d144b6d3dd438b84fa14a062c4f, type: 3} - m_Name: - m_EditorClassIdentifier: - playHover: 1 - playClick: 1 - playRelease: 1 - extraClickEvent: {fileID: 0} ---- !u!114 &5639901908411271319 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1269658673017942781} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 274bf6bf95184804cb2606eda1bf2a6a, type: 3} - m_Name: - m_EditorClassIdentifier: - showHideAnimator: {fileID: 0} - button: {fileID: 2065161310655255824} - text: {fileID: 0} - icon: {fileID: 3609486358049125995} - model: - text: - icon: {fileID: 21300000, guid: 7539fa1b890384b749ef64eec52331bb, type: 3} ---- !u!114 &5600684979079571461 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1269658673017942781} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 ---- !u!114 &632649275322277706 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1269658673017942781} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 63f05fbeb9b20044d9c1dc9abd16c772, type: 3} - m_Name: - m_EditorClassIdentifier: - textToChange: {fileID: 0} - iconToChange: {fileID: 3609486358049125995} - onFocusColor: {r: 1, g: 1, b: 1, a: 1} - onLoseFocusColor: {r: 0.027450982, g: 0.7803922, b: 0.7176471, a: 1} ---- !u!114 &7126940801410381578 + 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 &8382461539747110793 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1269658673017942781} + m_GameObject: {fileID: 1223533085651379293} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d30b4ce08e6854094b8461fdea1282aa, type: 3} + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} m_Name: m_EditorClassIdentifier: - targetRectTransform: {fileID: 2161564779954563308} - hoverScale: 1 - normalScale: 1 + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &1294846594088517225 GameObject: m_ObjectHideFlags: 0 @@ -2423,7 +2085,6 @@ RectTransform: m_Children: - {fileID: 8825579882899207089} m_Father: {fileID: 4327758705408432641} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -2653,6 +2314,42 @@ MonoBehaviour: targetRectTransform: {fileID: 688460988727583958} hoverScale: 1 normalScale: 1 +--- !u!1 &1450889551026058293 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3655131486069278806} + m_Layer: 5 + m_Name: AllUserView + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3655131486069278806 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1450889551026058293} + 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: 2557714013894868121} + m_Father: {fileID: 6242256912090690840} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1482960648076859358 GameObject: m_ObjectHideFlags: 0 @@ -2684,7 +2381,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9193388242622379385} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2760,7 +2456,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5254482340796141752} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -2896,7 +2591,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4536233496045276704} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2978,7 +2672,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7154242066238905131} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3053,7 +2746,6 @@ RectTransform: m_Children: - {fileID: 8271622426019976286} m_Father: {fileID: 4205163359284619698} - m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3091,7 +2783,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2866234400657368098} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3168,7 +2859,6 @@ RectTransform: - {fileID: 5064710158721716679} - {fileID: 8470542334961682300} m_Father: {fileID: 4327758705408432641} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -3429,7 +3119,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4183768475003249092} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3505,7 +3194,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5925883722346185609} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3641,7 +3329,6 @@ RectTransform: m_Children: - {fileID: 6857214587035311425} m_Father: {fileID: 2796315105140180887} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3687,7 +3374,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2268292946575333945} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3766,7 +3452,6 @@ RectTransform: - {fileID: 8704136648615178380} - {fileID: 1294251076192411025} m_Father: {fileID: 4205163359284619698} - m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3923,7 +3608,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2866234400657368098} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3994,7 +3678,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7154242066238905131} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4144,7 +3827,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2268292946575333945} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 1, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4280,7 +3962,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4183768475003249092} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4419,7 +4100,6 @@ RectTransform: - {fileID: 6092986433524676836} - {fileID: 7352274326136237567} m_Father: {fileID: 2866234400657368098} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4544,6 +4224,244 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &2869145964176271070 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5100612425432757902} + - component: {fileID: 2821513900148808668} + - component: {fileID: 9037124194846875958} + - component: {fileID: 8619673450594853569} + - component: {fileID: 4166768948900570709} + - component: {fileID: 6526694532230320097} + - component: {fileID: 8993938448409397404} + - component: {fileID: 3182194028566254456} + - component: {fileID: 2035150735500397244} + - component: {fileID: 5353273831387916365} + - component: {fileID: 4603537110689453174} + m_Layer: 5 + m_Name: Options + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5100612425432757902 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2869145964176271070} + 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: 5962995678979433584} + - {fileID: 706137901501789697} + m_Father: {fileID: 2557714013894868121} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 204.2, y: 70.69995} + m_SizeDelta: {x: 0, y: 24.07} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2821513900148808668 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2869145964176271070} + m_CullTransparentMesh: 1 +--- !u!114 &9037124194846875958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2869145964176271070} + 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: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, 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 &8619673450594853569 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2869145964176271070} + 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: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} + m_HighlightedColor: {r: 0.8509804, g: 0.8509804, b: 0.8509804, a: 1} + m_PressedColor: {r: 0.7264151, g: 0.7264151, b: 0.7264151, a: 1} + m_SelectedColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 0.9607843} + 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: 21300000, guid: f4587fb51fa334140ad8d598a3f69290, + type: 3} + 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: 5515716149678018264} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!225 &4166768948900570709 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2869145964176271070} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &6526694532230320097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2869145964176271070} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8b939b5bedb9494b806609faeda7d8d, type: 3} + m_Name: + m_EditorClassIdentifier: + hideOnEnable: 0 + animSpeedFactor: 1 + disableAfterFadeOut: 0 + canvasGroup: {fileID: 4166768948900570709} +--- !u!114 &8993938448409397404 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2869145964176271070} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4bfd0d144b6d3dd438b84fa14a062c4f, type: 3} + m_Name: + m_EditorClassIdentifier: + playHover: 1 + playClick: 1 + playRelease: 1 + extraClickEvent: {fileID: 0} +--- !u!114 &3182194028566254456 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2869145964176271070} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 274bf6bf95184804cb2606eda1bf2a6a, type: 3} + m_Name: + m_EditorClassIdentifier: + showHideAnimator: {fileID: 0} + button: {fileID: 8619673450594853569} + text: {fileID: 0} + icon: {fileID: 5515716149678018264} + model: + text: + icon: {fileID: 21300000, guid: 7539fa1b890384b749ef64eec52331bb, type: 3} +--- !u!114 &2035150735500397244 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2869145964176271070} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &5353273831387916365 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2869145964176271070} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 63f05fbeb9b20044d9c1dc9abd16c772, type: 3} + m_Name: + m_EditorClassIdentifier: + textToChange: {fileID: 0} + iconToChange: {fileID: 5515716149678018264} + onFocusColor: {r: 1, g: 1, b: 1, a: 1} + onLoseFocusColor: {r: 0.027450982, g: 0.7803922, b: 0.7176471, a: 1} +--- !u!114 &4603537110689453174 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2869145964176271070} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d30b4ce08e6854094b8461fdea1282aa, type: 3} + m_Name: + m_EditorClassIdentifier: + targetRectTransform: {fileID: 5962995678979433584} + hoverScale: 1 + normalScale: 1 --- !u!1 &2962350386722484211 GameObject: m_ObjectHideFlags: 0 @@ -4582,7 +4500,6 @@ RectTransform: - {fileID: 5248189550202281748} - {fileID: 8715853992886126872} m_Father: {fileID: 6242256912090690840} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4744,7 +4661,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7149390076076413767} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4820,7 +4736,6 @@ RectTransform: - {fileID: 3690865629982606153} - {fileID: 8734426621338584908} m_Father: {fileID: 6260411746877767189} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4861,7 +4776,6 @@ RectTransform: - {fileID: 6260411746877767189} - {fileID: 688460988727583958} m_Father: {fileID: 7464460673095847939} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -4903,7 +4817,6 @@ RectTransform: - {fileID: 9211741207170975534} - {fileID: 763163184522764662} m_Father: {fileID: 6517497836788886821} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5020,7 +4933,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5925883722346185609} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5097,7 +5009,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5064710158721716679} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5192,7 +5103,6 @@ RectTransform: m_Children: - {fileID: 383062008012009935} m_Father: {fileID: 4205163359284619698} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5230,7 +5140,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4183768475003249092} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5306,7 +5215,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5254482340796141752} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5382,7 +5290,6 @@ RectTransform: - {fileID: 2427606578267398849} - {fileID: 1269100450527140654} m_Father: {fileID: 6260411746877767189} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5421,7 +5328,6 @@ RectTransform: m_Children: - {fileID: 3968073222282360501} m_Father: {fileID: 8105776151471362163} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5499,7 +5405,6 @@ RectTransform: - {fileID: 6315112714204628162} - {fileID: 8307211641906140166} m_Father: {fileID: 3398963759224980233} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5574,7 +5479,6 @@ RectTransform: m_Children: - {fileID: 3318298624125217736} m_Father: {fileID: 4205163359284619698} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5611,7 +5515,6 @@ RectTransform: m_Children: - {fileID: 3233704873119766865} m_Father: {fileID: 3627889738987851393} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5653,7 +5556,6 @@ RectTransform: m_Children: - {fileID: 6475288240657770934} m_Father: {fileID: 7954715617966658305} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5804,7 +5706,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2235354227844099966} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5940,7 +5841,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8247106742040664970} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6077,7 +5977,6 @@ RectTransform: m_Children: - {fileID: 2235354227844099966} m_Father: {fileID: 8715853992886126872} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6147,7 +6046,6 @@ RectTransform: - {fileID: 2963745170216348391} - {fileID: 3627889738987851393} m_Father: {fileID: 4671858685540224553} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6269,7 +6167,6 @@ RectTransform: - {fileID: 4536233496045276704} - {fileID: 2071415358176203860} m_Father: {fileID: 8105776151471362163} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -6315,7 +6212,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6161720098586203839} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -6389,11 +6285,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4327758705408432641} - - {fileID: 6522013552441445847} - {fileID: 4362405388559671923} - - {fileID: 4338853027481271196} m_Father: {fileID: 3398963759224980233} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6433,7 +6326,6 @@ RectTransform: m_Children: - {fileID: 1658737520584083841} m_Father: {fileID: 4205163359284619698} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6589,7 +6481,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9193388242622379385} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6666,7 +6557,6 @@ RectTransform: - {fileID: 7017478933621568434} - {fileID: 1019443871384282443} m_Father: {fileID: 3879683221456652626} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6706,7 +6596,6 @@ RectTransform: m_Children: - {fileID: 7195531761594760196} m_Father: {fileID: 4205163359284619698} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6864,7 +6753,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8696091889090115589} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7000,7 +6888,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8825579882899207089} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -7045,7 +6932,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4278190335 - m_fontColor: {r: 1, g: 0, b: 0, a: 1} + m_fontColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -7136,7 +7023,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1186301723912198955} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7214,7 +7100,6 @@ RectTransform: m_Children: - {fileID: 4678594562742851624} m_Father: {fileID: 2214981579427688786} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7310,7 +7195,6 @@ RectTransform: - {fileID: 3267513444103947845} - {fileID: 9129046029304496001} m_Father: {fileID: 688460988727583958} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -7350,7 +7234,6 @@ RectTransform: m_Children: - {fileID: 1102298562814204194} m_Father: {fileID: 4205163359284619698} - m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -7506,7 +7389,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6208471426939786281} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7611,6 +7493,142 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5144020616523776511 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 599714726754386314} + - component: {fileID: 622166275625531516} + - component: {fileID: 8487025148429958923} + m_Layer: 5 + m_Name: BlockedText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &599714726754386314 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144020616523776511} + 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: 6013585962286874674} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0.000009059906} + m_SizeDelta: {x: 67, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &622166275625531516 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144020616523776511} + m_CullTransparentMesh: 1 +--- !u!114 &8487025148429958923 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144020616523776511} + 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: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 1196159134475820439, guid: a02669827dd9144f39b4b164e753a21a, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 16 + 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: 1 + 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.11206055, y: -0.032470703, z: 0.0045776367, w: 0.5112915} + 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 &5194458463930687345 GameObject: m_ObjectHideFlags: 0 @@ -7642,7 +7660,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5064710158721716679} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -7680,14 +7697,14 @@ MonoBehaviour: m_text: FRIENDS m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 94bcf48f866a3b745ad66a6ab5f880eb, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_fontColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -7744,7 +7761,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 + m_hasFontAssetChanged: 1 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &5225449709799050001 @@ -7795,7 +7812,6 @@ RectTransform: - {fileID: 5925883722346185609} - {fileID: 7424108760637795057} m_Father: {fileID: 2963745170216348391} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -7874,7 +7890,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 317727332808324348} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -8027,7 +8042,6 @@ RectTransform: - {fileID: 6456800582722953696} - {fileID: 8869709956567241685} m_Father: {fileID: 4205163359284619698} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -8184,7 +8198,6 @@ RectTransform: m_Children: - {fileID: 8674163013638372666} m_Father: {fileID: 8351078881523327284} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8266,7 +8279,6 @@ RectTransform: - {fileID: 411559172111689573} - {fileID: 3642460293469241520} m_Father: {fileID: 3398963759224980233} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8432,7 +8444,6 @@ RectTransform: - {fileID: 8458283689755396721} - {fileID: 239367632421469808} m_Father: {fileID: 8696091889090115589} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8535,7 +8546,6 @@ RectTransform: - {fileID: 2796315105140180887} - {fileID: 5926770823322623033} m_Father: {fileID: 8824488500589969801} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8581,7 +8591,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7954715617966658305} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8659,7 +8668,6 @@ RectTransform: - {fileID: 361602540637583454} - {fileID: 8921697674481203886} m_Father: {fileID: 678770521573999315} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -8735,7 +8743,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4205163359284619698} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -8773,7 +8780,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2866234400657368098} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -8846,7 +8852,6 @@ RectTransform: - {fileID: 1079695843541040867} - {fileID: 1972098898447585724} m_Father: {fileID: 4205163359284619698} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -9004,7 +9009,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8470542334961682300} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -9100,7 +9104,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2268292946575333945} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9176,7 +9179,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5584061021844873656} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -9252,7 +9254,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 146095768714997338} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9329,7 +9330,6 @@ RectTransform: m_Children: - {fileID: 1942924222423693017} m_Father: {fileID: 8795719026956483384} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9406,7 +9406,6 @@ RectTransform: - {fileID: 7415958476560820923} - {fileID: 317727332808324348} m_Father: {fileID: 4536233496045276704} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -9444,7 +9443,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7954715617966658305} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9519,7 +9517,6 @@ RectTransform: m_Children: - {fileID: 4596325221862910320} m_Father: {fileID: 4205163359284619698} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -9558,7 +9555,6 @@ RectTransform: m_Children: - {fileID: 1421269690586113527} m_Father: {fileID: 3398963759224980233} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9695,7 +9691,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7154242066238905131} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -9814,103 +9809,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 ---- !u!1 &6798716619741872015 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2161564779954563308} - - component: {fileID: 4642638778307739247} - - component: {fileID: 3609486358049125995} - - component: {fileID: 7590969437875685441} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2161564779954563308 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6798716619741872015} - 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: 6522013552441445847} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 12, y: -12.035} - m_SizeDelta: {x: 14, y: 24.07} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4642638778307739247 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6798716619741872015} - m_CullTransparentMesh: 1 ---- !u!114 &3609486358049125995 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6798716619741872015} - 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: 7539fa1b890384b749ef64eec52331bb, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &7590969437875685441 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6798716619741872015} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: 5 - m_MinHeight: 5 - m_PreferredWidth: 14 - m_PreferredHeight: 10 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!1 &6801399652414686851 GameObject: m_ObjectHideFlags: 0 @@ -9944,7 +9842,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6183542770652211329} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -10085,7 +9982,6 @@ RectTransform: - {fileID: 747943109132758452} - {fileID: 146095768714997338} m_Father: {fileID: 8824488500589969801} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -10133,7 +10029,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7149390076076413767} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -10244,7 +10139,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6161720098586203839} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -10381,7 +10275,6 @@ RectTransform: m_Children: - {fileID: 145759202348997670} m_Father: {fileID: 7017478933621568434} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -10458,7 +10351,6 @@ RectTransform: - {fileID: 5181903740572119726} - {fileID: 707173926624027473} m_Father: {fileID: 2214981579427688786} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -10523,7 +10415,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 317727332808324348} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -10673,7 +10564,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2866234400657368098} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -10812,7 +10702,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8825579882899207089} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -10840,7 +10729,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} + 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 @@ -10911,7 +10800,6 @@ RectTransform: - {fileID: 4205163359284619698} - {fileID: 4429888255166563581} m_Father: {fileID: 746264152102177289} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11002,7 +10890,6 @@ RectTransform: m_Children: - {fileID: 678770521573999315} m_Father: {fileID: 6857214587035311425} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -11091,7 +10978,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7954715617966658305} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -11166,7 +11052,6 @@ RectTransform: m_Children: - {fileID: 2459783546666612584} m_Father: {fileID: 8951862929425672620} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11208,7 +11093,6 @@ RectTransform: - {fileID: 177195414959549119} - {fileID: 8951862929425672620} m_Father: {fileID: 5800507459750407579} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11326,7 +11210,6 @@ RectTransform: m_Children: - {fileID: 746264152102177289} m_Father: {fileID: 2796315105140180887} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -11373,9 +11256,9 @@ RectTransform: m_Children: - {fileID: 7154242066238905131} - {fileID: 3398963759224980233} + - {fileID: 3655131486069278806} - {fileID: 8795719026956483384} m_Father: {fileID: 145759202348997670} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -11414,12 +11297,12 @@ MonoBehaviour: isFriendshipVisible: 0 name: {fileID: 1750995632636747991} address: {fileID: 3431385152357898269} - nameInOptionsPanel: {fileID: 2313361900714903975} + nameInOptionsPanel: {fileID: 3707437141108799745} walletCopyButton: {fileID: 769523437541750133} usernameCopyButton: {fileID: 4418144686090715020} usernameRect: {fileID: 7154242066238905131} wallet: {fileID: 6604510298414450422} - optionsButton: {fileID: 5639901908411271319} + optionsButton: {fileID: 3182194028566254456} addFriendButton: {fileID: 352113611570324711} alreadyFriendsButton: {fileID: 4766883677034281813} cancelFriendRequestButton: {fileID: 3539354935361854780} @@ -11432,9 +11315,9 @@ MonoBehaviour: offlineStatus: {fileID: 8817115063247729443} normalUserPanel: {fileID: 8039013603527699824} friendsFlowContainer: {fileID: 3257621660973361290} - blockedLabel: {fileID: 578114385315238572} + blockedLabel: {fileID: 9219686272622047673} optionsContainer: {fileID: 164390977393913415} - userContextMenu: {fileID: 2654002820891760919} + userContextMenu: {fileID: 4016412117711890865} alreadyFriendsVariation: {fileID: 3254262343926272793} unfriendVariation: {fileID: 3887018768837718645} jumpInButton: {fileID: 5444857929716565197} @@ -11474,7 +11357,6 @@ RectTransform: m_Children: - {fileID: 7509957416386781487} m_Father: {fileID: 6857214587035311425} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11599,7 +11481,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8470542334961682300} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -11637,14 +11518,14 @@ MonoBehaviour: m_text: UNFRIEND m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 94bcf48f866a3b745ad66a6ab5f880eb, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_fontColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -11701,7 +11582,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 + m_hasFontAssetChanged: 1 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7960658166578473912 @@ -11735,7 +11616,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5584061021844873656} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -11873,7 +11753,6 @@ RectTransform: - {fileID: 1186301723912198955} - {fileID: 7464460673095847939} m_Father: {fileID: 6242256912090690840} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -11912,7 +11791,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4582051933308536961} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -12008,7 +11886,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4183768475003249092} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -12150,7 +12027,6 @@ RectTransform: m_Children: - {fileID: 79831105070290493} m_Father: {fileID: 8105776151471362163} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -12305,7 +12181,6 @@ RectTransform: - {fileID: 2450981739599479571} - {fileID: 3251252221991356375} m_Father: {fileID: 6517497836788886821} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -12423,7 +12298,6 @@ RectTransform: - {fileID: 8824488500589969801} - {fileID: 6242256912090690840} m_Father: {fileID: 8458283689755396721} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -12467,7 +12341,6 @@ RectTransform: m_Children: - {fileID: 8696091889090115589} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -12491,7 +12364,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 6 m_TargetDisplay: 0 @@ -12624,7 +12499,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7149390076076413767} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -12775,7 +12649,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2866234400657368098} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -12932,7 +12805,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4582051933308536961} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -13088,7 +12960,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9193388242622379385} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 1, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -13226,7 +13097,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8503391869695278844} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 180, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -13302,7 +13172,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5134639423492432770} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.36813956} m_AnchorMax: {x: 1, y: 0.9999995} @@ -13378,7 +13247,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1186301723912198955} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -13458,7 +13326,6 @@ RectTransform: - {fileID: 7286821998086299275} - {fileID: 3842598738387491583} m_Father: {fileID: 3258806515172564462} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -13536,7 +13403,6 @@ RectTransform: m_Children: - {fileID: 5134639423492432770} m_Father: {fileID: 746264152102177289} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -13661,7 +13527,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8247106742040664970} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -13739,7 +13604,6 @@ RectTransform: m_Children: - {fileID: 4998251896009437864} m_Father: {fileID: 4205163359284619698} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -13896,7 +13760,6 @@ RectTransform: - {fileID: 9193388242622379385} - {fileID: 2268292946575333945} m_Father: {fileID: 2796315105140180887} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -13947,7 +13810,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7954715617966658305} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -14054,11 +13916,88 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &9219686272622047673 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6013585962286874674} + - component: {fileID: 3226313464158155864} + - component: {fileID: 780239224545776904} + m_Layer: 5 + m_Name: BlockedStatus + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6013585962286874674 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9219686272622047673} + 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: 599714726754386314} + m_Father: {fileID: 2557714013894868121} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 149.9, y: 70.1} + m_SizeDelta: {x: 82.9876, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3226313464158155864 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9219686272622047673} + m_CullTransparentMesh: 1 +--- !u!114 &780239224545776904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9219686272622047673} + 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.95686275, g: 0.08627451, b: 0.08627451, 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_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, 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: 3 --- !u!1001 &1120877678752874511 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8670079472788033730} m_Modifications: - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, @@ -14440,6 +14379,9 @@ PrefabInstance: value: -18 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} --- !u!224 &1102298562814204194 stripped RectTransform: @@ -14464,6 +14406,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7017478933621568434} m_Modifications: - target: {fileID: 1468447867525709604, guid: 276b5564e4c284ecb9422505666362ed, @@ -14617,6 +14560,9 @@ PrefabInstance: value: -62 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 276b5564e4c284ecb9422505666362ed, type: 3} --- !u!4 &239367632421469808 stripped Transform: @@ -14641,6 +14587,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4327758705408432641} m_Modifications: - target: {fileID: 31772840861612568, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, @@ -14679,12 +14626,31 @@ PrefabInstance: propertyPath: m_fontStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 990884883967006513, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, + type: 3} + propertyPath: m_fontColor.b + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 990884883967006513, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, + type: 3} + propertyPath: m_fontColor.g + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 990884883967006513, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, + type: 3} + propertyPath: m_fontColor.r + value: 0.9882353 + objectReference: {fileID: 0} - target: {fileID: 990884883967006513, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} propertyPath: m_sharedMaterial value: - objectReference: {fileID: 1196159134475820439, guid: a02669827dd9144f39b4b164e753a21a, - type: 2} + objectReference: {fileID: 2100000, guid: 94bcf48f866a3b745ad66a6ab5f880eb, type: 2} + - target: {fileID: 990884883967006513, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, + type: 3} + propertyPath: m_hasFontAssetChanged + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2864817450744932336, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} propertyPath: model.icon @@ -14953,6 +14919,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8654704049391754650, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, + type: 3} + insertIndex: -1 + addedObject: {fileID: 687582940704194139} m_SourcePrefab: {fileID: 100100000, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} --- !u!224 &2727066659380287612 stripped RectTransform: @@ -14998,6 +14971,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3232953795123736656} m_Modifications: - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, @@ -15374,6 +15348,9 @@ PrefabInstance: value: -18 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} --- !u!114 &271105339698334913 stripped MonoBehaviour: @@ -15398,6 +15375,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2071415358176203860} m_Modifications: - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, @@ -15516,6 +15494,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 252c1fea75fc0614587349a368eb8684, type: 3} --- !u!224 &4761071388539711649 stripped RectTransform: @@ -15528,6 +15509,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4536233496045276704} m_Modifications: - target: {fileID: 804860302255169224, guid: 8c9ed1f628f2dc14cba7feb822bd5693, @@ -15851,6 +15833,13 @@ PrefabInstance: value: 0.9882353 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4213288149590170572, guid: 8c9ed1f628f2dc14cba7feb822bd5693, + type: 3} + insertIndex: -1 + addedObject: {fileID: 10161030361542233} m_SourcePrefab: {fileID: 100100000, guid: 8c9ed1f628f2dc14cba7feb822bd5693, type: 3} --- !u!1 &1983955439945875542 stripped GameObject: @@ -15901,6 +15890,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4327758705408432641} m_Modifications: - target: {fileID: 31772840861612568, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, @@ -15932,18 +15922,43 @@ PrefabInstance: type: 3} propertyPath: m_fontAsset value: - objectReference: {fileID: 11400000, guid: 6b705423dc77d4fceb4122f6d7e571d6, + objectReference: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} - target: {fileID: 990884883967006513, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} propertyPath: m_fontStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 990884883967006513, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, + type: 3} + propertyPath: m_fontColor.b + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 990884883967006513, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, + type: 3} + propertyPath: m_fontColor.g + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 990884883967006513, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, + type: 3} + propertyPath: m_fontColor.r + value: 0.9882353 + objectReference: {fileID: 0} - target: {fileID: 990884883967006513, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} propertyPath: m_sharedMaterial value: - objectReference: {fileID: 2100000, guid: 9d9df32282a3c40299019c36b2157d37, type: 2} + objectReference: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + - target: {fileID: 990884883967006513, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, + type: 3} + propertyPath: m_fontColor32.rgba + value: 4294769916 + objectReference: {fileID: 0} + - target: {fileID: 990884883967006513, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, + type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3677132372896473776, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} propertyPath: m_Pivot.x @@ -16062,7 +16077,7 @@ PrefabInstance: - target: {fileID: 4924167685132402276, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} propertyPath: m_SizeDelta.x - value: 90.935 + value: 90.740005 objectReference: {fileID: 0} - target: {fileID: 4924167685132402276, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} @@ -16072,7 +16087,7 @@ PrefabInstance: - target: {fileID: 4924167685132402276, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} propertyPath: m_AnchoredPosition.x - value: 79.88251 + value: 79.98001 objectReference: {fileID: 0} - target: {fileID: 4924167685132402276, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} @@ -16107,7 +16122,7 @@ PrefabInstance: - target: {fileID: 8393160611633350539, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} propertyPath: m_SizeDelta.x - value: 20.415005 + value: 20.610004 objectReference: {fileID: 0} - target: {fileID: 8393160611633350539, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} @@ -16117,7 +16132,7 @@ PrefabInstance: - target: {fileID: 8393160611633350539, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} propertyPath: m_AnchoredPosition.x - value: 24.207502 + value: 24.305002 objectReference: {fileID: 0} - target: {fileID: 8393160611633350539, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} @@ -16190,6 +16205,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8654704049391754650, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6467599664483170286} m_SourcePrefab: {fileID: 100100000, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} --- !u!114 &352113611570324711 stripped MonoBehaviour: @@ -16235,6 +16257,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 145759202348997670} m_Modifications: - target: {fileID: 1067721058581695716, guid: 46a9d996f62a76b49a884d29ec93a0ed, @@ -16554,6 +16577,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 46a9d996f62a76b49a884d29ec93a0ed, type: 3} --- !u!224 &3577664604423027714 stripped RectTransform: @@ -16578,6 +16604,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7424108760637795057} m_Modifications: - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, @@ -16696,6 +16723,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 252c1fea75fc0614587349a368eb8684, type: 3} --- !u!224 &8271622426019976286 stripped RectTransform: @@ -16708,6 +16738,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4327758705408432641} m_Modifications: - target: {fileID: 31772840861612568, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, @@ -16739,18 +16770,38 @@ PrefabInstance: type: 3} propertyPath: m_fontAsset value: - objectReference: {fileID: 11400000, guid: 6b705423dc77d4fceb4122f6d7e571d6, + objectReference: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} - target: {fileID: 990884883967006513, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} propertyPath: m_fontStyle value: 0 objectReference: {fileID: 0} + - target: {fileID: 990884883967006513, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, + type: 3} + propertyPath: m_fontColor.b + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 990884883967006513, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, + type: 3} + propertyPath: m_fontColor.g + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 990884883967006513, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, + type: 3} + propertyPath: m_fontColor.r + value: 0.9882353 + objectReference: {fileID: 0} - target: {fileID: 990884883967006513, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} propertyPath: m_sharedMaterial value: - objectReference: {fileID: 2100000, guid: 9d9df32282a3c40299019c36b2157d37, type: 2} + objectReference: {fileID: 2100000, guid: 94bcf48f866a3b745ad66a6ab5f880eb, type: 2} + - target: {fileID: 990884883967006513, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, + type: 3} + propertyPath: m_hasFontAssetChanged + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2864817450744932336, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} propertyPath: model.icon @@ -17018,6 +17069,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8654704049391754650, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, + type: 3} + insertIndex: -1 + addedObject: {fileID: 9119791195109894000} m_SourcePrefab: {fileID: 100100000, guid: 1e4f462fb2fa04af0a00c7b9ed4caff4, type: 3} --- !u!224 &98373737746420695 stripped RectTransform: @@ -17075,6 +17133,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4205163359284619698} m_Modifications: - target: {fileID: 559267743169334, guid: f51437f8e9c544a6496c026fb9650fd8, type: 3} @@ -17417,6 +17476,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f51437f8e9c544a6496c026fb9650fd8, type: 3} --- !u!114 &2310975895607215135 stripped MonoBehaviour: @@ -17471,6 +17533,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1743745139732036328} m_Modifications: - target: {fileID: 63145900205893970, guid: 192c3b0a61eb8ac4ca1842d296756591, @@ -17707,6 +17770,9 @@ PrefabInstance: value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 192c3b0a61eb8ac4ca1842d296756591, type: 3} --- !u!114 &2036723919353643394 stripped MonoBehaviour: @@ -17731,6 +17797,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4205163359284619698} m_Modifications: - target: {fileID: 559267743169334, guid: f51437f8e9c544a6496c026fb9650fd8, type: 3} @@ -18073,6 +18140,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f51437f8e9c544a6496c026fb9650fd8, type: 3} --- !u!224 &825614759619371679 stripped RectTransform: @@ -18127,6 +18197,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4362405388559671923} m_Modifications: - target: {fileID: 101901147944420372, guid: 22b2c68bfb9b14e92ae66ede22e45642, @@ -18553,6 +18624,21 @@ PrefabInstance: m_RemovedComponents: - {fileID: 4689070530319497415, guid: 22b2c68bfb9b14e92ae66ede22e45642, type: 3} - {fileID: 2535064507794171431, guid: 22b2c68bfb9b14e92ae66ede22e45642, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3358492652153689735, guid: 22b2c68bfb9b14e92ae66ede22e45642, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8357220652421539829} + - targetCorrespondingSourceObject: {fileID: 1370676450840409504, guid: 22b2c68bfb9b14e92ae66ede22e45642, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1138852350890473293} + - targetCorrespondingSourceObject: {fileID: 8178496445658369467, guid: 22b2c68bfb9b14e92ae66ede22e45642, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6871998022794825598} m_SourcePrefab: {fileID: 100100000, guid: 22b2c68bfb9b14e92ae66ede22e45642, type: 3} --- !u!224 &620867429964518819 stripped RectTransform: @@ -18646,6 +18732,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 979191854737882682} m_Modifications: - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, @@ -19027,6 +19114,9 @@ PrefabInstance: value: -13.97 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} --- !u!224 &4998251896009437864 stripped RectTransform: @@ -19051,6 +19141,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2963745170216348391} m_Modifications: - target: {fileID: 189741099783477407, guid: 8a72afbddb60f4c4b9ae807c341c82a0, @@ -19711,6 +19802,9 @@ PrefabInstance: m_RemovedComponents: - {fileID: 7084325118553966522, guid: 8a72afbddb60f4c4b9ae807c341c82a0, type: 3} - {fileID: 2587779404760676462, guid: 8a72afbddb60f4c4b9ae807c341c82a0, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8a72afbddb60f4c4b9ae807c341c82a0, type: 3} --- !u!224 &4429888255166563581 stripped RectTransform: @@ -19723,6 +19817,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4205163359284619698} m_Modifications: - target: {fileID: 559267743169334, guid: f51437f8e9c544a6496c026fb9650fd8, type: 3} @@ -19964,162 +20059,300 @@ PrefabInstance: propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_RootOrder + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_SizeDelta.x + value: 847 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_SizeDelta.y + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 477.5 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -1144 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f51437f8e9c544a6496c026fb9650fd8, type: 3} +--- !u!224 &663668401258324186 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5683268729060239481, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + m_PrefabInstance: {fileID: 5182187594726754467} + m_PrefabAsset: {fileID: 0} +--- !u!224 &885187860383364606 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5449924557101907293, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + m_PrefabInstance: {fileID: 5182187594726754467} + m_PrefabAsset: {fileID: 0} +--- !u!224 &1563837482256165005 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5933784767212167214, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + m_PrefabInstance: {fileID: 5182187594726754467} + m_PrefabAsset: {fileID: 0} +--- !u!224 &4378297847669058550 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + m_PrefabInstance: {fileID: 5182187594726754467} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5182280393486087061 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 559267743169334, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + m_PrefabInstance: {fileID: 5182187594726754467} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4df6174eae7c4840b1729c3829bfa00, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &6593448724306213533 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2047579304230515262, guid: f51437f8e9c544a6496c026fb9650fd8, + type: 3} + m_PrefabInstance: {fileID: 5182187594726754467} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &6471513596030406424 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 520452756092467420} + m_Modifications: + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_RootOrder - value: 14 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_SizeDelta.x - value: 847 + value: 100 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_SizeDelta.y - value: 300 + value: 100 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_AnchoredPosition.x - value: 477.5 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_AnchoredPosition.y - value: -1144 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -336.96002 + objectReference: {fileID: 0} + - target: {fileID: 7837773527243981185, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_Name + value: LoadingSpinnerBlack + objectReference: {fileID: 0} + - target: {fileID: 7837773527243981185, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f51437f8e9c544a6496c026fb9650fd8, type: 3} ---- !u!224 &663668401258324186 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5683268729060239481, guid: f51437f8e9c544a6496c026fb9650fd8, - type: 3} - m_PrefabInstance: {fileID: 5182187594726754467} - m_PrefabAsset: {fileID: 0} ---- !u!224 &885187860383364606 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5449924557101907293, guid: f51437f8e9c544a6496c026fb9650fd8, - type: 3} - m_PrefabInstance: {fileID: 5182187594726754467} - m_PrefabAsset: {fileID: 0} ---- !u!224 &1563837482256165005 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5933784767212167214, guid: f51437f8e9c544a6496c026fb9650fd8, - type: 3} - m_PrefabInstance: {fileID: 5182187594726754467} - m_PrefabAsset: {fileID: 0} ---- !u!224 &4378297847669058550 stripped + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 252c1fea75fc0614587349a368eb8684, type: 3} +--- !u!224 &383062008012009935 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 8874345921017815893, guid: f51437f8e9c544a6496c026fb9650fd8, - type: 3} - m_PrefabInstance: {fileID: 5182187594726754467} - m_PrefabAsset: {fileID: 0} ---- !u!114 &5182280393486087061 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 559267743169334, guid: f51437f8e9c544a6496c026fb9650fd8, - type: 3} - m_PrefabInstance: {fileID: 5182187594726754467} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e4df6174eae7c4840b1729c3829bfa00, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &6593448724306213533 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2047579304230515262, guid: f51437f8e9c544a6496c026fb9650fd8, + m_CorrespondingSourceObject: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, type: 3} - m_PrefabInstance: {fileID: 5182187594726754467} + m_PrefabInstance: {fileID: 6471513596030406424} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1001 &5733201097744104684 +--- !u!1001 &6699575098145459274 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 6522013552441445847} + serializedVersion: 3 + m_TransformParent: {fileID: 5100612425432757902} m_Modifications: - target: {fileID: 141624545272207563, guid: 59dab406fb0f74972a9f59906589040d, type: 3} @@ -20199,7 +20432,7 @@ PrefabInstance: - target: {fileID: 1616525665509150121, guid: 59dab406fb0f74972a9f59906589040d, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1659266317040970982, guid: 59dab406fb0f74972a9f59906589040d, type: 3} @@ -20309,7 +20542,7 @@ PrefabInstance: - target: {fileID: 3255177139748142192, guid: 59dab406fb0f74972a9f59906589040d, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3355408138738260923, guid: 59dab406fb0f74972a9f59906589040d, type: 3} @@ -20653,18 +20886,21 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 59dab406fb0f74972a9f59906589040d, type: 3} ---- !u!224 &1920069070755841703 stripped +--- !u!224 &706137901501789697 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6139840743846935115, guid: 59dab406fb0f74972a9f59906589040d, type: 3} - m_PrefabInstance: {fileID: 5733201097744104684} + m_PrefabInstance: {fileID: 6699575098145459274} m_PrefabAsset: {fileID: 0} ---- !u!114 &2313361900714903975 stripped +--- !u!114 &3707437141108799745 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8037476597590291787, guid: 59dab406fb0f74972a9f59906589040d, type: 3} - m_PrefabInstance: {fileID: 5733201097744104684} + m_PrefabInstance: {fileID: 6699575098145459274} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -20672,11 +20908,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &2654002820891760919 stripped +--- !u!114 &4016412117711890865 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7729449665758356987, guid: 59dab406fb0f74972a9f59906589040d, type: 3} - m_PrefabInstance: {fileID: 5733201097744104684} + m_PrefabInstance: {fileID: 6699575098145459274} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -20684,141 +20920,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ca92589a6cb2ca4d84cbafdcced1755, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &6471513596030406424 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 520452756092467420} - m_Modifications: - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -336.96002 - objectReference: {fileID: 0} - - target: {fileID: 7837773527243981185, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_Name - value: LoadingSpinnerBlack - objectReference: {fileID: 0} - - target: {fileID: 7837773527243981185, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 252c1fea75fc0614587349a368eb8684, type: 3} ---- !u!224 &383062008012009935 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, - type: 3} - m_PrefabInstance: {fileID: 6471513596030406424} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7140920103551984937 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4358526427982979267} m_Modifications: - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, @@ -21200,6 +21307,9 @@ PrefabInstance: value: -18 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} --- !u!224 &7195531761594760196 stripped RectTransform: @@ -21224,6 +21334,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1776396859301073356} m_Modifications: - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, @@ -21342,6 +21453,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 252c1fea75fc0614587349a368eb8684, type: 3} --- !u!224 &4596325221862910320 stripped RectTransform: @@ -21354,6 +21468,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2214981579427688786} m_Modifications: - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, @@ -21750,6 +21865,9 @@ PrefabInstance: value: -18 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} --- !u!224 &7415958476560820923 stripped RectTransform: @@ -21774,6 +21892,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4812228112145123850} m_Modifications: - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, @@ -21892,6 +22011,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 252c1fea75fc0614587349a368eb8684, type: 3} --- !u!224 &3318298624125217736 stripped RectTransform: @@ -21904,6 +22026,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8696091889090115589} m_Modifications: - target: {fileID: 189741099783477407, guid: 8a72afbddb60f4c4b9ae807c341c82a0, @@ -22579,6 +22702,13 @@ PrefabInstance: m_RemovedComponents: - {fileID: 7084325118553966522, guid: 8a72afbddb60f4c4b9ae807c341c82a0, type: 3} - {fileID: 2587779404760676462, guid: 8a72afbddb60f4c4b9ae807c341c82a0, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2809002233333952605, guid: 8a72afbddb60f4c4b9ae807c341c82a0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3298503518760597367} m_SourcePrefab: {fileID: 100100000, guid: 8a72afbddb60f4c4b9ae807c341c82a0, type: 3} --- !u!224 &1019443871384282443 stripped RectTransform: @@ -22629,6 +22759,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6183542770652211329} m_Modifications: - target: {fileID: 910873934197864832, guid: 69d18becfc9ef4b7f92abaeae62a2ece, @@ -22784,6 +22915,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 69d18becfc9ef4b7f92abaeae62a2ece, type: 3} --- !u!224 &298017798417002233 stripped RectTransform: @@ -22808,6 +22942,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4205163359284619698} m_Modifications: - target: {fileID: 559267743169334, guid: f51437f8e9c544a6496c026fb9650fd8, type: 3} @@ -23160,6 +23295,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f51437f8e9c544a6496c026fb9650fd8, type: 3} --- !u!224 &368046192725445956 stripped RectTransform: diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PrivateChatWindow/IPrivateChatComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PrivateChatWindow/IPrivateChatComponentView.cs index a625f881a9..4c54280f00 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PrivateChatWindow/IPrivateChatComponentView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PrivateChatWindow/IPrivateChatComponentView.cs @@ -13,13 +13,10 @@ public interface IPrivateChatComponentView event Action OnFocused; event Action OnRequireMoreMessages; event Action OnClickOverWindow; - - IChatHUDComponentView ChatHUD { get; } bool IsActive { get; } RectTransform Transform { get; } bool IsFocused { get; } - void Initialize(IFriendsController friendsController, ISocialAnalytics socialAnalytics); void Setup(UserProfile profile, bool isOnline, bool isBlocked); void Show(); diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PrivateChatWindow/PrivateChatHUDView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PrivateChatWindow/PrivateChatHUDView.cs index 57d55f1838..93567ec57a 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PrivateChatWindow/PrivateChatHUDView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PrivateChatWindow/PrivateChatHUDView.cs @@ -1,4 +1,3 @@ -using DCL.Social.Chat; using System; using System.Collections.Generic; using UnityEngine; diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PrivateChatWindow/PrivateChatWindowComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PrivateChatWindow/PrivateChatWindowComponentView.cs index e1083f2d67..902dc3e37e 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PrivateChatWindow/PrivateChatWindowComponentView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PrivateChatWindow/PrivateChatWindowComponentView.cs @@ -1,5 +1,4 @@ using DCL.Social.Chat; -using DCL.Social.Chat; using DCL.Social.Friends; using SocialBar.UserThumbnail; using SocialFeaturesAnalytics; @@ -49,6 +48,7 @@ public event Action OnFocused remove => onFocused -= value; } public event Action OnClickOverWindow; + public event Action OnUnblockUser; public IChatHUDComponentView ChatHUD => chatView; public bool IsActive => gameObject.activeInHierarchy; @@ -68,6 +68,8 @@ public override void Awake() if (scrollPos.y > REQUEST_MORE_ENTRIES_SCROLL_THRESHOLD) OnRequireMoreMessages?.Invoke(); }); + + chatView.OnUnblockUser += HandleUnblockFromButtonInChat; } public void Initialize(IFriendsController friendsController, ISocialAnalytics socialAnalytics) @@ -82,9 +84,10 @@ public override void Dispose() if (!gameObject) return; if (userContextMenu != null) - { userContextMenu.OnBlock -= HandleBlockFromContextMenu; - } + + if (chatView!= null) + chatView.OnUnblockUser -= HandleUnblockFromButtonInChat; base.Dispose(); } @@ -116,6 +119,7 @@ public override void RefreshControl() }); userNameLabel.SetText(model.userName); jumpInButtonContainer.SetActive(model.isUserOnline); + chatView.SetBlockedStatus(model.isUserBlocked); } public void Setup(UserProfile profile, bool isOnline, bool isBlocked) @@ -154,6 +158,12 @@ private void HandleBlockFromContextMenu(string userId, bool isBlocked) RefreshControl(); } + private void HandleUnblockFromButtonInChat(string userId) + { + HandleBlockFromContextMenu(userId, false); + } + + [Serializable] private struct Model { diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PrivateChatWindow/PrivateChatWindowController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PrivateChatWindow/PrivateChatWindowController.cs index 5a57cd96d2..99516798bb 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PrivateChatWindow/PrivateChatWindowController.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PrivateChatWindow/PrivateChatWindowController.cs @@ -37,6 +37,7 @@ public class PrivateChatWindowController : IHUD private string oldestMessageId; private string conversationUserId; private BaseVariable> visibleTaskbarPanels => dataStore.HUDs.visibleTaskbarPanels; + private UserProfile ownUserProfile => userProfileBridge.GetOwn(); public event Action OnBack; public event Action OnClosed; @@ -77,6 +78,7 @@ public void Initialize(IPrivateChatComponentView view) mouseCatcher.OnMouseLock += Hide; view.OnRequireMoreMessages += RequestOldConversations; + view.ChatHUD.OnUnblockUser += UnblockUser; dataStore.mentions.someoneMentionedFromContextMenu.OnChange += SomeoneMentionedFromContextMenu; @@ -114,6 +116,7 @@ public void Setup(string newConversationUserId) conversationUserId = newConversationUserId; conversationProfile = newConversationUserProfile; chatHudController.ClearAllEntries(); + View.ChatHUD.SetConversationUserId(newConversationUserId); shouldRequestMessages = true; } @@ -186,6 +189,9 @@ public void Dispose() View.OnUnfriend -= Unfriend; View.OnFocused -= HandleViewFocused; View.OnRequireMoreMessages -= RequestOldConversations; + + if (View.ChatHUD != null) View.ChatHUD.OnUnblockUser -= UnblockUser; + View.Dispose(); } @@ -397,5 +403,20 @@ private void SomeoneMentionedFromContextMenu(string mention, string _) View.ChatHUD.AddTextIntoInputField(mention); } + + private void UnblockUser(string userId) + { + if (!ownUserProfile.IsBlocked(userId)) return; + + dataStore.notifications.GenericConfirmation.Set(GenericConfirmationNotificationData.CreateUnBlockUserData( + userProfileBridge.Get(userId)?.userName, + () => + { + ownUserProfile.Unblock(userId); + WebInterface.SendUnblockPlayer(userId); + socialAnalytics.SendPlayerUnblocked(friendsController.IsFriend(userId), PlayerActionSource.MyProfile, userId); + + }), true); + } } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Addressables/ChatChannelHUD.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Addressables/ChatChannelHUD.prefab index 787b5dd4e1..3eedb7f75f 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Addressables/ChatChannelHUD.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Addressables/ChatChannelHUD.prefab @@ -2414,6 +2414,11 @@ PrefabInstance: - target: {fileID: 3666262549960565997, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4167382919779286307, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - target: {fileID: 4755746969343816562, guid: bac007ac4ef98284c8cf05867a35ee0f, @@ -2437,6 +2442,11 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 7b9d8b2a13149489fac02d8d802c41b6, type: 3} + - target: {fileID: 4907925127487692455, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5106099487312357221, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_Value @@ -2456,7 +2466,7 @@ PrefabInstance: - target: {fileID: 5216665749222970468, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5599680012397558907, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} @@ -2612,7 +2622,7 @@ PrefabInstance: - target: {fileID: 8297576681798935997, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8369961270681273724, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} @@ -2816,7 +2826,7 @@ PrefabInstance: - target: {fileID: 439758649979947888, guid: 28988f9d309d15a4d8e70851f8671279, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 510474962384184233, guid: 28988f9d309d15a4d8e70851f8671279, type: 3} @@ -3216,7 +3226,7 @@ PrefabInstance: - target: {fileID: 4420826133141174953, guid: 28988f9d309d15a4d8e70851f8671279, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4532193810263743842, guid: 28988f9d309d15a4d8e70851f8671279, type: 3} @@ -3251,7 +3261,7 @@ PrefabInstance: - target: {fileID: 5178456170749413920, guid: 28988f9d309d15a4d8e70851f8671279, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5239503401355176004, guid: 28988f9d309d15a4d8e70851f8671279, type: 3} @@ -3328,6 +3338,11 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: -507 objectReference: {fileID: 0} + - target: {fileID: 6885735756550883947, guid: 28988f9d309d15a4d8e70851f8671279, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7200415949877738235, guid: 28988f9d309d15a4d8e70851f8671279, type: 3} propertyPath: m_AnchorMax.y diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Addressables/FriendsHUD.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Addressables/FriendsHUD.prefab index aaec0a300d..cebe09a871 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Addressables/FriendsHUD.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Addressables/FriendsHUD.prefab @@ -8914,6 +8914,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -354.95 objectReference: {fileID: 0} + - target: {fileID: 1740499964211845401, guid: 15120eceeeb9c45ee9d520a23f50872d, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2414586391627009806, guid: 15120eceeeb9c45ee9d520a23f50872d, type: 3} propertyPath: m_AnchorMax.y @@ -10854,6 +10859,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -354.95 objectReference: {fileID: 0} + - target: {fileID: 1740499964211845401, guid: 15120eceeeb9c45ee9d520a23f50872d, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2414586391627009806, guid: 15120eceeeb9c45ee9d520a23f50872d, type: 3} propertyPath: m_AnchorMax.y diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Addressables/NearbyChatChannelHUD.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Addressables/NearbyChatChannelHUD.prefab index c03cddcc1f..bcd6f491de 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Addressables/NearbyChatChannelHUD.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Addressables/NearbyChatChannelHUD.prefab @@ -1779,6 +1779,11 @@ PrefabInstance: - target: {fileID: 3666262549960565997, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4167382919779286307, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - target: {fileID: 4755746969343816562, guid: bac007ac4ef98284c8cf05867a35ee0f, @@ -1796,6 +1801,11 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4907925127487692455, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5106099487312357221, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_Size @@ -1820,7 +1830,7 @@ PrefabInstance: - target: {fileID: 5216665749222970468, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5599680012397558907, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} @@ -1951,7 +1961,7 @@ PrefabInstance: - target: {fileID: 8297576681798935997, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8369961270681273724, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} @@ -2138,6 +2148,11 @@ PrefabInstance: - target: {fileID: 1518162940632074403, guid: 2a98c159c9cf3c6408ed08ba859c8f78, type: 3} propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2462062477138408377, guid: 2a98c159c9cf3c6408ed08ba859c8f78, + type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - target: {fileID: 2786766140455427101, guid: 2a98c159c9cf3c6408ed08ba859c8f78, @@ -2248,7 +2263,7 @@ PrefabInstance: - target: {fileID: 3337768744575891834, guid: 2a98c159c9cf3c6408ed08ba859c8f78, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3448105264335573091, guid: 2a98c159c9cf3c6408ed08ba859c8f78, type: 3} @@ -2318,6 +2333,11 @@ PrefabInstance: - target: {fileID: 6113176333423905267, guid: 2a98c159c9cf3c6408ed08ba859c8f78, type: 3} propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6909356970361245757, guid: 2a98c159c9cf3c6408ed08ba859c8f78, + type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - target: {fileID: 8375963406985299811, guid: 2a98c159c9cf3c6408ed08ba859c8f78, diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Addressables/PrivateChatHUD.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Addressables/PrivateChatHUD.prefab index eda9924588..350795a440 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Addressables/PrivateChatHUD.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Addressables/PrivateChatHUD.prefab @@ -119,7 +119,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 205, y: -1442} + m_AnchoredPosition: {x: 205, y: -2370} m_SizeDelta: {x: 380, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1261448214712527041 @@ -223,8 +223,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -54, y: 1} - m_SizeDelta: {x: 18, y: 30} + m_AnchoredPosition: {x: -55.71393, y: 1} + m_SizeDelta: {x: 12, y: 30} m_Pivot: {x: 1, y: 0.5} --- !u!222 &5210975065797784063 CanvasRenderer: @@ -263,7 +263,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2.5 + m_PixelsPerUnitMultiplier: 6 --- !u!114 &3544711505021502213 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1851,6 +1851,16 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 781794596729631271, guid: 50b73964ecfa4da3bb8c80eb622f6cb9, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 781794596729631271, guid: 50b73964ecfa4da3bb8c80eb622f6cb9, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1333431249725901359, guid: 50b73964ecfa4da3bb8c80eb622f6cb9, type: 3} propertyPath: m_Material @@ -2521,6 +2531,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -316.95 objectReference: {fileID: 0} + - target: {fileID: 1740499964211845401, guid: 15120eceeeb9c45ee9d520a23f50872d, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2414586391627009806, guid: 15120eceeeb9c45ee9d520a23f50872d, type: 3} propertyPath: m_AnchorMax.y @@ -3435,6 +3450,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1600631337022772824, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1644297675920741430, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_AnchorMax.y @@ -3505,6 +3525,26 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -190 objectReference: {fileID: 0} + - target: {fileID: 2458051993248988174, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2458051993248988174, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2458051993248988174, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2458051993248988174, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_PixelsPerUnitMultiplier + value: 2.5 + objectReference: {fileID: 0} - target: {fileID: 2541944071727570178, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_AnchorMax.y @@ -3530,6 +3570,31 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2651455554799242179, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_SizeDelta.x + value: -12 + objectReference: {fileID: 0} + - target: {fileID: 2651455554799242179, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2651455554799242179, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2651455554799242179, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2651455554799242179, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 7 + objectReference: {fileID: 0} - target: {fileID: 2673553097085601578, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_AnchorMax.y @@ -3583,7 +3648,7 @@ PrefabInstance: - target: {fileID: 3076996614052553894, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3217403111863100899, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} @@ -3620,6 +3685,31 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3526608511010743512, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3526608511010743512, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3526608511010743512, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_SizeDelta.x + value: 22 + objectReference: {fileID: 0} + - target: {fileID: 3526608511010743512, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 131.11499 + objectReference: {fileID: 0} + - target: {fileID: 3526608511010743512, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -18 + objectReference: {fileID: 0} - target: {fileID: 3659875704379464865, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_PixelsPerUnitMultiplier @@ -3733,7 +3823,7 @@ PrefabInstance: - target: {fileID: 5106099487312357221, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_Value - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5136044219461246711, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} @@ -3771,6 +3861,21 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} + - target: {fileID: 5142454170631581955, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Color.b + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 5142454170631581955, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Color.g + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 5142454170631581955, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Color.r + value: 0.9882353 + objectReference: {fileID: 0} - target: {fileID: 5142454170631581955, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_PixelsPerUnitMultiplier @@ -3781,6 +3886,31 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5224875279456507402, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5224875279456507402, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5224875279456507402, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_SizeDelta.x + value: 135.77 + objectReference: {fileID: 0} + - target: {fileID: 5224875279456507402, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 210 + objectReference: {fileID: 0} + - target: {fileID: 5224875279456507402, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -18 + objectReference: {fileID: 0} - target: {fileID: 5465446266408006575, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_AnchorMax.y @@ -3987,6 +4117,27 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: -50 objectReference: {fileID: 0} + - target: {fileID: 6813242914667732198, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 18e8a062e074b4b35a0a1c05fd97640e, + type: 3} + - target: {fileID: 6813242914667732198, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6813242914667732198, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6813242914667732198, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7259452158740017375, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_AnchorMax.y @@ -4238,11 +4389,91 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 590e1b5ec5d7e45379b7d1f4f3f4e1af, type: 3} + - target: {fileID: 8369961270681273724, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Color.b + value: 0.9294118 + objectReference: {fileID: 0} + - target: {fileID: 8369961270681273724, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Color.g + value: 0.9215687 + objectReference: {fileID: 0} + - target: {fileID: 8369961270681273724, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Color.r + value: 0.92549026 + objectReference: {fileID: 0} - target: {fileID: 8690498980713894478, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} + - target: {fileID: 8746823548386143571, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Colors.m_NormalColor.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8746823548386143571, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Colors.m_NormalColor.b + value: 0.764151 + objectReference: {fileID: 0} + - target: {fileID: 8746823548386143571, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Colors.m_NormalColor.g + value: 0.74612856 + objectReference: {fileID: 0} + - target: {fileID: 8746823548386143571, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Colors.m_NormalColor.r + value: 0.7512778 + objectReference: {fileID: 0} + - target: {fileID: 8746823548386143571, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Colors.m_PressedColor.b + value: 0.6509434 + objectReference: {fileID: 0} + - target: {fileID: 8746823548386143571, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Colors.m_PressedColor.g + value: 0.62944996 + objectReference: {fileID: 0} + - target: {fileID: 8746823548386143571, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Colors.m_PressedColor.r + value: 0.6437789 + objectReference: {fileID: 0} + - target: {fileID: 8746823548386143571, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Colors.m_SelectedColor.b + value: 0.7647059 + objectReference: {fileID: 0} + - target: {fileID: 8746823548386143571, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Colors.m_SelectedColor.g + value: 0.74509805 + objectReference: {fileID: 0} + - target: {fileID: 8746823548386143571, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Colors.m_SelectedColor.r + value: 0.7529412 + objectReference: {fileID: 0} + - target: {fileID: 8746823548386143571, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.b + value: 0.6981132 + objectReference: {fileID: 0} + - target: {fileID: 8746823548386143571, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.g + value: 0.68823427 + objectReference: {fileID: 0} + - target: {fileID: 8746823548386143571, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.r + value: 0.6921858 + objectReference: {fileID: 0} - target: {fileID: 8792091523014359011, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} propertyPath: m_AnchorMax.y @@ -4323,6 +4554,36 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 9115997490858637353, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_fontSize + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 9115997490858637353, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_fontColor.b + value: 0.09411765 + objectReference: {fileID: 0} + - target: {fileID: 9115997490858637353, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_fontColor.g + value: 0.08235294 + objectReference: {fileID: 0} + - target: {fileID: 9115997490858637353, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_fontColor.r + value: 0.08627451 + objectReference: {fileID: 0} + - target: {fileID: 9115997490858637353, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_enableAutoSizing + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9115997490858637353, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + propertyPath: m_fontColor32.rgba + value: 4279768342 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2216557797817228083, guid: bac007ac4ef98284c8cf05867a35ee0f, type: 3} m_RemovedGameObjects: [] @@ -4405,11 +4666,13 @@ MonoBehaviour: type: 2} chatMentionSuggestions: {fileID: 1011907313089259839} webGlImeInput: {fileID: 9143899745818840519} + unblockButton: {fileID: 1088608049409071332} model: isInputFieldFocused: 0 inputFieldText: enableFadeoutMode: 0 entries: [] + conversationUserId: chatEntryFactory: {fileID: 11400000, guid: bf02cc4e774224d3f9074978807f7141, type: 2} --- !u!1 &377096908946920340 stripped GameObject: @@ -4453,6 +4716,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e687e06fa1a744cb887b2453852fb9a2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1088608049409071332 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8746823548386143571, guid: bac007ac4ef98284c8cf05867a35ee0f, + type: 3} + m_PrefabInstance: {fileID: 8536985326357018039} + 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!114 &1379511485321851930 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7303840854963470765, guid: bac007ac4ef98284c8cf05867a35ee0f, diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/ChannelMemberEntry.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/ChannelMemberEntry.prefab index be929f81e2..2079f69cea 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/ChannelMemberEntry.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/ChannelMemberEntry.prefab @@ -148,12 +148,14 @@ MonoBehaviour: optionsButtonContainer: {fileID: 9048398029967829629} optionsButton: {fileID: 1575258791199021983} userContextMenuPositionReference: {fileID: 2396126356780351439} + playerBlockedImage: {fileID: 7623477224628564898} model: userId: userName: Player Name thumnailUrl: isOnline: 0 isOptionsButtonHidden: 0 + blocked: 0 --- !u!114 &7758688996308583502 MonoBehaviour: m_ObjectHideFlags: 0 @@ -200,6 +202,7 @@ RectTransform: m_Children: - {fileID: 3208162396482114920} - {fileID: 8537413690132117273} + - {fileID: 8064131696761577710} - {fileID: 8262196633347919611} m_Father: {fileID: 5456606117727073459} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1160,6 +1163,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8152867621896560792 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8064131696761577710} + - component: {fileID: 2336779303421633936} + - component: {fileID: 7623477224628564898} + m_Layer: 5 + m_Name: BlockFrame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8064131696761577710 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8152867621896560792} + 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: 6933523995295731836} + 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 &2336779303421633936 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8152867621896560792} + m_CullTransparentMesh: 0 +--- !u!114 &7623477224628564898 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8152867621896560792} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a26c049177d1b423cbf29f2f44dd73c2, type: 3} + 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 &8452403119373172112 GameObject: m_ObjectHideFlags: 0 diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/ChannelMembersHUD.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/ChannelMembersHUD.prefab index fbfe7dedd3..4a2b5e1416 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/ChannelMembersHUD.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/ChannelMembersHUD.prefab @@ -2227,7 +2227,7 @@ PrefabInstance: - target: {fileID: 33180226908608850, guid: 15120eceeeb9c45ee9d520a23f50872d, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 209470434955866080, guid: 15120eceeeb9c45ee9d520a23f50872d, type: 3} @@ -2617,7 +2617,7 @@ PrefabInstance: - target: {fileID: 4733887283956242434, guid: 15120eceeeb9c45ee9d520a23f50872d, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5191761706286609472, guid: 15120eceeeb9c45ee9d520a23f50872d, type: 3} @@ -3047,7 +3047,7 @@ PrefabInstance: - target: {fileID: 8859036475654810075, guid: 15120eceeeb9c45ee9d520a23f50872d, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9109606891818156669, guid: 15120eceeeb9c45ee9d520a23f50872d, type: 3} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/ChatHUD.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/ChatHUD.prefab index 6429a3e191..d71027b09e 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/ChatHUD.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/ChatHUD.prefab @@ -33,7 +33,6 @@ RectTransform: m_Children: - {fileID: 3903517524969113808} m_Father: {fileID: 7497584698789204027} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -164,7 +163,6 @@ RectTransform: - {fileID: 2411879222414548724} - {fileID: 1149488815536750324} m_Father: {fileID: 7497584698789204027} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -235,6 +233,237 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b85da332798fc458595ca5a677f1bf18, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &770418427479395056 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5224875279456507402} + - component: {fileID: 3306013923987732157} + - component: {fileID: 9115997490858637353} + m_Layer: 19 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5224875279456507402 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 770418427479395056} + 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: 2651455554799242179} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 216, y: -18} + m_SizeDelta: {x: 193.95, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3306013923987732157 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 770418427479395056} + m_CullTransparentMesh: 0 +--- !u!114 &9115997490858637353 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 770418427479395056} + 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: UNBLOCK TO CHAT + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 15 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 15 + m_fontSizeMax: 20 + 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: 1 + 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: 1 + 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 &926650157667340878 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3526608511010743512} + - component: {fileID: 1734283996156290091} + - component: {fileID: 6813242914667732198} + - component: {fileID: 7007992443478943163} + m_Layer: 19 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3526608511010743512 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 926650157667340878} + 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: 2651455554799242179} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 108.025, y: -18} + m_SizeDelta: {x: 22, y: 22} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1734283996156290091 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 926650157667340878} + m_CullTransparentMesh: 0 +--- !u!114 &6813242914667732198 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 926650157667340878} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 518e3be6157b64d5a9fabd3e9c35622d, type: 3} + 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!114 &7007992443478943163 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 926650157667340878} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 22 + m_MinHeight: 22 + m_PreferredWidth: 22 + m_PreferredHeight: 22 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &1466904682867656693 GameObject: m_ObjectHideFlags: 0 @@ -270,7 +499,6 @@ RectTransform: m_Children: - {fileID: 3712662683410062164} m_Father: {fileID: 7497584698789204027} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -445,6 +673,172 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: showHtmlElement: 0 +--- !u!1 &1600631337022772824 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2651455554799242179} + - component: {fileID: 3441432904058219286} + - component: {fileID: 2458051993248988174} + - component: {fileID: 8746823548386143571} + - component: {fileID: 7977632639650138} + - component: {fileID: 673714090103496241} + m_Layer: 19 + m_Name: ButtonUnblock + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2651455554799242179 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600631337022772824} + 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: 3526608511010743512} + - {fileID: 5224875279456507402} + m_Father: {fileID: 7497584698789204027} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 8.7} + m_SizeDelta: {x: 0, y: 36} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &3441432904058219286 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600631337022772824} + m_CullTransparentMesh: 0 +--- !u!114 &2458051993248988174 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600631337022772824} + 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.7735849, g: 0.7735849, b: 0.7735849, 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: f02af068e11cb4902a1a4faad10b890a, 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: 3 +--- !u!114 &8746823548386143571 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600631337022772824} + 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: 0.9056604, g: 0.9056604, b: 0.9056604, a: 1} + m_HighlightedColor: {r: 1, g: 1, b: 1, 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.16 + 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: 2458051993248988174} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &7977632639650138 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600631337022772824} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4bfd0d144b6d3dd438b84fa14a062c4f, type: 3} + m_Name: + m_EditorClassIdentifier: + playHover: 1 + playClick: 1 + playRelease: 1 + extraClickEvent: {fileID: 0} +--- !u!114 &673714090103496241 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1600631337022772824} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &1867782450773908753 GameObject: m_ObjectHideFlags: 0 @@ -476,7 +870,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7497584698789204027} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -554,7 +947,6 @@ RectTransform: - {fileID: 4374481908968045022} - {fileID: 1055481873373078086} m_Father: {fileID: 6795723292658424848} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -632,7 +1024,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1674427979688183568} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -180} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -709,7 +1100,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2411879222414548724} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -858,7 +1248,6 @@ RectTransform: m_Children: - {fileID: 4755746969343816562} m_Father: {fileID: 7356526495144410225} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -897,7 +1286,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3903517524969113808} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -987,7 +1375,6 @@ RectTransform: m_Children: - {fileID: 1424589142354361523} m_Father: {fileID: 7497584698789204027} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1064,7 +1451,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1149488815536750324} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1161,7 +1547,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6795723292658424848} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1260,7 +1645,6 @@ RectTransform: - {fileID: 7458856228276626231} - {fileID: 8690498980713894478} m_Father: {fileID: 552498375794308537} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1312,7 +1696,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6795723292658424848} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1388,7 +1771,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3712662683410062164} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1525,7 +1907,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2411879222414548724} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1621,7 +2002,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3712662683410062164} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1759,7 +2139,6 @@ RectTransform: - {fileID: 6121836176943155271} - {fileID: 3217403111863100899} m_Father: {fileID: 6795723292658424848} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -1842,11 +2221,11 @@ RectTransform: - {fileID: 7356526495144410225} - {fileID: 5007828408558574685} - {fileID: 552498375794308537} + - {fileID: 2651455554799242179} - {fileID: 558041174302718228} - {fileID: 3493947927791817311} - {fileID: 126570184104127833} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1899,6 +2278,7 @@ MonoBehaviour: type: 2} chatMentionSuggestions: {fileID: 8679125580999122056} webGlImeInput: {fileID: 620615709946968176} + unblockButton: {fileID: 8746823548386143571} model: isInputFieldFocused: 0 inputFieldText: @@ -1935,7 +2315,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7497584698789204027} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2011,7 +2390,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1149488815536750324} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2121,6 +2499,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7497584698789204027} m_Modifications: - target: {fileID: 1697152473561375629, guid: ac9b58818bf0b4779a12e1e30a9b8483, @@ -2304,6 +2683,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ac9b58818bf0b4779a12e1e30a9b8483, type: 3} --- !u!224 &558041174302718228 stripped RectTransform: @@ -2328,12 +2710,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7497584698789204027} m_Modifications: - target: {fileID: 33180226908608850, guid: 15120eceeeb9c45ee9d520a23f50872d, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 209470434955866080, guid: 15120eceeeb9c45ee9d520a23f50872d, type: 3} @@ -2768,7 +3151,7 @@ PrefabInstance: - target: {fileID: 4733887283956242434, guid: 15120eceeeb9c45ee9d520a23f50872d, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5191761706286609472, guid: 15120eceeeb9c45ee9d520a23f50872d, type: 3} @@ -3223,7 +3606,7 @@ PrefabInstance: - target: {fileID: 8859036475654810075, guid: 15120eceeeb9c45ee9d520a23f50872d, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9109606891818156669, guid: 15120eceeeb9c45ee9d520a23f50872d, type: 3} @@ -3246,6 +3629,9 @@ PrefabInstance: value: -21 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15120eceeeb9c45ee9d520a23f50872d, type: 3} --- !u!114 &1012573262644825583 stripped MonoBehaviour: @@ -3270,6 +3656,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7497584698789204027} m_Modifications: - target: {fileID: 2270140030997826954, guid: e8e31cd13af984fa496a37d39835e770, @@ -3573,6 +3960,9 @@ PrefabInstance: value: 3 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e8e31cd13af984fa496a37d39835e770, type: 3} --- !u!224 &126570184104127833 stripped RectTransform: diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/FriendEntry.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/FriendEntry.prefab index 0fd3fa065e..4c9e49eaa1 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/FriendEntry.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/FriendEntry.prefab @@ -32,7 +32,6 @@ RectTransform: m_Children: - {fileID: 9075420694447359819} m_Father: {fileID: 5456606117727073459} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -116,7 +115,6 @@ RectTransform: - {fileID: 400802966039089134} - {fileID: 2396126356780351439} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -206,7 +204,6 @@ RectTransform: - {fileID: 8537413690132117273} - {fileID: 7064280046403328459} m_Father: {fileID: 5456606117727073459} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -256,7 +253,6 @@ RectTransform: m_Children: - {fileID: 8694297625600924364} m_Father: {fileID: 7149079082500279503} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -411,7 +407,6 @@ RectTransform: - {fileID: 1847832236836700114} - {fileID: 5704189429481424444} m_Father: {fileID: 6933523995295731836} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -500,7 +495,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6933523995295731836} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -576,7 +570,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 400802966039089134} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -711,7 +704,6 @@ RectTransform: m_Children: - {fileID: 337787086226473174} m_Father: {fileID: 7149079082500279503} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -749,7 +741,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8603588938482584769} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -827,7 +818,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7149079082500279503} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -963,7 +953,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5456606117727073459} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1039,7 +1028,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6933523995295731836} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1074,7 +1062,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d2451ef1daf10724b8191eaaa27ebd04, type: 3} + m_Sprite: {fileID: 21300000, guid: a26c049177d1b423cbf29f2f44dd73c2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1115,7 +1103,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3208162396482114920} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1191,7 +1178,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2880661323653110145} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1268,7 +1254,6 @@ RectTransform: m_Children: - {fileID: 7748367149753732600} m_Father: {fileID: 5456606117727073459} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1345,7 +1330,6 @@ RectTransform: - {fileID: 5557930252562946457} - {fileID: 2880661323653110145} m_Father: {fileID: 5456606117727073459} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1481,7 +1465,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3208162396482114920} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1555,7 +1538,6 @@ RectTransform: m_Children: - {fileID: 2155454614030449086} m_Father: {fileID: 5456606117727073459} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1631,7 +1613,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2672706927414828394} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1705,7 +1686,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5456606117727073459} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1717,6 +1697,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3775164562340596133} m_Modifications: - target: {fileID: 101901147944420372, guid: 22b2c68bfb9b14e92ae66ede22e45642, @@ -2044,6 +2025,9 @@ PrefabInstance: - {fileID: 5507833735981208710, guid: 22b2c68bfb9b14e92ae66ede22e45642, type: 3} - {fileID: 2535064507794171431, guid: 22b2c68bfb9b14e92ae66ede22e45642, type: 3} - {fileID: 6210765197424354044, guid: 22b2c68bfb9b14e92ae66ede22e45642, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 22b2c68bfb9b14e92ae66ede22e45642, type: 3} --- !u!224 &337787086226473174 stripped RectTransform: diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/FriendRequestEntry.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/FriendRequestEntry.prefab index a128de93e8..382b999a8e 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/FriendRequestEntry.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/FriendRequestEntry.prefab @@ -35,7 +35,6 @@ RectTransform: m_Children: - {fileID: 5657055130319872392} m_Father: {fileID: 8875728503830647966} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -191,7 +190,6 @@ RectTransform: - {fileID: 8875728503830647966} - {fileID: 7166026021154403223} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -282,7 +280,6 @@ RectTransform: - {fileID: 8537413690132117273} - {fileID: 7064280046403328459} m_Father: {fileID: 8875728503830647966} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -331,7 +328,6 @@ RectTransform: - {fileID: 1847832236836700114} - {fileID: 5704189429481424444} m_Father: {fileID: 6933523995295731836} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -420,7 +416,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6933523995295731836} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -496,7 +491,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8130751678321697642} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -632,7 +626,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8130751678321697642} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -770,7 +763,6 @@ RectTransform: m_Children: - {fileID: 7121750725772544828} m_Father: {fileID: 7151878220996575671} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -892,7 +884,6 @@ RectTransform: m_Children: - {fileID: 8599501568539529622} m_Father: {fileID: 583539154141141577} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1014,7 +1005,6 @@ RectTransform: - {fileID: 3199548369804527641} - {fileID: 2832149277067752304} m_Father: {fileID: 8875728503830647966} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1078,7 +1068,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1570486618486935519} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1216,7 +1205,6 @@ RectTransform: - {fileID: 7151878220996575671} - {fileID: 583539154141141577} m_Father: {fileID: 1570486618486935519} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1274,7 +1262,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1934836797930882919} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1410,7 +1397,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5456606117727073459} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1486,7 +1472,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6933523995295731836} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1514,7 +1499,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0, b: 0, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1562,7 +1547,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3208162396482114920} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1638,7 +1622,6 @@ RectTransform: m_Children: - {fileID: 1934836797930882919} m_Father: {fileID: 2832149277067752304} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1692,7 +1675,6 @@ RectTransform: m_Children: - {fileID: 4387186462516961530} m_Father: {fileID: 2832149277067752304} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1748,7 +1730,6 @@ RectTransform: m_Children: - {fileID: 1370806911086421753} m_Father: {fileID: 2099729747741884662} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1868,7 +1849,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3208162396482114920} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1939,7 +1919,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5456606117727073459} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1977,7 +1956,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8115091092717883366} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2053,7 +2031,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 178768652495005368} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2189,7 +2166,6 @@ RectTransform: m_Children: - {fileID: 178768652495005368} m_Father: {fileID: 2832149277067752304} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2248,7 +2224,6 @@ RectTransform: - {fileID: 1570486618486935519} - {fileID: 8115091092717883366} m_Father: {fileID: 5456606117727073459} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2386,7 +2361,6 @@ RectTransform: - {fileID: 7748367149753732600} - {fileID: 3792906126654906232} m_Father: {fileID: 1570486618486935519} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2470,7 +2444,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4387186462516961530} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/NearbyMembersHUD.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/NearbyMembersHUD.prefab index bdf9f5687a..4ce470b5ba 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/NearbyMembersHUD.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/NearbyMembersHUD.prefab @@ -1189,7 +1189,7 @@ PrefabInstance: - target: {fileID: 439758649979947888, guid: 28988f9d309d15a4d8e70851f8671279, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 510474962384184233, guid: 28988f9d309d15a4d8e70851f8671279, type: 3} @@ -1216,6 +1216,11 @@ PrefabInstance: propertyPath: m_Value value: 0 objectReference: {fileID: 0} + - target: {fileID: 3540057766655389802, guid: 28988f9d309d15a4d8e70851f8671279, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3866157782987366350, guid: 28988f9d309d15a4d8e70851f8671279, type: 3} propertyPath: m_Pivot.x @@ -1364,7 +1369,7 @@ PrefabInstance: - target: {fileID: 4420826133141174953, guid: 28988f9d309d15a4d8e70851f8671279, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4547125968938856368, guid: 28988f9d309d15a4d8e70851f8671279, type: 3} @@ -1389,7 +1394,7 @@ PrefabInstance: - target: {fileID: 5178456170749413920, guid: 28988f9d309d15a4d8e70851f8671279, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5239503401355176004, guid: 28988f9d309d15a4d8e70851f8671279, type: 3} @@ -1411,6 +1416,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -10 objectReference: {fileID: 0} + - target: {fileID: 5542022945334629358, guid: 28988f9d309d15a4d8e70851f8671279, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6385060616518280574, guid: 28988f9d309d15a4d8e70851f8671279, type: 3} propertyPath: m_SizeDelta.y diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/WhisperChannelElement.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/WhisperChannelElement.prefab index 0bef8f2563..91b745eb08 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/WhisperChannelElement.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/WhisperChannelElement.prefab @@ -33,7 +33,6 @@ RectTransform: - {fileID: 171428270515962682} - {fileID: 7588105118743867833} m_Father: {fileID: 5191408291402297711} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -78,7 +77,6 @@ RectTransform: m_Children: - {fileID: 6003009283485841396} m_Father: {fileID: 2901606008627308901} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -116,7 +114,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 864862577226660547} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -195,7 +192,6 @@ RectTransform: - {fileID: 5713901615314955241} - {fileID: 1134429644144040798} m_Father: {fileID: 969621388164549049} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -284,7 +280,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8008444378116973989} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -420,7 +415,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1524262764069937065} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -560,7 +554,6 @@ RectTransform: m_Children: - {fileID: 8557973407149072024} m_Father: {fileID: 5191408291402297711} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -696,7 +689,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4742853846814306970} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -773,7 +765,6 @@ RectTransform: - {fileID: 1524262764069937065} - {fileID: 653627275417150065} m_Father: {fileID: 5191408291402297711} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -837,7 +828,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 969621388164549049} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -914,7 +904,6 @@ RectTransform: m_Children: - {fileID: 5972231887313186349} m_Father: {fileID: 5191408291402297711} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -992,7 +981,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5191408291402297711} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1128,7 +1116,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1474900684112146219} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1204,7 +1191,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8008444378116973989} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1338,7 +1324,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5191408291402297711} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1376,7 +1361,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5191408291402297711} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1453,7 +1437,6 @@ RectTransform: m_Children: - {fileID: 320903741133197847} m_Father: {fileID: 5191408291402297711} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1537,7 +1520,6 @@ RectTransform: - {fileID: 448060260310794847} - {fileID: 1314382267237426187} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1607,7 +1589,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5897622821986987931} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1683,7 +1664,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 969621388164549049} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1711,7 +1691,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0, b: 0, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1760,7 +1740,6 @@ RectTransform: - {fileID: 7312558993303916739} - {fileID: 7925265007151991075} m_Father: {fileID: 5191408291402297711} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1798,6 +1777,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2901606008627308901} m_Modifications: - target: {fileID: 2475570976191959864, guid: 0a008e464c70e3744b62a048a23c72f5, @@ -1992,6 +1972,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0a008e464c70e3744b62a048a23c72f5, type: 3} --- !u!224 &653627275417150065 stripped RectTransform: @@ -2016,6 +1999,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4742853846814306970} m_Modifications: - target: {fileID: 5573392751968575400, guid: 4849d2ed3b5a18948bf3cd46256869a4, @@ -2134,6 +2118,9 @@ PrefabInstance: value: Picture objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4849d2ed3b5a18948bf3cd46256869a4, type: 3} --- !u!224 &1134429644144040798 stripped RectTransform: diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WalletHUD/Prefabs/WalletSectionHUD.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WalletHUD/Prefabs/WalletSectionHUD.prefab index ea925c0b38..5e190faa32 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WalletHUD/Prefabs/WalletSectionHUD.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WalletHUD/Prefabs/WalletSectionHUD.prefab @@ -35,7 +35,6 @@ RectTransform: - {fileID: 8807877777810676484} - {fileID: 1769710653374957617} m_Father: {fileID: 8024335577128154959} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -113,7 +112,6 @@ RectTransform: - {fileID: 6415464689658621707} - {fileID: 4639170539762641500} m_Father: {fileID: 5767479417770043217} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -190,7 +188,6 @@ RectTransform: m_Children: - {fileID: 4437538292560894961} m_Father: {fileID: 5162748506838320623} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -266,7 +263,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2732417274843291327} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -402,7 +398,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8024335577128154959} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -542,7 +537,6 @@ RectTransform: - {fileID: 4430491699436984487} - {fileID: 3119860021214060066} m_Father: {fileID: 5162748506838320623} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -618,7 +612,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1960522124742881463} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -694,7 +687,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8024335577128154959} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -774,7 +766,6 @@ RectTransform: - {fileID: 8684231317590422067} - {fileID: 7304540842489317220} m_Father: {fileID: 8024335577128154959} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -850,7 +841,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8024335577128154959} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -926,7 +916,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8024335577128154959} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1062,7 +1051,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2089308355771791489} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1138,7 +1126,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7255877064385387001} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1214,7 +1201,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7255877064385387001} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1353,7 +1339,6 @@ RectTransform: - {fileID: 3322531206387040970} - {fileID: 5767479417770043217} m_Father: {fileID: 8024335577128154959} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1407,7 +1392,6 @@ RectTransform: - {fileID: 8024335577128154959} - {fileID: 3388301883310125062} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1431,7 +1415,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 10 m_TargetDisplay: 0 @@ -1556,7 +1542,6 @@ RectTransform: m_Children: - {fileID: 1960522124742881463} m_Father: {fileID: 5886021582177722409} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1663,7 +1648,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8024335577128154959} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1800,7 +1784,6 @@ RectTransform: m_Children: - {fileID: 536659079848275615} m_Father: {fileID: 5162748506838320623} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} @@ -1876,7 +1859,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1727892208182772155} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2012,7 +1994,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6681451118616159500} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} @@ -2161,7 +2142,6 @@ RectTransform: - {fileID: 2732417274843291327} - {fileID: 1727892208182772155} m_Father: {fileID: 5162748506838320623} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} @@ -2237,7 +2217,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8024335577128154959} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2313,7 +2292,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5886021582177722409} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2449,7 +2427,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1960522124742881463} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -2585,7 +2562,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8024335577128154959} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2620,8 +2596,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "Is Decentraland\u2019s cryptocurrency. Use it to buy names, LAND - and wearables in Ethereum. Learn More" + m_text: "It is Decentraland\u2019s cryptocurrency. Use it to buy names, + LAND and wearables in Ethereum. Learn + More" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} @@ -2722,7 +2699,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2089308355771791489} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -2800,7 +2776,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5886021582177722409} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -2936,7 +2911,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8024335577128154959} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3072,7 +3046,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8024335577128154959} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3208,7 +3181,6 @@ RectTransform: - {fileID: 1761196272916745506} - {fileID: 6445870691444354964} m_Father: {fileID: 2089308355771791489} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3246,7 +3218,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8024335577128154959} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3383,7 +3354,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5886021582177722409} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3459,7 +3429,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1727892208182772155} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3595,7 +3564,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2732417274843291327} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3705,6 +3673,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1727892208182772155} m_Modifications: - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, @@ -3833,6 +3802,9 @@ PrefabInstance: value: PolygonManaBuy_Button objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: df2ca57878cc0834088cff37f213e619, type: 3} --- !u!224 &1769710653374957617 stripped RectTransform: @@ -3857,6 +3829,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2732417274843291327} m_Modifications: - target: {fileID: 5510830612936421616, guid: 252c1fea75fc0614587349a368eb8684, @@ -3995,6 +3968,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 252c1fea75fc0614587349a368eb8684, type: 3} --- !u!1 &5250718527397694821 stripped GameObject: @@ -4013,6 +3989,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1727892208182772155} m_Modifications: - target: {fileID: 5510830612936421616, guid: 252c1fea75fc0614587349a368eb8684, @@ -4151,6 +4128,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 252c1fea75fc0614587349a368eb8684, type: 3} --- !u!1 &5359570378951812178 stripped GameObject: @@ -4169,6 +4149,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3388301883310125062} m_Modifications: - target: {fileID: 34620168043170737, guid: a85688c1f1a68884f88fdfda26f08ea9, @@ -4312,6 +4293,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2425466382528157947, guid: a85688c1f1a68884f88fdfda26f08ea9, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1475315907500178686} m_SourcePrefab: {fileID: 100100000, guid: a85688c1f1a68884f88fdfda26f08ea9, type: 3} --- !u!224 &536659079848275615 stripped RectTransform: @@ -4371,6 +4359,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2732417274843291327} m_Modifications: - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, @@ -4499,6 +4488,9 @@ PrefabInstance: value: EthereumManaBuy_Button objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: df2ca57878cc0834088cff37f213e619, type: 3} --- !u!114 &2554883155582148515 stripped MonoBehaviour: diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WorldChatWindowHUD/ChannelMemberEntry.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WorldChatWindowHUD/ChannelMemberEntry.cs index 4c8da4cd74..0a68e571d0 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WorldChatWindowHUD/ChannelMemberEntry.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WorldChatWindowHUD/ChannelMemberEntry.cs @@ -1,4 +1,3 @@ -using DCL.Social.Chat; using TMPro; using UnityEngine; using UnityEngine.UI; @@ -14,6 +13,7 @@ public class ChannelMemberEntry : BaseComponentView, IComponentModelConfig channelMe thumnailUrl = "", userId = member.userId, userName = member.userId, - isOptionsButtonHidden = member.userId == userProfileBridge.GetOwn().userId + isOptionsButtonHidden = member.userId == userProfileBridge.GetOwn().userId, + blocked = false }; view.Set(fallbackMemberEntry); @@ -178,7 +181,8 @@ async UniTaskVoid UpdateChannelMembersAsync(IEnumerable channelMe thumnailUrl = memberProfile.face256SnapshotURL, userId = memberProfile.userId, userName = memberProfile.userName, - isOptionsButtonHidden = memberProfile.userId == userProfileBridge.GetOwn().userId + isOptionsButtonHidden = memberProfile.userId == userProfileBridge.GetOwn().userId, + blocked = IsUserBlocked(memberProfile.userId) }; view.Set(userToAdd); @@ -200,6 +204,14 @@ async UniTaskVoid UpdateChannelMembersAsync(IEnumerable channelMe UpdateChannelMembersAsync(channelMembers, showMembersCancellationToken.Token).Forget(); } + private bool IsUserBlocked(string userId) + { + if (ownUserProfile != null && ownUserProfile.blocked != null) + return ownUserProfile.blocked.Contains(userId); + + return false; + } + private void LoadMoreMembers() { if (IsLoading() || diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WorldChatWindowHUD/NearbyMembersHUDController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WorldChatWindowHUD/NearbyMembersHUDController.cs index 8ebd62378d..21f7118f47 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WorldChatWindowHUD/NearbyMembersHUDController.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WorldChatWindowHUD/NearbyMembersHUDController.cs @@ -9,6 +9,7 @@ public class NearbyMembersHUDController : IDisposable private readonly IUserProfileBridge userProfileBridge; private bool isVisible; private string currentSearchText; + private readonly UserProfile ownUserProfile; public IChannelMembersComponentView View => view; @@ -21,6 +22,8 @@ public NearbyMembersHUDController( this.playerDataStore = playerDataStore; this.userProfileBridge = userProfileBridge; + ownUserProfile = userProfileBridge.GetOwn(); + playerDataStore.otherPlayers.OnAdded += OnNearbyPlayersAdded; playerDataStore.otherPlayers.OnRemoved += OnNearbyPlayersRemoved; view.OnSearchUpdated += OnSearchPlayers; @@ -86,11 +89,20 @@ private void OnNearbyPlayersAdded(string userId, Player player) userId = otherProfile.userId, userName = otherProfile.userName, isOptionsButtonHidden = otherProfile.userId == userProfileBridge.GetOwn().userId, + blocked = IsUserBlocked(otherProfile.userId) }; view.Set(userToAdd); } + private bool IsUserBlocked(string userId) + { + if (ownUserProfile != null && ownUserProfile.blocked != null) + return ownUserProfile.blocked.Contains(userId); + + return false; + } + private void OnNearbyPlayersRemoved(string userId, Player _) { if (!isVisible) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WorldChatWindowHUD/PrivateChatEntry.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WorldChatWindowHUD/PrivateChatEntry.cs index 6ef0eb8c53..d1981d7a13 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WorldChatWindowHUD/PrivateChatEntry.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WorldChatWindowHUD/PrivateChatEntry.cs @@ -1,4 +1,3 @@ -using DCL.Social.Chat; using System; using TMPro; using UnityEngine; diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WorldChatWindowHUD/WorldChatWindowComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WorldChatWindowHUD/WorldChatWindowComponentView.cs index bbd80d24a3..8fd15b3cd3 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WorldChatWindowHUD/WorldChatWindowComponentView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/WorldChatWindowHUD/WorldChatWindowComponentView.cs @@ -6,6 +6,7 @@ using TMPro; using UIComponents.CollapsableSortedList; using UnityEngine; +using UnityEngine.Pool; using UnityEngine.UI; namespace DCL.Social.Chat @@ -195,6 +196,23 @@ public void Configure(WorldChatWindowModel newModel) public void RefreshBlockedDirectMessages(List blockedUsers) { if (blockedUsers == null) return; + + var keysToUpdate = ListPool.Get(); + + foreach (KeyValuePair privateChatModel in privateChatsCreationQueue) + { + if (blockedUsers.Contains(privateChatModel.Key) != privateChatModel.Value.isBlocked) { keysToUpdate.Add(privateChatModel.Key); } + } + + foreach (string key in keysToUpdate) + { + PrivateChatModel refreshedPrivateChatModel = privateChatsCreationQueue[key]; + refreshedPrivateChatModel.isBlocked = blockedUsers.Contains(key); + privateChatsCreationQueue[key] = refreshedPrivateChatModel; + } + + ListPool.Release(keysToUpdate); + directChatList.RefreshBlockedEntries(blockedUsers); } @@ -451,6 +469,8 @@ private void FetchProfilePicturesForVisibleEntries() entry.EnableAvatarSnapshotFetching(); else entry.DisableAvatarSnapshotFetching(); + + entry.RefreshControl(); } currentAvatarSnapshotIndex += AVATAR_SNAPSHOTS_PER_FRAME; diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/LoadingScreen/Resources/_LoadingScreen.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/LoadingScreen/Resources/_LoadingScreen.prefab index 9d232adaed..80c16865bc 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/LoadingScreen/Resources/_LoadingScreen.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/LoadingScreen/Resources/_LoadingScreen.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1244904327} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -170,7 +169,6 @@ RectTransform: - {fileID: 102198957} - {fileID: 1858120786} m_Father: {fileID: 5696763185950597558} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -222,7 +220,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1858120786} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -299,7 +296,6 @@ RectTransform: m_Children: - {fileID: 1548540705} m_Father: {fileID: 1244904327} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -375,7 +371,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1244904327} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -453,7 +448,6 @@ RectTransform: - {fileID: 6322710159802854320} - {fileID: 7423075662883644013} m_Father: {fileID: 5696763185950597558} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -533,7 +527,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5696763185950597558} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -611,7 +604,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5696763185950597558} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -682,7 +674,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -722,7 +716,6 @@ RectTransform: - {fileID: 5465143494324565093} - {fileID: 136838695967996016} m_Father: {fileID: 5696763185950597558} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -746,7 +739,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 1000 m_TargetDisplay: 0 @@ -842,7 +837,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5570195312150058620} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -918,7 +912,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5570195312150058620} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1055,7 +1048,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5570195312150058620} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1145,7 +1137,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5696763185950597558} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1182,7 +1173,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 24bad1613b3e14b969cf6086aa095ffc, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1231,7 +1222,6 @@ RectTransform: - {fileID: 4296387108997757867} - {fileID: 3246031618494657702} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1255,7 +1245,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 100 m_TargetDisplay: 0 @@ -1349,6 +1341,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1244904327} m_Modifications: - target: {fileID: 1589542079631269309, guid: 2da37fa1269fc1f48a3470d0ca3e9450, @@ -1557,6 +1550,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2da37fa1269fc1f48a3470d0ca3e9450, type: 3} --- !u!224 &6281035913215727768 stripped RectTransform: @@ -1569,6 +1565,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3246031618494657702} m_Modifications: - target: {fileID: 316622536944760797, guid: 97e9067bfed47423b9e491675f0c6d06, @@ -1697,6 +1694,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 97e9067bfed47423b9e491675f0c6d06, type: 3} --- !u!1 &728389790094115166 stripped GameObject: @@ -1739,6 +1739,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3246031618494657702} m_Modifications: - target: {fileID: 316622536944760797, guid: 97e9067bfed47423b9e491675f0c6d06, @@ -1892,6 +1893,9 @@ PrefabInstance: value: -9.116089 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 97e9067bfed47423b9e491675f0c6d06, type: 3} --- !u!224 &136838695967996016 stripped RectTransform: @@ -1922,6 +1926,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3246031618494657702} m_Modifications: - target: {fileID: 608093966221723960, guid: 97e9067bfed47423b9e491675f0c6d06, @@ -2045,6 +2050,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 97e9067bfed47423b9e491675f0c6d06, type: 3} --- !u!224 &3147506433864547738 stripped RectTransform: diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/DataStore/DataStore_Notifications.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/DataStore/DataStore_Notifications.cs index 0f57d8aad8..46cd5660dd 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/DataStore/DataStore_Notifications.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/DataStore/DataStore_Notifications.cs @@ -34,11 +34,20 @@ public static GenericConfirmationNotificationData CreateUnFriendData(string user public static GenericConfirmationNotificationData CreateBlockUserData(string userName, Action confirmationAction) => new ( $"Are you sure you want to block {userName}?", - "Blocking will prevent you from seeing their chat messages in public or private conversations.", + "Blocking someone means that you and that person can no longer see each other's avatars, messages, and send friend requests.", "CANCEL", "BLOCK", null, confirmationAction); + + public static GenericConfirmationNotificationData CreateUnBlockUserData(string userName, Action confirmationAction) => + new ( + $"Are you sure you want to unblock {userName}?", + "Once you unblock someone, you and that person would be able to see each other's avatars, messages, and send friend requests.", + "CANCEL", + "UNBLOCK", + null, + confirmationAction); } public class DataStore_Notifications diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/UserProfile/UserProfile.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/UserProfile/UserProfile.cs index bbd33b77ee..692ecdfab0 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/UserProfile/UserProfile.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/UserProfile/UserProfile.cs @@ -193,9 +193,16 @@ public void Block(string userId) if (IsBlocked(userId)) return; blocked.Add(userId); + OnUpdate?.Invoke(this); } - public void Unblock(string userId) { blocked.Remove(userId); } + public void Unblock(string userId) + { + if (!IsBlocked(userId)) + return; + blocked.Remove(userId); + OnUpdate?.Invoke(this); + } public bool HasEquipped(string wearableId) => avatar.wearables.Contains(wearableId); diff --git a/unity-renderer/Assets/Textures/UI/Common/BlockPlayerBlackIcon.png b/unity-renderer/Assets/Textures/UI/Common/BlockPlayerBlackIcon.png new file mode 100644 index 0000000000..692b1ce329 --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/Common/BlockPlayerBlackIcon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0615717c82dc13bc09fa65ce7a9e61e1a8da56f0eb32cb602e6951811cc161a +size 2415 diff --git a/unity-renderer/Assets/Textures/UI/Common/BlockPlayerBlackIcon.png.meta b/unity-renderer/Assets/Textures/UI/Common/BlockPlayerBlackIcon.png.meta new file mode 100644 index 0000000000..1a32787178 --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/Common/BlockPlayerBlackIcon.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 18e8a062e074b4b35a0a1c05fd97640e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + 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: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + 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: 1 + swizzle: 50462976 + cookieLightType: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 00a5e3f65aff44311a4bf11efb868671 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer/Assets/Textures/UI/Common/BlockPlayerIcon.png b/unity-renderer/Assets/Textures/UI/Common/BlockPlayerWhiteIcon.png similarity index 100% rename from unity-renderer/Assets/Textures/UI/Common/BlockPlayerIcon.png rename to unity-renderer/Assets/Textures/UI/Common/BlockPlayerWhiteIcon.png diff --git a/unity-renderer/Assets/Textures/UI/Common/BlockPlayerIcon.png.meta b/unity-renderer/Assets/Textures/UI/Common/BlockPlayerWhiteIcon.png.meta similarity index 100% rename from unity-renderer/Assets/Textures/UI/Common/BlockPlayerIcon.png.meta rename to unity-renderer/Assets/Textures/UI/Common/BlockPlayerWhiteIcon.png.meta diff --git a/unity-renderer/Assets/Textures/UI/Common/DCLLogo.png b/unity-renderer/Assets/Textures/UI/Common/DCLLogo.png old mode 100755 new mode 100644 index e53070572c..f0900e430e --- a/unity-renderer/Assets/Textures/UI/Common/DCLLogo.png +++ b/unity-renderer/Assets/Textures/UI/Common/DCLLogo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba643dc57a21c27d9da1f87ffed8851db0a2f80cf0e1fbd5fdff74d4e4addaa4 -size 4115 +oid sha256:cc256bac32700dd16db1db43bcb684d90c4a83cb837c0f11d3a2bd58e10cbf0a +size 4275 diff --git a/unity-renderer/Assets/Textures/UI/Common/TexturesUI.spriteatlas b/unity-renderer/Assets/Textures/UI/Common/TexturesUI.spriteatlas index 8c43d18204..fd1f0ae7e4 100644 --- a/unity-renderer/Assets/Textures/UI/Common/TexturesUI.spriteatlas +++ b/unity-renderer/Assets/Textures/UI/Common/TexturesUI.spriteatlas @@ -100,6 +100,7 @@ SpriteAtlas: - 9033ce43858a34293b6140b0e6b601f6: 21300000 - 09d7c763693b246d7bdb6df137a6f0cc: 21300000 - c553839314f3e4d218eed6729f828916: 21300000 + - fe227f939d22a5941aa33dece9abecab: 21300000 - f9ac9ba35ccb34e818a1cdcdd0af3643: 21300000 - f5a8ac1491c276a4c9b7f3d606f0a1fd: 21300000 - 553df444098fb244bbc6e7162657a1e5: 21300000 @@ -195,6 +196,7 @@ SpriteAtlas: - 3c940a5c07400864db483f5212bd11dd: 21300000 - f0bcc87cbbf78438ebfb049f6c1aa203: 21300000 - 6017049c5a0dc43f6a4a68f1b4e28664: 21300000 + - 9fb5589c5caac46e5882f2be6709b03d: 21300000 - 0c1f94bccfacc415f8b7916a4f3ae512: 21300000 - 31a98abcdcc4e4022b74038cdc7154be: 21300000 - 21fb0bbc6fe494c8789ea7221ac96c59: 21300000 @@ -204,7 +206,6 @@ SpriteAtlas: - 6d5f6edc2bfb441e1969ee1e10c3c572: 21300000 - 45e823eca8727410d947ff8af56eb13a: 21300000 - 654b9c0dd7f12442687bd4d4b034ece7: 21300000 - - ccff713df52bf45b5b10c8fcfb44fee7: 21300000 - 8191374d830c647edb5ed715100f2b48: 21300000 - cf43c05d20914491481a6f7736f2eec6: 21300000 - 871dd18d15e4c4712985e30bc63a6168: 21300000 @@ -213,6 +214,7 @@ SpriteAtlas: - 68f5b9dd92031414ab32a5fe3238ca08: 21300000 - ffdb9ddd1a2d940e5a6daf599ae1c755: 21300000 - 44bac0edc4fa04134a635701947adb48: 21300000 + - c3c5b20e67f164ab08adfebe8f01d208: 21300000 - 4fec551e960ee4ccca8b3390ea2d3071: 21300000 - ee23632e4a71040eea4378f310a5eaef: 21300000 - 590e1b5ec5d7e45379b7d1f4f3f4e1af: 21300000 @@ -269,6 +271,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 9033ce43858a34293b6140b0e6b601f6, type: 3} - {fileID: 21300000, guid: 09d7c763693b246d7bdb6df137a6f0cc, type: 3} - {fileID: 21300000, guid: c553839314f3e4d218eed6729f828916, type: 3} + - {fileID: 21300000, guid: fe227f939d22a5941aa33dece9abecab, type: 3} - {fileID: 21300000, guid: f9ac9ba35ccb34e818a1cdcdd0af3643, type: 3} - {fileID: 21300000, guid: f5a8ac1491c276a4c9b7f3d606f0a1fd, type: 3} - {fileID: 21300000, guid: 553df444098fb244bbc6e7162657a1e5, type: 3} @@ -364,6 +367,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 3c940a5c07400864db483f5212bd11dd, type: 3} - {fileID: 21300000, guid: f0bcc87cbbf78438ebfb049f6c1aa203, type: 3} - {fileID: 21300000, guid: 6017049c5a0dc43f6a4a68f1b4e28664, type: 3} + - {fileID: 21300000, guid: 9fb5589c5caac46e5882f2be6709b03d, type: 3} - {fileID: 21300000, guid: 0c1f94bccfacc415f8b7916a4f3ae512, type: 3} - {fileID: 21300000, guid: 31a98abcdcc4e4022b74038cdc7154be, type: 3} - {fileID: 21300000, guid: 21fb0bbc6fe494c8789ea7221ac96c59, type: 3} @@ -373,7 +377,6 @@ SpriteAtlas: - {fileID: 21300000, guid: 6d5f6edc2bfb441e1969ee1e10c3c572, type: 3} - {fileID: 21300000, guid: 45e823eca8727410d947ff8af56eb13a, type: 3} - {fileID: 21300000, guid: 654b9c0dd7f12442687bd4d4b034ece7, type: 3} - - {fileID: 21300000, guid: ccff713df52bf45b5b10c8fcfb44fee7, type: 3} - {fileID: 21300000, guid: 8191374d830c647edb5ed715100f2b48, type: 3} - {fileID: 21300000, guid: cf43c05d20914491481a6f7736f2eec6, type: 3} - {fileID: 21300000, guid: 871dd18d15e4c4712985e30bc63a6168, type: 3} @@ -382,6 +385,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 68f5b9dd92031414ab32a5fe3238ca08, type: 3} - {fileID: 21300000, guid: ffdb9ddd1a2d940e5a6daf599ae1c755, type: 3} - {fileID: 21300000, guid: 44bac0edc4fa04134a635701947adb48, type: 3} + - {fileID: 21300000, guid: c3c5b20e67f164ab08adfebe8f01d208, type: 3} - {fileID: 21300000, guid: 4fec551e960ee4ccca8b3390ea2d3071, type: 3} - {fileID: 21300000, guid: ee23632e4a71040eea4378f310a5eaef, type: 3} - {fileID: 21300000, guid: 590e1b5ec5d7e45379b7d1f4f3f4e1af, type: 3} @@ -402,7 +406,7 @@ SpriteAtlas: m_PackedSpriteNamesToIndex: - SliderHandle - BuilderOn - - RadialGradient + - RadialGradientHard - MicOff - FavoritesImg - EllipseOutline2 @@ -415,7 +419,7 @@ SpriteAtlas: - SpeakerOn - DCLLogo - BlockedIcn - - CheckIcn + - CheckmarkContainerIcn - ManaIcon - CancelButton - EllipseOutline2Gradient @@ -437,6 +441,7 @@ SpriteAtlas: - BookIcon - CopyIcn - IconBellActive + - CheckIcn - EmptySearchImg - TooltipPeak - LikeSolidIcn @@ -500,7 +505,7 @@ SpriteAtlas: - WorldsIcnColor - HandleThin - MicIDle - - WheelIcn + - ScrollIcn - SupportIcon - JumpInIcn - Container12RectRight @@ -532,6 +537,7 @@ SpriteAtlas: - FavouriteToggleBlocked - OutlineGradient - EndVoiceChat + - RadialGradientSoft - RightClickIcn - HelpIcn - SettingsOff @@ -541,7 +547,6 @@ SpriteAtlas: - ArrowGradient - FavouriteToggleOff - MarketplaceOn - - LeftClick - EventsIcn - EllipticalShadow - LikeStrokeIcn @@ -550,6 +555,7 @@ SpriteAtlas: - LinkIcn - Container24Shadow4 - FavouriteToggleStrokeOn + - NameIcn - UnfriendIcon - QuitIconOutline - Container12RectTop diff --git a/unity-renderer/Assets/Textures/UI/MyAccount/BlockUser.png b/unity-renderer/Assets/Textures/UI/MyAccount/BlockUser.png new file mode 100644 index 0000000000..8b9909909a --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/MyAccount/BlockUser.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8545772f37eef862d2d129ceccb1809dd79913b843fc4c9deb4568ef01549cb +size 1173 diff --git a/unity-renderer/Assets/Textures/UI/MyAccount/BlockUser.png.meta b/unity-renderer/Assets/Textures/UI/MyAccount/BlockUser.png.meta new file mode 100644 index 0000000000..4b0fb62f87 --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/MyAccount/BlockUser.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 0fea5ecc9e83df74d8002c4b8b2191bd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 64 + 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 + - serializedVersion: 3 + buildTarget: Android + 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: Server + 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/unity-renderer/Assets/Textures/UI/MyAccount/BlockedImg.png b/unity-renderer/Assets/Textures/UI/MyAccount/BlockedImg.png new file mode 100644 index 0000000000..be86bda936 --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/MyAccount/BlockedImg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4000ee4b14b4105249c1f7bc676ed17a05dcf6542fd60b00235ec1538bf8e96 +size 8635 diff --git a/unity-renderer/Assets/Textures/UI/MyAccount/BlockedImg.png.meta b/unity-renderer/Assets/Textures/UI/MyAccount/BlockedImg.png.meta new file mode 100644 index 0000000000..b5ade71137 --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/MyAccount/BlockedImg.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: dea479ede2d444b17bd0c7c8c3d4c4cb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 256 + 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: Server + 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: WebGL + 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/unity-renderer/Assets/UIComponents/Prefabs/Button_Common2.prefab b/unity-renderer/Assets/UIComponents/Prefabs/Button_Common2.prefab new file mode 100644 index 0000000000..827b5ce4d3 --- /dev/null +++ b/unity-renderer/Assets/UIComponents/Prefabs/Button_Common2.prefab @@ -0,0 +1,384 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4246289522992575071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8616488889774720505} + - component: {fileID: 7703451836026012201} + - component: {fileID: 4469143239268576428} + 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 &8616488889774720505 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4246289522992575071} + 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: 54622623229548845} + 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 &7703451836026012201 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4246289522992575071} + m_CullTransparentMesh: 1 +--- !u!114 &4469143239268576428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4246289522992575071} + 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: Unblock + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6b705423dc77d4fceb4122f6d7e571d6, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 9d9df32282a3c40299019c36b2157d37, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 14 + m_fontSizeBase: 15 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 0 + m_fontSizeMax: 14 + 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: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 1 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + 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 &5466927874646222343 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 54622623229548845} + - component: {fileID: 4523211747859918047} + - component: {fileID: 3725923502685340037} + - component: {fileID: 5109399184885072362} + - component: {fileID: 8412491424384214035} + - component: {fileID: 7263379833390393243} + - component: {fileID: 8360437818873036568} + - component: {fileID: 7887689455078732951} + - component: {fileID: 1442316120381234285} + - component: {fileID: 1727543226122190079} + - component: {fileID: 5946802166726151088} + m_Layer: 5 + m_Name: Button_Common2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &54622623229548845 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5466927874646222343} + 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: 8616488889774720505} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 46} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4523211747859918047 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5466927874646222343} + m_CullTransparentMesh: 1 +--- !u!114 &3725923502685340037 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5466927874646222343} + 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.5754717, g: 0.5754717, b: 0.5754717, 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: f02af068e11cb4902a1a4faad10b890a, 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 &5109399184885072362 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5466927874646222343} + 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.9245283, g: 0.9245283, b: 0.9245283, a: 1} + m_PressedColor: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} + m_SelectedColor: {r: 1, g: 1, b: 1, 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: 3725923502685340037} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!225 &8412491424384214035 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5466927874646222343} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &7263379833390393243 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5466927874646222343} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8b939b5bedb9494b806609faeda7d8d, type: 3} + m_Name: + m_EditorClassIdentifier: + hideOnEnable: 0 + animSpeedFactor: 1 + disableAfterFadeOut: 0 + canvasGroup: {fileID: 8412491424384214035} +--- !u!114 &8360437818873036568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5466927874646222343} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 10 + m_Right: 10 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 5 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &7887689455078732951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5466927874646222343} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4bfd0d144b6d3dd438b84fa14a062c4f, type: 3} + m_Name: + m_EditorClassIdentifier: + playHover: 1 + playClick: 1 + playRelease: 1 + extraClickEvent: {fileID: 0} +--- !u!114 &1442316120381234285 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5466927874646222343} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 274bf6bf95184804cb2606eda1bf2a6a, type: 3} + m_Name: + m_EditorClassIdentifier: + showHideAnimator: {fileID: 0} + button: {fileID: 5109399184885072362} + text: {fileID: 4469143239268576428} + icon: {fileID: 0} + model: + text: CLICK ME! + icon: {fileID: 21300000, guid: 877d19aa5b7d74c25862a30311503ed4, type: 3} +--- !u!114 &1727543226122190079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5466927874646222343} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &5946802166726151088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5466927874646222343} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 63f05fbeb9b20044d9c1dc9abd16c772, type: 3} + m_Name: + m_EditorClassIdentifier: + textToChange: {fileID: 4469143239268576428} + iconToChange: {fileID: 0} + onFocusColor: {r: 1, g: 1, b: 1, a: 1} + onLoseFocusColor: {r: 0.027450982, g: 0.7803922, b: 0.7176471, a: 1} diff --git a/unity-renderer/Assets/UIComponents/Prefabs/Button_Common2.prefab.meta b/unity-renderer/Assets/UIComponents/Prefabs/Button_Common2.prefab.meta new file mode 100644 index 0000000000..ad0a5ff204 --- /dev/null +++ b/unity-renderer/Assets/UIComponents/Prefabs/Button_Common2.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1773ea34a6d37b740b50e11631032a01 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer/Assets/UIComponents/Prefabs/Button_Common3.prefab b/unity-renderer/Assets/UIComponents/Prefabs/Button_Common3.prefab new file mode 100644 index 0000000000..a57ee814f3 --- /dev/null +++ b/unity-renderer/Assets/UIComponents/Prefabs/Button_Common3.prefab @@ -0,0 +1,399 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &755178142233910029 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3915869077436214683} + - component: {fileID: 2213409228404944232} + - component: {fileID: 6353296740767503781} + - component: {fileID: 7487113516315356408} + m_Layer: 19 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3915869077436214683 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 755178142233910029} + 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: 2480688633441682048} + 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: 22} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2213409228404944232 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 755178142233910029} + m_CullTransparentMesh: 0 +--- !u!114 &6353296740767503781 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 755178142233910029} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 518e3be6157b64d5a9fabd3e9c35622d, type: 3} + 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!114 &7487113516315356408 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 755178142233910029} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 22 + m_MinHeight: 22 + m_PreferredWidth: 22 + m_PreferredHeight: 22 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &871414187085824947 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5630781075557326665} + - component: {fileID: 3118641353125740542} + - component: {fileID: 8657174706389299562} + m_Layer: 19 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5630781075557326665 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 871414187085824947} + 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: 2480688633441682048} + 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: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3118641353125740542 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 871414187085824947} + m_CullTransparentMesh: 0 +--- !u!114 &8657174706389299562 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 871414187085824947} + 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: Report + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 10 + 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: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + 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: 1 + 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 &1193564214144687899 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2480688633441682048} + - component: {fileID: 2982681555733094997} + - component: {fileID: 2646481263273473357} + - component: {fileID: 9206488215366427664} + - component: {fileID: 484882914636267545} + - component: {fileID: 1152765964377708402} + m_Layer: 19 + m_Name: Button_Common3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2480688633441682048 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1193564214144687899} + 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: 3915869077436214683} + - {fileID: 5630781075557326665} + 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: 156, y: 36} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2982681555733094997 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1193564214144687899} + m_CullTransparentMesh: 0 +--- !u!114 &2646481263273473357 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1193564214144687899} + 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.7735849, g: 0.7735849, b: 0.7735849, 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: f02af068e11cb4902a1a4faad10b890a, 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: 3 +--- !u!114 &9206488215366427664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1193564214144687899} + 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: 0.9056604, g: 0.9056604, b: 0.9056604, a: 1} + m_HighlightedColor: {r: 1, g: 1, b: 1, 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.16 + 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: 2646481263273473357} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &484882914636267545 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1193564214144687899} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4bfd0d144b6d3dd438b84fa14a062c4f, type: 3} + m_Name: + m_EditorClassIdentifier: + playHover: 1 + playClick: 1 + playRelease: 1 + extraClickEvent: {fileID: 0} +--- !u!114 &1152765964377708402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1193564214144687899} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 10 + m_Right: 10 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 diff --git a/unity-renderer/Assets/UIComponents/Prefabs/Button_Common3.prefab.meta b/unity-renderer/Assets/UIComponents/Prefabs/Button_Common3.prefab.meta new file mode 100644 index 0000000000..e5a2dea01c --- /dev/null +++ b/unity-renderer/Assets/UIComponents/Prefabs/Button_Common3.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ee786a0939c0252449336865bf65750d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: