diff --git a/Assets/Prefabs/Probes/Pipette_100um.prefab b/Assets/Prefabs/Probes/Pipette_100um.prefab index 99ba44cf..87668b11 100644 --- a/Assets/Prefabs/Probes/Pipette_100um.prefab +++ b/Assets/Prefabs/Probes/Pipette_100um.prefab @@ -1,5 +1,38 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1026607253182833388 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6751269961660561659} + m_Layer: 10 + m_Name: Model + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6751269961660561659 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1026607253182833388} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, 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: 3870803029599558718} + - {fileID: 4144110547788140338} + m_Father: {fileID: 3485671869318689184} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1 &1420707051332254735 GameObject: m_ObjectHideFlags: 0 @@ -151,12 +184,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2698243037706463709} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -1.92} - m_LocalScale: {x: 0.125, y: 3.84, z: 0.125} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.9199998, z: 0} + m_LocalScale: {x: 0.125, y: 3.8400002, z: 0.125} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3485671869318689184} + m_Father: {fileID: 6751269961660561659} m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &267607643579158225 MeshFilter: @@ -236,12 +269,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2888827817699935360} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -5} - m_LocalScale: {x: 0.1, y: 5, z: 0.1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 5, z: 0} + m_LocalScale: {x: 0.1, y: 5, z: 0.10000001} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3485671869318689184} + m_Father: {fileID: 6751269961660561659} m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &5125959021611580786 MeshFilter: @@ -539,8 +572,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3870803029599558718} - - {fileID: 4144110547788140338} + - {fileID: 6751269961660561659} m_Father: {fileID: 4023158563732113569} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3485671869318689213 @@ -642,7 +674,6 @@ MonoBehaviour: _probeController: {fileID: 2207803182506741358} _lineMaterial: {fileID: 2100000, guid: ebc1facc3e73f274c8c4d918e266a49d, type: 2} _ghostMaterial: {fileID: 2100000, guid: b64d32d990074b34889dd43bce409aa6, type: 2} - surfaceCoordinateWorldT: {x: 0, y: 0, z: 0} --- !u!114 &4368194536080577050 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Probes/Pipette_200um.prefab b/Assets/Prefabs/Probes/Pipette_200um.prefab index 281b21c4..09afec87 100644 --- a/Assets/Prefabs/Probes/Pipette_200um.prefab +++ b/Assets/Prefabs/Probes/Pipette_200um.prefab @@ -151,12 +151,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2698243037706463709} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -1.92} - m_LocalScale: {x: 0.225, y: 3.84, z: 0.225} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.9199998, z: 0} + m_LocalScale: {x: 0.22500001, y: 3.8400002, z: 0.22500002} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3485671869318689184} + m_Father: {fileID: 4665772870319396272} m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &267607643579158225 MeshFilter: @@ -236,12 +236,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2888827817699935360} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -5} - m_LocalScale: {x: 0.2, y: 5, z: 0.2} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 5, z: 0} + m_LocalScale: {x: 0.2, y: 5, z: 0.20000002} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3485671869318689184} + m_Father: {fileID: 4665772870319396272} m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &5125959021611580786 MeshFilter: @@ -539,8 +539,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3870803029599558718} - - {fileID: 4144110547788140338} + - {fileID: 4665772870319396272} m_Father: {fileID: 4023158563732113569} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3485671869318689213 @@ -642,7 +641,6 @@ MonoBehaviour: _probeController: {fileID: 2207803182506741358} _lineMaterial: {fileID: 2100000, guid: ebc1facc3e73f274c8c4d918e266a49d, type: 2} _ghostMaterial: {fileID: 2100000, guid: b64d32d990074b34889dd43bce409aa6, type: 2} - surfaceCoordinateWorldT: {x: 0, y: 0, z: 0} --- !u!114 &4368194536080577050 MonoBehaviour: m_ObjectHideFlags: 0 @@ -703,3 +701,36 @@ MonoBehaviour: IsSetToDropToSurfaceWithDepthChangedEvent: m_PersistentCalls: m_Calls: [] +--- !u!1 &4940020979612041078 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4665772870319396272} + m_Layer: 10 + m_Name: Model + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4665772870319396272 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4940020979612041078} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, 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: 3870803029599558718} + - {fileID: 4144110547788140338} + m_Father: {fileID: 3485671869318689184} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} diff --git a/Assets/Prefabs/Probes/Pipette_25um.prefab b/Assets/Prefabs/Probes/Pipette_25um.prefab index 5d6f73e5..7dbc0dd9 100644 --- a/Assets/Prefabs/Probes/Pipette_25um.prefab +++ b/Assets/Prefabs/Probes/Pipette_25um.prefab @@ -120,13 +120,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2698243037706463709} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -1.92} - m_LocalScale: {x: 0.05, y: 3.84, z: 0.05} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.92, z: 0} + m_LocalScale: {x: 0.05, y: 3.84, z: 0.050000004} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3485671869318689184} - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_Father: {fileID: 3660772377889825401} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &267607643579158225 MeshFilter: m_ObjectHideFlags: 0 @@ -205,13 +205,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2888827817699935360} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -5} - m_LocalScale: {x: 0.025, y: 5, z: 0.025} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 5, z: 0} + m_LocalScale: {x: 0.025, y: 5, z: 0.025000002} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3485671869318689184} - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_Father: {fileID: 3660772377889825401} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5125959021611580786 MeshFilter: m_ObjectHideFlags: 0 @@ -477,6 +477,39 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &3156379734606293785 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3660772377889825401} + m_Layer: 10 + m_Name: Model + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3660772377889825401 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3156379734606293785} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, 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: 3870803029599558718} + - {fileID: 4144110547788140338} + m_Father: {fileID: 3485671869318689184} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1 &3485671869318689185 GameObject: m_ObjectHideFlags: 0 @@ -508,8 +541,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3870803029599558718} - - {fileID: 4144110547788140338} + - {fileID: 3660772377889825401} m_Father: {fileID: 4023158563732113569} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3485671869318689213 @@ -610,7 +642,6 @@ MonoBehaviour: _probeController: {fileID: 2207803182506741358} _lineMaterial: {fileID: 2100000, guid: ebc1facc3e73f274c8c4d918e266a49d, type: 2} _ghostMaterial: {fileID: 2100000, guid: b64d32d990074b34889dd43bce409aa6, type: 2} - surfaceCoordinateWorldT: {x: 0, y: 0, z: 0} --- !u!114 &4368194536080577050 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Probes/Pipette_50um.prefab b/Assets/Prefabs/Probes/Pipette_50um.prefab index 5314e6f9..3bf0e56f 100644 --- a/Assets/Prefabs/Probes/Pipette_50um.prefab +++ b/Assets/Prefabs/Probes/Pipette_50um.prefab @@ -120,12 +120,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2698243037706463709} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -1.92} - m_LocalScale: {x: 0.075, y: 3.84, z: 0.075} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.9199998, z: 0} + m_LocalScale: {x: 0.075, y: 3.8400002, z: 0.075} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3485671869318689184} + m_Father: {fileID: 7372804797232836525} m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &267607643579158225 MeshFilter: @@ -205,12 +205,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2888827817699935360} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -5} - m_LocalScale: {x: 0.05, y: 5, z: 0.05} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 5, z: 0} + m_LocalScale: {x: 0.05, y: 5, z: 0.050000004} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3485671869318689184} + m_Father: {fileID: 7372804797232836525} m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &5125959021611580786 MeshFilter: @@ -508,8 +508,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3870803029599558718} - - {fileID: 4144110547788140338} + - {fileID: 7372804797232836525} m_Father: {fileID: 4023158563732113569} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3485671869318689213 @@ -610,7 +609,6 @@ MonoBehaviour: _probeController: {fileID: 2207803182506741358} _lineMaterial: {fileID: 2100000, guid: ebc1facc3e73f274c8c4d918e266a49d, type: 2} _ghostMaterial: {fileID: 2100000, guid: b64d32d990074b34889dd43bce409aa6, type: 2} - surfaceCoordinateWorldT: {x: 0, y: 0, z: 0} --- !u!114 &4368194536080577050 MonoBehaviour: m_ObjectHideFlags: 0 @@ -671,3 +669,36 @@ MonoBehaviour: IsSetToDropToSurfaceWithDepthChangedEvent: m_PersistentCalls: m_Calls: [] +--- !u!1 &5492618716247240017 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7372804797232836525} + m_Layer: 10 + m_Name: Model + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7372804797232836525 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5492618716247240017} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, 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: 3870803029599558718} + - {fileID: 4144110547788140338} + m_Father: {fileID: 3485671869318689184} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} diff --git a/Library/com.unity.addressables/AddressablesBuildTEP.json b/Library/com.unity.addressables/AddressablesBuildTEP.json index ada43a45..6bb15d3c 100644 --- a/Library/com.unity.addressables/AddressablesBuildTEP.json +++ b/Library/com.unity.addressables/AddressablesBuildTEP.json @@ -1,9 +1,9 @@ { -"Date": "11/29/2023 10:12:58 PM", +"Date": "11/29/2023 10:20:31 PM", "UnityVersion": "2022.3.12f1", "com.unity.scriptablebuildpipeline": "1.21.20", "com.unity.addressables": "1.21.18", "traceEvents": [ -{"name": "Building Use Existing Build (requires built groups)", "ph": "X", "dur": 4539.3, "tid": 1, "ts": 1624, "pid": 1} +{"name": "Building Use Existing Build (requires built groups)", "ph": "X", "dur": 1420.8, "tid": 1, "ts": 1589, "pid": 1} ] }