From 15f8d7d182a12011644145ac35792e9e9efd7af5 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Fri, 6 Sep 2024 17:44:57 +0100 Subject: [PATCH 1/6] Vertical slider for brush size --- Assets/Prefabs/Panels/BrushesPanel.prefab | 482 ++++- .../Panels/BrushesPanel_experimental.prefab | 509 ++++- .../Panels/Widgets/AdvancedSliderV.prefab | 1724 +++++++++++++++++ .../Widgets/AdvancedSliderV.prefab.meta | 7 + .../UIComponents/BrushSettingsTray.prefab | 492 +++++ .../BrushSettingsTray.prefab.meta | 7 + Assets/Scripts/GUI/BaseSlider.cs | 44 +- Assets/Scripts/GUI/BaseTray.cs | 41 +- Assets/Scripts/GUI/BrushSettingsTray.cs | 56 + Assets/Scripts/GUI/BrushSettingsTray.cs.meta | 3 + 10 files changed, 3207 insertions(+), 158 deletions(-) create mode 100644 Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab create mode 100644 Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab.meta create mode 100644 Assets/Prefabs/UIComponents/BrushSettingsTray.prefab create mode 100644 Assets/Prefabs/UIComponents/BrushSettingsTray.prefab.meta create mode 100644 Assets/Scripts/GUI/BrushSettingsTray.cs create mode 100644 Assets/Scripts/GUI/BrushSettingsTray.cs.meta diff --git a/Assets/Prefabs/Panels/BrushesPanel.prefab b/Assets/Prefabs/Panels/BrushesPanel.prefab index 38b0d34173..f05e14935b 100644 --- a/Assets/Prefabs/Panels/BrushesPanel.prefab +++ b/Assets/Prefabs/Panels/BrushesPanel.prefab @@ -27,13 +27,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 114108} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.009, y: -0.643, z: 0.05} m_LocalScale: {x: 0.35767, y: 0.35, z: 0.3855768} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 457820} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3328504 MeshFilter: @@ -110,6 +110,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: Music Visualization + 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: 0b9b3dffa74802347b4464ee95d62f3c, type: 3} @@ -162,9 +171,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 114108} 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.1} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &118774 @@ -193,6 +210,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 118774} + 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} @@ -201,8 +219,8 @@ Transform: - {fileID: 4000010436372174} - {fileID: 423482} - {fileID: 457820} + - {fileID: 5254574416487740940} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 4.574, y: -62.7954, z: 0} --- !u!114 &114666146255114844 MonoBehaviour: @@ -345,13 +363,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 137668} + 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: 457820} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3355160 MeshFilter: @@ -385,13 +403,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 151754} + 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: 434816} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &6534176 BoxCollider: @@ -401,9 +419,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 151754} 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 &186796 @@ -429,6 +455,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 186796} + 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} @@ -440,7 +467,6 @@ Transform: - {fileID: 4000010181597228} - {fileID: 451564} m_Father: {fileID: 434816} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &188140 GameObject: @@ -466,13 +492,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 188140} + 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: 457820} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &6507090 BoxCollider: @@ -482,9 +508,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 188140} 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 &1000013324895138 @@ -512,13 +546,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000013324895138} + 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: 434816} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33000011495623358 MeshFilter: @@ -596,13 +630,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000013658316794} + 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: 457820} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 4.574, y: -62.7954, z: 0} --- !u!33 &33000011759986358 MeshFilter: @@ -693,6 +727,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1033254370908088} + 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} @@ -713,7 +748,6 @@ Transform: - {fileID: 4541394138392128} - {fileID: 4594233671013312} m_Father: {fileID: 457820} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 4.574, y: -62.7954, z: 0} --- !u!114 &114967847436321090 MonoBehaviour: @@ -740,6 +774,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: 1363341550207350} @@ -760,9 +803,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1033254370908088} 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 &114191328384987222 @@ -802,13 +853,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1034646577577660} + 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: 4222800809097972} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33258176710762266 MeshFilter: @@ -885,13 +936,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1036635943068616} + 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: 4092786056026944} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33798956104844744 MeshFilter: @@ -970,13 +1021,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1057002490137040} + 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: 4439849343356344} - m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33442641929622692 MeshFilter: @@ -1036,9 +1087,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1057002490137040} 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 &114221200383573830 @@ -1066,6 +1125,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} @@ -1112,6 +1180,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1070133057988858} + 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} @@ -1120,7 +1189,6 @@ Transform: - {fileID: 4108651137447072} - {fileID: 4486633406044210} m_Father: {fileID: 4439849343356344} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33602195719779224 MeshFilter: @@ -1197,6 +1265,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} @@ -1223,9 +1300,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1070133057988858} 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 &1082253630387296 @@ -1255,6 +1340,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1082253630387296} + 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} @@ -1263,7 +1349,6 @@ Transform: - {fileID: 4869283307891142} - {fileID: 4781517279745158} m_Father: {fileID: 4439849343356344} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33137769298429946 MeshFilter: @@ -1340,6 +1425,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} @@ -1366,9 +1460,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1082253630387296} 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 &1092626861718874 @@ -1396,13 +1498,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1092626861718874} + 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: 4169963971905518} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33764684550163016 MeshFilter: @@ -1481,6 +1583,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1124170676566392} + 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} @@ -1489,7 +1592,6 @@ Transform: - {fileID: 4155577581400712} - {fileID: 4867981065072342} m_Father: {fileID: 4439849343356344} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33999848501626978 MeshFilter: @@ -1566,6 +1668,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} @@ -1592,9 +1703,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1124170676566392} 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 &1151936270169688 @@ -1622,13 +1741,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1151936270169688} + 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: 4800880677547804} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33143972308239754 MeshFilter: @@ -1705,13 +1824,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1197317096230920} + 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: 4797752376659910} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33608213675346472 MeshFilter: @@ -1788,13 +1907,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1276197100454822} + 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: 4442583011411748} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33620541378919070 MeshFilter: @@ -1871,13 +1990,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1283019572438770} + 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: 4191910600466198} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33114786386958736 MeshFilter: @@ -1954,13 +2073,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1313800748318712} + 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: 4092786056026944} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33036039735581926 MeshFilter: @@ -2039,6 +2158,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1315464994656632} + 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} @@ -2047,7 +2167,6 @@ Transform: - {fileID: 4750288536566258} - {fileID: 4632883719001664} m_Father: {fileID: 4439849343356344} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33487977049538338 MeshFilter: @@ -2124,6 +2243,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} @@ -2150,9 +2278,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1315464994656632} 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 &1363341550207350 @@ -2182,13 +2318,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1363341550207350} + 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: 4439849343356344} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33830763336452674 MeshFilter: @@ -2248,9 +2384,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1363341550207350} 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 &114641627188333250 @@ -2278,6 +2422,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} @@ -2324,6 +2477,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1389368293188596} + 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} @@ -2332,7 +2486,6 @@ Transform: - {fileID: 4508354498534506} - {fileID: 4449170370298676} m_Father: {fileID: 4439849343356344} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33331189676582540 MeshFilter: @@ -2409,6 +2562,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} @@ -2435,9 +2597,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1389368293188596} 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 &1407389709943618 @@ -2465,13 +2635,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1407389709943618} + 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: 4971485809952630} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33833414770521524 MeshFilter: @@ -2548,13 +2718,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1407773391288006} + 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: 4191910600466198} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33702479640743884 MeshFilter: @@ -2633,6 +2803,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1408422628715924} + 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} @@ -2641,7 +2812,6 @@ Transform: - {fileID: 4336677930866082} - {fileID: 4653578460935370} m_Father: {fileID: 4439849343356344} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33279007656315524 MeshFilter: @@ -2718,6 +2888,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} @@ -2744,9 +2923,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1408422628715924} 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 &1409130113285012 @@ -2776,6 +2963,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1409130113285012} + 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} @@ -2784,7 +2972,6 @@ Transform: - {fileID: 4726737439690614} - {fileID: 4080543137521298} m_Father: {fileID: 4439849343356344} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33277730104430012 MeshFilter: @@ -2861,6 +3048,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} @@ -2887,9 +3083,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1409130113285012} 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 &1413670148038462 @@ -2917,13 +3121,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1413670148038462} + 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: 4169963971905518} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33847780503233892 MeshFilter: @@ -3000,13 +3204,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1525429200455070} + 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: 4442583011411748} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33998393394827242 MeshFilter: @@ -3085,6 +3289,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1549567265420218} + 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} @@ -3093,7 +3298,6 @@ Transform: - {fileID: 4659550634184844} - {fileID: 4517492496873706} m_Father: {fileID: 4439849343356344} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33278401593486628 MeshFilter: @@ -3170,6 +3374,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} @@ -3196,9 +3409,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1549567265420218} 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 &1555066545323188 @@ -3228,6 +3449,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1555066545323188} + 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} @@ -3236,7 +3458,6 @@ Transform: - {fileID: 4883194001148416} - {fileID: 4667571532236068} m_Father: {fileID: 4439849343356344} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33229309276187046 MeshFilter: @@ -3313,6 +3534,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} @@ -3339,9 +3569,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1555066545323188} 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 &1563262884317394 @@ -3369,13 +3607,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1563262884317394} + 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: 4622063583187076} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33434646923364246 MeshFilter: @@ -3452,13 +3690,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1596100141879696} + 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: 4037035157830360} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33484435722109490 MeshFilter: @@ -3537,6 +3775,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1638574061759500} + 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} @@ -3545,7 +3784,6 @@ Transform: - {fileID: 4609603735146808} - {fileID: 4557975401200536} m_Father: {fileID: 4439849343356344} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33926155320871928 MeshFilter: @@ -3622,6 +3860,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} @@ -3648,9 +3895,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1638574061759500} 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 &1644893705138206 @@ -3678,13 +3933,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1644893705138206} + 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: 4797752376659910} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33847613196621608 MeshFilter: @@ -3761,13 +4016,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1651586829955410} + 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: 4222800809097972} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33869925315002074 MeshFilter: @@ -3844,13 +4099,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1663085257925684} + 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: 4070048248072900} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33664219135662338 MeshFilter: @@ -3927,13 +4182,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1680427181151818} + 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: 4814286370340806} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33202902787055948 MeshFilter: @@ -4010,13 +4265,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1704109031662054} + 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: 4037035157830360} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33392759002234942 MeshFilter: @@ -4095,6 +4350,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1755985509404858} + 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} @@ -4103,7 +4359,6 @@ Transform: - {fileID: 4053472915575908} - {fileID: 4275656455712760} m_Father: {fileID: 4439849343356344} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33755036306560476 MeshFilter: @@ -4180,6 +4435,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} @@ -4206,9 +4470,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1755985509404858} 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 &1838449828711304 @@ -4238,6 +4510,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1838449828711304} + 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} @@ -4246,7 +4519,6 @@ Transform: - {fileID: 4433726612805618} - {fileID: 4421465453303074} m_Father: {fileID: 4439849343356344} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33314844711177206 MeshFilter: @@ -4323,6 +4595,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} @@ -4349,9 +4630,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1838449828711304} 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 &1851629141480844 @@ -4379,13 +4668,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1851629141480844} + 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: 4814286370340806} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33932113903494686 MeshFilter: @@ -4462,13 +4751,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1905045451697176} + 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: 4622063583187076} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33338309971752166 MeshFilter: @@ -4545,13 +4834,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1929883965980120} + 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: 4070048248072900} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33214354388262684 MeshFilter: @@ -4628,13 +4917,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1954837425108698} + 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: 4800880677547804} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33917045310055202 MeshFilter: @@ -4711,13 +5000,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1964883706184972} + 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: 4971485809952630} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33196787180989904 MeshFilter: @@ -4769,3 +5058,66 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1001 &5252753378642689984 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 434816} + 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.145 + 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 &5254574416487740940 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, + type: 3} + m_PrefabInstance: {fileID: 5252753378642689984} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Panels/BrushesPanel_experimental.prefab b/Assets/Prefabs/Panels/BrushesPanel_experimental.prefab index 7de43c041b..a6827a3c6e 100644 --- a/Assets/Prefabs/Panels/BrushesPanel_experimental.prefab +++ b/Assets/Prefabs/Panels/BrushesPanel_experimental.prefab @@ -27,13 +27,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 114108} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.009, y: -0.643, z: 0.05} m_LocalScale: {x: 0.35767, y: 0.35, z: 0.3855768} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 457820} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3328504 MeshFilter: @@ -110,6 +110,15 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: Music Visualization + 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: 0b9b3dffa74802347b4464ee95d62f3c, type: 3} @@ -162,9 +171,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 114108} 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.1} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &118774 @@ -193,6 +210,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 118774} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -12.256248, y: 9.122084, z: 3.5018842} m_LocalScale: {x: 1, y: 1, z: 1} @@ -201,8 +219,8 @@ Transform: - {fileID: 4000010436372174} - {fileID: 423482} - {fileID: 457820} + - {fileID: 2575239402434674311} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114648931210450374 MonoBehaviour: @@ -252,7 +270,7 @@ MonoBehaviour: m_BorderMeshAdvWidth: 0.01 m_PanelSensitivity: 0.1 m_ClampToBounds: 1 - m_ReticleBounds: {x: 2.05, y: 2, z: 0} + m_ReticleBounds: {x: 3, y: 2, z: 0} m_BorderSphereHighlightRadius: 2 m_PositioningSpheresBounds: {x: 0.75, y: 1} m_PositioningSphereRadius: 0.4 @@ -345,13 +363,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 137668} + 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: 457820} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3355160 MeshFilter: @@ -385,13 +403,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 151754} + 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: 434816} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &6534176 BoxCollider: @@ -401,9 +419,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 151754} 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 &186796 @@ -429,6 +455,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 186796} + 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} @@ -441,7 +468,6 @@ Transform: - {fileID: 4000012403472088} - {fileID: 451564} m_Father: {fileID: 434816} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &188140 GameObject: @@ -467,13 +493,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 188140} + 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: 457820} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &6507090 BoxCollider: @@ -483,9 +509,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 188140} 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.95, z: 0.02} m_Center: {x: 0, y: -0.05, z: 0} --- !u!1 &1000012021792532 @@ -515,6 +549,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000012021792532} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.6394243, y: -0.91969776, z: 0.001816988} m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} @@ -522,7 +557,6 @@ Transform: m_Children: - {fileID: 4000010162471726} m_Father: {fileID: 457820} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33000014201479214 MeshFilter: @@ -582,9 +616,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000012021792532} 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: 0.7, z: 0.01} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &114000011635621490 @@ -612,6 +654,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: 0} @@ -681,13 +732,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000012382714590} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.01} m_LocalScale: {x: 0.19999999, y: 0.19999999, z: 0.19999999} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4000010162471726} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33000012623774488 MeshFilter: @@ -765,6 +816,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000013204392080} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.85, y: 2.85, z: 2.85} @@ -772,7 +824,6 @@ Transform: m_Children: - {fileID: 4000013741424004} m_Father: {fileID: 4000012403472088} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33000011628112868 MeshFilter: @@ -862,13 +913,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000013324895138} + 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: 434816} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33000011495623358 MeshFilter: @@ -946,13 +997,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000013658316794} + 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: 457820} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 4.574, y: -62.7954, z: 0} --- !u!33 &33000011759986358 MeshFilter: @@ -1042,13 +1093,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1002136952495706} + 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: 4910167534954346} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33559353189938966 MeshFilter: @@ -1127,6 +1178,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1017389889125372} + 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} @@ -1135,7 +1187,6 @@ Transform: - {fileID: 4699942439530024} - {fileID: 4369968486831918} m_Father: {fileID: 4987826134018012} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33664844160875248 MeshFilter: @@ -1212,6 +1263,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} @@ -1238,9 +1298,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1017389889125372} 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 &1045142711562232 @@ -1270,6 +1338,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1045142711562232} + 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} @@ -1278,7 +1347,6 @@ Transform: - {fileID: 4496610398848936} - {fileID: 4024569421384500} m_Father: {fileID: 4987826134018012} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33343846969515172 MeshFilter: @@ -1355,6 +1423,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} @@ -1381,9 +1458,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1045142711562232} 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 &1068886911742040 @@ -1411,13 +1496,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1068886911742040} + 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: 4511965426731848} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33621799137673010 MeshFilter: @@ -1494,13 +1579,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1095195590912222} + 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: 4560302905391112} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33808926566088872 MeshFilter: @@ -1577,13 +1662,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1122114045904648} + 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: 4401839305095188} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33197401792477740 MeshFilter: @@ -1662,13 +1747,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1173171073385108} + 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: 4987826134018012} - m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33215534452313844 MeshFilter: @@ -1728,9 +1813,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1173171073385108} 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 &114009177938015764 @@ -1758,6 +1851,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} @@ -1802,13 +1904,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1225330402099696} + 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: 4199709033773110} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33201303246395208 MeshFilter: @@ -1885,13 +1987,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1239516176388870} + 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: 4583253585690090} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33211422424025736 MeshFilter: @@ -1968,13 +2070,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1259949351074368} + 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: 4752066769842734} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33453515146481754 MeshFilter: @@ -2051,13 +2153,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1294157172380824} + 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: 4401839305095188} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33988888348342816 MeshFilter: @@ -2134,13 +2236,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1316553682398480} + 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: 4849344738282920} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33478077004114106 MeshFilter: @@ -2217,13 +2319,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1320028852325204} + 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: 4560302905391112} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33500535723270066 MeshFilter: @@ -2302,6 +2404,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1325287791365946} + 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} @@ -2310,7 +2413,6 @@ Transform: - {fileID: 4629125763619662} - {fileID: 4231618220447054} m_Father: {fileID: 4987826134018012} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33486269581621554 MeshFilter: @@ -2387,6 +2489,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} @@ -2413,9 +2524,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1325287791365946} 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 &1336878034408986 @@ -2443,13 +2562,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1336878034408986} + 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: 4899860777075550} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33572425144981616 MeshFilter: @@ -2528,6 +2647,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1341374961367108} + 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} @@ -2536,7 +2656,6 @@ Transform: - {fileID: 4522963442166718} - {fileID: 4629301845662422} m_Father: {fileID: 4987826134018012} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33152097647845546 MeshFilter: @@ -2613,6 +2732,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} @@ -2639,9 +2767,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1341374961367108} 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 &1429706728465662 @@ -2671,6 +2807,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1429706728465662} + 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} @@ -2679,7 +2816,6 @@ Transform: - {fileID: 4277663897643548} - {fileID: 4384697508490590} m_Father: {fileID: 4987826134018012} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33248762093001474 MeshFilter: @@ -2756,6 +2892,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} @@ -2782,9 +2927,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1429706728465662} 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 &1460707959648700 @@ -2812,13 +2965,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1460707959648700} + 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: 4511965426731848} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33292712281572088 MeshFilter: @@ -2896,6 +3049,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1464418273390488} + 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} @@ -2916,7 +3070,6 @@ Transform: - {fileID: 4388109476167430} - {fileID: 4874383899918386} m_Father: {fileID: 457820} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114390729393873594 MonoBehaviour: @@ -2943,6 +3096,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: 1828042464346620} @@ -2963,9 +3125,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1464418273390488} 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 &114517528198912880 @@ -3005,13 +3175,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1470122324660056} + 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: 4955679311667128} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33488315794649814 MeshFilter: @@ -3088,13 +3258,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1521704884557320} + 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: 4081339383792766} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33291958012442388 MeshFilter: @@ -3173,6 +3343,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1534635085516240} + 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} @@ -3181,7 +3352,6 @@ Transform: - {fileID: 4845959139908808} - {fileID: 4651274934816280} m_Father: {fileID: 4987826134018012} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33394391474382742 MeshFilter: @@ -3258,6 +3428,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} @@ -3284,9 +3463,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1534635085516240} 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 &1546409615781184 @@ -3314,13 +3501,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1546409615781184} + 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: 4752066769842734} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33954329024379868 MeshFilter: @@ -3399,6 +3586,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1589488024180748} + 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} @@ -3407,7 +3595,6 @@ Transform: - {fileID: 4518891295224158} - {fileID: 4214855725233142} m_Father: {fileID: 4987826134018012} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33739381203405168 MeshFilter: @@ -3484,6 +3671,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} @@ -3510,9 +3706,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1589488024180748} 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 &1623268025553172 @@ -3542,6 +3746,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1623268025553172} + 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} @@ -3550,7 +3755,6 @@ Transform: - {fileID: 4876631101703082} - {fileID: 4003099579237326} m_Father: {fileID: 4987826134018012} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33097858168767402 MeshFilter: @@ -3627,6 +3831,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} @@ -3653,9 +3866,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1623268025553172} 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 &1652101200395126 @@ -3685,6 +3906,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1652101200395126} + 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} @@ -3693,7 +3915,6 @@ Transform: - {fileID: 4575104272437520} - {fileID: 4455900687172376} m_Father: {fileID: 4987826134018012} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33599774249954356 MeshFilter: @@ -3770,6 +3991,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} @@ -3796,9 +4026,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1652101200395126} 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 &1666804009135450 @@ -3826,13 +4064,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1666804009135450} + 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: 4199709033773110} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33094899670974002 MeshFilter: @@ -3911,6 +4149,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1742036980236408} + 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} @@ -3919,7 +4158,6 @@ Transform: - {fileID: 4671655840828330} - {fileID: 4776414701783990} m_Father: {fileID: 4987826134018012} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33394192381210146 MeshFilter: @@ -3996,6 +4234,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} @@ -4022,9 +4269,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1742036980236408} 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 &1762803892830380 @@ -4052,13 +4307,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1762803892830380} + 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: 4955679311667128} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33457206555735776 MeshFilter: @@ -4135,13 +4390,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1795120565229932} + 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: 4849344738282920} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33750782876786696 MeshFilter: @@ -4218,13 +4473,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1812545929815744} + 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: 4242888187637946} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33924949832364642 MeshFilter: @@ -4301,13 +4556,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1818163194938814} + 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: 4081339383792766} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33178268923077974 MeshFilter: @@ -4386,13 +4641,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1828042464346620} + 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: 4987826134018012} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33501584768716402 MeshFilter: @@ -4452,9 +4707,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1828042464346620} 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 &114424494261967632 @@ -4482,6 +4745,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} @@ -4526,13 +4798,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1840566682281644} + 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: 4583253585690090} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33399706850251968 MeshFilter: @@ -4609,13 +4881,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1884034506313884} + 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: 4899860777075550} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33685593175333900 MeshFilter: @@ -4694,6 +4966,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1892627715501604} + 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} @@ -4702,7 +4975,6 @@ Transform: - {fileID: 4161529488360534} - {fileID: 4034421993837658} m_Father: {fileID: 4987826134018012} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33022905201746602 MeshFilter: @@ -4779,6 +5051,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} @@ -4805,9 +5086,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1892627715501604} 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 &1898448960570084 @@ -4835,13 +5124,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1898448960570084} + 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: 4910167534954346} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33429636850874410 MeshFilter: @@ -4920,6 +5209,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1955756542660386} + 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} @@ -4928,7 +5218,6 @@ Transform: - {fileID: 4610220566871394} - {fileID: 4202094304577002} m_Father: {fileID: 4987826134018012} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33237723500592688 MeshFilter: @@ -5005,6 +5294,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} @@ -5031,9 +5329,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1955756542660386} 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 &1989153269657150 @@ -5061,13 +5367,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1989153269657150} + 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: 4242888187637946} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33141063034174456 MeshFilter: @@ -5119,3 +5425,66 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1001 &2572521163231377227 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 434816} + 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 &2575239402434674311 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, + type: 3} + m_PrefabInstance: {fileID: 2572521163231377227} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab b/Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab new file mode 100644 index 0000000000..8f35066f99 --- /dev/null +++ b/Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab @@ -0,0 +1,1724 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1366882551601991066 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1884626016259365661} + - component: {fileID: 4220200482343937391} + - component: {fileID: 6988663123546496789} + m_Layer: 16 + m_Name: ValueText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1884626016259365661 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + 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_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_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.15, y: -5.13} + m_SizeDelta: {x: 0.2, y: 0.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &4220200482343937391 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1366882551601991066} + 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: 2122602, guid: ec48085d8b1ed18499cf1411d42005a0, 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: 1 + 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 &6988663123546496789 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1366882551601991066} + 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: 99 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: ec48085d8b1ed18499cf1411d42005a0, type: 2} + m_sharedMaterial: {fileID: 2122602, guid: ec48085d8b1ed18499cf1411d42005a0, 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: 1 + m_fontSizeBase: 1 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -0.092847615, y: 0, z: -0.103544034, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 4220200482343937391} + m_maskType: 0 +--- !u!1 &4905375960837836422 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7824979537496111407} + - component: {fileID: 1495263022959812396} + - component: {fileID: 791795469446217164} + m_Layer: 16 + m_Name: MaxText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7824979537496111407 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4905375960837836422} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.010000063} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4471627121253688460} + 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_SizeDelta: {x: 0.2, y: 0.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &1495263022959812396 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4905375960837836422} + 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: 2122602, guid: ec48085d8b1ed18499cf1411d42005a0, 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: 1 + 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 &791795469446217164 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4905375960837836422} + 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: 99 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: ec48085d8b1ed18499cf1411d42005a0, type: 2} + m_sharedMaterial: {fileID: 2122602, guid: ec48085d8b1ed18499cf1411d42005a0, 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: 1 + m_fontSizeBase: 1 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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: 1 + 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: 1495263022959812396} + m_maskType: 0 +--- !u!1 &7353319288416430107 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8879551121032234077} + - component: {fileID: 6476449211560461609} + - component: {fileID: 7444929264988374951} + m_Layer: 16 + m_Name: MinText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8879551121032234077 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7353319288416430107} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.010000207} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4471627121253688460} + 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_SizeDelta: {x: 0.2, y: 0.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &6476449211560461609 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7353319288416430107} + 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: 2122602, guid: ec48085d8b1ed18499cf1411d42005a0, 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: 1 + 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 &7444929264988374951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7353319288416430107} + 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: 99 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: ec48085d8b1ed18499cf1411d42005a0, type: 2} + m_sharedMaterial: {fileID: 2122602, guid: ec48085d8b1ed18499cf1411d42005a0, 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: 1 + m_fontSizeBase: 1 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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: 1 + 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: 6476449211560461609} + m_maskType: 0 +--- !u!1001 &800866435964202640 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4471627121253806520} + m_Modifications: + - target: {fileID: 7630606763700834929, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Name + value: MaxLimits + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalScale.x + value: 0.09374998 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalScale.y + value: 0.09374998 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalScale.z + value: 0.075 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_HoverScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_ZAdjustClick + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_ZAdjustHover + value: -0.001 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_ButtonTexture + value: + objectReference: {fileID: 2800000, guid: 609917f61fdca0d469c1bc06bfeb713b, type: 3} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_DescriptionText + value: Maximum Value + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_DescriptionType + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_HoverBoxColliderGrow + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_DescriptionActivateSpeed + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2514466698640951438} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: HandleChangeLimits + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: TiltBrush.PolyhydraSlider, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + 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, + type: 3} + propertyPath: m_Size.x + value: 0.9999999 + objectReference: {fileID: 0} + - target: {fileID: 975834435811877436, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_Size.y + value: 4.206745 + 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.y + value: 1.6033727 + objectReference: {fileID: 0} + - target: {fileID: 975834435811877436, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_Center.z + value: 0.0043739914 + objectReference: {fileID: 0} + - target: {fileID: 975834435814035598, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.002 + objectReference: {fileID: 0} + - target: {fileID: 975834435814035598, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.308 + objectReference: {fileID: 0} + - target: {fileID: 975834435814035598, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 975834435814062736, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.005 + objectReference: {fileID: 0} + - target: {fileID: 975834435814062736, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.214 + objectReference: {fileID: 0} + - target: {fileID: 975834435814062736, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 975834435814079746, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.008 + objectReference: {fileID: 0} + - target: {fileID: 975834435814079746, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.261 + objectReference: {fileID: 0} + - target: {fileID: 975834435814079746, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 975834435814114336, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.014 + objectReference: {fileID: 0} + - target: {fileID: 975834435814114336, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.165 + objectReference: {fileID: 0} + - target: {fileID: 975834435814114336, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.59 + objectReference: {fileID: 0} + - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.029999733 + objectReference: {fileID: 0} + - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 975834435814146394, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.003 + objectReference: {fileID: 0} + - target: {fileID: 975834435814146394, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 975834435814146394, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 975834435814146394, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 975834435814146394, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 975834435814146394, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 975834435814149948, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 975834435814149948, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.008 + objectReference: {fileID: 0} + - target: {fileID: 975834435814149948, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 975834435814149948, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 975834435814149948, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 975834435814149948, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 975834435814208152, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 975834435814209696, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 975834435814379256, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 975834435814379478, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_Name + value: AdvancedSliderV + objectReference: {fileID: 0} + - target: {fileID: 975834435814423874, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 975834435816094086, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 975834435816409572, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 975834435816411850, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 975834435816451644, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: max + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: min + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: maxText + value: + objectReference: {fileID: 791795469446217164} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: minText + value: + objectReference: {fileID: 7444929264988374951} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: valueText + value: + objectReference: {fileID: 6988663123546496789} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_DescriptionText + value: P Value + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: onUpdateValue.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: onUpdateValue.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: HandleSliderP + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: HandleSliderP + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: onUpdateValue.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: onUpdateValue.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: onUpdateValue.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: HandleSliderP + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: onUpdateValue.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_FloatArgument + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: onUpdateValue.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 975834435824077772, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_Icon + value: + objectReference: {fileID: 0} + - target: {fileID: 975834435824087934, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + propertyPath: m_Icon + value: + 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: + m_CorrespondingSourceObject: {fileID: 975834435814379478, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + m_PrefabInstance: {fileID: 3712291086473841850} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2514466698640951438 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4471627121253417836} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 42c914c85d400664c9df3239aafbec71, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DescriptionType: -1 + m_DescriptionYOffset: 0 + m_DescriptionText: + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + 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: 10 + m_Nob: {fileID: 4471627121253469398} + m_Mesh: {fileID: 4471627121255601424} + m_Orientation: 1 + m_DisplayDecimalPlaces: 1 + m_Param1: 0 + m_Param2: 0 + m_safeMin: 0 + m_safeMax: 1 + m_unsafeMin: 0 + m_unsafeMax: 1 + m_SafeLimits: 1 + m_InitialValue: 0.5 + minText: {fileID: 7444929264988374951} + maxText: {fileID: 791795469446217164} + valueText: {fileID: 6988663123546496789} + SliderType: 1 + onUpdateValue: + m_PersistentCalls: + m_Calls: [] + references: + version: 2 + RefIds: [] +--- !u!1 &4471627121253469398 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 975834435814391916, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + m_PrefabInstance: {fileID: 3712291086473841850} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4471627121253681306 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 975834435814114336, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + m_PrefabInstance: {fileID: 3712291086473841850} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4471627121253688460 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + m_PrefabInstance: {fileID: 3712291086473841850} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4471627121253715424 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 975834435814146394, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + m_PrefabInstance: {fileID: 3712291086473841850} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4471627121253758506 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 975834435814062736, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + m_PrefabInstance: {fileID: 3712291086473841850} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4471627121253768244 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 975834435814035598, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + m_PrefabInstance: {fileID: 3712291086473841850} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4471627121253806520 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 975834435814079746, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + m_PrefabInstance: {fileID: 3712291086473841850} + m_PrefabAsset: {fileID: 0} +--- !u!23 &4471627121255601424 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 975834435816397226, guid: ebe6fa705c559de4084f3b11e7668c61, + type: 3} + m_PrefabInstance: {fileID: 3712291086473841850} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7102101814680079538 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4471627121253681306} + m_Modifications: + - target: {fileID: 7630606763700834929, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Name + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalScale.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalScale.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.39 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.01000319 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.z + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_HoverScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_ZAdjustClick + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_ZAdjustHover + value: -0.001 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_ButtonTexture + value: + objectReference: {fileID: 2800000, guid: ab8b9a0b96b6cb74ca1e518f3c56b425, type: 3} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_DescriptionText + value: Increase + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_DescriptionType + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_HoverBoxColliderGrow + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_DescriptionActivateSpeed + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2514466698640951438} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: HandleIncrement + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: TiltBrush.PolyhydraSlider, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + 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, + type: 3} + propertyPath: m_Name + value: MinLimits + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalScale.x + value: 0.09375 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalScale.y + value: 0.09375 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalScale.z + value: 0.09375 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_HoverScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_ZAdjustClick + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_ZAdjustHover + value: -0.001 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_ButtonTexture + value: + objectReference: {fileID: 2800000, guid: 609917f61fdca0d469c1bc06bfeb713b, type: 3} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_DescriptionText + value: Minimum Value + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_DescriptionType + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_HoverBoxColliderGrow + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_DescriptionActivateSpeed + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2514466698640951438} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: HandleChangeLimits + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: TiltBrush.PolyhydraSlider, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + 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, + type: 3} + propertyPath: m_Name + value: Decrement + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalScale.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalScale.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.322 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.01 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_HoverScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_ZAdjustClick + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_ZAdjustHover + value: -0.001 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_ButtonTexture + value: + objectReference: {fileID: 2800000, guid: f74f6eac3e3e3c640b1a343ec46ba2dd, type: 3} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_DescriptionText + value: Decrease + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_DescriptionType + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_HoverBoxColliderGrow + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_DescriptionActivateSpeed + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2514466698640951438} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: HandleDecrement + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: TiltBrush.PolyhydraSlider, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + 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.meta b/Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab.meta new file mode 100644 index 0000000000..e0ba221377 --- /dev/null +++ b/Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 93b04d984a8fd234eb4a7227567865a7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UIComponents/BrushSettingsTray.prefab b/Assets/Prefabs/UIComponents/BrushSettingsTray.prefab new file mode 100644 index 0000000000..03081ca6dc --- /dev/null +++ b/Assets/Prefabs/UIComponents/BrushSettingsTray.prefab @@ -0,0 +1,492 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1503094713155990 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4073457010706892} + - component: {fileID: 114495678799595950} + - component: {fileID: 114279940278832510} + m_Layer: 16 + m_Name: BrushSettingsTray + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4073457010706892 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503094713155990} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.75, y: -0.518, z: 0.1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4144920620344815534} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &114495678799595950 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503094713155990} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ed240c59f162403a9a7e46111b7eb2ae, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DescriptionType: -1 + m_DescriptionYOffset: 0 + m_DescriptionText: + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + 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_Mesh: {fileID: 1596481825594902} + m_Border: {fileID: 505703257451421084} + m_AnimateSpeed: 8 + m_AnimateRange: {x: 0, y: 1} + m_ShowOnToolType: 10 + references: + version: 2 + RefIds: [] +--- !u!114 &114279940278832510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503094713155990} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 739d5b1996234d64992a2ae60c3723e9, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1596481825594902 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4418329079800618} + m_Layer: 16 + m_Name: Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4418329079800618 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1596481825594902} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.000000014901161, y: 0, z: 0} + m_LocalScale: {x: 0.75, y: 0.75, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 529174815131490180} + - {fileID: 529637542510126424} + - {fileID: 1510895170789172903} + m_Father: {fileID: 4144920620344815534} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1895032314352020 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4291139537264568} + - component: {fileID: 65343707767525102} + m_Layer: 16 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4291139537264568 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1895032314352020} + 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: 4144920620344815534} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &65343707767525102 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1895032314352020} + 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: 3 + m_Size: {x: 0.4, y: 1.7, z: 0.2} + m_Center: {x: 0, y: -0.18, z: 0} +--- !u!1 &527762663584930946 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 529174815131490180} + - component: {fileID: 514358804627021014} + - component: {fileID: 505945780469162462} + m_Layer: 16 + m_Name: PopupBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &529174815131490180 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527762663584930946} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.41800007, z: 0} + m_LocalScale: {x: 100, y: 100, z: 100} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4418329079800618} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &514358804627021014 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527762663584930946} + m_Mesh: {fileID: 2354710593453032189, guid: 8d7f6f9042de7b848b5659b416329439, type: 3} +--- !u!23 &505945780469162462 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527762663584930946} + 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: db0305ff9081c3b448ac79e85d26e5d4, 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 &527906196806127360 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 529637542510126424} + - component: {fileID: 513783929244077404} + - component: {fileID: 505703257451421084} + m_Layer: 16 + m_Name: PopupBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &529637542510126424 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527906196806127360} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.418, z: 0} + m_LocalScale: {x: 100, y: 100, z: 100} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4418329079800618} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &513783929244077404 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527906196806127360} + m_Mesh: {fileID: -9015812876457905431, guid: 8d7f6f9042de7b848b5659b416329439, type: 3} +--- !u!23 &505703257451421084 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527906196806127360} + 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: 77dd4ff8b1158a84397aba783cd0af05, 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 &4746940080256643886 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4144920620344815534} + m_Layer: 16 + m_Name: PivotOffset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4144920620344815534 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4746940080256643886} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.2, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4291139537264568} + - {fileID: 4418329079800618} + m_Father: {fileID: 4073457010706892} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &3096697584449339947 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4418329079800618} + m_Modifications: + - target: {fileID: 2514466698640951438, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: onUpdateValue.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2514466698640951438, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: m_LocalizedDescription.m_TableEntryReference.m_KeyId + value: 5065710952488960 + objectReference: {fileID: 0} + - target: {fileID: 2514466698640951438, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: m_LocalizedDescription.m_TableReference.m_TableCollectionName + value: GUID:c84355079ab3f3e4f8f3812258805f86 + objectReference: {fileID: 0} + - target: {fileID: 2514466698640951438, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: onUpdateValue.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 114495678799595950} + - target: {fileID: 2514466698640951438, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: onUpdateValue.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2514466698640951438, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: onUpdateValue.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OnSliderChanged + objectReference: {fileID: 0} + - target: {fileID: 2514466698640951438, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: onUpdateValue.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: TiltBrush.BrushSettingsTray, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 2514466698640951438, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: onUpdateValue.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4471627121253417836, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: m_Name + value: AdvancedSliderV + objectReference: {fileID: 0} + - target: {fileID: 4471627121253688460, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471627121253688460, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.184 + objectReference: {fileID: 0} + - target: {fileID: 4471627121253688460, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.03 + objectReference: {fileID: 0} + - target: {fileID: 4471627121253688460, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4471627121253688460, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471627121253688460, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471627121253688460, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471627121253688460, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471627121253688460, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471627121253688460, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 93b04d984a8fd234eb4a7227567865a7, type: 3} +--- !u!4 &1510895170789172903 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4471627121253688460, guid: 93b04d984a8fd234eb4a7227567865a7, + type: 3} + m_PrefabInstance: {fileID: 3096697584449339947} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/UIComponents/BrushSettingsTray.prefab.meta b/Assets/Prefabs/UIComponents/BrushSettingsTray.prefab.meta new file mode 100644 index 0000000000..8bd290bbba --- /dev/null +++ b/Assets/Prefabs/UIComponents/BrushSettingsTray.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ef594e7ddc7909f429747f1ebbe8af90 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GUI/BaseSlider.cs b/Assets/Scripts/GUI/BaseSlider.cs index ab2bb0b54a..fa73d7fe98 100644 --- a/Assets/Scripts/GUI/BaseSlider.cs +++ b/Assets/Scripts/GUI/BaseSlider.cs @@ -20,8 +20,16 @@ namespace TiltBrush public class BaseSlider : UIComponent { + [Serializable] + public enum Orientation + { + Horizontal, + Vertical + } + [SerializeField] public GameObject m_Nob; [SerializeField] private Renderer m_Mesh; + [SerializeField] private Orientation m_Orientation; [NonSerialized] public Vector3 m_MeshScale; protected float m_CurrentValue; @@ -55,6 +63,11 @@ override protected void OnDescriptionChanged() m_Description.transform.position = m_Nob.transform.position; m_Description.transform.rotation = m_Nob.transform.rotation; m_Description.transform.parent = m_Nob.transform; + if (m_Orientation == Orientation.Vertical) + { + m_Description.transform.Rotate(0, 0, 90); + m_Description.transform.localScale = Vector3.one; + } } override public void SetColor(Color color) @@ -83,7 +96,15 @@ public virtual void SetSliderPositionToReflectValue() if (m_Nob != null) { Vector3 vLocalPos = m_Nob.transform.localPosition; - vLocalPos.x = (m_CurrentValue - 0.5f) * m_MeshScale.x; + switch (m_Orientation) + { + case Orientation.Horizontal: + vLocalPos.x = (m_CurrentValue - 0.5f) * m_MeshScale.x; + break; + case Orientation.Vertical: + vLocalPos.y = (m_CurrentValue - 0.5f) * m_MeshScale.x; + break; + } m_Nob.transform.localPosition = vLocalPos; } } @@ -122,12 +143,25 @@ protected void PositionSliderNob(Vector3 pos_WS) { m_Nob.transform.position = pos_WS; Vector3 vLocalPos = m_Nob.transform.localPosition; - float fScaledBounds = 0.5f * m_MeshScale.x; - vLocalPos.x = Mathf.Clamp(vLocalPos.x, -fScaledBounds, fScaledBounds); - vLocalPos.y = 0.0f; + float fScaledBounds; + float fValue = 0; + switch (m_Orientation) + { + case Orientation.Horizontal: + fScaledBounds = 0.5f * m_MeshScale.x; + vLocalPos.x = Mathf.Clamp(vLocalPos.x, -fScaledBounds, fScaledBounds); + vLocalPos.y = 0.0f; + fValue = (vLocalPos.x / m_MeshScale.x) + 0.5f; + break; + case Orientation.Vertical: + fScaledBounds = 0.5f * m_MeshScale.x; + vLocalPos.x = 0.0f; + vLocalPos.y = Mathf.Clamp(vLocalPos.y, -fScaledBounds, fScaledBounds); + fValue = (vLocalPos.y / m_MeshScale.x) + 0.5f; + break; + } vLocalPos.z = 0.0f; m_Nob.transform.localPosition = vLocalPos; - float fValue = (vLocalPos.x / m_MeshScale.x) + 0.5f; UpdateValue(fValue); OnPositionSliderNobUpdated(); } diff --git a/Assets/Scripts/GUI/BaseTray.cs b/Assets/Scripts/GUI/BaseTray.cs index 6d860f4745..51f5b9f63a 100644 --- a/Assets/Scripts/GUI/BaseTray.cs +++ b/Assets/Scripts/GUI/BaseTray.cs @@ -20,14 +20,14 @@ namespace TiltBrush public abstract class BaseTray : UIComponent { - [SerializeField] private GameObject m_Mesh; + [SerializeField] protected GameObject m_Mesh; [SerializeField] private Renderer m_Border; [SerializeField] private float m_AnimateSpeed; - [SerializeField] private Vector2 m_AnimateRange; + [SerializeField] protected Vector2 m_AnimateRange; private UIComponentManager m_UIComponentManager; private Coroutine m_AnimationCoroutine; - private bool m_AnimateIn; + protected bool m_AnimateIn; private bool m_AnimateWhenEnabled; public BaseTool.ToolType m_ShowOnToolType; @@ -130,22 +130,27 @@ protected virtual void OnToolChanged() m_ShowOnToolType; if (isSelectionTool != m_AnimateIn) { - if (m_AnimationCoroutine != null) - { - StopCoroutine(m_AnimationCoroutine); - } - m_AnimateIn = !m_AnimateIn; + DoAnimateIn(); + } + } - // If we get a callback that our tool changed while we're inactive, don't try to - // start our coroutine until we've been enabled. - if (isActiveAndEnabled) - { - m_AnimationCoroutine = StartCoroutine(Animate()); - } - else - { - m_AnimateWhenEnabled = true; - } + public void DoAnimateIn() + { + if (m_AnimationCoroutine != null) + { + StopCoroutine(m_AnimationCoroutine); + } + m_AnimateIn = !m_AnimateIn; + + // If we get a callback that our tool changed while we're inactive, don't try to + // start our coroutine until we've been enabled. + if (isActiveAndEnabled) + { + m_AnimationCoroutine = StartCoroutine(Animate()); + } + else + { + m_AnimateWhenEnabled = true; } } diff --git a/Assets/Scripts/GUI/BrushSettingsTray.cs b/Assets/Scripts/GUI/BrushSettingsTray.cs new file mode 100644 index 0000000000..59293107c4 --- /dev/null +++ b/Assets/Scripts/GUI/BrushSettingsTray.cs @@ -0,0 +1,56 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// 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 + { + + override protected void Start() + { + base.Start(); + + if (true) + { + DoAnimateIn(); + } + + // m_AnimateIn = true; + // Vector3 localScale = transform.localScale; + // localScale.x = m_AnimateRange.y; + // transform.localScale = localScale; + // m_Mesh.SetActive(true); + // m_Collider.enabled = true; + + transform.GetComponentInChildren().SetInitialValueAndUpdate( + PointerManager.m_Instance.MainPointer.BrushSize01 + ); + } + + protected override void OnToolChanged() + { + // No op + } + + public void OnSliderChanged(Vector3 value) + { + PointerManager.m_Instance.MainPointer.BrushSize01 = value.y; + } + } + +} // namespace TiltBrush diff --git a/Assets/Scripts/GUI/BrushSettingsTray.cs.meta b/Assets/Scripts/GUI/BrushSettingsTray.cs.meta new file mode 100644 index 0000000000..1d2cf055a4 --- /dev/null +++ b/Assets/Scripts/GUI/BrushSettingsTray.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ed240c59f162403a9a7e46111b7eb2ae +timeCreated: 1725121184 \ No newline at end of file From 7c32cbe398e38e38b95b9629aa99a552bf095319 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Fri, 6 Sep 2024 18:51:34 +0100 Subject: [PATCH 2/6] We were setting the brush size from the wrong slider vector component --- Assets/Scripts/GUI/BrushSettingsTray.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/GUI/BrushSettingsTray.cs b/Assets/Scripts/GUI/BrushSettingsTray.cs index 59293107c4..61be8a3659 100644 --- a/Assets/Scripts/GUI/BrushSettingsTray.cs +++ b/Assets/Scripts/GUI/BrushSettingsTray.cs @@ -49,7 +49,8 @@ protected override void OnToolChanged() public void OnSliderChanged(Vector3 value) { - PointerManager.m_Instance.MainPointer.BrushSize01 = value.y; + PointerManager.m_Instance.SetAllPointersBrushSize01(value.z); + PointerManager.m_Instance.MarkAllBrushSizeUsed(); } } From cd7a8b8a9d0020593bede2bb1fd3a605e1f922a4 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Sat, 7 Sep 2024 11:10:45 +0100 Subject: [PATCH 3/6] Add up/down arrow icons --- Assets/Resources/Icons/downarrow.png | Bin 0 -> 3073 bytes Assets/Resources/Icons/downarrow.png.meta | 110 ++++++++++++++++++++++ Assets/Resources/Icons/uparrow.png | Bin 0 -> 3017 bytes Assets/Resources/Icons/uparrow.png.meta | 110 ++++++++++++++++++++++ 4 files changed, 220 insertions(+) create mode 100644 Assets/Resources/Icons/downarrow.png create mode 100644 Assets/Resources/Icons/downarrow.png.meta create mode 100644 Assets/Resources/Icons/uparrow.png create mode 100644 Assets/Resources/Icons/uparrow.png.meta diff --git a/Assets/Resources/Icons/downarrow.png b/Assets/Resources/Icons/downarrow.png new file mode 100644 index 0000000000000000000000000000000000000000..27a413b041b9702adced6d385a3696c3469cf395 GIT binary patch literal 3073 zcmbtW2~-o;8lE7;lzkOcA|XgcB|BS2!;UNpBA}qw!jKFQC7F-}l2Ad20u>ReRV#}M zv>xD5g{l>6L>3ni>H-4hi2{`t5vrny5*x4+L{9ro-+Slv%{epk&%NLM{{26*H#EfG zKzETY000Jo0ls1AJ418hu;}xOJJgQ8J`x0M76E{sndZg-MI}}Mpz|>|B1#+;ybfd| zJTk;VVqvnBCqU5vu-Zc^fY>`=F(DR?=ki&^=ZXd*fy-eLBb|e(!2%yRfg6x2gu_!q zBG{=r*h~)5!=12N3Zeu&SPT)QyhOeTl(L93ydWxTmMKKS3`D$xMfB1rBt!*=5_}LL zOkk2}BsP^wC%7`nkPGC(V7fRG=v2BBh037N=p?Eu=;Q{{8HCx3h^iBE;=nN9HM7dl zFBUODEEa$iibNtIOBiHC7*C-wnM?|mPNCCDD1s!C@x_po#249pVDN=SY#~=5<|2H8 zh7pQIlEo|{YU+C*c!D`vzGya1Xv8Q|NI;>HsT!YVfE@N5PLM22oKenUQ{Y6H2lK@u z6ib`K3K9@8B1%C14fWjipA?|64Gx~u@t3yncylU5V!ssBjoE@T5Aknv|I zT2CBE4E}kMQ|_}$QOwrJ{u17 zWf9SMkhxqA$Z%#mL#|8?38FhONN%tblLS$jOi~<`L8noj*-SS5y%*?tUxb~k$@+)$ zod5CsdLb8WJ1FsQ^Jtn;Q!ZctSA-@~Hrp-XaMG-l$R*5F2new?mCquwH7SQV#Mx!; z-;Th0T1f(olKzKuzlVvCII#p0!d~%cwEnMBqo9saH2wSDN6NptKeP9TUjG0`2Z%=)@DEqiu0zfdiP_FH1T+=ZX(tWDvK=#k<{`Py5 zPMMLDIXv@uNJgdV4UURG@wN8xq7x@FD2-U9%ggM@PMti@2gCTObxVQ*@wvCV%9IaO z6Nk(k$Cded6%w+E{-N3%K8YW=N);}Py1rV`lSZmdV1>Z6KRLdhF#>>PCazvp42{fuhu)g zaa;HHvC3OO`|8(&ClCJwxkj1xtm!+oqKGyw*H&SURrk!h-n&r${>zro>-rK)yXL<7 z#ao%b-MxRytZaOW6+zu??29^O==Gpu-;K>g56`lMf8IFo(cUj?4&596{%#0$JvA0b>HgV5|rvJ_pA?6DQt~)vc`1Gv{(gC9gr$TV|4f>rK#$C z1y}=D?;yQ8rsc?Bx!`g36A`sf-)3CK+>!OC9UuOVbtistjE-7))(TGT3)@xex^4Qx zj`_7+ip6a^CyyA0H$~!4B&LNg&(;1~cHT36bd&SCeU|*=0-i2adNF`ze7yD`@G%SKk)DYrX&F#2zwyxDv3 z2>DJA=18T=9ZGnj#lsW)>(puNwGVaj-R@x)pv$q$v;Gn?;PFsl>X&EPcRU2MfHm}d zmH%U0$g0NJwjgtp1vw2RSkK;uch<6*^MP|Vl!%rqx)`jcNnns+kY`->jT9%vv0=PZMmE8 zmcMtMq!N(Dnjn+K`<$Ik|0vetxvV zHGi;r9xEAl@o4nMjTSB6q3a#GaRU3>r`MUtPY*?Iw0Gy@4>jtOdyg;OYi2vlPCvNx z(O{3)6GyF>ys9&fW(Hn1<7XXy z8rN%#u*F?f%di7|wzyWc3On$rE$&CPY<|qI#@Y$f>Uq>nI4$S?0^q?SdB)8*%K#rA z;|r>EotOZemTQB&&|3G1erC&%C3W|gUI%T*lI^WNY@dtsUov{F{L0{?Yvpx~6;HNr_;|={ znZ%4GX#kF4)xTubrM4dxC_7&qp#e6}x8xF=Hm{#Jp9F<=j-OAmzpu0NksV25*uAyo z?fM&yTU(AKSdL}(toImxI+zyUez>_p2cnz58L4>n?U&0w zDb`AfdS%`8zzrPgzdoA3ep6VE{gO}e>Glmt6(SI{xKQ(LcRfRVOe;k>q_ggJ%ksOS zVaNoca4#J-7ffosD|amvAC5knkc7y0R)^zP{xBS+msXMCLnmDP=|!7#^@h6XKw6g~ zyYq(8Hm1CnV}eOLtMsyPyOU+-q}^21VCS9g=^ftH^i}n%hX#p*HUr3rT~>eItCFBq z9`kkuStjMbxRQ1DG+A6P- z>VufUr%Tt06{Q8aaX(&aE)Vy%gr%2plB|^7E~l^sBR|#-kCgkIlulP6Y%ir^AM@e` ztdI1rcgLl8(V$Y6)%1=~`2tUE{7hZ6=;aWr@W6Eks|AgAFR_N*c3?|^{N%JY+*+I( zyg9rYpJr|zW0P$zJ1Yq)ta^gZx0I|49jitdaYMIiBExE$r`FYDcZnX~Q>=8?9x(59 y!1mR8>|fNuvbO)NeaIaXUAe!nb8xGxXkb^AUr=sJ8~?H9Cq2+F#P_s!jQn@rMb$?D literal 0 HcmV?d00001 diff --git a/Assets/Resources/Icons/downarrow.png.meta b/Assets/Resources/Icons/downarrow.png.meta new file mode 100644 index 0000000000..1c3126550f --- /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 0000000000000000000000000000000000000000..5cd267cd11ebe62dfbea77737bbb4d19910703b4 GIT binary patch literal 3017 zcmbtW2~-nj9-jaSkSfIhf-9J5qzWiG36NkogOZhSNI2A@PLct#kW5G-3CIz^dewT> z(#jzqiY^ra5s!+JD&^2v50I@}fhY)+SBl6|q@}VGL|(hk-F@4g_h#n%&-eR&|NH-D zZ$#L-h4??=0RULY3*l}+-&*5sfkU4+eWBav%TgY)Q3(L=*cfjNP+05$0N520L7Xa% zAIcUXQZgh)gfLknm7{0?SmURWL!x9@1q$IriHt)Uz1lb8J;Jx_6F|S zIc2ECAtk9)ayEscR;$Ts1{qN#QfMp|i$bMS=yZ1!;jT=VsUVHJOu76G0~c0`6cV{g zg2+H4BP2w&t2iXo)Ym>p<@2;Mn&!5-vR$HXfc@;`ka2o2yTtME6RtnPPFl7U* zM7AqLaBv!G=5nJqa(0jchE#|`fFLPvG8OU0WRT7z(-@$OF*#Hgl}475>0V4P&;u5G ziXq4q1YKe!GBKi7y8ea?=0Yl%Loyz6r?Sv=3TQMonp7%v6%}1jUqktbSdx(bRw#>2 z_xK$YttT<0g8nO5EMg}h3MqsJLn4I|VTxRqNCM|W%nm|Q5Cy6jwT>}s1)tC6$&@Nc zCW3if4hfA1St1d$MJ!J*7SogF&JrdhxU)naEO!k`8T327)gyLdYj;&1 zVFEW(TP-v=SvU9{1UklZI(5mvOssm2ZOfIeLNv>rbY{)fJq&$+U8e_c?AQv|7v`nm zteYm`{uO2y1-eNg^Xy?n zZXews?Q<`H^?j$J4G=TLBKeTIrt0FIMlkq#z-Lt|?hc>)fc39z-Qo-?8tI4cyF1-j zkGs;2Ta1hn%lBcO19lb?QwYv&UJ({ma``Un_j;-2uES4mujVE_`Yhr@Q=WDCfO(M_ zu4MR1*%6;}HjnGwF6(j$CxJU|&q`YyU#9h2MwwhYIO5`WPmr54;Jq;~^HEfM%!BVY znFn13ZU@%z%>(%zb}7Fsd)}?HX)GJKx*y{iWaU7|#hEr)O%3j|D5yL?nDy#1V!usN zx%8Ie<>6)V0lnmH5gQ|mx6$v$v>lX1_g(n8{`Ft7PE=OlRnb~A zX79=cPLq~jy7})tFr6h@AB7FOEWpH^ner80p;lZy3N&%pgy8*1BWKiPb;g}ub=Z%K ziet48ix0by&K_uDg#+$0uar;6Qth|he?i1=y_(yHuRXGdy9jESdFqYHKIUf?yr*Uh zQH}A*^|xj9=*mr+6{#+P&1II>bee8*#B21~(?jp^2xl9BluMhBmzD)RaaSM3w3!y;{cMEf@uEp5ODX$k>qSGuNHT= zw4c>Etvdo@4-&ug?V8pe0mnTtKQjFeIk)LU0D6qSa5lZ!)ZP7h}k<1=FPQQ_{qis7Mxw`+;%>+ zu{)#f!3LIf=;^Z!SI@65q0ek09EGpcckOFU3$kywGo(_%w+X>nPXrA4ZQ@_@CdGz>S7VZu=A9N`{obL;g#9_;gZPC)mcq@s__hK|fS z7smMB`fe^|#J;Rs+mzW?En8w^wK+q!#B>ujv%l{Yarj~?6v2>xce(Ju{>a7c>)2^l z535DLo=)iRs$-&Vz%*7*4BRzMSn-ew+n22A zi?Oe5Juzuf(9+JFA@}?=oyg>$Z?3o*InW=T(bMt$X3S5v{vOXA;4NDuxa?~Vg+Rdy zOTDh|X!;q6zV|0i8DcNb%*(mYUlIRIov`U~5y|gXbcx%w;W)HIwIbCTgH_Ffp~=%X z?u9Nq#qd*oYH^^Qa{@d)hQvp$-A;#!GwKr1## z@Z@<&&g#V@grCpo#)B^>_b+`EUA^wo@QvD`zzz|td3A1782oL=*M#^F^2=Sb>|X5B zpQ_5bGw{vDaeV&F-m;cS9T5KVA@k^&v5GhhrERHq3?+%^XIW6`X4_Vju|9a|7bT5$ zwuVCsmb^$9{j@HkV|1h45BStCCOy=8eg56pj8SVP uwI2_aIx=^+4qP|cnzX-%Ziw<)Z^&^;VPpN;eoiy~Z1aM{xaR`5<^2<-EUBmf literal 0 HcmV?d00001 diff --git a/Assets/Resources/Icons/uparrow.png.meta b/Assets/Resources/Icons/uparrow.png.meta new file mode 100644 index 0000000000..f5706f0ece --- /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: From d5e535ad6998c4f05be07e4fe1336f6f1f191f49 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Sat, 7 Sep 2024 11:11:31 +0100 Subject: [PATCH 4/6] Brush size slider fixes --- .../Panels/Widgets/AdvancedSlider.prefab | 90 +++++++++++++++++-- .../Panels/Widgets/AdvancedSliderV.prefab | 47 +++++----- .../UIComponents/BrushSettingsTray.prefab | 15 +++- Assets/Scripts/GUI/BrushSettingsTray.cs | 32 +++++-- Assets/Scripts/Switchboard.cs | 6 ++ Assets/Scripts/Tools/FreePaintTool.cs | 1 + 6 files changed, 153 insertions(+), 38 deletions(-) diff --git a/Assets/Prefabs/Panels/Widgets/AdvancedSlider.prefab b/Assets/Prefabs/Panels/Widgets/AdvancedSlider.prefab index 6a9990fc31..9662ca99c4 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 8f35066f99..fda64f65e7 100644 --- a/Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab +++ b/Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab @@ -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.26099947} 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.282} 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.28199944 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} @@ -748,7 +753,7 @@ 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} @@ -1256,7 +1261,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 +1271,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 +1322,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 +1594,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 +1614,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 +1660,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/UIComponents/BrushSettingsTray.prefab b/Assets/Prefabs/UIComponents/BrushSettingsTray.prefab index 03081ca6dc..298f236acb 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: [] @@ -427,7 +428,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 +485,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/Scripts/GUI/BrushSettingsTray.cs b/Assets/Scripts/GUI/BrushSettingsTray.cs index 61be8a3659..3f957ef5ae 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,14 +55,12 @@ 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) diff --git a/Assets/Scripts/Switchboard.cs b/Assets/Scripts/Switchboard.cs index a5795b23a4..d91744c3e6 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 75a407c46b..c033b27843 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; From c7d1f8971f7bbdf98ec7c215680f7a0875167ab1 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Sat, 7 Sep 2024 11:30:45 +0100 Subject: [PATCH 5/6] Correct orientation for slider increment button. Prefab fixes --- .../Panels/Widgets/AdvancedSliderV.prefab | 30 ++++++++++++------- .../UIComponents/BrushSettingsTray.prefab | 2 +- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab b/Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab index fda64f65e7..2a89c43c16 100644 --- a/Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab +++ b/Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab @@ -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.00020009885, 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.005, y: -0.282} + 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 @@ -728,7 +728,7 @@ PrefabInstance: - target: {fileID: 975834435814035598, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_LocalPosition.y - value: -0.28199944 + value: -0.293 objectReference: {fileID: 0} - target: {fileID: 975834435814035598, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} @@ -743,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} @@ -758,7 +758,7 @@ PrefabInstance: - 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} @@ -768,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 @@ -908,7 +918,7 @@ PrefabInstance: - target: {fileID: 975834435814379256, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 975834435814379478, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} @@ -933,7 +943,7 @@ PrefabInstance: - target: {fileID: 975834435816411850, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 975834435816451644, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} @@ -1126,7 +1136,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 42c914c85d400664c9df3239aafbec71, type: 3} m_Name: m_EditorClassIdentifier: - m_DescriptionType: -1 + m_DescriptionType: 1 m_DescriptionYOffset: 0 m_DescriptionText: m_LocalizedDescription: diff --git a/Assets/Prefabs/UIComponents/BrushSettingsTray.prefab b/Assets/Prefabs/UIComponents/BrushSettingsTray.prefab index 298f236acb..096d9b4f42 100644 --- a/Assets/Prefabs/UIComponents/BrushSettingsTray.prefab +++ b/Assets/Prefabs/UIComponents/BrushSettingsTray.prefab @@ -393,7 +393,7 @@ PrefabInstance: - target: {fileID: 2514466698640951438, guid: 93b04d984a8fd234eb4a7227567865a7, type: 3} propertyPath: m_LocalizedDescription.m_TableEntryReference.m_KeyId - value: 5065710952488960 + value: 172767995928834048 objectReference: {fileID: 0} - target: {fileID: 2514466698640951438, guid: 93b04d984a8fd234eb4a7227567865a7, type: 3} From d36ec4f9434cdfa7b846bae46d68b79cccda9c44 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Sun, 8 Sep 2024 19:08:17 +0100 Subject: [PATCH 6/6] FInish off vertical slider UI --- Assets/Prefabs/Panels/BrushesPanel.prefab | 4 +- .../Prefabs/Panels/BrushesPanel_Mobile.prefab | 461 +++++++- .../Panels/Widgets/AdvancedSliderV.prefab | 28 +- .../SliderDescriptionVertical_Pill.prefab | 864 ++++++++++++++ ...SliderDescriptionVertical_Pill.prefab.meta | 7 + ...erDescriptionVertical_Pill_TwoLines.prefab | 1038 +++++++++++++++++ ...criptionVertical_Pill_TwoLines.prefab.meta | 7 + .../UIComponents/BrushSettingsTray.prefab | 7 +- Assets/Scenes/Main.unity | 5 +- Assets/Scripts/Config.cs | 17 +- Assets/Scripts/GUI/BaseSlider.cs | 10 +- .../Strings/Strings Shared Data.asset | 4 + .../Localization/Strings/Strings_en.asset | 4 + 13 files changed, 2373 insertions(+), 83 deletions(-) create mode 100644 Assets/Prefabs/SliderDescriptionVertical_Pill.prefab create mode 100644 Assets/Prefabs/SliderDescriptionVertical_Pill.prefab.meta create mode 100644 Assets/Prefabs/SliderDescriptionVertical_Pill_TwoLines.prefab create mode 100644 Assets/Prefabs/SliderDescriptionVertical_Pill_TwoLines.prefab.meta diff --git a/Assets/Prefabs/Panels/BrushesPanel.prefab b/Assets/Prefabs/Panels/BrushesPanel.prefab index f05e14935b..e33632aae8 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 1a75c0fd3e..05f48783bf 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/AdvancedSliderV.prefab b/Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab index 2a89c43c16..8d30b1e559 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 @@ -845,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 @@ -863,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} @@ -918,7 +928,7 @@ PrefabInstance: - target: {fileID: 975834435814379256, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 975834435814379478, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} @@ -943,7 +953,7 @@ PrefabInstance: - target: {fileID: 975834435816411850, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} propertyPath: m_Enabled - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 975834435816451644, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} @@ -1136,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: diff --git a/Assets/Prefabs/SliderDescriptionVertical_Pill.prefab b/Assets/Prefabs/SliderDescriptionVertical_Pill.prefab new file mode 100644 index 0000000000..79cf9bffc4 --- /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 0000000000..32ef1c0cc1 --- /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 0000000000..bde94f9b90 --- /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 0000000000..0325f1033c --- /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 096d9b4f42..b21c5017ca 100644 --- a/Assets/Prefabs/UIComponents/BrushSettingsTray.prefab +++ b/Assets/Prefabs/UIComponents/BrushSettingsTray.prefab @@ -385,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 @@ -393,7 +398,7 @@ PrefabInstance: - target: {fileID: 2514466698640951438, guid: 93b04d984a8fd234eb4a7227567865a7, type: 3} propertyPath: m_LocalizedDescription.m_TableEntryReference.m_KeyId - value: 172767995928834048 + value: 276171365497266176 objectReference: {fileID: 0} - target: {fileID: 2514466698640951438, guid: 93b04d984a8fd234eb4a7227567865a7, type: 3} diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index a244127cfd..3eb7b03bab 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 7ff74dcbbb..efadeeb3db 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 fa73d7fe98..c644ba998f 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() @@ -63,11 +68,6 @@ override protected void OnDescriptionChanged() m_Description.transform.position = m_Nob.transform.position; m_Description.transform.rotation = m_Nob.transform.rotation; m_Description.transform.parent = m_Nob.transform; - if (m_Orientation == Orientation.Vertical) - { - m_Description.transform.Rotate(0, 0, 90); - m_Description.transform.localScale = Vector3.one; - } } override public void SetColor(Color color) diff --git a/Assets/Settings/Localization/Strings/Strings Shared Data.asset b/Assets/Settings/Localization/Strings/Strings Shared Data.asset index c60ef0817e..4aaa38e1db 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 dc601834e7..0c50b585da 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: []