diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ui_conversation_name_point.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_conversation_name_point.png new file mode 100644 index 00000000..52365806 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_conversation_name_point.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ui_conversation_name_point.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_conversation_name_point.png.meta new file mode 100644 index 00000000..2a4118fc --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_conversation_name_point.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 3dc71c71f9e277b46aff12fc536835d4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab index dae146d3..05a21312 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab @@ -835,6 +835,80 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1451581146470115335 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2881766811783059679} + - component: {fileID: 1811976284931718311} + - component: {fileID: 7195932677279463968} + m_Layer: 5 + m_Name: name_point + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2881766811783059679 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1451581146470115335} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5325445695590656810} + 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} + m_AnchoredPosition: {x: -2.8, y: 76.999985} + m_SizeDelta: {x: 38, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1811976284931718311 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1451581146470115335} + m_CullTransparentMesh: 0 +--- !u!114 &7195932677279463968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1451581146470115335} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3dc71c71f9e277b46aff12fc536835d4, 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 &1596363388502900369 GameObject: m_ObjectHideFlags: 0 @@ -4343,7 +4417,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7625413361251093135} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.49, y: -3.6699998, z: 0} + m_LocalPosition: {x: -0.55, y: -3.6699998, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 9012476003026081154} @@ -10106,7 +10180,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8326132142916714447 RectTransform: m_ObjectHideFlags: 0 @@ -10382,7 +10456,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8661359385873922132} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.71, y: -3.22, z: 0} + m_LocalPosition: {x: -3.03, y: -3.22, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3688964211588030036} @@ -10569,7 +10643,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5325445695590656810 RectTransform: m_ObjectHideFlags: 0 @@ -10583,6 +10657,7 @@ RectTransform: m_Children: - {fileID: 2079635568913446914} - {fileID: 6034435834378236524} + - {fileID: 2881766811783059679} m_Father: {fileID: 8326132142488478140} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}