diff --git a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/Textures/EmotesIcn.png b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/Textures/EmotesIcn.png new file mode 100644 index 00000000000..628e972e48f --- /dev/null +++ b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/Textures/EmotesIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a97f37ca4c9630eb0a9013f71d110e262564adb49304e1b9054eee5bdd04090 +size 642 diff --git a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/Textures/EmotesIcn.png.meta b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/Textures/EmotesIcn.png.meta new file mode 100644 index 00000000000..0329cc59231 --- /dev/null +++ b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/Textures/EmotesIcn.png.meta @@ -0,0 +1,169 @@ +fileFormatVersion: 2 +guid: 089798e4e628c4810949862aaf077ff0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 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: 0 + swizzle: 50462976 + cookieLightType: 1 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Server + maxTextureSize: 128 + 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: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipAction.prefab b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipAction.prefab index d170999fc26..fc4695c5e54 100644 --- a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipAction.prefab +++ b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipAction.prefab @@ -74,7 +74,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.3 --- !u!1 &4814421507037005243 GameObject: m_ObjectHideFlags: 0 @@ -136,7 +136,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.2} + m_Color: {r: 0, g: 0, b: 0, a: 0.4} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -152,7 +152,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.3 --- !u!1 &6512991250934431310 GameObject: m_ObjectHideFlags: 0 @@ -187,7 +187,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 156, y: 0.000015258789} + m_AnchoredPosition: {x: 156, y: 0} m_SizeDelta: {x: 267, y: 78} m_Pivot: {x: 1, y: 0.5} --- !u!222 &5627829241958566859 diff --git a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipAddFriends.prefab b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipAddFriends.prefab index b8c96b68aa6..61ada642fba 100644 --- a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipAddFriends.prefab +++ b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipAddFriends.prefab @@ -22,7 +22,7 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: 68f9eff02d2384f72b6d01286cf5cff8, type: 3} - target: {fileID: 1450107832291094929, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} propertyPath: m_text - value: "Open profile \u2192 to see events" + value: "Open profile \u2192 Add friend" objectReference: {fileID: 0} - target: {fileID: 1450107832291094929, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} propertyPath: m_characterSpacing @@ -124,6 +124,18 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 212.3392 objectReference: {fileID: 0} + - target: {fileID: 6455313194973673589, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} + propertyPath: m_AnchoredPosition.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7423570456732473033, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} + propertyPath: m_AnchoredPosition.x + value: 33 + objectReference: {fileID: 0} + - target: {fileID: 7423570456732473033, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7510907615130953338, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} propertyPath: m_text value: Add Friends diff --git a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipEarnBadges.prefab b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipEarnBadges.prefab index 03b06880a2c..9eef46f86a1 100644 --- a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipEarnBadges.prefab +++ b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipEarnBadges.prefab @@ -120,6 +120,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 217.5 objectReference: {fileID: 0} + - target: {fileID: 6455313194973673589, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} + propertyPath: m_AnchoredPosition.y + value: 3 + objectReference: {fileID: 0} - target: {fileID: 7510907615130953338, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} propertyPath: m_text value: Earn Badges diff --git a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipHangOut.prefab b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipHangOut.prefab index fe4b19342eb..882e0cadb0f 100644 --- a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipHangOut.prefab +++ b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipHangOut.prefab @@ -34,7 +34,7 @@ RectTransform: 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: 266, y: 0} + m_AnchoredPosition: {x: 266, y: -2} m_SizeDelta: {x: 42, y: 42} m_Pivot: {x: 0, y: 0.5} --- !u!222 &9181923708062901375 @@ -195,6 +195,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 244.31653 objectReference: {fileID: 0} + - target: {fileID: 6455313194973673589, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} + propertyPath: m_AnchoredPosition.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7423570456732473033, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} + propertyPath: m_SizeDelta.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 7423570456732473033, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 7423570456732473033, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7510907615130953338, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} propertyPath: m_text value: Hang Out diff --git a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipLiveNow.prefab b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipLiveNow.prefab index f08773c3b62..3448888bed5 100644 --- a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipLiveNow.prefab +++ b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipLiveNow.prefab @@ -120,6 +120,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 176.77179 objectReference: {fileID: 0} + - target: {fileID: 6455313194973673589, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} + propertyPath: m_AnchoredPosition.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7423570456732473033, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} + propertyPath: m_AnchoredPosition.y + value: 1.56 + objectReference: {fileID: 0} - target: {fileID: 7510907615130953338, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} propertyPath: m_text value: Live Now diff --git a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipMakeMove.prefab b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipMakeMove.prefab index 135ad9d6999..3c46e08a9ba 100644 --- a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipMakeMove.prefab +++ b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipMakeMove.prefab @@ -10,7 +10,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 543383342138890165, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} propertyPath: m_Name - value: TipMakeAMove + value: TipMakeMove objectReference: {fileID: 0} - target: {fileID: 565513630802350116, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} propertyPath: m_Type @@ -19,7 +19,7 @@ PrefabInstance: - target: {fileID: 565513630802350116, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 68f9eff02d2384f72b6d01286cf5cff8, type: 3} + objectReference: {fileID: 21300000, guid: 089798e4e628c4810949862aaf077ff0, type: 3} - target: {fileID: 1450107832291094929, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} propertyPath: m_text value: ' Press B to open Emotes Wheel' @@ -120,6 +120,18 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 244.31653 objectReference: {fileID: 0} + - target: {fileID: 6455313194973673589, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} + propertyPath: m_AnchoredPosition.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7423570456732473033, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} + propertyPath: m_AnchoredPosition.x + value: 33 + objectReference: {fileID: 0} + - target: {fileID: 7423570456732473033, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7510907615130953338, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} propertyPath: m_text value: Make a Move diff --git a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipSayHi.prefab b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipSayHi.prefab index dc7aa3e41f7..c120dd774f2 100644 --- a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipSayHi.prefab +++ b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipSayHi.prefab @@ -535,6 +535,14 @@ PrefabInstance: propertyPath: m_Name value: SceneLoadingTipAction objectReference: {fileID: 0} + - target: {fileID: 5821765197461066070, guid: 88d142307cfbc4417ac0ad01a0e5e256, type: 3} + propertyPath: m_AnchoredPosition.y + value: -1.92 + objectReference: {fileID: 0} + - target: {fileID: 7951985042051678186, guid: 88d142307cfbc4417ac0ad01a0e5e256, type: 3} + propertyPath: m_AnchoredPosition.y + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipTakeShot.prefab b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipTakeShot.prefab index 8d66f538737..38a59339501 100644 --- a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipTakeShot.prefab +++ b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipTakeShot.prefab @@ -120,6 +120,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 244.31653 objectReference: {fileID: 0} + - target: {fileID: 7423570456732473033, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} + propertyPath: m_AnchoredPosition.x + value: 33 + objectReference: {fileID: 0} - target: {fileID: 7510907615130953338, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} propertyPath: m_text value: Take a Shot diff --git a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipYourPeople.prefab b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipYourPeople.prefab index ccb461b3e97..c82bbb4e578 100644 --- a/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipYourPeople.prefab +++ b/Explorer/Assets/DCL/SceneLoadingScreens/Assets/TipYourPeople.prefab @@ -124,6 +124,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 259.29797 objectReference: {fileID: 0} + - target: {fileID: 6455313194973673589, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} + propertyPath: m_AnchoredPosition.y + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7423570456732473033, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} propertyPath: m_SizeDelta.x value: 45 @@ -132,6 +136,14 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 45 objectReference: {fileID: 0} + - target: {fileID: 7423570456732473033, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} + propertyPath: m_AnchoredPosition.x + value: 33 + objectReference: {fileID: 0} + - target: {fileID: 7423570456732473033, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7510907615130953338, guid: dfee83d4e12e048269f60e1c7b26f595, type: 3} propertyPath: m_text value: Your People