Merge pull request 'MAVRIC-2178: Socket Fixes' (#21) from bugfix/MAVRIC-2178_Socket-Fixes into development

Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/21
This commit is contained in:
Joshua Latham 2023-11-10 17:16:27 +00:00
commit 5eb30b2b54

View File

@ -165,9 +165,9 @@ GameObject:
m_Component:
- component: {fileID: 1961561016324934063}
- component: {fileID: 6653872844417109238}
- component: {fileID: 8437017510020342149}
- component: {fileID: 451147257670573576}
- component: {fileID: 2737193980852221215}
- component: {fileID: 5373423712683366451}
m_Layer: 0
m_Name: Clip_Start (Socket)
m_TagString: Untagged
@ -251,27 +251,6 @@ MonoBehaviour:
m_SocketScaleMode: 0
m_FixedScale: {x: 1, y: 1, z: 1}
m_TargetBoundsSize: {x: 1, y: 1, z: 1}
--- !u!65 &8437017510020342149
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1240268899927606166}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.0008, y: 0.0005, z: 0.0001}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &451147257670573576
MonoBehaviour:
m_ObjectHideFlags: 0
@ -335,6 +314,27 @@ MonoBehaviour:
onSelectExit:
m_PersistentCalls:
m_Calls: []
--- !u!135 &5373423712683366451
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1240268899927606166}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Radius: 0.001
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &1248507882105758780
GameObject:
m_ObjectHideFlags: 0
@ -345,9 +345,9 @@ GameObject:
m_Component:
- component: {fileID: 1378838645015165914}
- component: {fileID: 3814621177531744636}
- component: {fileID: 6988986027458748647}
- component: {fileID: 8115251326410904405}
- component: {fileID: 6222311094814769827}
- component: {fileID: 2866580778842063362}
m_Layer: 0
m_Name: FlipArm_Open (Socket)
m_TagString: Untagged
@ -431,27 +431,6 @@ MonoBehaviour:
m_SocketScaleMode: 0
m_FixedScale: {x: 1, y: 1, z: 1}
m_TargetBoundsSize: {x: 1, y: 1, z: 1}
--- !u!65 &6988986027458748647
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1248507882105758780}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.0006917121, y: 0.0007471194, z: 0.000049418595}
m_Center: {x: 0.0000000051496545, y: 0.00030665586, z: -0.0002064954}
--- !u!114 &8115251326410904405
MonoBehaviour:
m_ObjectHideFlags: 0
@ -515,6 +494,27 @@ MonoBehaviour:
onSelectExit:
m_PersistentCalls:
m_Calls: []
--- !u!135 &2866580778842063362
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1248507882105758780}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Radius: 0.00025
m_Center: {x: 0.0000000051496545, y: 0.00030665586, z: -0.0002064954}
--- !u!1 &1482632842156037249
GameObject:
m_ObjectHideFlags: 0
@ -829,8 +829,8 @@ GameObject:
- component: {fileID: 8069852317492100785}
- component: {fileID: 6824668403049178182}
- component: {fileID: 3895941486496572692}
- component: {fileID: 8166801029888305641}
- component: {fileID: 2572485284290775642}
- component: {fileID: 4372263260855305159}
m_Layer: 0
m_Name: Tape_End (Socket)
m_TagString: Untagged
@ -927,27 +927,6 @@ MonoBehaviour:
m_SocketScaleMode: 0
m_FixedScale: {x: 1, y: 1, z: 1}
m_TargetBoundsSize: {x: 1, y: 1, z: 1}
--- !u!65 &8166801029888305641
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2125079628016757550}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.0023358676, y: 0.00048794097, z: 0.0015067597}
m_Center: {x: -0.000024799845, y: -0.00017440498, z: 0.000024916084}
--- !u!114 &2572485284290775642
MonoBehaviour:
m_ObjectHideFlags: 0
@ -997,6 +976,27 @@ MonoBehaviour:
onSelectExit:
m_PersistentCalls:
m_Calls: []
--- !u!135 &4372263260855305159
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2125079628016757550}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Radius: 0.002
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &2250823593686253332
GameObject:
m_ObjectHideFlags: 0
@ -1318,9 +1318,9 @@ GameObject:
m_Component:
- component: {fileID: 7875816157478138735}
- component: {fileID: 1405931015951622987}
- component: {fileID: 7632834216210554718}
- component: {fileID: 455284171443377540}
- component: {fileID: 6089482281729606390}
- component: {fileID: 11408579239814541}
m_Layer: 0
m_Name: FlipArm_Closed (Socket)
m_TagString: Untagged
@ -1404,27 +1404,6 @@ MonoBehaviour:
m_SocketScaleMode: 0
m_FixedScale: {x: 1, y: 1, z: 1}
m_TargetBoundsSize: {x: 1, y: 1, z: 1}
--- !u!65 &7632834216210554718
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3143734064679636714}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.0006917121, y: 0.0007471194, z: 0.000049418595}
m_Center: {x: 0.0000000051496545, y: 0.00030665586, z: -0.0002064954}
--- !u!114 &455284171443377540
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1488,6 +1467,27 @@ MonoBehaviour:
onSelectExit:
m_PersistentCalls:
m_Calls: []
--- !u!135 &11408579239814541
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3143734064679636714}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Radius: 0.00025
m_Center: {x: 0, y: 0.00030665586, z: -0.0002064954}
--- !u!1 &3184747893969138918
GameObject:
m_ObjectHideFlags: 0
@ -1498,9 +1498,9 @@ GameObject:
m_Component:
- component: {fileID: 1950196403452966282}
- component: {fileID: 7059930980236943887}
- component: {fileID: 4233591411056678351}
- component: {fileID: 4179622553577901806}
- component: {fileID: 5638705141534915174}
- component: {fileID: 8392500647244102627}
m_Layer: 0
m_Name: Clip_End (Socket)
m_TagString: Untagged
@ -1584,27 +1584,6 @@ MonoBehaviour:
m_SocketScaleMode: 0
m_FixedScale: {x: 1, y: 1, z: 1}
m_TargetBoundsSize: {x: 1, y: 1, z: 1}
--- !u!65 &4233591411056678351
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3184747893969138918}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.0008, y: 0.0005, z: 0.0001}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &4179622553577901806
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1668,6 +1647,27 @@ MonoBehaviour:
onSelectExit:
m_PersistentCalls:
m_Calls: []
--- !u!135 &8392500647244102627
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3184747893969138918}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Radius: 0.001
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &3468872304847212793
GameObject:
m_ObjectHideFlags: 0
@ -1761,8 +1761,8 @@ GameObject:
- component: {fileID: 9049674868906666110}
- component: {fileID: 5399462717350305253}
- component: {fileID: 4922499876124057319}
- component: {fileID: 4729277622632100194}
- component: {fileID: 2699399988459098154}
- component: {fileID: 2628139407165235555}
m_Layer: 0
m_Name: Tape_Start (Socket)
m_TagString: Untagged
@ -1859,27 +1859,6 @@ MonoBehaviour:
m_SocketScaleMode: 0
m_FixedScale: {x: 1, y: 1, z: 1}
m_TargetBoundsSize: {x: 1, y: 1, z: 1}
--- !u!65 &4729277622632100194
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4630323535086491078}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.0023358676, y: 0.00048794097, z: 0.0015067597}
m_Center: {x: -0.000024799845, y: -0.00017440498, z: 0.000024916084}
--- !u!114 &2699399988459098154
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1929,6 +1908,27 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!135 &2628139407165235555
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4630323535086491078}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Radius: 0.002
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &4823190321506824250
GameObject:
m_ObjectHideFlags: 0
@ -2206,9 +2206,9 @@ GameObject:
m_Component:
- component: {fileID: 4309003337707650749}
- component: {fileID: 8165242818413526658}
- component: {fileID: 6842947207065266639}
- component: {fileID: 2587806449280458971}
- component: {fileID: 8304860850689742517}
- component: {fileID: 1134912742732562417}
m_Layer: 0
m_Name: Pad_End (Socket)
m_TagString: Untagged
@ -2292,27 +2292,6 @@ MonoBehaviour:
m_SocketScaleMode: 0
m_FixedScale: {x: 1, y: 1, z: 1}
m_TargetBoundsSize: {x: 1, y: 1, z: 1}
--- !u!65 &6842947207065266639
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6318786732990583905}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.00084896904, y: 0.0003274822, z: 0.000100000005}
m_Center: {x: -0.000018735975, y: 0.000034502416, z: -2.9305727e-14}
--- !u!114 &2587806449280458971
MonoBehaviour:
m_ObjectHideFlags: 0
@ -2364,6 +2343,27 @@ MonoBehaviour:
onSelectExit:
m_PersistentCalls:
m_Calls: []
--- !u!135 &1134912742732562417
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6318786732990583905}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Radius: 0.0005
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &6323585219557918973
GameObject:
m_ObjectHideFlags: 0
@ -2374,9 +2374,9 @@ GameObject:
m_Component:
- component: {fileID: 4469360914765932825}
- component: {fileID: 6422205148102677687}
- component: {fileID: 4878092750278571340}
- component: {fileID: 629311655103251361}
- component: {fileID: 2491457592659407591}
- component: {fileID: 6356316048225965857}
m_Layer: 0
m_Name: Plug (Socket)
m_TagString: Untagged
@ -2459,27 +2459,6 @@ MonoBehaviour:
m_SocketScaleMode: 0
m_FixedScale: {x: 1, y: 1, z: 1}
m_TargetBoundsSize: {x: 1, y: 1, z: 1}
--- !u!65 &4878092750278571340
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6323585219557918973}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.00033943207, y: 0.00018372209, z: 0.00033943198}
m_Center: {x: 0, y: -0.00007943221, z: 2.2575996e-18}
--- !u!114 &629311655103251361
MonoBehaviour:
m_ObjectHideFlags: 0
@ -2543,6 +2522,27 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!135 &6356316048225965857
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6323585219557918973}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Radius: 0.0015
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &6396892782732616106
GameObject:
m_ObjectHideFlags: 0
@ -3662,6 +3662,10 @@ PrefabInstance:
propertyPath: m_InteractionLayers.m_Bits
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8710816239888859076, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_DistanceCalculationMode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8710816239888859076, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_InteractionLayers.m_Bits
value: 9
@ -3802,7 +3806,7 @@ MonoBehaviour:
m_Bits: 4294967295
m_InteractionLayers:
m_Bits: 17
m_DistanceCalculationMode: 1
m_DistanceCalculationMode: 0
m_SelectMode: 0
m_FocusMode: 1
m_CustomReticle: {fileID: 0}