From 616d77467f3d45d7d32808d7696f5e99161bb2a9 Mon Sep 17 00:00:00 2001 From: Josh Date: Sat, 18 Feb 2023 01:09:00 -0500 Subject: [PATCH 1/2] text-only --- .../Assets/Prefabs/Player Prefab.prefab | 52 ----------- namedropper/Assets/Scenes/Game.unity | 64 ++++++++++++++ namedropper/Assets/Scenes/TopicSelect.unity | 88 ++++++++++++++++++- namedropper/Assets/Scripts/Player.cs | 2 +- .../LiberationSans SDF.asset | 4 +- 5 files changed, 151 insertions(+), 59 deletions(-) diff --git a/namedropper/Assets/Prefabs/Player Prefab.prefab b/namedropper/Assets/Prefabs/Player Prefab.prefab index 289efc6..33bff99 100644 --- a/namedropper/Assets/Prefabs/Player Prefab.prefab +++ b/namedropper/Assets/Prefabs/Player Prefab.prefab @@ -186,7 +186,6 @@ GameObject: m_Component: - component: {fileID: 9049015333349338420} - component: {fileID: 9049015333349338377} - - component: {fileID: 9049015333349338379} - component: {fileID: 9049015333349338422} - component: {fileID: 9049015333349338423} - component: {fileID: 9049015333349338378} @@ -239,57 +238,6 @@ MonoBehaviour: _forTopicSelect: 0 _playerNumber: 0 _spriteOptions: [] ---- !u!212 &9049015333349338379 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9049015333349338381} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 2 - m_Sprite: {fileID: 21300000, guid: 53a3b3c44060d8e40b7a2bc4b844e364, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 157, y: 164} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!58 &9049015333349338422 CircleCollider2D: m_ObjectHideFlags: 0 diff --git a/namedropper/Assets/Scenes/Game.unity b/namedropper/Assets/Scenes/Game.unity index dab3720..4239261 100644 --- a/namedropper/Assets/Scenes/Game.unity +++ b/namedropper/Assets/Scenes/Game.unity @@ -209,6 +209,22 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1929977604} m_Modifications: + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.g + value: 0.23703766 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor32.rgba + value: 4294917120 + objectReference: {fileID: 0} - target: {fileID: 9049015333299688696, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_Text value: Josh @@ -974,6 +990,22 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1929977604} m_Modifications: + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.g + value: 0.039973527 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor32.rgba + value: 4278192895 + objectReference: {fileID: 0} - target: {fileID: 9049015333349338377, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: _team value: 0 @@ -3943,6 +3975,22 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1929977604} m_Modifications: + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.b + value: 0.09437685 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.r + value: 0.6509434 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor32.rgba + value: 4279763110 + objectReference: {fileID: 0} - target: {fileID: 9049015333299688696, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_Text value: Josh @@ -4312,6 +4360,22 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1929977604} m_Modifications: + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.g + value: 0.7799194 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor32.rgba + value: 4294952704 + objectReference: {fileID: 0} - target: {fileID: 9049015333349338377, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: _team value: 1 diff --git a/namedropper/Assets/Scenes/TopicSelect.unity b/namedropper/Assets/Scenes/TopicSelect.unity index 70a4925..d72d893 100644 --- a/namedropper/Assets/Scenes/TopicSelect.unity +++ b/namedropper/Assets/Scenes/TopicSelect.unity @@ -184,7 +184,27 @@ PrefabInstance: m_Modifications: - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_text - value: "\t" + value: Player\u00A01 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontSize + value: 44.25 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.g + value: 0.9441657 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor32.rgba + value: 4294963456 objectReference: {fileID: 0} - target: {fileID: 9049015333349338377, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: _team @@ -377,7 +397,27 @@ PrefabInstance: m_Modifications: - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_text - value: "\t" + value: Player\u00A04 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontSize + value: 42.65 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.b + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.g + value: 0.27615115 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor32.rgba + value: 4282402559 objectReference: {fileID: 0} - target: {fileID: 9049015333349338377, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: _team @@ -547,7 +587,27 @@ PrefabInstance: m_Modifications: - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_text - value: "\t" + value: Player\u00A03 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontSize + value: 42.25 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.b + value: 0.12253404 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.r + value: 0.7169812 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor32.rgba + value: 4280221879 objectReference: {fileID: 0} - target: {fileID: 9049015333299688696, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_Text @@ -860,7 +920,27 @@ PrefabInstance: m_Modifications: - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_text - value: "\t" + value: Player\u00A02 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontSize + value: 42.65 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.g + value: 0.306108 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: m_fontColor32.rgba + value: 4294921728 objectReference: {fileID: 0} - target: {fileID: 9049015333299688696, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_Text diff --git a/namedropper/Assets/Scripts/Player.cs b/namedropper/Assets/Scripts/Player.cs index 7cf2025..f59530f 100644 --- a/namedropper/Assets/Scripts/Player.cs +++ b/namedropper/Assets/Scripts/Player.cs @@ -32,7 +32,7 @@ public class Player : MonoBehaviour private void Awake() { - GetComponent().sprite = _spriteOptions[GameManager.PLAYER_SKIN]; + //GetComponent().sprite = _spriteOptions[GameManager.PLAYER_SKIN]; _rigidbody = GetComponent(); _text = transform.GetChild(0).GetComponent(); _game = FindObjectOfType(); diff --git a/namedropper/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset b/namedropper/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset index 87168f7..081ab4c 100644 --- a/namedropper/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset +++ b/namedropper/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset @@ -33,9 +33,9 @@ Material: - _OutlineSoftness: 0 - _OutlineWidth: 0 - _PerspectiveFilter: 0.875 - - _ScaleRatioA: 1 + - _ScaleRatioA: 0.9 - _ScaleRatioB: 1 - - _ScaleRatioC: 1 + - _ScaleRatioC: 0.73125 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 From bc676d31c42400b7caa4dda01d1507f40a7846b3 Mon Sep 17 00:00:00 2001 From: Josh Date: Sun, 19 Feb 2023 15:11:20 -0500 Subject: [PATCH 2/2] version tested with Justin and SAm --- namedropper/Assets/Scenes/Game.unity | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/namedropper/Assets/Scenes/Game.unity b/namedropper/Assets/Scenes/Game.unity index 4239261..0c56115 100644 --- a/namedropper/Assets/Scenes/Game.unity +++ b/namedropper/Assets/Scenes/Game.unity @@ -996,7 +996,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.g - value: 0.039973527 + value: 0.36163178 objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor.r @@ -1004,7 +1004,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_fontColor32.rgba - value: 4278192895 + value: 4278213887 objectReference: {fileID: 0} - target: {fileID: 9049015333349338377, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: _team