diff --git a/Assets/Prefabs/Panels/BrushesPanel.prefab b/Assets/Prefabs/Panels/BrushesPanel.prefab index f05e14935..e33632aae 100644 --- a/Assets/Prefabs/Panels/BrushesPanel.prefab +++ b/Assets/Prefabs/Panels/BrushesPanel.prefab @@ -5076,11 +5076,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, type: 3} propertyPath: m_LocalPosition.y - value: 0.145 + value: -0.26 objectReference: {fileID: 0} - target: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, type: 3} propertyPath: m_LocalPosition.z - value: 0.006 + value: 0.04 objectReference: {fileID: 0} - target: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Prefabs/Panels/BrushesPanel_Mobile.prefab b/Assets/Prefabs/Panels/BrushesPanel_Mobile.prefab index 1a75c0fd3..05f48783b 100644 --- a/Assets/Prefabs/Panels/BrushesPanel_Mobile.prefab +++ b/Assets/Prefabs/Panels/BrushesPanel_Mobile.prefab @@ -27,6 +27,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1058414191071464} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.64699984, y: -0.21899986, z: 0.05000019} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} @@ -35,7 +36,6 @@ Transform: - {fileID: 4980129379857646} - {fileID: 4336857922903122} m_Father: {fileID: 4218283724290616} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33829579923079940 MeshFilter: @@ -112,6 +112,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 8 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 0} @@ -138,9 +147,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1058414191071464} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.0000001, y: 1.0000001, z: 0.025} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1083883430886350 @@ -169,13 +186,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1083883430886350} + serializedVersion: 2 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: 4262501330086264} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 4.574, y: -62.7954, z: 0} --- !u!33 &33232768086799094 MeshFilter: @@ -265,13 +282,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1085901682039170} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.25, y: -0.25, z: -0.05} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4919321322644624} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33962602204690344 MeshFilter: @@ -347,13 +364,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1103716007502724} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: -0, z: 0.05} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4262501330086264} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33906815294370636 MeshFilter: @@ -389,6 +406,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1119189097058054} + serializedVersion: 2 m_LocalRotation: {x: 0.034062065, y: -0.52056015, z: 0.020789683, w: 0.852892} m_LocalPosition: {x: -12.256248, y: 9.122084, z: 3.5018842} m_LocalScale: {x: 1, y: 1, z: 1} @@ -397,8 +415,8 @@ Transform: - {fileID: 4204026960391338} - {fileID: 4578343200855608} - {fileID: 4262501330086264} + - {fileID: 1343216314990874693} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 4.574, y: -62.7954, z: 0} --- !u!114 &114655130322712890 MonoBehaviour: @@ -542,13 +560,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1138426446375662} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.25, y: -0.25, z: -0.05} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4635115123912042} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33148732521409060 MeshFilter: @@ -627,6 +645,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1186826680350636} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.21400023, y: 0.6289997, z: 0.05000019} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} @@ -635,7 +654,6 @@ Transform: - {fileID: 4643240604885268} - {fileID: 4852671337294226} m_Father: {fileID: 4218283724290616} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33670466575045350 MeshFilter: @@ -712,6 +730,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 8 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 0} @@ -738,9 +765,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1186826680350636} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.0000001, y: 1.0000001, z: 0.025} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1193249063360678 @@ -768,13 +803,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1193249063360678} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.250001, y: -0.25000095, z: -0.049999934} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4499118054183530} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33596694001206824 MeshFilter: @@ -851,13 +886,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1211353507619724} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.250001, y: -0.25000095, z: -0.049999934} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4112838380170586} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33950639601530010 MeshFilter: @@ -934,13 +969,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1216868067511642} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.25, y: -0.25, z: -0.05} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4745565324966208} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33286962047810642 MeshFilter: @@ -1019,6 +1054,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1240710088958898} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.64699984, y: 0.21100044, z: 0.05000019} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} @@ -1027,7 +1063,6 @@ Transform: - {fileID: 4404283085811178} - {fileID: 4709401090306618} m_Father: {fileID: 4218283724290616} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33434504902454900 MeshFilter: @@ -1104,6 +1139,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 8 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 0} @@ -1130,9 +1174,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1240710088958898} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.0000001, y: 1.0000001, z: 0.025} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1244779604786196 @@ -1160,13 +1212,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1244779604786196} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.25000027, y: -0.25, z: -0.049999926} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4427406993299286} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33864810670875618 MeshFilter: @@ -1243,13 +1295,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1268333643522296} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.25, y: -0.25, z: -0.05} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4499118054183530} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33182025628817704 MeshFilter: @@ -1328,6 +1380,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1297590146505348} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.64699984, y: 0.6289997, z: 0.05000019} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} @@ -1336,7 +1389,6 @@ Transform: - {fileID: 4821554448650398} - {fileID: 4712261802085726} m_Father: {fileID: 4218283724290616} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33945842074703724 MeshFilter: @@ -1413,6 +1465,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 8 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 0} @@ -1439,9 +1500,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1297590146505348} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.0000001, y: 1.0000001, z: 0.025} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1352109191960432 @@ -1469,13 +1538,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1352109191960432} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.25, y: -0.25, z: -0.05} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4112838380170586} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33588722846769574 MeshFilter: @@ -1554,6 +1623,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1364078719353600} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.64699984, y: 0.6289997, z: 0.05000019} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} @@ -1562,7 +1632,6 @@ Transform: - {fileID: 4561141709141812} - {fileID: 4168229079718132} m_Father: {fileID: 4218283724290616} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33063928819510806 MeshFilter: @@ -1639,6 +1708,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 8 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 0} @@ -1665,9 +1743,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1364078719353600} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.0000001, y: 1.0000001, z: 0.025} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1387716348806134 @@ -1695,13 +1781,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1387716348806134} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.25, y: -0.25, z: -0.05} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4126013512449192} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33574619786469024 MeshFilter: @@ -1780,6 +1866,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1467429439201416} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.21400023, y: -0.21899986, z: 0.05000019} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} @@ -1788,7 +1875,6 @@ Transform: - {fileID: 4853608897367684} - {fileID: 4369157395221718} m_Father: {fileID: 4218283724290616} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33069631729019714 MeshFilter: @@ -1865,6 +1951,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 8 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 0} @@ -1891,9 +1986,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1467429439201416} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.0000001, y: 1.0000001, z: 0.025} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1477318144670002 @@ -1923,13 +2026,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1477318144670002} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.6339998, y: -0.6370001, z: 0.05000019} m_LocalScale: {x: 0.29999995, y: 0.29999998, z: 0.3000001} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4218283724290616} - m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33121097593193784 MeshFilter: @@ -1989,9 +2092,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1477318144670002} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 0.01} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &114887031890454866 @@ -2019,6 +2130,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 2800000, guid: ab8b9a0b96b6cb74ca1e518f3c56b425, type: 3} @@ -2065,6 +2185,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1496261736206120} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.21400023, y: 0.6289997, z: 0.05000019} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} @@ -2073,7 +2194,6 @@ Transform: - {fileID: 4407059440980384} - {fileID: 4071958273888044} m_Father: {fileID: 4218283724290616} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33687396251989378 MeshFilter: @@ -2150,6 +2270,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 8 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 0} @@ -2176,9 +2305,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1496261736206120} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.0000001, y: 1.0000001, z: 0.025} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1541022397896848 @@ -2206,13 +2343,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1541022397896848} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.25, y: -0.25, z: -0.049999926} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4126013512449192} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33176133485144398 MeshFilter: @@ -2287,6 +2424,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1552050041013830} + serializedVersion: 2 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} @@ -2297,7 +2435,6 @@ Transform: - {fileID: 4404169667267474} - {fileID: 4799943180469330} m_Father: {fileID: 4283814734408908} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1562875133912318 GameObject: @@ -2324,13 +2461,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1562875133912318} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.25, y: -0.25, z: -0.049999926} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4745565324966208} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33015736571262038 MeshFilter: @@ -2406,13 +2543,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1572614490045680} + serializedVersion: 2 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: 4262501330086264} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &65963000711119570 BoxCollider: @@ -2422,9 +2559,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1572614490045680} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.9, y: 1.9, z: 0.02} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1609012604900488 @@ -2452,13 +2597,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1609012604900488} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.25000027, y: -0.25, z: -0.049999926} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4635115123912042} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33089349128830104 MeshFilter: @@ -2535,13 +2680,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1621156500989810} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.25, y: -0.25, z: -0.05} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4195160479732622} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33140344032387366 MeshFilter: @@ -2620,6 +2765,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1632985123738494} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.21400023, y: 0.21100044, z: 0.05000019} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} @@ -2628,7 +2774,6 @@ Transform: - {fileID: 4343642231580014} - {fileID: 4303631290832536} m_Father: {fileID: 4218283724290616} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33286233296174550 MeshFilter: @@ -2705,6 +2850,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 8 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 0} @@ -2731,9 +2885,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1632985123738494} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.0000001, y: 1.0000001, z: 0.025} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1633808620163262 @@ -2761,13 +2923,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1633808620163262} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.25, y: -0.25, z: -0.05} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4206574239112854} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33029057915814752 MeshFilter: @@ -2844,13 +3006,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1663662598384544} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.25, y: -0.25, z: -0.05} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4427406993299286} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33061096735157338 MeshFilter: @@ -2929,6 +3091,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1725842912189370} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.64699984, y: 0.21100044, z: 0.05000019} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} @@ -2937,7 +3100,6 @@ Transform: - {fileID: 4634057245373120} - {fileID: 4570503017862772} m_Father: {fileID: 4218283724290616} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33784614468687708 MeshFilter: @@ -3014,6 +3176,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 8 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 0} @@ -3040,9 +3211,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1725842912189370} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.0000001, y: 1.0000001, z: 0.025} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1758917389014430 @@ -3070,13 +3249,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1758917389014430} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.25, y: -0.25, z: -0.049999926} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4206574239112854} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33836731073942734 MeshFilter: @@ -3153,13 +3332,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1778865231537526} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.25, y: -0.25, z: -0.05} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4135665873458212} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33361690734344536 MeshFilter: @@ -3238,13 +3417,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1809602046009930} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.6160002, y: -0.6370001, z: 0.05000019} m_LocalScale: {x: 0.29999995, y: 0.29999998, z: 0.3000001} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4218283724290616} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33475352732982568 MeshFilter: @@ -3304,9 +3483,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1809602046009930} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 0.01} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &114619252139223240 @@ -3334,6 +3521,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 2800000, guid: f74f6eac3e3e3c640b1a343ec46ba2dd, type: 3} @@ -3378,13 +3574,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1822824095780682} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.250001, y: -0.25000098, z: -0.049999926} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4919321322644624} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33121160248624278 MeshFilter: @@ -3463,6 +3659,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1823816310067468} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.21400023, y: 0.21100044, z: 0.05000019} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} @@ -3471,7 +3668,6 @@ Transform: - {fileID: 4658181519975404} - {fileID: 4659436650145310} m_Father: {fileID: 4218283724290616} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33731117596138066 MeshFilter: @@ -3548,6 +3744,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 8 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 0} @@ -3574,9 +3779,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1823816310067468} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.0000001, y: 1.0000001, z: 0.025} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1826016046196850 @@ -3604,13 +3817,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1826016046196850} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.2500004, y: -0.25000095, z: -0.049999654} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4195160479732622} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33690381368566602 MeshFilter: @@ -3687,13 +3900,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1853609275384804} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.25, y: -0.25, z: -0.049999926} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4269592690076886} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33949272424441370 MeshFilter: @@ -3772,6 +3985,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1856811985082432} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.21400023, y: -0.21899986, z: 0.05000019} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} @@ -3780,7 +3994,6 @@ Transform: - {fileID: 4627296858957054} - {fileID: 4772817652619804} m_Father: {fileID: 4218283724290616} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33034592604580924 MeshFilter: @@ -3857,6 +4070,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 8 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 0} @@ -3883,9 +4105,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1856811985082432} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.0000001, y: 1.0000001, z: 0.025} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1865684630343422 @@ -3915,6 +4145,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1865684630343422} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.64699984, y: -0.21899986, z: 0.05000019} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} @@ -3923,7 +4154,6 @@ Transform: - {fileID: 4873379009260372} - {fileID: 4334570224379938} m_Father: {fileID: 4218283724290616} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33758751416636830 MeshFilter: @@ -4000,6 +4230,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 8 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 0} @@ -4026,9 +4265,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1865684630343422} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.0000001, y: 1.0000001, z: 0.025} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1898079655448966 @@ -4056,13 +4303,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1898079655448966} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.25, y: -0.25, z: -0.049999926} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4914655778411374} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33924063209100840 MeshFilter: @@ -4139,13 +4386,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1910235469589772} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.25, y: -0.25, z: -0.05} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4914655778411374} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33832440501447474 MeshFilter: @@ -4223,6 +4470,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1930707074163008} + serializedVersion: 2 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} @@ -4243,7 +4491,6 @@ Transform: - {fileID: 4995525888944572} - {fileID: 4185013486352696} m_Father: {fileID: 4262501330086264} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 4.574, y: -62.7954, z: 0} --- !u!114 &114291947272354016 MonoBehaviour: @@ -4270,6 +4517,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_PrevButton: {fileID: 1809602046009930} @@ -4290,9 +4546,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1930707074163008} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.8, y: 1.8, z: 0.01} m_Center: {x: 0, y: 0, z: -0.05} --- !u!114 &114719984306980722 @@ -4332,13 +4596,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1938820135156418} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4283814734408908} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33388559943476218 MeshFilter: @@ -4415,13 +4679,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1965207530917036} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.25, y: -0.25, z: -0.049999926} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4135665873458212} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33858302406373116 MeshFilter: @@ -4497,13 +4761,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1968419465027758} + serializedVersion: 2 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: 4283814734408908} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &65991805485152614 BoxCollider: @@ -4513,9 +4777,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1968419465027758} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 2.4, y: 2.4, z: 0.5} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1968830271372814 @@ -4543,13 +4815,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1968830271372814} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.25, y: -0.25, z: -0.05} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4269592690076886} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33144485263834602 MeshFilter: @@ -4601,3 +4873,66 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1001 &1345002710036633993 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4283814734408908} + m_Modifications: + - target: {fileID: 1503094713155990, guid: ef594e7ddc7909f429747f1ebbe8af90, type: 3} + propertyPath: m_Name + value: BrushSettingsTray + objectReference: {fileID: 0} + - target: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, type: 3} + propertyPath: m_LocalPosition.x + value: 0.959 + objectReference: {fileID: 0} + - target: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, type: 3} + propertyPath: m_LocalPosition.y + value: -0.233 + objectReference: {fileID: 0} + - target: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, type: 3} + propertyPath: m_LocalPosition.z + value: 0.006 + objectReference: {fileID: 0} + - target: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ef594e7ddc7909f429747f1ebbe8af90, type: 3} +--- !u!4 &1343216314990874693 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, + type: 3} + m_PrefabInstance: {fileID: 1345002710036633993} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Panels/Widgets/AdvancedSlider.prefab b/Assets/Prefabs/Panels/Widgets/AdvancedSlider.prefab index 6a9990fc3..9662ca99c 100644 --- a/Assets/Prefabs/Panels/Widgets/AdvancedSlider.prefab +++ b/Assets/Prefabs/Panels/Widgets/AdvancedSlider.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4471627121253715424} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -203,7 +202,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4471627121253688460} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -375,7 +373,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4471627121253688460} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -521,6 +518,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4471627121253806520} m_Modifications: - target: {fileID: 7630606763700834929, guid: 0963942396a615f4fb1b390436e881b8, @@ -674,12 +672,22 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0963942396a615f4fb1b390436e881b8, type: 3} +--- !u!4 &7130468635975133489 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + m_PrefabInstance: {fileID: 800866435964202640} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3712291086473841850 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 975834435811877436, guid: ebe6fa705c559de4084f3b11e7668c61, @@ -934,6 +942,41 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8879551121032234077} + - targetCorrespondingSourceObject: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7824979537496111407} + - targetCorrespondingSourceObject: {fileID: 975834435814146394, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1884626016259365661} + - targetCorrespondingSourceObject: {fileID: 975834435814114336, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + insertIndex: -1 + addedObject: {fileID: 821352009802746643} + - targetCorrespondingSourceObject: {fileID: 975834435814062736, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2151883694999471845} + - targetCorrespondingSourceObject: {fileID: 975834435814035598, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1004010000664055458} + - targetCorrespondingSourceObject: {fileID: 975834435814079746, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7130468635975133489} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 975834435814379478, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2514466698640951438} m_SourcePrefab: {fileID: 100100000, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} --- !u!1 &4471627121253417836 stripped GameObject: @@ -958,20 +1001,20 @@ MonoBehaviour: m_DescriptionText: m_LocalizedDescription: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: m_TableEntryReference: m_KeyId: 0 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] - m_DescriptionTextExtra: + m_DescriptionTextExtra: m_LocalizedDescriptionExtra: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: m_TableEntryReference: m_KeyId: 0 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] @@ -979,6 +1022,7 @@ MonoBehaviour: m_DescriptionZScale: 10 m_Nob: {fileID: 4471627121253469398} m_Mesh: {fileID: 4471627121255601424} + m_Orientation: 0 m_DisplayDecimalPlaces: 1 m_Param1: 0 m_Param2: 0 @@ -1051,6 +1095,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4471627121253681306} m_Modifications: - target: {fileID: 7630606763700834929, guid: 0963942396a615f4fb1b390436e881b8, @@ -1204,12 +1249,22 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0963942396a615f4fb1b390436e881b8, type: 3} +--- !u!4 &821352009802746643 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + m_PrefabInstance: {fileID: 7102101814680079538} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7207810488610326787 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4471627121253768244} m_Modifications: - target: {fileID: 7630606763700834929, guid: 0963942396a615f4fb1b390436e881b8, @@ -1363,12 +1418,22 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0963942396a615f4fb1b390436e881b8, type: 3} +--- !u!4 &1004010000664055458 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + m_PrefabInstance: {fileID: 7207810488610326787} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8373522546168381764 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4471627121253758506} m_Modifications: - target: {fileID: 7630606763700834929, guid: 0963942396a615f4fb1b390436e881b8, @@ -1522,4 +1587,13 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0963942396a615f4fb1b390436e881b8, type: 3} +--- !u!4 &2151883694999471845 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + m_PrefabInstance: {fileID: 8373522546168381764} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab b/Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab index 8f35066f9..8d30b1e55 100644 --- a/Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab +++ b/Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab @@ -25,16 +25,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1366882551601991066} - m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.6666667} m_LocalScale: {x: 17.2374, y: 51.7122, z: 51.7122} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4471627121253715424} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} + 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: -0.15, y: -5.13} + m_AnchoredPosition: {x: 3.44, y: -0.1} m_SizeDelta: {x: 0.2, y: 0.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &4220200482343937391 @@ -205,7 +205,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: 0.0072000995, y: 0.26099947} + m_AnchoredPosition: {x: 0.00020009885, y: 0.27699983} m_SizeDelta: {x: 0.2, y: 0.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &1495263022959812396 @@ -376,7 +376,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: 0.002500397, y: -0.3080006} + m_AnchoredPosition: {x: 0.005, y: -0.29300058} m_SizeDelta: {x: 0.2, y: 0.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &6476449211560461609 @@ -693,22 +693,27 @@ PrefabInstance: - target: {fileID: 975834435811877436, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_Size.x - value: 0.9999999 + value: 0.3349072 objectReference: {fileID: 0} - target: {fileID: 975834435811877436, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_Size.y - value: 4.206745 + value: 2.7804582 objectReference: {fileID: 0} - target: {fileID: 975834435811877436, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_Size.z value: 0.040708233 objectReference: {fileID: 0} + - target: {fileID: 975834435811877436, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_Center.x + value: -0.007917739 + objectReference: {fileID: 0} - target: {fileID: 975834435811877436, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_Center.y - value: 1.6033727 + value: -0.06772725 objectReference: {fileID: 0} - target: {fileID: 975834435811877436, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} @@ -718,17 +723,17 @@ PrefabInstance: - target: {fileID: 975834435814035598, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_LocalPosition.x - value: -0.002 + value: 0.00049960264 objectReference: {fileID: 0} - target: {fileID: 975834435814035598, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_LocalPosition.y - value: -0.308 + value: -0.293 objectReference: {fileID: 0} - target: {fileID: 975834435814035598, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_LocalPosition.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 975834435814062736, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} @@ -738,7 +743,7 @@ PrefabInstance: - target: {fileID: 975834435814062736, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_LocalPosition.y - value: -0.214 + value: -0.217 objectReference: {fileID: 0} - target: {fileID: 975834435814062736, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} @@ -748,12 +753,12 @@ PrefabInstance: - target: {fileID: 975834435814079746, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_LocalPosition.x - value: 0.008 + value: 0.001 objectReference: {fileID: 0} - target: {fileID: 975834435814079746, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_LocalPosition.y - value: 0.261 + value: 0.277 objectReference: {fileID: 0} - target: {fileID: 975834435814079746, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} @@ -763,18 +768,28 @@ PrefabInstance: - target: {fileID: 975834435814114336, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_LocalPosition.x - value: -0.014 + value: 0.013 objectReference: {fileID: 0} - target: {fileID: 975834435814114336, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_LocalPosition.y - value: 0.165 + value: 0.189 objectReference: {fileID: 0} - target: {fileID: 975834435814114336, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 975834435814114336, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 975834435814114336, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_RootOrder @@ -830,6 +845,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 975834435814146394, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalScale.x + value: 0.03 + objectReference: {fileID: 0} + - target: {fileID: 975834435814146394, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalScale.y + value: 0.01 + objectReference: {fileID: 0} - target: {fileID: 975834435814146394, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_LocalPosition.x @@ -848,17 +873,17 @@ PrefabInstance: - target: {fileID: 975834435814146394, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 1 objectReference: {fileID: 0} - target: {fileID: 975834435814146394, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_LocalRotation.z - value: 0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 975834435814146394, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 90 + value: 0 objectReference: {fileID: 0} - target: {fileID: 975834435814149948, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} @@ -1121,7 +1146,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 42c914c85d400664c9df3239aafbec71, type: 3} m_Name: m_EditorClassIdentifier: - m_DescriptionType: -1 + m_DescriptionType: 3 m_DescriptionYOffset: 0 m_DescriptionText: m_LocalizedDescription: @@ -1256,7 +1281,7 @@ PrefabInstance: - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -0.28 objectReference: {fileID: 0} - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, type: 3} @@ -1266,22 +1291,22 @@ PrefabInstance: - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, type: 3} propertyPath: m_LocalRotation.w - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, type: 3} propertyPath: m_LocalRotation.z - value: -1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, type: 3} @@ -1317,7 +1342,7 @@ PrefabInstance: type: 3} propertyPath: m_ButtonTexture value: - objectReference: {fileID: 2800000, guid: ab8b9a0b96b6cb74ca1e518f3c56b425, type: 3} + objectReference: {fileID: 2800000, guid: e5a95db3eceb2ac48bd574c538be1470, type: 3} - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, type: 3} propertyPath: m_DescriptionText @@ -1589,12 +1614,12 @@ PrefabInstance: - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, type: 3} propertyPath: m_LocalPosition.x - value: -0.322 + value: -0.14 objectReference: {fileID: 0} - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.59 objectReference: {fileID: 0} - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, type: 3} @@ -1609,17 +1634,17 @@ PrefabInstance: - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, type: 3} @@ -1655,7 +1680,7 @@ PrefabInstance: type: 3} propertyPath: m_ButtonTexture value: - objectReference: {fileID: 2800000, guid: f74f6eac3e3e3c640b1a343ec46ba2dd, type: 3} + objectReference: {fileID: 2800000, guid: 73dde82cc4f081546876901bce591a1e, type: 3} - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, type: 3} propertyPath: m_DescriptionText diff --git a/Assets/Prefabs/SliderDescriptionVertical_Pill.prefab b/Assets/Prefabs/SliderDescriptionVertical_Pill.prefab new file mode 100644 index 000000000..79cf9bffc --- /dev/null +++ b/Assets/Prefabs/SliderDescriptionVertical_Pill.prefab @@ -0,0 +1,864 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1031604341972012 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4349668459466822} + - component: {fileID: 33913801300591068} + - component: {fileID: 23162514034225944} + m_Layer: 16 + m_Name: LeftBG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4349668459466822 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1031604341972012} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.7071067, z: 0.7071068, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 99.99997, z: 99.99997} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4541991548142212} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33913801300591068 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1031604341972012} + m_Mesh: {fileID: 4300008, guid: 43a200728859bfe489640f76f3bbf13d, type: 3} +--- !u!23 &23162514034225944 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1031604341972012} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fc985b8d6f54c6645ab36cccbafa6ee6, type: 2} + 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1110612856389182 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4271023386467634} + - component: {fileID: 33864590963698454} + - component: {fileID: 23378255582476254} + m_Layer: 16 + m_Name: RightBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4271023386467634 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110612856389182} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.7071067, z: 0.7071068, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 99.99997, z: 99.99997} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4510075354660724} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33864590963698454 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110612856389182} + m_Mesh: {fileID: 4300010, guid: 43a200728859bfe489640f76f3bbf13d, type: 3} +--- !u!23 &23378255582476254 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110612856389182} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f2d6b7b74fe1d7643b9bfc6700026493, type: 2} + 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1219777963505972 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4423080799211536} + m_Layer: 16 + m_Name: Center + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4423080799211536 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1219777963505972} + serializedVersion: 2 + 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: 4795596623256706} + - {fileID: 4852237231748870} + m_Father: {fileID: 4730816088910194} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1270269764682322 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4852237231748870} + - component: {fileID: 33635436758652978} + - component: {fileID: 23996510484795302} + m_Layer: 16 + m_Name: CenterBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4852237231748870 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1270269764682322} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.7071067, z: 0.7071068, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 99.99997, z: 99.99997} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4423080799211536} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33635436758652978 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1270269764682322} + m_Mesh: {fileID: 4300000, guid: 43a200728859bfe489640f76f3bbf13d, type: 3} +--- !u!23 &23996510484795302 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1270269764682322} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f2d6b7b74fe1d7643b9bfc6700026493, type: 2} + 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1354504750949956 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4363468780315798} + - component: {fileID: 33689156436411526} + - component: {fileID: 23844648081075438} + m_Layer: 16 + m_Name: RightBG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4363468780315798 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354504750949956} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.7071067, z: 0.7071068, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 99.99997, z: 99.99997} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4510075354660724} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33689156436411526 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354504750949956} + m_Mesh: {fileID: 4300004, guid: 43a200728859bfe489640f76f3bbf13d, type: 3} +--- !u!23 &23844648081075438 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354504750949956} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fc985b8d6f54c6645ab36cccbafa6ee6, type: 2} + 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1407859891928218 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4730816088910194} + m_Layer: 16 + m_Name: RoundedTooltipMesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4730816088910194 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1407859891928218} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.294, y: -0, z: -0.3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4541991548142212} + - {fileID: 4423080799211536} + - {fileID: 4510075354660724} + m_Father: {fileID: 4719072339593620} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1417282016649708 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4283381800739476} + - component: {fileID: 33898656397844776} + - component: {fileID: 23619935002574026} + m_Layer: 16 + m_Name: LeftBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4283381800739476 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417282016649708} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.7071067, z: 0.7071068, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 99.99997, z: 99.99997} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4541991548142212} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33898656397844776 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417282016649708} + m_Mesh: {fileID: 4300006, guid: 43a200728859bfe489640f76f3bbf13d, type: 3} +--- !u!23 &23619935002574026 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417282016649708} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f2d6b7b74fe1d7643b9bfc6700026493, type: 2} + 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1483869887805908 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4541991548142212} + m_Layer: 16 + m_Name: Left + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4541991548142212 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1483869887805908} + serializedVersion: 2 + 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: 4349668459466822} + - {fileID: 4283381800739476} + m_Father: {fileID: 4730816088910194} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1748473933979218 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4510075354660724} + m_Layer: 16 + m_Name: Right + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4510075354660724 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1748473933979218} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4363468780315798} + - {fileID: 4271023386467634} + m_Father: {fileID: 4730816088910194} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1977092981759950 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4795596623256706} + - component: {fileID: 33538494050617450} + - component: {fileID: 23133793043248348} + m_Layer: 16 + m_Name: CenterBG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4795596623256706 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977092981759950} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.7071067, z: 0.7071068, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 99.99997, z: 99.99997} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4423080799211536} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33538494050617450 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977092981759950} + m_Mesh: {fileID: 4300002, guid: 43a200728859bfe489640f76f3bbf13d, type: 3} +--- !u!23 &23133793043248348 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977092981759950} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fc985b8d6f54c6645ab36cccbafa6ee6, type: 2} + 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1997325689525770 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4719072339593620} + - component: {fileID: 114575628490289154} + m_Layer: 16 + m_Name: SliderDescriptionVertical_Pill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4719072339593620 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1997325689525770} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 353777852704801239} + - {fileID: 4730816088910194} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} +--- !u!114 &114575628490289154 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1997325689525770} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16f35aa6482457046851f086c0b7b324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BG: {fileID: 4423080799211536} + m_RightCap: {fileID: 1748473933979218} + m_LeftCap: {fileID: 0} + m_TintVisuals: + - {fileID: 23619935002574026} + - {fileID: 23996510484795302} + - {fileID: 23378255582476254} + - {fileID: 5544652876518447854} + m_Text: + - {fileID: 5902178398589492328} + m_UnavailableColor: {r: 0.3529412, g: 0.3529412, b: 0.3529412, a: 1} + m_PlaceOnRightEdge: 0 + m_SwitchCaps: 0 + m_DefaultScale: 0.4235 +--- !u!1 &5104181830672000078 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 353777852704801239} + - component: {fileID: 5544652876518447854} + - component: {fileID: 5902178398589492328} + m_Layer: 16 + m_Name: DescriptionTextLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &353777852704801239 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5104181830672000078} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.32} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4719072339593620} + 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: 0.294, y: 0.971} + m_SizeDelta: {x: 10, y: 0.25} + m_Pivot: {x: 0, y: 1} +--- !u!23 &5544652876518447854 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5104181830672000078} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &5902178398589492328 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5104181830672000078} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, 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_text: Description + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 3.85 + m_fontSizeBase: 3.85 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 5544652876518447854} + m_maskType: 0 diff --git a/Assets/Prefabs/SliderDescriptionVertical_Pill.prefab.meta b/Assets/Prefabs/SliderDescriptionVertical_Pill.prefab.meta new file mode 100644 index 000000000..32ef1c0cc --- /dev/null +++ b/Assets/Prefabs/SliderDescriptionVertical_Pill.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fffc394d878a99d468781b50d53e5edb +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/SliderDescriptionVertical_Pill_TwoLines.prefab b/Assets/Prefabs/SliderDescriptionVertical_Pill_TwoLines.prefab new file mode 100644 index 000000000..bde94f9b9 --- /dev/null +++ b/Assets/Prefabs/SliderDescriptionVertical_Pill_TwoLines.prefab @@ -0,0 +1,1038 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1039059812658152 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4401778007224324} + m_Layer: 16 + m_Name: Right + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4401778007224324 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1039059812658152} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4008139922774742} + - {fileID: 4926415686564388} + m_Father: {fileID: 4974388410799054} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1075103291083872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4863253020439994} + - component: {fileID: 114403808906102626} + m_Layer: 16 + m_Name: SliderDescriptionVertical_Pill_TwoLines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4863253020439994 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1075103291083872} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4845065726837924906} + - {fileID: 7964335755823164065} + - {fileID: 4974388410799054} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} +--- !u!114 &114403808906102626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1075103291083872} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16f35aa6482457046851f086c0b7b324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BG: {fileID: 4068022327856694} + m_RightCap: {fileID: 1039059812658152} + m_LeftCap: {fileID: 0} + m_TintVisuals: + - {fileID: 23055134206337570} + - {fileID: 23899672226956908} + - {fileID: 23263550306026140} + - {fileID: 729179338462917352} + - {fileID: 4578249849576213564} + m_Text: + - {fileID: 2033705490667070087} + - {fileID: 2207091946775676473} + m_UnavailableColor: {r: 0.3529412, g: 0.3529412, b: 0.3529412, a: 1} + m_PlaceOnRightEdge: 0 + m_SwitchCaps: 0 + m_DefaultScale: 0.4235 +--- !u!1 &1232450646587154 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4852688723625630} + - component: {fileID: 33743507001873778} + - component: {fileID: 23495573930245876} + m_Layer: 16 + m_Name: CenterBG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4852688723625630 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232450646587154} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.7071067, z: 0.7071068, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 99.99997, z: 99.99997} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4068022327856694} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33743507001873778 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232450646587154} + m_Mesh: {fileID: 4300002, guid: b2e44fa23281ca243bd0cde519bdf873, type: 3} +--- !u!23 &23495573930245876 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232450646587154} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fc985b8d6f54c6645ab36cccbafa6ee6, type: 2} + 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1383466022206060 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4068022327856694} + m_Layer: 16 + m_Name: Center + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4068022327856694 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1383466022206060} + serializedVersion: 2 + 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: 4852688723625630} + - {fileID: 4946762775824472} + m_Father: {fileID: 4974388410799054} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1475690022247710 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4008139922774742} + - component: {fileID: 33863324903891838} + - component: {fileID: 23018174175184174} + m_Layer: 16 + m_Name: RightBG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4008139922774742 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1475690022247710} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.7071067, z: 0.7071068, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 99.99997, z: 99.99997} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4401778007224324} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33863324903891838 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1475690022247710} + m_Mesh: {fileID: 4300004, guid: b2e44fa23281ca243bd0cde519bdf873, type: 3} +--- !u!23 &23018174175184174 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1475690022247710} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fc985b8d6f54c6645ab36cccbafa6ee6, type: 2} + 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1599386878184812 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4974388410799054} + m_Layer: 16 + m_Name: RoundedTooltipMesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4974388410799054 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1599386878184812} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.295, y: -0, z: -0.3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4114414229266494} + - {fileID: 4068022327856694} + - {fileID: 4401778007224324} + m_Father: {fileID: 4863253020439994} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1617426107363530 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4114414229266494} + m_Layer: 16 + m_Name: Left + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4114414229266494 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1617426107363530} + serializedVersion: 2 + 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: 4086127304204970} + - {fileID: 4316336594099042} + m_Father: {fileID: 4974388410799054} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1713375849109820 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4316336594099042} + - component: {fileID: 33246371528825008} + - component: {fileID: 23055134206337570} + m_Layer: 16 + m_Name: LeftBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4316336594099042 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1713375849109820} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.7071067, z: 0.7071068, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 99.99997, z: 99.99997} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4114414229266494} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33246371528825008 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1713375849109820} + m_Mesh: {fileID: 4300006, guid: b2e44fa23281ca243bd0cde519bdf873, type: 3} +--- !u!23 &23055134206337570 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1713375849109820} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f2d6b7b74fe1d7643b9bfc6700026493, type: 2} + 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1717665191716908 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4946762775824472} + - component: {fileID: 33729962248626104} + - component: {fileID: 23899672226956908} + m_Layer: 16 + m_Name: CenterBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4946762775824472 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1717665191716908} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.7071067, z: 0.7071068, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 99.99997, z: 99.99997} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4068022327856694} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33729962248626104 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1717665191716908} + m_Mesh: {fileID: 4300000, guid: b2e44fa23281ca243bd0cde519bdf873, type: 3} +--- !u!23 &23899672226956908 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1717665191716908} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f2d6b7b74fe1d7643b9bfc6700026493, type: 2} + 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1817087993932420 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4086127304204970} + - component: {fileID: 33970509871018124} + - component: {fileID: 23065162295210484} + m_Layer: 16 + m_Name: LeftBG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4086127304204970 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1817087993932420} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.7071067, z: 0.7071068, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 99.99997, z: 99.99997} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4114414229266494} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33970509871018124 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1817087993932420} + m_Mesh: {fileID: 4300008, guid: b2e44fa23281ca243bd0cde519bdf873, type: 3} +--- !u!23 &23065162295210484 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1817087993932420} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fc985b8d6f54c6645ab36cccbafa6ee6, type: 2} + 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1991058128693382 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4926415686564388} + - component: {fileID: 33816362963710026} + - component: {fileID: 23263550306026140} + m_Layer: 16 + m_Name: RightBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4926415686564388 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1991058128693382} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.7071067, z: 0.7071068, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 99.99997, z: 99.99997} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4401778007224324} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33816362963710026 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1991058128693382} + m_Mesh: {fileID: 4300010, guid: b2e44fa23281ca243bd0cde519bdf873, type: 3} +--- !u!23 &23263550306026140 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1991058128693382} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f2d6b7b74fe1d7643b9bfc6700026493, type: 2} + 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1424296579612529526 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4845065726837924906} + - component: {fileID: 729179338462917352} + - component: {fileID: 2033705490667070087} + m_Layer: 16 + m_Name: DescriptionTextLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4845065726837924906 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1424296579612529526} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.32} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4863253020439994} + 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: 0.295, y: 1.364} + m_SizeDelta: {x: 10, y: 0.25} + m_Pivot: {x: 0, y: 1} +--- !u!23 &729179338462917352 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1424296579612529526} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &2033705490667070087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1424296579612529526} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, 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_text: Description + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 3.85 + m_fontSizeBase: 3.85 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 729179338462917352} + m_maskType: 0 +--- !u!1 &1917712957467886031 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7964335755823164065} + - component: {fileID: 4578249849576213564} + - component: {fileID: 2207091946775676473} + m_Layer: 16 + m_Name: DescriptionExtraTextLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7964335755823164065 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1917712957467886031} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.32} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4863253020439994} + 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: 0.295, y: 0.91499984} + m_SizeDelta: {x: 10, y: 0.25} + m_Pivot: {x: 0, y: 1} +--- !u!23 &4578249849576213564 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1917712957467886031} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + 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: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &2207091946775676473 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1917712957467886031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, 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_text: Description + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_sharedMaterial: {fileID: 2133298, guid: fce54057bad3d2d4cb3c36ee394be518, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4286085240 + m_fontColor: {r: 0.47058824, g: 0.47058824, b: 0.47058824, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 3.21 + m_fontSizeBase: 3.21 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 4578249849576213564} + m_maskType: 0 diff --git a/Assets/Prefabs/SliderDescriptionVertical_Pill_TwoLines.prefab.meta b/Assets/Prefabs/SliderDescriptionVertical_Pill_TwoLines.prefab.meta new file mode 100644 index 000000000..0325f1033 --- /dev/null +++ b/Assets/Prefabs/SliderDescriptionVertical_Pill_TwoLines.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d0ce8c56faa567f438b1a68b3565a078 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UIComponents/BrushSettingsTray.prefab b/Assets/Prefabs/UIComponents/BrushSettingsTray.prefab index 03081ca6d..b21c5017c 100644 --- a/Assets/Prefabs/UIComponents/BrushSettingsTray.prefab +++ b/Assets/Prefabs/UIComponents/BrushSettingsTray.prefab @@ -75,6 +75,7 @@ MonoBehaviour: m_AnimateSpeed: 8 m_AnimateRange: {x: 0, y: 1} m_ShowOnToolType: 10 + m_BrushSizeSlider: {fileID: 584482961708206757} references: version: 2 RefIds: [] @@ -384,6 +385,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4418329079800618} m_Modifications: + - target: {fileID: 2514466698640951438, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: m_DescriptionText + value: BRUSH_SETTINGS_TRAY_BRUSH_SIZE + objectReference: {fileID: 0} - target: {fileID: 2514466698640951438, guid: 93b04d984a8fd234eb4a7227567865a7, type: 3} propertyPath: onUpdateValue.m_PersistentCalls.m_Calls.Array.size @@ -392,7 +398,7 @@ PrefabInstance: - target: {fileID: 2514466698640951438, guid: 93b04d984a8fd234eb4a7227567865a7, type: 3} propertyPath: m_LocalizedDescription.m_TableEntryReference.m_KeyId - value: 5065710952488960 + value: 276171365497266176 objectReference: {fileID: 0} - target: {fileID: 2514466698640951438, guid: 93b04d984a8fd234eb4a7227567865a7, type: 3} @@ -427,7 +433,7 @@ PrefabInstance: - target: {fileID: 4471627121253417836, guid: 93b04d984a8fd234eb4a7227567865a7, type: 3} propertyPath: m_Name - value: AdvancedSliderV + value: Brush Size Slider objectReference: {fileID: 0} - target: {fileID: 4471627121253688460, guid: 93b04d984a8fd234eb4a7227567865a7, type: 3} @@ -484,6 +490,18 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 93b04d984a8fd234eb4a7227567865a7, type: 3} +--- !u!114 &584482961708206757 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2514466698640951438, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + m_PrefabInstance: {fileID: 3096697584449339947} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 42c914c85d400664c9df3239aafbec71, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &1510895170789172903 stripped Transform: m_CorrespondingSourceObject: {fileID: 4471627121253688460, guid: 93b04d984a8fd234eb4a7227567865a7, diff --git a/Assets/Resources/Icons/downarrow.png b/Assets/Resources/Icons/downarrow.png new file mode 100644 index 000000000..27a413b04 Binary files /dev/null and b/Assets/Resources/Icons/downarrow.png differ diff --git a/Assets/Resources/Icons/downarrow.png.meta b/Assets/Resources/Icons/downarrow.png.meta new file mode 100644 index 000000000..1c3126550 --- /dev/null +++ b/Assets/Resources/Icons/downarrow.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 73dde82cc4f081546876901bce591a1e +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Icons/uparrow.png b/Assets/Resources/Icons/uparrow.png new file mode 100644 index 000000000..5cd267cd1 Binary files /dev/null and b/Assets/Resources/Icons/uparrow.png differ diff --git a/Assets/Resources/Icons/uparrow.png.meta b/Assets/Resources/Icons/uparrow.png.meta new file mode 100644 index 000000000..f5706f0ec --- /dev/null +++ b/Assets/Resources/Icons/uparrow.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: e5a95db3eceb2ac48bd574c538be1470 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index a244127cf..3eb7b03ba 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -38,7 +38,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 8900000, guid: 378efb751ea39e14cb1fd93f49ead278, type: 3} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &4 LightmapSettings: @@ -3698,6 +3697,10 @@ MonoBehaviour: type: 3} m_SliderDescriptionTwoLinesPrefab: {fileID: 1075103291083872, guid: 9473e6ac1bd905b42b3ab718e61edaa2, type: 3} + m_VerticalSliderDescriptionOneLinePrefab: {fileID: 1997325689525770, guid: fffc394d878a99d468781b50d53e5edb, + type: 3} + m_VerticalSliderDescriptionTwoLinesPrefab: {fileID: 1075103291083872, guid: d0ce8c56faa567f438b1a68b3565a078, + type: 3} m_PreviewCubeDescriptionOneLinePrefab: {fileID: 1083040994653220, guid: 4008b21a5ab500743beaafe495d976a7, type: 3} m_PreviewCubeDescriptionTwoLinesPrefab: {fileID: 1083040994653220, guid: a8af8f97b474d2247a17f4c6d100630a, diff --git a/Assets/Scripts/Config.cs b/Assets/Scripts/Config.cs index 7ff74dcbb..efadeeb3d 100644 --- a/Assets/Scripts/Config.cs +++ b/Assets/Scripts/Config.cs @@ -66,8 +66,9 @@ public enum DescriptionType { None = -1, Button = 0, - Slider, - PreviewCube, + Slider = 1, + PreviewCube = 2, + VerticalSlider = 3, } /// Script Ordering: @@ -223,6 +224,8 @@ public bool IsMobileHardware [SerializeField] GameObject m_ButtonDescriptionThreeLinesPrefab; [SerializeField] GameObject m_SliderDescriptionOneLinePrefab; [SerializeField] GameObject m_SliderDescriptionTwoLinesPrefab; + [SerializeField] GameObject m_VerticalSliderDescriptionOneLinePrefab; + [SerializeField] GameObject m_VerticalSliderDescriptionTwoLinesPrefab; [SerializeField] GameObject m_PreviewCubeDescriptionOneLinePrefab; [SerializeField] GameObject m_PreviewCubeDescriptionTwoLinesPrefab; @@ -254,6 +257,16 @@ public GameObject CreateDescriptionFor(DescriptionType type, int numberOfLines) default: throw new Exception($"{type} description does not have a ${numberOfLines} line variant"); } + case DescriptionType.VerticalSlider: + switch (numberOfLines) + { + case 1: + return Instantiate(m_VerticalSliderDescriptionOneLinePrefab); + case 2: + return Instantiate(m_VerticalSliderDescriptionTwoLinesPrefab); + default: + throw new Exception($"{type} description does not have a ${numberOfLines} line variant"); + } case DescriptionType.PreviewCube: switch (numberOfLines) { diff --git a/Assets/Scripts/GUI/BaseSlider.cs b/Assets/Scripts/GUI/BaseSlider.cs index fa73d7fe9..c34a9425d 100644 --- a/Assets/Scripts/GUI/BaseSlider.cs +++ b/Assets/Scripts/GUI/BaseSlider.cs @@ -44,6 +44,11 @@ protected void SetAvailable(bool available) { m_IsAvailable = available; SetDescriptionVisualsAvailable(m_IsAvailable); + if (m_Orientation == Orientation.Vertical) + { + // Fix distortion due to the parent having a non-uniform scale. + m_Description.transform.localScale = Vector3.one; + } } override protected void Awake() diff --git a/Assets/Scripts/GUI/BrushSettingsTray.cs b/Assets/Scripts/GUI/BrushSettingsTray.cs index 59293107c..3f957ef5a 100644 --- a/Assets/Scripts/GUI/BrushSettingsTray.cs +++ b/Assets/Scripts/GUI/BrushSettingsTray.cs @@ -1,4 +1,4 @@ -// Copyright 2020 The Tilt Brush Authors +// Copyright 2024 The Open Brush Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,16 +12,34 @@ // See the License for the specific language governing permissions and // limitations under the License. -using System; -using System.Collections; using UnityEngine; namespace TiltBrush { public class BrushSettingsTray : BaseTray { + [SerializeField] private AdvancedSlider m_BrushSizeSlider; - override protected void Start() + protected override void Awake() + { + base.Awake(); + App.Switchboard.BrushSizeChanged += UpdateSliderToMatchCurrentSize; + } + + protected override void OnDestroy() + { + base.OnDestroy(); + App.Switchboard.ToolChanged -= UpdateSliderToMatchCurrentSize; + } + + private void UpdateSliderToMatchCurrentSize() + { + m_BrushSizeSlider.SetInitialValueAndUpdate( + PointerManager.m_Instance.MainPointer.BrushSize01 + ); + } + + protected override void Start() { base.Start(); @@ -37,19 +55,18 @@ override protected void Start() // m_Mesh.SetActive(true); // m_Collider.enabled = true; - transform.GetComponentInChildren().SetInitialValueAndUpdate( - PointerManager.m_Instance.MainPointer.BrushSize01 - ); + UpdateSliderToMatchCurrentSize(); } protected override void OnToolChanged() { - // No op + UpdateSliderToMatchCurrentSize(); } public void OnSliderChanged(Vector3 value) { - PointerManager.m_Instance.MainPointer.BrushSize01 = value.y; + PointerManager.m_Instance.SetAllPointersBrushSize01(value.z); + PointerManager.m_Instance.MarkAllBrushSizeUsed(); } } diff --git a/Assets/Scripts/Switchboard.cs b/Assets/Scripts/Switchboard.cs index a5795b23a..d91744c3e 100644 --- a/Assets/Scripts/Switchboard.cs +++ b/Assets/Scripts/Switchboard.cs @@ -18,6 +18,7 @@ namespace TiltBrush { public class Switchboard { + public event Action BrushSizeChanged; public event Action ToolChanged; public event Action MirrorVisibilityChanged; public event Action PanelDismissed; @@ -50,6 +51,11 @@ public void TriggerToolChanged() ToolChanged?.Invoke(); } + public void TriggerBrushSizeChanged() + { + BrushSizeChanged?.Invoke(); + } + public void TriggerMirrorVisibilityChanged() { MirrorVisibilityChanged?.Invoke(); diff --git a/Assets/Scripts/Tools/FreePaintTool.cs b/Assets/Scripts/Tools/FreePaintTool.cs index 75a407c46..c033b2784 100644 --- a/Assets/Scripts/Tools/FreePaintTool.cs +++ b/Assets/Scripts/Tools/FreePaintTool.cs @@ -246,6 +246,7 @@ override public void UpdateSize(float fAdjustAmount) float fPrevRatio = GetSize01(); PointerManager.m_Instance.AdjustAllPointersBrushSize01(m_AdjustSizeScalar * fAdjustAmount); PointerManager.m_Instance.MarkAllBrushSizeUsed(); + App.Switchboard.TriggerBrushSizeChanged(); float fCurrentRatio = GetSize01(); float fHalfInterval = m_HapticInterval * 0.5f; diff --git a/Assets/Settings/Localization/Strings/Strings Shared Data.asset b/Assets/Settings/Localization/Strings/Strings Shared Data.asset index c60ef0817..4aaa38e1d 100644 --- a/Assets/Settings/Localization/Strings/Strings Shared Data.asset +++ b/Assets/Settings/Localization/Strings/Strings Shared Data.asset @@ -3327,6 +3327,10 @@ MonoBehaviour: m_Key: PANEL_REFERENCE_ICONIMAGE_GENERICERRORTEXT m_Metadata: m_Items: [] + - m_Id: 276171365497266176 + m_Key: BRUSH_SETTINGS_TRAY_BRUSH_SIZE + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/Settings/Localization/Strings/Strings_en.asset b/Assets/Settings/Localization/Strings/Strings_en.asset index dc601834e..0c50b585d 100644 --- a/Assets/Settings/Localization/Strings/Strings_en.asset +++ b/Assets/Settings/Localization/Strings/Strings_en.asset @@ -3524,6 +3524,10 @@ MonoBehaviour: m_Localized: Image failed to load m_Metadata: m_Items: [] + - m_Id: 276171365497266176 + m_Localized: Brush Size + m_Metadata: + m_Items: [] references: version: 2 RefIds: []