diff --git a/Assets/Prefabs/Message.prefab b/Assets/Prefabs/Message.prefab index c37443a..8b9673c 100644 --- a/Assets/Prefabs/Message.prefab +++ b/Assets/Prefabs/Message.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: New Text + m_text: New Text m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index a264e1b..8a9ed5b 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -185,7 +185,6 @@ GameObject: - component: {fileID: 1284257434} - component: {fileID: 1284257433} - component: {fileID: 1284257432} - - component: {fileID: 1284257435} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -248,7 +247,7 @@ Camera: m_HDR: 1 m_AllowMSAA: 1 m_AllowDynamicResolution: 0 - m_ForceIntoRT: 1 + m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 @@ -267,26 +266,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1284257435 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1284257431} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6a160d838ff8b4b4693ac20007e008c7, type: 3} - m_Name: - m_EditorClassIdentifier: - m_AssetsPPU: 100 - m_RefResolutionX: 320 - m_RefResolutionY: 180 - m_UpscaleRT: 1 - m_PixelSnapping: 0 - m_CropFrameX: 1 - m_CropFrameY: 1 - m_StretchFill: 0 --- !u!1 &1741129166 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Messaging/MessageManager.cs b/Assets/Scripts/Messaging/MessageManager.cs index f5eb7c2..b2657c3 100644 --- a/Assets/Scripts/Messaging/MessageManager.cs +++ b/Assets/Scripts/Messaging/MessageManager.cs @@ -14,15 +14,15 @@ namespace Messaging { private async void Start() { await Task.Delay(2000); - CreateMessage("asl;dkrhjufioe qvnfioeqlcnnmcuq"); + CreateMessage(""); await Task.Delay(2000); - CreateMessage("asl;dkrhjufioe qvnfioeqlcnnmcuq"); + CreateMessage(""); await Task.Delay(2000); - CreateMessage("asl;dkrhjufioe qvnfioeqlcnnmcuq"); + CreateMessage(""); await Task.Delay(2000); - CreateMessage("asl;dkrhjufioe qvnfioeqlcnnmcuq"); + CreateMessage(""); await Task.Delay(2000); - CreateMessage("asl;dkrhjufioe qvnfioeqlcnnmcuq"); + CreateMessage(""); } public void CreateMessage(string message) { diff --git a/Assets/Scripts/Messaging/MessageStructureGenerator.cs b/Assets/Scripts/Messaging/MessageStructureGenerator.cs index d858b2a..0b6b532 100644 --- a/Assets/Scripts/Messaging/MessageStructureGenerator.cs +++ b/Assets/Scripts/Messaging/MessageStructureGenerator.cs @@ -19,8 +19,8 @@ namespace Messaging { } private Message GenerateMessage(int offsetY) { - Message message = Instantiate(messagePrefab, Vector2.zero, Quaternion.identity, transform); - message.RectTransform.anchoredPosition = new Vector2(0, -offsetY); + Message message = Instantiate(messagePrefab, Vector3.zero, Quaternion.identity, transform); + message.RectTransform.anchoredPosition3D = new Vector2(0, -offsetY); return message; } } diff --git a/Assets/Sprites.meta b/Assets/Sprites.meta new file mode 100644 index 0000000..ce7c7c3 --- /dev/null +++ b/Assets/Sprites.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 33df446cd094cd3448f5b542424251fc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Sprite-0001.asset b/Assets/Sprites/Sprite-0001.asset new file mode 100644 index 0000000..0c6d4ee --- /dev/null +++ b/Assets/Sprites/Sprite-0001.asset @@ -0,0 +1,108 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 84a92b25f83d49b9bc132d206b370281, type: 3} + m_Name: Sprite-0001 + m_EditorClassIdentifier: + hashCode: -1579524987 + material: {fileID: 8949633185332001125} + materialHashCode: 0 + m_Version: 1.1.0 + m_FaceInfo: + m_FaceIndex: 0 + m_FamilyName: + m_StyleName: + m_PointSize: 0 + m_Scale: 0 + m_UnitsPerEM: 0 + m_LineHeight: 0 + m_AscentLine: 0 + m_CapLine: 0 + m_MeanLine: 0 + m_Baseline: 0 + m_DescentLine: 0 + m_SuperscriptOffset: 0 + m_SuperscriptSize: 0 + m_SubscriptOffset: 0 + m_SubscriptSize: 0 + m_UnderlineOffset: 0 + m_UnderlineThickness: 0 + m_StrikethroughOffset: 0 + m_StrikethroughThickness: 0 + m_TabWidth: 0 + spriteSheet: {fileID: 2800000, guid: 801ac9074fdefb740bd8d86392c3d0d5, type: 3} + m_SpriteCharacterTable: + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 0 + m_Scale: 1 + m_Name: Sprite-0001 + m_HashCode: -1579524987 + m_SpriteGlyphTable: + - m_Index: 0 + m_Metrics: + m_Width: 16 + m_Height: 16 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 16 + m_HorizontalAdvance: 16 + m_GlyphRect: + m_X: 0 + m_Y: 0 + m_Width: 16 + m_Height: 16 + m_Scale: 1 + m_AtlasIndex: 0 + m_ClassDefinitionType: 0 + sprite: {fileID: 21300000, guid: 801ac9074fdefb740bd8d86392c3d0d5, type: 3} + spriteInfoList: [] + fallbackSpriteAssets: [] +--- !u!21 &8949633185332001125 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TextMeshPro/Sprite + m_Shader: {fileID: 4800000, guid: cf81c85f95fe47e1a27f6ae460cf182c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 801ac9074fdefb740bd8d86392c3d0d5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _CullMode: 0 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Sprites/Sprite-0001.asset.meta b/Assets/Sprites/Sprite-0001.asset.meta new file mode 100644 index 0000000..4e0bc94 --- /dev/null +++ b/Assets/Sprites/Sprite-0001.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c6efd181f7c7e0e4a948f2794e650a40 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Sprite-0001.png b/Assets/Sprites/Sprite-0001.png new file mode 100644 index 0000000..7eff69b Binary files /dev/null and b/Assets/Sprites/Sprite-0001.png differ diff --git a/Assets/Sprites/Sprite-0001.png.meta b/Assets/Sprites/Sprite-0001.png.meta new file mode 100644 index 0000000..de58c2f --- /dev/null +++ b/Assets/Sprites/Sprite-0001.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 801ac9074fdefb740bd8d86392c3d0d5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Sprite-0001_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 16 + height: 16 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ca947ab33b6e8564dba75a30becbe283 + internalID: -1793815795 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Sprite-0001_0: -1793815795 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Resources/TMP Settings.asset b/Assets/TextMesh Pro/Resources/TMP Settings.asset index c09a92f..b44c43b 100644 --- a/Assets/TextMesh Pro/Resources/TMP Settings.asset +++ b/Assets/TextMesh Pro/Resources/TMP Settings.asset @@ -29,18 +29,16 @@ MonoBehaviour: m_defaultTextMeshProTextContainerSize: {x: 20, y: 5} m_defaultTextMeshProUITextContainerSize: {x: 200, y: 50} m_autoSizeTextContainer: 0 + m_IsTextObjectScaleStatic: 0 m_fallbackFontAssets: [] m_matchMaterialPreset: 1 - m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45, - type: 2} + m_defaultSpriteAsset: {fileID: 11400000, guid: c6efd181f7c7e0e4a948f2794e650a40, type: 2} m_defaultSpriteAssetPath: Sprite Assets/ m_enableEmojiSupport: 1 m_MissingCharacterSpriteUnicode: 0 m_defaultColorGradientPresetsPath: Color Gradient Presets/ - m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e, - type: 2} + m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e, type: 2} m_StyleSheetsResourcePath: m_leadingCharacters: {fileID: 4900000, guid: d82c1b31c7e74239bff1220585707d2b, type: 3} - m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b, - type: 3} + m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b, type: 3} m_UseModernHangulLineBreakingRules: 0