diff --git a/Assets/MenuUi/Prefabs/Chat/BlueMessage.prefab b/Assets/MenuUi/Prefabs/Chat/BlueMessage.prefab index 8e43ecc76..8acd8c5d8 100644 --- a/Assets/MenuUi/Prefabs/Chat/BlueMessage.prefab +++ b/Assets/MenuUi/Prefabs/Chat/BlueMessage.prefab @@ -137,81 +137,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &1564432998669676391 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6583450164459290759} - - component: {fileID: 2718679258241734782} - - component: {fileID: 8665523881752419553} - m_Layer: 5 - m_Name: Avatar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6583450164459290759 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564432998669676391} - 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: 3363965265471710657} - 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: 332.9533, y: 2.8103027} - m_SizeDelta: {x: 91.5079, y: 88.3985} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2718679258241734782 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564432998669676391} - m_CullTransparentMesh: 1 ---- !u!114 &8665523881752419553 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564432998669676391} - 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: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &4250206361280662525 GameObject: m_ObjectHideFlags: 0 @@ -243,7 +168,7 @@ RectTransform: m_Children: - {fileID: 1355985985701982470} - {fileID: 5859081688326684396} - - {fileID: 6583450164459290759} + - {fileID: 4081311695883639653} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -396,3 +321,127 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1001 &314490366628692672 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3363965265471710657} + m_Modifications: + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.x + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.y + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 306 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6696904714036861434, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Name + value: CharacterHeadImage + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 242eb41c9b6db9841a5c6610aa625c54, type: 3} +--- !u!224 &4081311695883639653 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + m_PrefabInstance: {fileID: 314490366628692672} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/MenuUi/Prefabs/Chat/OrangeMessage.prefab b/Assets/MenuUi/Prefabs/Chat/OrangeMessage.prefab index 472bf3955..7666b04d4 100644 --- a/Assets/MenuUi/Prefabs/Chat/OrangeMessage.prefab +++ b/Assets/MenuUi/Prefabs/Chat/OrangeMessage.prefab @@ -362,81 +362,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &1564432998669676391 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6583450164459290759} - - component: {fileID: 2718679258241734782} - - component: {fileID: 8665523881752419553} - m_Layer: 5 - m_Name: Avatar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6583450164459290759 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564432998669676391} - 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: 3363965265471710657} - 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: 331.94586, y: 5.3015137} - m_SizeDelta: {x: 91.5079, y: 88.3985} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2718679258241734782 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564432998669676391} - m_CullTransparentMesh: 1 ---- !u!114 &8665523881752419553 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564432998669676391} - 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: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &3482619346814152036 GameObject: m_ObjectHideFlags: 0 @@ -589,7 +514,7 @@ RectTransform: m_Children: - {fileID: 1355985985701982470} - {fileID: 5859081688326684396} - - {fileID: 6583450164459290759} + - {fileID: 1504714492515423792} - {fileID: 1987272549193885490} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1017,3 +942,127 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1001 &2891066683033030549 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3363965265471710657} + m_Modifications: + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.x + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.y + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 306 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6696904714036861434, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Name + value: CharacterHeadImage + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 242eb41c9b6db9841a5c6610aa625c54, type: 3} +--- !u!224 &1504714492515423792 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + m_PrefabInstance: {fileID: 2891066683033030549} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/MenuUi/Prefabs/Chat/OtherBlueMessage.prefab b/Assets/MenuUi/Prefabs/Chat/OtherBlueMessage.prefab index e399a9183..273cc2ea7 100644 --- a/Assets/MenuUi/Prefabs/Chat/OtherBlueMessage.prefab +++ b/Assets/MenuUi/Prefabs/Chat/OtherBlueMessage.prefab @@ -137,81 +137,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &5302617219383530251 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 539949035414764779} - - component: {fileID: 8762287040954622994} - - component: {fileID: 2621505980514902157} - m_Layer: 5 - m_Name: Avatar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &539949035414764779 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5302617219383530251} - 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: 8254079246718392749} - 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: -325.9926, y: 6} - m_SizeDelta: {x: 91.5079, y: 88.3985} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8762287040954622994 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5302617219383530251} - m_CullTransparentMesh: 1 ---- !u!114 &2621505980514902157 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5302617219383530251} - 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: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &6126836930712003908 GameObject: m_ObjectHideFlags: 0 @@ -248,7 +173,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: 1, y: -13} + m_AnchoredPosition: {x: 1, y: 1} m_SizeDelta: {x: 810, y: 155} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8102383100053729997 @@ -380,7 +305,7 @@ RectTransform: m_Children: - {fileID: 5688675060564348266} - {fileID: 967418510627455616} - - {fileID: 539949035414764779} + - {fileID: 4629365591680912934} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -396,3 +321,127 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7410833616610932625} m_CullTransparentMesh: 1 +--- !u!1001 &8989254628200388483 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8254079246718392749} + m_Modifications: + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.x + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.y + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -318 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6696904714036861434, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Name + value: CharacterHeadImage + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 242eb41c9b6db9841a5c6610aa625c54, type: 3} +--- !u!224 &4629365591680912934 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + m_PrefabInstance: {fileID: 8989254628200388483} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/MenuUi/Prefabs/Chat/OtherOrangeMessage.prefab b/Assets/MenuUi/Prefabs/Chat/OtherOrangeMessage.prefab index ce167bc83..ba3717d32 100644 --- a/Assets/MenuUi/Prefabs/Chat/OtherOrangeMessage.prefab +++ b/Assets/MenuUi/Prefabs/Chat/OtherOrangeMessage.prefab @@ -362,81 +362,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &1769482511198699787 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6225822368377106155} - - component: {fileID: 2918681239439390226} - - component: {fileID: 8464987675200156301} - m_Layer: 5 - m_Name: Avatar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6225822368377106155 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1769482511198699787} - 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: 2563878510907657133} - 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: -327, y: 5.3015137} - m_SizeDelta: {x: 91.5079, y: 88.3985} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2918681239439390226 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1769482511198699787} - m_CullTransparentMesh: 1 ---- !u!114 &8464987675200156301 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1769482511198699787} - 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: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &4017291496211637649 GameObject: m_ObjectHideFlags: 0 @@ -468,7 +393,7 @@ RectTransform: m_Children: - {fileID: 2299900629280464746} - {fileID: 6662001145494114432} - - {fileID: 6225822368377106155} + - {fileID: 6977754178542660073} - {fileID: 1634728207264450910} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1017,3 +942,127 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1001 &6641409204075458636 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2563878510907657133} + m_Modifications: + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.x + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.y + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -318 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6696904714036861434, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Name + value: CharacterHeadImage + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 242eb41c9b6db9841a5c6610aa625c54, type: 3} +--- !u!224 &6977754178542660073 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + m_PrefabInstance: {fileID: 6641409204075458636} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/MenuUi/Prefabs/Chat/OtherPinkMessage.prefab b/Assets/MenuUi/Prefabs/Chat/OtherPinkMessage.prefab index bc2851ec5..42ca97aff 100644 --- a/Assets/MenuUi/Prefabs/Chat/OtherPinkMessage.prefab +++ b/Assets/MenuUi/Prefabs/Chat/OtherPinkMessage.prefab @@ -563,7 +563,7 @@ RectTransform: m_Children: - {fileID: 7834880922425643845} - {fileID: 3397362705696545967} - - {fileID: 2681723886249419460} + - {fileID: 132069746308317887} - {fileID: 1199118843590337541} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -580,81 +580,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4940937571568691646} m_CullTransparentMesh: 1 ---- !u!1 &7773075688614792484 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2681723886249419460} - - component: {fileID: 6616008581130910269} - - component: {fileID: 443702072811110050} - m_Layer: 5 - m_Name: Avatar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2681723886249419460 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7773075688614792484} - 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: 5820141880569448322} - 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: -327.00006, y: -7} - m_SizeDelta: {x: 91.5079, y: 88.3985} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6616008581130910269 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7773075688614792484} - m_CullTransparentMesh: 1 ---- !u!114 &443702072811110050 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7773075688614792484} - 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: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &7948982687881259204 GameObject: m_ObjectHideFlags: 0 @@ -795,7 +720,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: 1.0000238, y: -8.7928} + m_AnchoredPosition: {x: 1.0000238, y: 1} m_SizeDelta: {x: 810, y: 155} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5924590741286366434 @@ -1017,3 +942,127 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1001 &4407832935213669146 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5820141880569448322} + m_Modifications: + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.x + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.y + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -313 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -12 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6696904714036861434, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Name + value: CharacterHeadImage + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 242eb41c9b6db9841a5c6610aa625c54, type: 3} +--- !u!224 &132069746308317887 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + m_PrefabInstance: {fileID: 4407832935213669146} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/MenuUi/Prefabs/Chat/OtherRedMessage.prefab b/Assets/MenuUi/Prefabs/Chat/OtherRedMessage.prefab index f4a4b4af9..579b4a8ed 100644 --- a/Assets/MenuUi/Prefabs/Chat/OtherRedMessage.prefab +++ b/Assets/MenuUi/Prefabs/Chat/OtherRedMessage.prefab @@ -241,81 +241,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &435060397878819862 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5251553051854476278} - - component: {fileID: 3893061470305012495} - - component: {fileID: 7781796468367986576} - m_Layer: 5 - m_Name: Avatar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5251553051854476278 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 435060397878819862} - 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: 4400978030340830896} - 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: -328.00757, y: -11} - m_SizeDelta: {x: 91.5079, y: 88.3985} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3893061470305012495 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 435060397878819862} - m_CullTransparentMesh: 1 ---- !u!114 &7781796468367986576 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 435060397878819862} - 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: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &1916825755443317337 GameObject: m_ObjectHideFlags: 0 @@ -484,7 +409,7 @@ RectTransform: m_Children: - {fileID: 102791931886461559} - {fileID: 4824478243749359005} - - {fileID: 5251553051854476278} + - {fileID: 6075250505898015685} - {fileID: 2503866074569436127} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1017,3 +942,127 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1001 &7543898995420373600 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4400978030340830896} + m_Modifications: + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.x + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.y + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -318 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -22 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6696904714036861434, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Name + value: CharacterHeadImage + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 242eb41c9b6db9841a5c6610aa625c54, type: 3} +--- !u!224 &6075250505898015685 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + m_PrefabInstance: {fileID: 7543898995420373600} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/MenuUi/Prefabs/Chat/OtherYellowMessage.prefab b/Assets/MenuUi/Prefabs/Chat/OtherYellowMessage.prefab index 111abd5af..15aa956ac 100644 --- a/Assets/MenuUi/Prefabs/Chat/OtherYellowMessage.prefab +++ b/Assets/MenuUi/Prefabs/Chat/OtherYellowMessage.prefab @@ -426,7 +426,7 @@ RectTransform: m_Children: - {fileID: 7171095880501709404} - {fileID: 2313183782347982262} - - {fileID: 3028858418416565213} + - {fileID: 2082520029005896470} - {fileID: 4779247214984265041} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -701,81 +701,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7268893508849898557 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3028858418416565213} - - component: {fileID: 6120118964732715812} - - component: {fileID: 655159029978015675} - m_Layer: 5 - m_Name: Avatar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3028858418416565213 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7268893508849898557} - 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: 6915984427018313371} - 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: -330, y: -8} - m_SizeDelta: {x: 91.5079, y: 88.3985} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6120118964732715812 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7268893508849898557} - m_CullTransparentMesh: 1 ---- !u!114 &655159029978015675 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7268893508849898557} - 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: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &8678445124755710578 GameObject: m_ObjectHideFlags: 0 @@ -1017,3 +942,127 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1001 &2312713726923195059 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6915984427018313371} + m_Modifications: + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.x + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.y + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -307 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -23 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6696904714036861434, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Name + value: CharacterHeadImage + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 242eb41c9b6db9841a5c6610aa625c54, type: 3} +--- !u!224 &2082520029005896470 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + m_PrefabInstance: {fileID: 2312713726923195059} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/MenuUi/Prefabs/Chat/PinkMessage.prefab b/Assets/MenuUi/Prefabs/Chat/PinkMessage.prefab index 05336322b..eb2ee4f29 100644 --- a/Assets/MenuUi/Prefabs/Chat/PinkMessage.prefab +++ b/Assets/MenuUi/Prefabs/Chat/PinkMessage.prefab @@ -362,81 +362,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &1564432998669676391 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6583450164459290759} - - component: {fileID: 2718679258241734782} - - component: {fileID: 8665523881752419553} - m_Layer: 5 - m_Name: Avatar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6583450164459290759 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564432998669676391} - 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: 3363965265471710657} - 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: 331.94586, y: -10} - m_SizeDelta: {x: 91.5079, y: 88.3985} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2718679258241734782 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564432998669676391} - m_CullTransparentMesh: 1 ---- !u!114 &8665523881752419553 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564432998669676391} - 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: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &4250206361280662525 GameObject: m_ObjectHideFlags: 0 @@ -468,7 +393,7 @@ RectTransform: m_Children: - {fileID: 1355985985701982470} - {fileID: 5859081688326684396} - - {fileID: 6583450164459290759} + - {fileID: 9097718316043481892} - {fileID: 7984416624518825542} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1017,3 +942,127 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1001 &4809675713579002497 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3363965265471710657} + m_Modifications: + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.x + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.y + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 306 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -25 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6696904714036861434, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Name + value: CharacterHeadImage + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 242eb41c9b6db9841a5c6610aa625c54, type: 3} +--- !u!224 &9097718316043481892 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + m_PrefabInstance: {fileID: 4809675713579002497} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/MenuUi/Prefabs/Chat/RedMessage.prefab b/Assets/MenuUi/Prefabs/Chat/RedMessage.prefab index bfcb10a1c..9c8ccbc21 100644 --- a/Assets/MenuUi/Prefabs/Chat/RedMessage.prefab +++ b/Assets/MenuUi/Prefabs/Chat/RedMessage.prefab @@ -378,81 +378,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &1564432998669676391 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6583450164459290759} - - component: {fileID: 2718679258241734782} - - component: {fileID: 8665523881752419553} - m_Layer: 5 - m_Name: Avatar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6583450164459290759 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564432998669676391} - 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: 3363965265471710657} - 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: 330.93835, y: -11} - m_SizeDelta: {x: 91.5079, y: 88.3985} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2718679258241734782 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564432998669676391} - m_CullTransparentMesh: 1 ---- !u!114 &8665523881752419553 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564432998669676391} - 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: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &3357226426346132287 GameObject: m_ObjectHideFlags: 0 @@ -605,7 +530,7 @@ RectTransform: m_Children: - {fileID: 1355985985701982470} - {fileID: 5859081688326684396} - - {fileID: 6583450164459290759} + - {fileID: 8606906764750267051} - {fileID: 3531906551603148974} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1017,3 +942,127 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1001 &5444588163357850382 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3363965265471710657} + m_Modifications: + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.x + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.y + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 306 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -22 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6696904714036861434, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Name + value: CharacterHeadImage + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 242eb41c9b6db9841a5c6610aa625c54, type: 3} +--- !u!224 &8606906764750267051 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + m_PrefabInstance: {fileID: 5444588163357850382} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/MenuUi/Prefabs/Chat/YellowMessage.prefab b/Assets/MenuUi/Prefabs/Chat/YellowMessage.prefab index 9319c8338..5f4f5d297 100644 --- a/Assets/MenuUi/Prefabs/Chat/YellowMessage.prefab +++ b/Assets/MenuUi/Prefabs/Chat/YellowMessage.prefab @@ -362,81 +362,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &1564432998669676391 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6583450164459290759} - - component: {fileID: 2718679258241734782} - - component: {fileID: 8665523881752419553} - m_Layer: 5 - m_Name: Avatar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6583450164459290759 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564432998669676391} - 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: 3363965265471710657} - 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: 317.631, y: -13} - m_SizeDelta: {x: 91.5079, y: 88.3985} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2718679258241734782 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564432998669676391} - m_CullTransparentMesh: 1 ---- !u!114 &8665523881752419553 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564432998669676391} - 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: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &1577856487099913409 GameObject: m_ObjectHideFlags: 0 @@ -605,7 +530,7 @@ RectTransform: m_Children: - {fileID: 1355985985701982470} - {fileID: 5859081688326684396} - - {fileID: 6583450164459290759} + - {fileID: 356090537033088380} - {fileID: 3676902816436684299} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1017,3 +942,127 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1001 &4039700809034310873 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3363965265471710657} + m_Modifications: + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.x + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_SizeDelta.y + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 306 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -23 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6696904714036861434, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + propertyPath: m_Name + value: CharacterHeadImage + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 242eb41c9b6db9841a5c6610aa625c54, type: 3} +--- !u!224 &356090537033088380 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4395214235301648805, guid: 242eb41c9b6db9841a5c6610aa625c54, + type: 3} + m_PrefabInstance: {fileID: 4039700809034310873} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab b/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab index bb8f44f2a..a4187eb68 100644 --- a/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab +++ b/Assets/MenuUi/Prefabs/Windows/GlobalWindows/ChatView.prefab @@ -527,10 +527,10 @@ RectTransform: - {fileID: 7928024248625897835} m_Father: {fileID: 138673655222672912} 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: 60} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 430.12595, y: -745} + m_SizeDelta: {x: 860.2519, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3112314650041157463 CanvasRenderer: @@ -1015,12 +1015,12 @@ GameObject: - component: {fileID: 4902137308248284456} - component: {fileID: 3259344104525364856} m_Layer: 5 - m_Name: SendButton + m_Name: SendButtonSadness m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7026562413202385907 RectTransform: m_ObjectHideFlags: 0 @@ -1035,9 +1035,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2306716702012635805} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -50} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4254372580444969030 @@ -1297,10 +1297,10 @@ RectTransform: - {fileID: 7747916833131686888} m_Father: {fileID: 138673655222672912} 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: 60} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 430.12595, y: -290} + m_SizeDelta: {x: 860.2519, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &916316066475746994 CanvasRenderer: @@ -1844,7 +1844,7 @@ RectTransform: m_AnchorMin: {x: 0.03, y: 1} m_AnchorMax: {x: 1.03, y: 1} m_AnchoredPosition: {x: 0, y: -0.00024414062} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 840} m_Pivot: {x: 0, y: 1} --- !u!114 &3237306479466359678 MonoBehaviour: @@ -1920,10 +1920,10 @@ RectTransform: - {fileID: 974569260299826133} m_Father: {fileID: 138673655222672912} 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: 60} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 430.12595, y: -30} + m_SizeDelta: {x: 860.2519, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5336718198234313675 CanvasRenderer: @@ -2723,10 +2723,10 @@ RectTransform: - {fileID: 6281764204812225827} m_Father: {fileID: 138673655222672912} 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: 60} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 430.12595, y: -225} + m_SizeDelta: {x: 860.2519, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2231358790119612578 CanvasRenderer: @@ -2856,10 +2856,10 @@ RectTransform: - {fileID: 3694062671370978544} m_Father: {fileID: 138673655222672912} 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: 60} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 430.12595, y: -355} + m_SizeDelta: {x: 860.2519, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5762855699733123678 CanvasRenderer: @@ -2955,6 +2955,71 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &1983480450410086116 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8448351510553921281} + - component: {fileID: 6305229669535269081} + m_Layer: 5 + m_Name: InputArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8448351510553921281 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1983480450410086116} + 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: 6552214911538149563} + - {fileID: 2306716702012635805} + - {fileID: 8799694380537292622} + m_Father: {fileID: 7916536672776780153} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.24} + m_AnchoredPosition: {x: 0, y: -0.0010070801} + m_SizeDelta: {x: 0, y: 0.0030002594} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6305229669535269081 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1983480450410086116} + 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: 0 + 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 &2024303914879965933 GameObject: m_ObjectHideFlags: 0 @@ -3102,10 +3167,10 @@ RectTransform: - {fileID: 3338685048738131034} m_Father: {fileID: 1151533547217091628} 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: -70.19995} - m_SizeDelta: {x: 0, y: 608.4} + m_AnchorMin: {x: 0, y: 0.08} + m_AnchorMax: {x: 1, y: 0.88} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6497374208940577736 CanvasRenderer: @@ -3234,6 +3299,7 @@ GameObject: - component: {fileID: 2254137198222503692} - component: {fileID: 1507561895058106312} - component: {fileID: 189633976828316623} + - component: {fileID: 8266930852059003901} m_Layer: 5 m_Name: InputField m_TagString: Untagged @@ -3254,12 +3320,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3031172781968238891} - m_Father: {fileID: 7916536672776780153} + m_Father: {fileID: 8448351510553921281} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1.5} - m_AnchoredPosition: {x: -56.068, y: 0} - m_SizeDelta: {x: -112.14, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2254137198222503692 CanvasRenderer: @@ -3366,7 +3432,31 @@ MonoBehaviour: m_Calls: [] m_OnSelect: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 2740101029024463485} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 7565461932916702478} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 m_OnDeselect: m_PersistentCalls: m_Calls: [] @@ -3400,6 +3490,26 @@ MonoBehaviour: isAlert: 0 m_InputValidator: {fileID: 0} m_ShouldActivateOnSelect: 1 +--- !u!114 &8266930852059003901 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2159076929317161585} + 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 &2274126019110168904 GameObject: m_ObjectHideFlags: 0 @@ -3511,10 +3621,10 @@ RectTransform: - {fileID: 8428951322235186489} m_Father: {fileID: 7921986362807274530} 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: -4.7191, y: 237.32059} - m_SizeDelta: {x: 1070.6, y: 1085.0869} + 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 &8496871565532436558 CanvasRenderer: @@ -3569,7 +3679,7 @@ MonoBehaviour: m_Content: {fileID: 6538388467248521458} m_Horizontal: 0 m_Vertical: 1 - m_MovementType: 0 + m_MovementType: 1 m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 @@ -3705,7 +3815,7 @@ MonoBehaviour: m_HandleRect: {fileID: 5079551979823130596} m_Direction: 2 m_Value: 1.0000004 - m_Size: 0.40435925 + m_Size: 0.27688318 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -4251,7 +4361,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3705610905479725235 RectTransform: m_ObjectHideFlags: 0 @@ -4267,8 +4377,8 @@ RectTransform: - {fileID: 7183293622584055669} m_Father: {fileID: 7916536672776780153} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0.8, y: 7.2} + m_AnchorMin: {x: 0, y: 0.24} + m_AnchorMax: {x: 0.89725965, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -4306,10 +4416,10 @@ RectTransform: - {fileID: 6686777669580802134} m_Father: {fileID: 138673655222672912} 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: 60} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 430.12595, y: -420} + m_SizeDelta: {x: 860.2519, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6553933755725700146 CanvasRenderer: @@ -4493,7 +4603,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2869727882010124244} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -4548,8 +4658,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 3603811569387764947} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.7231168} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -4604,7 +4714,7 @@ GameObject: - component: {fileID: 6904759659702267211} - component: {fileID: 993502511043796009} m_Layer: 5 - m_Name: SendButton + m_Name: SendButtonJoy m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4863,6 +4973,7 @@ GameObject: - component: {fileID: 2239081685515598083} - component: {fileID: 1811987810955763152} - component: {fileID: 6361091160463748575} + - component: {fileID: 5626942554413117587} m_Layer: 5 m_Name: SendButtons(emotions) m_TagString: Untagged @@ -4887,12 +4998,12 @@ RectTransform: - {fileID: 176928675489138995} - {fileID: 5549537841413828318} - {fileID: 4390607825897656922} - m_Father: {fileID: 7916536672776780153} + m_Father: {fileID: 8448351510553921281} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.8, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 32.547607, y: 0} - m_SizeDelta: {x: -65.0955, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 934.95996, y: -100} + m_SizeDelta: {x: 100, y: 0} m_Pivot: {x: 0.5, y: 0} --- !u!222 &7696485582972512613 CanvasRenderer: @@ -4972,6 +5083,26 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!114 &5626942554413117587 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3239857786752039811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: 100 + m_MinHeight: -1 + m_PreferredWidth: 100 + m_PreferredHeight: -1 + m_FlexibleWidth: 0 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &3511398613663147723 GameObject: m_ObjectHideFlags: 0 @@ -5007,9 +5138,9 @@ RectTransform: m_Father: {fileID: 7183293622584055669} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -23.51294, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8078014483706112297 CanvasRenderer: @@ -5096,10 +5227,10 @@ RectTransform: - {fileID: 2933145432012626628} m_Father: {fileID: 138673655222672912} 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: 60} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 430.12595, y: -95} + m_SizeDelta: {x: 860.2519, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6048363940448631168 CanvasRenderer: @@ -5366,10 +5497,10 @@ RectTransform: - {fileID: 4788925268938691409} m_Father: {fileID: 138673655222672912} 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: 60} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 430.12595, y: -615} + m_SizeDelta: {x: 860.2519, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2226516796765596248 CanvasRenderer: @@ -5993,6 +6124,62 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 +--- !u!1 &4136632975230872408 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8799694380537292622} + - component: {fileID: 39892923913430767} + m_Layer: 5 + m_Name: Filler + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8799694380537292622 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4136632975230872408} + 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: 8448351510553921281} + 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: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &39892923913430767 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4136632975230872408} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 100 + m_MinHeight: -1 + m_PreferredWidth: 100 + m_PreferredHeight: -1 + m_FlexibleWidth: 0 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &4178355005318564478 GameObject: m_ObjectHideFlags: 0 @@ -6229,10 +6416,10 @@ RectTransform: - {fileID: 3773253668798515548} m_Father: {fileID: 3705610905479725235} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.07} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 32.547623, y: 0} - m_SizeDelta: {x: 65.0953, y: 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 &5706957448347808618 CanvasRenderer: @@ -7190,12 +7377,12 @@ GameObject: - component: {fileID: 1845890855603600987} - component: {fileID: 8867080251875204377} m_Layer: 5 - m_Name: SendButton + m_Name: SendButtonAnger m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6208257164484641020 RectTransform: m_ObjectHideFlags: 0 @@ -7210,9 +7397,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2306716702012635805} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -50} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3479501088613553431 @@ -7657,7 +7844,7 @@ MonoBehaviour: m_HandleRect: {fileID: 3927875660389003530} m_Direction: 0 m_Value: 0 - m_Size: 1 + m_Size: 0.99999994 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -7698,10 +7885,10 @@ RectTransform: - {fileID: 8557409658164920778} m_Father: {fileID: 7921986362807274530} 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: -4.7191, y: 237.31998} - m_SizeDelta: {x: 1070.6, y: 1085.0897} + 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 &9191095110808171411 CanvasRenderer: @@ -7756,7 +7943,7 @@ MonoBehaviour: m_Content: {fileID: 3283960692175201444} m_Horizontal: 0 m_Vertical: 1 - m_MovementType: 0 + m_MovementType: 1 m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 @@ -8508,13 +8695,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6552214911538149563} - - {fileID: 2306716702012635805} + - {fileID: 8448351510553921281} + - {fileID: 5860386545379866579} - {fileID: 3705610905479725235} m_Father: {fileID: 1151533547217091628} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.05} + m_AnchorMax: {x: 1, y: 0.32200003} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -8562,10 +8749,10 @@ RectTransform: - {fileID: 7618322532180933409} m_Father: {fileID: 7921986362807274530} 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: -4.7191, y: 237.32059} - m_SizeDelta: {x: 1070.6, y: 1085.0869} + 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 &4598440540860408090 CanvasRenderer: @@ -8620,7 +8807,7 @@ MonoBehaviour: m_Content: {fileID: 5941351211359421970} m_Horizontal: 0 m_Vertical: 1 - m_MovementType: 0 + m_MovementType: 1 m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 @@ -8805,12 +8992,12 @@ GameObject: - component: {fileID: 782444512269204344} - component: {fileID: 8645019309255837952} m_Layer: 5 - m_Name: SendButton + m_Name: SendButtonPlayful m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5549537841413828318 RectTransform: m_ObjectHideFlags: 0 @@ -8825,9 +9012,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2306716702012635805} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -155} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5789869789867441289 @@ -8986,6 +9173,7 @@ GameObject: m_Component: - component: {fileID: 3283960692175201444} - component: {fileID: 2436922484023595276} + - component: {fileID: 8568650613926527196} m_Layer: 5 m_Name: ContentLanguage m_TagString: Untagged @@ -9010,7 +9198,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0.00018310547} - m_SizeDelta: {x: 0, y: 300} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2436922484023595276 MonoBehaviour: @@ -9038,6 +9226,20 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!114 &8568650613926527196 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6086783591708459899} + 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 &6189173702100981711 GameObject: m_ObjectHideFlags: 0 @@ -9075,7 +9277,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &5736472857268926712 CanvasRenderer: @@ -9092,7 +9294,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6189173702100981711} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -9273,10 +9475,10 @@ RectTransform: - {fileID: 1696064155928326060} m_Father: {fileID: 138673655222672912} 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: 60} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 430.12595, y: -810} + m_SizeDelta: {x: 860.2519, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5874633743792503736 CanvasRenderer: @@ -10882,10 +11084,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 7921986362807274530} - {fileID: 6602365028443997892} - - {fileID: 7916536672776780153} - {fileID: 2827112549031579263} - - {fileID: 7921986362807274530} + - {fileID: 1512093868322653456} + - {fileID: 7916536672776780153} - {fileID: 3526988955111742713} m_Father: {fileID: 1212113446874224732} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10987,6 +11190,15 @@ MonoBehaviour: languageChatScrollRect: {fileID: 5692141976376438495} globalChatScrollRect: {fileID: 5345705474066992928} clanChatScrollRect: {fileID: 6182957393491053538} + quickMessages: {fileID: 2740101029024463485} + sendButtons: + - {fileID: 652102874510165360} + - {fileID: 4980087199686146618} + - {fileID: 2977898987667073549} + - {fileID: 6067375122463891519} + - {fileID: 8678484190465885865} + buttonOpenSendButtons: {fileID: 8442546168124923564} + optionsMinimizeButton: {fileID: 7565461932916702478} delete: /deleteMessage deleteAllMessages: /clear --- !u!114 &1176563068381732146 @@ -11092,6 +11304,138 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7565461932916702478 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1512093868322653456} + - component: {fileID: 437177066678571808} + - component: {fileID: 1597086614875563044} + - component: {fileID: 5920827796417423845} + m_Layer: 5 + m_Name: OptionsMinimizeButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1512093868322653456 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7565461932916702478} + 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: 1151533547217091628} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.32200003} + 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 &437177066678571808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7565461932916702478} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0} + 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: 5920827796417423845} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 7358076422430287421} + m_TargetAssemblyTypeName: Chat, MainMenu + m_MethodName: MinimizeOptions + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!222 &1597086614875563044 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7565461932916702478} + m_CullTransparentMesh: 1 +--- !u!114 &5920827796417423845 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7565461932916702478} + 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 &7578350076691661297 GameObject: m_ObjectHideFlags: 0 @@ -11126,10 +11470,10 @@ RectTransform: - {fileID: 8380534999606274333} m_Father: {fileID: 138673655222672912} 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: 60} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 430.12595, y: -160} + m_SizeDelta: {x: 860.2519, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &254980818737453949 CanvasRenderer: @@ -11953,10 +12297,10 @@ RectTransform: - {fileID: 8800638577999004078} m_Father: {fileID: 138673655222672912} 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: 60} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 430.12595, y: -550} + m_SizeDelta: {x: 860.2519, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6214129153517057071 CanvasRenderer: @@ -12796,10 +13140,10 @@ RectTransform: - {fileID: 1068313752643043768} m_Father: {fileID: 138673655222672912} 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: 60} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 430.12595, y: -680} + m_SizeDelta: {x: 860.2519, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8982252433388976969 CanvasRenderer: @@ -12895,6 +13239,231 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &8442546168124923564 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5860386545379866579} + - component: {fileID: 3532586438642007453} + - component: {fileID: 1963484652774863931} + - component: {fileID: 6928145096550785386} + - component: {fileID: 8337695890130130658} + m_Layer: 5 + m_Name: ButtonOpenSendButtons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5860386545379866579 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8442546168124923564} + 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: 7916536672776780153} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.89, y: 0} + m_AnchorMax: {x: 1, y: 0.24} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3532586438642007453 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8442546168124923564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6928145096550785386} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8442546168124923564} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 652102874510165360} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 4980087199686146618} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 2977898987667073549} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 6067375122463891519} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 8678484190465885865} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 7565461932916702478} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 +--- !u!222 &1963484652774863931 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8442546168124923564} + m_CullTransparentMesh: 1 +--- !u!114 &6928145096550785386 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8442546168124923564} + 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!114 &8337695890130130658 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8442546168124923564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 100 + m_MinHeight: -1 + m_PreferredWidth: 100 + m_PreferredHeight: -1 + m_FlexibleWidth: 0 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &8465531718494878061 GameObject: m_ObjectHideFlags: 0 @@ -12944,12 +13513,12 @@ GameObject: - component: {fileID: 1362996188009511178} - component: {fileID: 8822930230156111468} m_Layer: 5 - m_Name: SendButton + m_Name: SendButtonLove m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4390607825897656922 RectTransform: m_ObjectHideFlags: 0 @@ -12964,9 +13533,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2306716702012635805} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -155} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6592203742024091368 @@ -14253,10 +14822,10 @@ RectTransform: - {fileID: 1554884857088696786} m_Father: {fileID: 138673655222672912} 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: 60} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 430.12595, y: -485} + m_SizeDelta: {x: 860.2519, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &145976505952459430 CanvasRenderer: @@ -14672,6 +15241,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6016632658432163293, guid: e41290d0959bdfe47b62024b1a7a3c44, + type: 3} + propertyPath: m_fontSize + value: 28 + objectReference: {fileID: 0} - target: {fileID: 6221160951982613882, guid: e41290d0959bdfe47b62024b1a7a3c44, type: 3} propertyPath: m_Name @@ -14717,6 +15291,11 @@ PrefabInstance: propertyPath: m_ActiveFontFeatures.Array.data[0] value: 1801810542 objectReference: {fileID: 0} + - target: {fileID: 7584895158970224139, guid: e41290d0959bdfe47b62024b1a7a3c44, + type: 3} + propertyPath: m_fontSize + value: 28 + objectReference: {fileID: 0} - target: {fileID: 7734853749946393845, guid: e41290d0959bdfe47b62024b1a7a3c44, type: 3} propertyPath: m_ActiveFontFeatures.Array.data[0] @@ -15248,7 +15827,7 @@ PrefabInstance: - target: {fileID: 2641932565321544379, guid: 57890b7dbec8a984abb7d8148eefe9f6, type: 3} propertyPath: m_AnchorMin.y - value: 0.9620536 + value: 0.95971566 objectReference: {fileID: 0} - target: {fileID: 2853600601693954760, guid: 57890b7dbec8a984abb7d8148eefe9f6, type: 3} @@ -15278,12 +15857,12 @@ PrefabInstance: - target: {fileID: 3472046463813142143, guid: 57890b7dbec8a984abb7d8148eefe9f6, type: 3} propertyPath: m_AnchorMax.y - value: 0.8870101 + value: 0.88466954 objectReference: {fileID: 0} - target: {fileID: 3472046463813142143, guid: 57890b7dbec8a984abb7d8148eefe9f6, type: 3} propertyPath: m_AnchorMin.y - value: 0.19765218 + value: 0.19766153 objectReference: {fileID: 0} - target: {fileID: 3778881251723653096, guid: 57890b7dbec8a984abb7d8148eefe9f6, type: 3} @@ -15458,7 +16037,7 @@ PrefabInstance: - target: {fileID: 7827142668286818857, guid: 57890b7dbec8a984abb7d8148eefe9f6, type: 3} propertyPath: m_AnchorMax.y - value: 0.19765218 + value: 0.19766153 objectReference: {fileID: 0} - target: {fileID: 8620236399698832103, guid: 57890b7dbec8a984abb7d8148eefe9f6, type: 3} @@ -15470,6 +16049,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8620236399698832103, guid: 57890b7dbec8a984abb7d8148eefe9f6, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8620236399698832103, guid: 57890b7dbec8a984abb7d8148eefe9f6, type: 3} propertyPath: m_SizeDelta.y @@ -15483,12 +16067,12 @@ PrefabInstance: - target: {fileID: 9009743781400064838, guid: 57890b7dbec8a984abb7d8148eefe9f6, type: 3} propertyPath: m_AnchorMax.y - value: 0.9620536 + value: 0.95971566 objectReference: {fileID: 0} - target: {fileID: 9009743781400064838, guid: 57890b7dbec8a984abb7d8148eefe9f6, type: 3} propertyPath: m_AnchorMin.y - value: 0.8870101 + value: 0.88466954 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/MenuUi/Scripts/Chat/Chat.cs b/Assets/MenuUi/Scripts/Chat/Chat.cs index a6ef5fdfb..c8b50ca24 100644 --- a/Assets/MenuUi/Scripts/Chat/Chat.cs +++ b/Assets/MenuUi/Scripts/Chat/Chat.cs @@ -3,6 +3,7 @@ using TMPro; using System.Collections.Generic; using UnityEngine.EventSystems; +using System.Collections; public class Chat : MonoBehaviour { @@ -30,6 +31,12 @@ public class Chat : MonoBehaviour public ScrollRect globalChatScrollRect; public ScrollRect clanChatScrollRect; + [Header("Minimize")] + public GameObject quickMessages; + public GameObject[] sendButtons; + public GameObject buttonOpenSendButtons; + public GameObject optionsMinimizeButton; + private ScrollRect currentScrollRect; // Tällä hetkellä aktiivinen Scroll Rect private GameObject currentPrefab; // Tällä hetkellä valittu message Prefab @@ -108,6 +115,7 @@ public void SendChatMessage() DisplayMessage(inputField.text); inputField.text = ""; this.GetComponent().UpdateProgress("1"); + MinimizeOptions(); } else { @@ -157,8 +165,7 @@ public void DisplayMessage(string messageText) { if (currentContent != null) { - Canvas.ForceUpdateCanvases(); - currentScrollRect.verticalNormalizedPosition = 0f; + StartCoroutine(UpdateLayoutAndScroll()); shouldScroll = false; } else @@ -173,6 +180,17 @@ public void DisplayMessage(string messageText) } } + private IEnumerator UpdateLayoutAndScroll() + { + yield return null; + + Canvas.ForceUpdateCanvases(); + + yield return null; + + currentScrollRect.verticalNormalizedPosition = 0f; + } + // Lisää vuorovaikutuksen viestiin (klikkauksen) public void AddMessageInteraction(GameObject message) { @@ -306,14 +324,35 @@ public void LanguageChatActive() Debug.Log("Kielivalinnan mukainen Chat aktivoitu"); } + + private int chosenButton; // Asettaa sinisen viestipohjan ja lähettää viestin - public void SetBluePrefab() { currentPrefab = messagePrefabBlue; SendChatMessage(); } + public void SetBluePrefab() { currentPrefab = messagePrefabBlue; chosenButton = 0; SendChatMessage(); } // Asettaa punaisen viestipohjan ja lähettää viestin - public void SetRedPrefab() { currentPrefab = messagePrefabRed; SendChatMessage(); } + public void SetRedPrefab() { currentPrefab = messagePrefabRed; chosenButton = 1; SendChatMessage(); } // Asettaa keltaisen viestipohjan ja lähettää viestin - public void SetYellowPrefab() { currentPrefab = messagePrefabYellow; SendChatMessage(); } + public void SetYellowPrefab() { currentPrefab = messagePrefabYellow; chosenButton = 2; SendChatMessage(); } // Asettaa oranssin viestipohjan ja lähettää viestin - public void SetOrangePrefab() { currentPrefab = messagePrefabOrange; SendChatMessage(); } + public void SetOrangePrefab() { currentPrefab = messagePrefabOrange; chosenButton = 3; SendChatMessage(); } // Asettaa vaaleanpunaisen viestipohjan ja lähettää viestin - public void SetPinkPrefab() { currentPrefab = messagePrefabPink; SendChatMessage(); } + public void SetPinkPrefab() { currentPrefab = messagePrefabPink; chosenButton = 4; SendChatMessage(); } + + /// + /// Minimizes quick messages panel and send buttons. Last used send button is the one left visible. + /// + public void MinimizeOptions() + { + quickMessages.SetActive(false); + + for (int i = 0; i < sendButtons.Length; i++) + { + if(i != chosenButton) + { + sendButtons[i].SetActive(false); + } + } + + buttonOpenSendButtons.SetActive(true); + optionsMinimizeButton.SetActive(false); + } }