Merge branch 'development' into bugfix/MAVRIC-2183_Flip-Arm-Socket-ZFighting

# Conflicts:
#	Assets/Prefabs/Cartridge-Interactable.prefab
This commit is contained in:
Brown, Caleb M 2023-11-10 12:32:27 -05:00
commit f03fd52026

View File

@ -103,9 +103,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
description: 'next step
We don''t need to do anything here since the clip
socket alread is active and locked. This will lock the clip in place once it
has been put into the socket'
We don''t need to do anything here since the clip socket alread is active and
locked. This will lock the clip in place once it has been put into the socket'
channel: {fileID: 11400000, guid: d1c3fee5a7e29bf49b295b270071caac, type: 2}
focusStep: {fileID: 11400000, guid: e51eda9c183374b4dbc8af0e471d3e20, type: 2}
focusResponse:
@ -165,9 +164,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 +250,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 +313,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 +344,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 +430,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 +493,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
@ -561,8 +560,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9b475c9cc9b3efa4a8b68f22256096d6, type: 3}
m_Name:
m_EditorClassIdentifier:
description: If the current step is "Peel Tape" set things up to interact with
the tape.
description: If the current step is "Peel Tape" set things up to interact with the
tape.
channel: {fileID: 11400000, guid: d1c3fee5a7e29bf49b295b270071caac, type: 2}
focusStep: {fileID: 11400000, guid: 02cca6afcbf63494c8f89acd805840e0, type: 2}
focusResponse:
@ -619,8 +618,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9b475c9cc9b3efa4a8b68f22256096d6, type: 3}
m_Name:
m_EditorClassIdentifier:
description: If the current step is "Remove Plug" (the step after "Peel Tape")
disable all tape interactions
description: If the current step is "Remove Plug" (the step after "Peel Tape") disable
all tape interactions
channel: {fileID: 11400000, guid: d1c3fee5a7e29bf49b295b270071caac, type: 2}
focusStep: {fileID: 11400000, guid: 84b7b1c8e966b28489c54ff68685888f, type: 2}
focusResponse:
@ -664,8 +663,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9b475c9cc9b3efa4a8b68f22256096d6, type: 3}
m_Name:
m_EditorClassIdentifier:
description: If the current step is "Replace Tape" enable all interactions for
the tape and socket
description: If the current step is "Replace Tape" enable all interactions for the
tape and socket
channel: {fileID: 11400000, guid: d1c3fee5a7e29bf49b295b270071caac, type: 2}
focusStep: {fileID: 11400000, guid: f06581b6a2676704cbac6d816ed881e1, type: 2}
focusResponse:
@ -811,8 +810,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
description: 'next step
shouldn''t have to do anything because the socket
is setup to lock'
shouldn''t have to do anything because the socket is setup to lock'
channel: {fileID: 11400000, guid: d1c3fee5a7e29bf49b295b270071caac, type: 2}
focusStep: {fileID: 11400000, guid: 107053ccd95c109498dabaaabc0c71bb, type: 2}
focusResponse:
@ -829,8 +827,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 +925,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 +974,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
@ -1276,8 +1274,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9b475c9cc9b3efa4a8b68f22256096d6, type: 3}
m_Name:
m_EditorClassIdentifier:
description: what to do on the step after next (forgot to remove the plug when
replacing the tape)
description: what to do on the step after next (forgot to remove the plug when replacing
the tape)
channel: {fileID: 11400000, guid: d1c3fee5a7e29bf49b295b270071caac, type: 2}
focusStep: {fileID: 11400000, guid: 8f01251921d0b0841b8ec39df16747b7, type: 2}
focusResponse:
@ -1319,9 +1317,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
@ -1405,27 +1403,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
@ -1489,6 +1466,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
@ -1499,9 +1497,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
@ -1585,27 +1583,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
@ -1669,6 +1646,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
@ -1762,8 +1760,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
@ -1860,27 +1858,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
@ -1930,6 +1907,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
@ -2207,9 +2205,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
@ -2293,27 +2291,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
@ -2365,6 +2342,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
@ -2375,9 +2373,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
@ -2460,27 +2458,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
@ -2544,6 +2521,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
@ -2806,20 +2804,11 @@ MonoBehaviour:
focusStep: {fileID: 11400000, guid: 41578b197ccb3f647b4025e8dafa94df, type: 2}
focusResponse:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 8115251326410904405}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRSocketInteractorFilter,
Assembly-CSharp
m_MethodName: set_locked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
m_Calls: [{m_Target: {fileID: 8115251326410904405}, m_TargetAssemblyTypeName: 'UnityEngine.XR.Interaction.Toolkit.Filtering.XRSocketInteractorFilter,
Assembly-CSharp', m_MethodName: set_locked, m_Mode: 6, m_Arguments: {
m_ObjectArgument: {fileID: 0}, m_ObjectArgumentAssemblyTypeName: 'UnityEngine.Object,
UnityEngine', m_IntArgument: 0, m_FloatArgument: 0, m_StringArgument: '',
m_BoolArgument: 1}, m_CallState: 2}]
--- !u!114 &1461544611288019900
MonoBehaviour:
m_ObjectHideFlags: 0
@ -3574,119 +3563,153 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 6554210300994472440}
m_Modifications:
- target: {fileID: 421256685097331234, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 421256685097331234, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -86
objectReference: {fileID: 0}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -90
objectReference: {fileID: 0}
- target: {fileID: 2668331196309396013, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 2668331196309396013, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_IsKinematic
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2757302664559975263, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 2757302664559975263, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_Size.y
value: 0.0007471194
objectReference: {fileID: 0}
- target: {fileID: 2757302664559975263, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 2757302664559975263, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_Size.z
value: 0.000049418595
objectReference: {fileID: 0}
- target: {fileID: 2757302664559975263, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 2757302664559975263, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_Center.x
value: 0.0000000051496545
objectReference: {fileID: 0}
- target: {fileID: 2757302664559975263, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 2757302664559975263, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_Center.y
value: 0.00030665586
objectReference: {fileID: 0}
- target: {fileID: 2757302664559975263, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 2757302664559975263, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_Center.z
value: -0.0002064954
objectReference: {fileID: 0}
- target: {fileID: 2966508083732920723, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 2966508083732920723, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_Name
value: Cartridge_V3 Variant Interactable
objectReference: {fileID: 0}
- target: {fileID: 6165883632583038797, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 6165883632583038797, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_Name
value: Flip_Pad_Pull_Out (Transform)
objectReference: {fileID: 0}
- target: {fileID: 6165883632583038797, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 6165883632583038797, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_MovementType
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_VelocityScale
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_SmoothPosition
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_TightenPosition
value: 0.01
objectReference: {fileID: 0}
- target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_DistanceCalculationMode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8925856456829875478, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 8710816239888859076, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_DistanceCalculationMode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8925856456829875478, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_MovementType
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8925856456829875478, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 8925856456829875478, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_DistanceCalculationMode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8925856456829875478, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 8925856456829875478, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_InteractionLayers.m_Bits
value: 33
objectReference: {fileID: 0}
- target: {fileID: 9126189417414843225, guid: b27049639847946ddac425fa7721eb71, type: 3}
- target: {fileID: 9126189417414843225, guid: b27049639847946ddac425fa7721eb71,
type: 3}
propertyPath: m_InteractionLayers.m_Bits
value: 5
objectReference: {fileID: 0}
@ -3694,39 +3717,60 @@ PrefabInstance:
- {fileID: 3856986954198828731, guid: b27049639847946ddac425fa7721eb71, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 421256685097331234, guid: b27049639847946ddac425fa7721eb71, type: 3}
- targetCorrespondingSourceObject: {fileID: 421256685097331234, guid: b27049639847946ddac425fa7721eb71,
type: 3}
insertIndex: -1
addedObject: {fileID: 3299088965526146119}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1182665900626322174, guid: b27049639847946ddac425fa7721eb71, type: 3}
- targetCorrespondingSourceObject: {fileID: 1182665900626322174, guid: b27049639847946ddac425fa7721eb71,
type: 3}
insertIndex: -1
addedObject: {fileID: 3774238497440674398}
- targetCorrespondingSourceObject: {fileID: 5567684709285273722, guid: b27049639847946ddac425fa7721eb71, type: 3}
- targetCorrespondingSourceObject: {fileID: 5567684709285273722, guid: b27049639847946ddac425fa7721eb71,
type: 3}
insertIndex: -1
addedObject: {fileID: 8075794149781177989}
- targetCorrespondingSourceObject: {fileID: 5875810263984471138, guid: b27049639847946ddac425fa7721eb71, type: 3}
- targetCorrespondingSourceObject: {fileID: 5875810263984471138, guid: b27049639847946ddac425fa7721eb71,
type: 3}
insertIndex: -1
addedObject: {fileID: 5921433187843998212}
- targetCorrespondingSourceObject: {fileID: 5875810263984471138, guid: b27049639847946ddac425fa7721eb71, type: 3}
- targetCorrespondingSourceObject: {fileID: 5875810263984471138, guid: b27049639847946ddac425fa7721eb71,
type: 3}
insertIndex: -1
addedObject: {fileID: 9216550692661000586}
- targetCorrespondingSourceObject: {fileID: 8861309074893074346, guid: b27049639847946ddac425fa7721eb71, type: 3}
- targetCorrespondingSourceObject: {fileID: 8861309074893074346, guid: b27049639847946ddac425fa7721eb71,
type: 3}
insertIndex: -1
addedObject: {fileID: 8138633126094991808}
m_SourcePrefab: {fileID: 100100000, guid: b27049639847946ddac425fa7721eb71, type: 3}
--- !u!4 &893407086461366721 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71, type: 3}
m_CorrespondingSourceObject: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71,
type: 3}
m_PrefabInstance: {fileID: 3316605137565340392}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1943633797168437857 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3819015551208540297, guid: b27049639847946ddac425fa7721eb71, type: 3}
m_CorrespondingSourceObject: {fileID: 3819015551208540297, guid: b27049639847946ddac425fa7721eb71,
type: 3}
m_PrefabInstance: {fileID: 3316605137565340392}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3161078843648604362 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 421256685097331234, guid: b27049639847946ddac425fa7721eb71,
type: 3}
m_PrefabInstance: {fileID: 3316605137565340392}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4498918534765473814 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1182665900626322174, guid: b27049639847946ddac425fa7721eb71,
type: 3}
m_PrefabInstance: {fileID: 3316605137565340392}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2244017144755370326 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3540580792236698558, guid: b27049639847946ddac425fa7721eb71, type: 3}
m_CorrespondingSourceObject: {fileID: 3540580792236698558, guid: b27049639847946ddac425fa7721eb71,
type: 3}
m_PrefabInstance: {fileID: 3316605137565340392}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4498918534765473814}
@ -3735,16 +3779,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &3161078843648604362 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 421256685097331234, guid: b27049639847946ddac425fa7721eb71, type: 3}
m_PrefabInstance: {fileID: 3316605137565340392}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4498918534765473814 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1182665900626322174, guid: b27049639847946ddac425fa7721eb71, type: 3}
m_PrefabInstance: {fileID: 3316605137565340392}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3774238497440674398
MonoBehaviour:
m_ObjectHideFlags: 0
@ -3761,12 +3795,14 @@ MonoBehaviour:
m_locked: 1
--- !u!23 &4858649905186535133 stripped
MeshRenderer:
m_CorrespondingSourceObject: {fileID: 7884561136558908469, guid: b27049639847946ddac425fa7721eb71, type: 3}
m_CorrespondingSourceObject: {fileID: 7884561136558908469, guid: b27049639847946ddac425fa7721eb71,
type: 3}
m_PrefabInstance: {fileID: 3316605137565340392}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5809729421961169329 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 9126189417414843225, guid: b27049639847946ddac425fa7721eb71, type: 3}
m_CorrespondingSourceObject: {fileID: 9126189417414843225, guid: b27049639847946ddac425fa7721eb71,
type: 3}
m_PrefabInstance: {fileID: 3316605137565340392}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6124688146851642690}
@ -3777,12 +3813,14 @@ MonoBehaviour:
m_EditorClassIdentifier:
--- !u!4 &5991556086484635058 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 9016411276530573146, guid: b27049639847946ddac425fa7721eb71, type: 3}
m_CorrespondingSourceObject: {fileID: 9016411276530573146, guid: b27049639847946ddac425fa7721eb71,
type: 3}
m_PrefabInstance: {fileID: 3316605137565340392}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6124688146851642690 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8861309074893074346, guid: b27049639847946ddac425fa7721eb71, type: 3}
m_CorrespondingSourceObject: {fileID: 8861309074893074346, guid: b27049639847946ddac425fa7721eb71,
type: 3}
m_PrefabInstance: {fileID: 3316605137565340392}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8138633126094991808
@ -3801,7 +3839,8 @@ MonoBehaviour:
m_locked: 1
--- !u!114 &6261687912628628780 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8710816239888859076, guid: b27049639847946ddac425fa7721eb71, type: 3}
m_CorrespondingSourceObject: {fileID: 8710816239888859076, guid: b27049639847946ddac425fa7721eb71,
type: 3}
m_PrefabInstance: {fileID: 3316605137565340392}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7152439078817100434}
@ -3812,7 +3851,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
--- !u!1 &7152439078817100434 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5567684709285273722, guid: b27049639847946ddac425fa7721eb71, type: 3}
m_CorrespondingSourceObject: {fileID: 5567684709285273722, guid: b27049639847946ddac425fa7721eb71,
type: 3}
m_PrefabInstance: {fileID: 3316605137565340392}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8075794149781177989
@ -3831,12 +3871,14 @@ MonoBehaviour:
m_locked: 1
--- !u!1 &8905706300752561573 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6165883632583038797, guid: b27049639847946ddac425fa7721eb71, type: 3}
m_CorrespondingSourceObject: {fileID: 6165883632583038797, guid: b27049639847946ddac425fa7721eb71,
type: 3}
m_PrefabInstance: {fileID: 3316605137565340392}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9191249259938328202 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5875810263984471138, guid: b27049639847946ddac425fa7721eb71, type: 3}
m_CorrespondingSourceObject: {fileID: 5875810263984471138, guid: b27049639847946ddac425fa7721eb71,
type: 3}
m_PrefabInstance: {fileID: 3316605137565340392}
m_PrefabAsset: {fileID: 0}
--- !u!65 &5921433187843998212