diff --git a/Assets/_PROJECT/Components/Guardian/Guardian Barriers/Sign.prefab b/Assets/_PROJECT/Components/Guardian/Guardian Barriers/Sign.prefab index 25f040ed..c5296d5e 100644 --- a/Assets/_PROJECT/Components/Guardian/Guardian Barriers/Sign.prefab +++ b/Assets/_PROJECT/Components/Guardian/Guardian Barriers/Sign.prefab @@ -31,6 +31,9 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 7921922657197840971} + - {fileID: 5538929780198363686} + - {fileID: 4592115865606785128} + - {fileID: 7014926098072648185} m_Father: {fileID: 9164851303759649724} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 180, y: 0, z: 0} @@ -85,6 +88,59 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &2159071680447297791 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4592115865606785128} + - component: {fileID: 1238617081323543605} + m_Layer: 0 + m_Name: Collider (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4592115865606785128 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2159071680447297791} + m_LocalRotation: {x: 0, y: 0, z: 0.5, w: 0.8660254} + m_LocalPosition: {x: 0, y: 0, z: -0.0092} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2682289115991355014} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 60} +--- !u!65 &1238617081323543605 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2159071680447297791} + 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.017320512, y: 0.01, z: 0.0015800049} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &4472433257338951034 GameObject: m_ObjectHideFlags: 0 @@ -365,6 +421,59 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_renderer: {fileID: 3155261771512299869} m_maskType: 0 +--- !u!1 &4942053202746612151 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7014926098072648185} + - component: {fileID: 8131730683290524916} + m_Layer: 0 + m_Name: Collider (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7014926098072648185 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4942053202746612151} + m_LocalRotation: {x: -0.007179506, y: -0.00414509, z: -0.49998283, w: 0.86599565} + m_LocalPosition: {x: 0, y: 0, z: -0.0092} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2682289115991355014} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: -0.95, y: 0, z: -60} +--- !u!65 &8131730683290524916 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4942053202746612151} + 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.017320512, y: 0.01, z: 0.0015800049} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &4944465253087424345 GameObject: m_ObjectHideFlags: 0 @@ -504,6 +613,59 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} +--- !u!1 &6166976609312591130 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5538929780198363686} + - component: {fileID: 6982848044266025958} + m_Layer: 0 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5538929780198363686 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6166976609312591130} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0092} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2682289115991355014} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6982848044266025958 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6166976609312591130} + 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.017320512, y: 0.01, z: 0.0015800049} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &8393521238868148486 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_PROJECT/Components/NewHandPresence/ControllerInformation/Oculus Touch Left.asset b/Assets/_PROJECT/Components/NewHandPresence/ControllerInformation/Oculus Touch Left.asset index 0768e1cb..4da62cda 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/ControllerInformation/Oculus Touch Left.asset +++ b/Assets/_PROJECT/Components/NewHandPresence/ControllerInformation/Oculus Touch Left.asset @@ -1,29 +1,3 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e8ec755bf8f404d4281d06c066a84e98, type: 3} - m_Name: Oculus Touch Left - m_EditorClassIdentifier: - controllerName: Oculus - controllerPrefab: {fileID: 8159774460421497457, guid: 03130be3722d15f45b84b6d8d3d4df14, - type: 3} - controllerOffset: {x: 0, y: 0.03, z: -0.01} - controllerRotationOffset: {x: 35, y: -180, z: 0} - handPrefab: {fileID: 6766972025625408647, guid: bb6211941b6864e4695e422ddc077417, - type: 3} - handOffset: {x: 0.055, y: 0, z: 0} - handRotationOffset: {x: 0, y: 0, z: 90} - turnHintText: Move joystick left/right to turn - moveHintText: Move joystick foward/backwards to move - teleportStartHintText: Move joystick forward to aim teleport - invalidTeleportHintText: Some objects you can't teleport on - teleportHintText: Release joystick to teleport - gripHintText: Press and hold grip to pick up item +version https://git-lfs.github.com/spec/v1 +oid sha256:c4e24a3ea83c4dfa60e5c1812d10b8fa2db010648b4a47711a3c4e3878280e0f +size 1196 diff --git a/Assets/_PROJECT/Components/NewHandPresence/ControllerInformation/Oculus Touch Right.asset b/Assets/_PROJECT/Components/NewHandPresence/ControllerInformation/Oculus Touch Right.asset index d140f90d..3aaa4567 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/ControllerInformation/Oculus Touch Right.asset +++ b/Assets/_PROJECT/Components/NewHandPresence/ControllerInformation/Oculus Touch Right.asset @@ -1,29 +1,3 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e8ec755bf8f404d4281d06c066a84e98, type: 3} - m_Name: Oculus Touch Right - m_EditorClassIdentifier: - controllerName: Oculus - controllerPrefab: {fileID: 4652374109135883258, guid: 5c89d7c4927a8e84f818e6c2694db27c, - type: 3} - controllerOffset: {x: 0, y: 0.03, z: -0.01} - controllerRotationOffset: {x: 35, y: -180, z: 0} - handPrefab: {fileID: 5553551016358545212, guid: 06b91e141d98e5346aee689f8994fa5d, - type: 3} - handOffset: {x: -0.045, y: 0, z: 0} - handRotationOffset: {x: 0, y: 0, z: -90} - turnHintText: Move joystick left/right to turn - moveHintText: Move joystick foward/backwards to move - teleportStartHintText: Move joystick forward to aim teleport - invalidTeleportHintText: Some objects you can't teleport on - teleportHintText: Release joystick to teleport - gripHintText: Press and hold grip to pick up item +version https://git-lfs.github.com/spec/v1 +oid sha256:586a5d5b79e59c3770e6369c9e2616e49a478bb462efcf616ddb4fb32fc83c6f +size 1200 diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Controllers/Oculus Touch/Oculus Touch Left.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Controllers/Oculus Touch/Oculus Touch Left.prefab index 0d880e1f..0011322d 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Controllers/Oculus Touch/Oculus Touch Left.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Controllers/Oculus Touch/Oculus Touch Left.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4066697426206295884} - m_Layer: 0 + m_Layer: 21 m_Name: grip_rotation_center m_TagString: Untagged m_Icon: {fileID: 0} @@ -41,7 +41,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3134737213848559909} - m_Layer: 0 + m_Layer: 21 m_Name: thumbstick_rotation_center m_TagString: Untagged m_Icon: {fileID: 0} @@ -73,7 +73,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4952025666149278534} - m_Layer: 0 + m_Layer: 21 m_Name: trigger_rotation_center m_TagString: Untagged m_Icon: {fileID: 0} @@ -107,7 +107,7 @@ GameObject: - component: {fileID: 9062241314923908314} - component: {fileID: 6247171210129923414} - component: {fileID: 8158463085824228395} - m_Layer: 0 + m_Layer: 21 m_Name: thumbstick m_TagString: Untagged m_Icon: {fileID: 0} @@ -190,7 +190,7 @@ GameObject: - component: {fileID: 9062241314867636624} - component: {fileID: 6247171210077157404} - component: {fileID: 8158463085742774625} - m_Layer: 0 + m_Layer: 21 m_Name: grip m_TagString: Untagged m_Icon: {fileID: 0} @@ -273,7 +273,7 @@ GameObject: - component: {fileID: 9062241314862212276} - component: {fileID: 6247171210065802552} - component: {fileID: 8158463085735253061} - m_Layer: 0 + m_Layer: 21 m_Name: body m_TagString: Untagged m_Icon: {fileID: 0} @@ -356,7 +356,7 @@ GameObject: - component: {fileID: 9062241315346829503} - component: {fileID: 6247171210487136563} - component: {fileID: 8158463085112582222} - m_Layer: 0 + m_Layer: 21 m_Name: trigger m_TagString: Untagged m_Icon: {fileID: 0} @@ -439,7 +439,7 @@ GameObject: - component: {fileID: 9062241315375960027} - component: {fileID: 6247171210516733527} - component: {fileID: 8158463085099777834} - m_Layer: 0 + m_Layer: 21 m_Name: button_x m_TagString: Untagged m_Icon: {fileID: 0} @@ -522,7 +522,7 @@ GameObject: - component: {fileID: 9062241315500892323} - component: {fileID: 6247171210643468591} - component: {fileID: 8158463085226790994} - m_Layer: 0 + m_Layer: 21 m_Name: button_y m_TagString: Untagged m_Icon: {fileID: 0} @@ -605,7 +605,7 @@ GameObject: - component: {fileID: 9062241315501822880} - component: {fileID: 6247171210642522668} - component: {fileID: 8158463085225632593} - m_Layer: 0 + m_Layer: 21 m_Name: menu_button m_TagString: Untagged m_Icon: {fileID: 0} @@ -689,7 +689,7 @@ GameObject: - component: {fileID: 1270581827023853383} - component: {fileID: 3649480308885486090} - component: {fileID: 3376253515980734203} - m_Layer: 0 + m_Layer: 21 m_Name: Oculus Touch Left m_TagString: Untagged m_Icon: {fileID: 0} @@ -781,10 +781,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8824389019078637771} m_Modifications: + - target: {fileID: 106450, guid: 31fb231465c0ba947a9eb173e60f1679, type: 3} + propertyPath: m_Layer + value: 21 + objectReference: {fileID: 0} - target: {fileID: 140952, guid: 31fb231465c0ba947a9eb173e60f1679, type: 3} propertyPath: m_Name value: hint billboard objectReference: {fileID: 0} + - target: {fileID: 140952, guid: 31fb231465c0ba947a9eb173e60f1679, type: 3} + propertyPath: m_Layer + value: 21 + objectReference: {fileID: 0} - target: {fileID: 444586, guid: 31fb231465c0ba947a9eb173e60f1679, type: 3} propertyPath: m_RootOrder value: 0 @@ -829,6 +837,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3698684970970094947, guid: 31fb231465c0ba947a9eb173e60f1679, + type: 3} + propertyPath: m_Layer + value: 21 + objectReference: {fileID: 0} + - target: {fileID: 5615189752425831018, guid: 31fb231465c0ba947a9eb173e60f1679, + type: 3} + propertyPath: m_Layer + value: 21 + objectReference: {fileID: 0} + - target: {fileID: 6886418318191067747, guid: 31fb231465c0ba947a9eb173e60f1679, + type: 3} + propertyPath: m_Layer + value: 21 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Controllers/Oculus Touch/Oculus Touch Right.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Controllers/Oculus Touch/Oculus Touch Right.prefab index cbb71ab9..f83e3f73 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Controllers/Oculus Touch/Oculus Touch Right.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Controllers/Oculus Touch/Oculus Touch Right.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4558648361292797792} - m_Layer: 0 + m_Layer: 21 m_Name: grip_rotation_center m_TagString: Untagged m_Icon: {fileID: 0} @@ -44,7 +44,7 @@ GameObject: - component: {fileID: 3060242288266649367} - component: {fileID: 6570840354189838564} - component: {fileID: 4475894781922331434} - m_Layer: 0 + m_Layer: 21 m_Name: Oculus Touch Right m_TagString: Untagged m_Icon: {fileID: 0} @@ -72,7 +72,7 @@ Transform: - {fileID: 4558648361292797792} - {fileID: 5973681094436754426} m_Father: {fileID: 0} - m_RootOrder: -1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3060242288266649367 MonoBehaviour: @@ -127,6 +127,60 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &5311823096500135044 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 835650820590754452} + - component: {fileID: 2252121980502252906} + m_Layer: 21 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &835650820590754452 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5311823096500135044} + m_LocalRotation: {x: 0.041203193, y: -0.08091445, z: 0.003347616, w: 0.99586344} + m_LocalPosition: {x: 0.016, y: 0.0187, z: 0.0367} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5507434294320401727} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 4.738, y: -9.29, z: 0} +--- !u!65 &2252121980502252906 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5311823096500135044} + 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.09, y: 0.09, z: -0.02} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &5926245407173495046 GameObject: m_ObjectHideFlags: 0 @@ -138,7 +192,7 @@ GameObject: - component: {fileID: 5507434295091381683} - component: {fileID: 7430854878937093183} - component: {fileID: 4653754205148935490} - m_Layer: 0 + m_Layer: 21 m_Name: right_button_b m_TagString: Untagged m_Icon: {fileID: 0} @@ -221,7 +275,7 @@ GameObject: - component: {fileID: 5507434294993827119} - component: {fileID: 7430854878908834979} - component: {fileID: 4653754205112174046} - m_Layer: 0 + m_Layer: 21 m_Name: thumbstick m_TagString: Untagged m_Icon: {fileID: 0} @@ -304,7 +358,7 @@ GameObject: - component: {fileID: 5507434295805006344} - component: {fileID: 7430854879188157316} - component: {fileID: 4653754204280251129} - m_Layer: 0 + m_Layer: 21 m_Name: right_grip m_TagString: Untagged m_Icon: {fileID: 0} @@ -387,7 +441,7 @@ GameObject: - component: {fileID: 5507434295828729425} - component: {fileID: 7430854879139274717} - component: {fileID: 4653754204277767840} - m_Layer: 0 + m_Layer: 21 m_Name: right_button_menu m_TagString: Untagged m_Icon: {fileID: 0} @@ -470,7 +524,7 @@ GameObject: - component: {fileID: 5507434295466739281} - component: {fileID: 7430854879383820253} - component: {fileID: 4653754204484105888} - m_Layer: 0 + m_Layer: 21 m_Name: right_button_a m_TagString: Untagged m_Icon: {fileID: 0} @@ -553,7 +607,7 @@ GameObject: - component: {fileID: 5507434294320401727} - component: {fileID: 7430854878240070835} - component: {fileID: 4653754203366079950} - m_Layer: 0 + m_Layer: 21 m_Name: body m_TagString: Untagged m_Icon: {fileID: 0} @@ -571,7 +625,8 @@ Transform: m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 835650820590754452} m_Father: {fileID: 5466065062541431104} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -636,7 +691,7 @@ GameObject: - component: {fileID: 5507434294574195081} - component: {fileID: 7430854878422495237} - component: {fileID: 4653754203519193464} - m_Layer: 0 + m_Layer: 21 m_Name: right_trigger m_TagString: Untagged m_Icon: {fileID: 0} @@ -717,7 +772,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1577107718795983854} - m_Layer: 0 + m_Layer: 21 m_Name: trigger_rotation_center m_TagString: Untagged m_Icon: {fileID: 0} @@ -749,7 +804,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6509558431624773915} - m_Layer: 0 + m_Layer: 21 m_Name: thumbstick_rotation_center m_TagString: Untagged m_Icon: {fileID: 0} @@ -780,10 +835,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5466065062541431104} m_Modifications: + - target: {fileID: 106450, guid: 31fb231465c0ba947a9eb173e60f1679, type: 3} + propertyPath: m_Layer + value: 21 + objectReference: {fileID: 0} - target: {fileID: 140952, guid: 31fb231465c0ba947a9eb173e60f1679, type: 3} propertyPath: m_Name value: hint billboard objectReference: {fileID: 0} + - target: {fileID: 140952, guid: 31fb231465c0ba947a9eb173e60f1679, type: 3} + propertyPath: m_Layer + value: 21 + objectReference: {fileID: 0} - target: {fileID: 444586, guid: 31fb231465c0ba947a9eb173e60f1679, type: 3} propertyPath: m_RootOrder value: 0 @@ -836,6 +899,21 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -0.05 objectReference: {fileID: 0} + - target: {fileID: 3698684970970094947, guid: 31fb231465c0ba947a9eb173e60f1679, + type: 3} + propertyPath: m_Layer + value: 21 + objectReference: {fileID: 0} + - target: {fileID: 5615189752425831018, guid: 31fb231465c0ba947a9eb173e60f1679, + type: 3} + propertyPath: m_Layer + value: 21 + objectReference: {fileID: 0} + - target: {fileID: 6886418318191067747, guid: 31fb231465c0ba947a9eb173e60f1679, + type: 3} + propertyPath: m_Layer + value: 21 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Colliding hands/Left Hand Colliding Prefab.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Colliding hands/Left Hand Colliding Prefab.prefab index 25aae6cb..7a10fca9 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Colliding hands/Left Hand Colliding Prefab.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Colliding hands/Left Hand Colliding Prefab.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4344012406568950252} + - component: {fileID: 8764262191404547501} m_Layer: 21 m_Name: hands:b_l_pinky0 m_TagString: Untagged @@ -29,10 +30,32 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2814274188839192420} - - {fileID: 4567095018192920005} m_Father: {fileID: 276514911156691508} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &8764262191404547501 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1334471391740531852} + 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 + m_Radius: 0.01 + m_Height: 0.08 + m_Direction: 0 + m_Center: {x: 0.03, y: 0, z: 0} --- !u!1 &1786730637530685619 GameObject: m_ObjectHideFlags: 0 @@ -129,7 +152,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1880287470229878877} - - component: {fileID: 2532850916798241163} + - component: {fileID: 1944697586618938354} m_Layer: 21 m_Name: hands:b_l_index1 m_TagString: Untagged @@ -150,11 +173,10 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6720027502428405820} - - {fileID: 3005062584445871978} m_Father: {fileID: 276514911156691508} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!136 &2532850916798241163 +--- !u!136 &1944697586618938354 CapsuleCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -173,10 +195,10 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.01 - m_Height: 0.08 + m_Radius: 0.009 + m_Height: 0.04 m_Direction: 0 - m_Center: {x: 0, y: 0, z: 0} + m_Center: {x: -0.025, y: -0.002, z: 0} --- !u!1 &2108535156103806256 GameObject: m_ObjectHideFlags: 0 @@ -186,7 +208,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4543854955624006782} - - component: {fileID: 1984184929908990090} m_Layer: 21 m_Name: hands:b_l_ring1 m_TagString: Untagged @@ -207,33 +228,9 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2302804313002517258} - - {fileID: 5167183940343474804} m_Father: {fileID: 276514911156691508} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!136 &1984184929908990090 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2108535156103806256} - 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 - m_Radius: 0.01 - m_Height: 0.08 - m_Direction: 0 - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &2894239586721265696 GameObject: m_ObjectHideFlags: 0 @@ -376,12 +373,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3141760929839906172} - m_LocalRotation: {x: -0.63814414, y: -0.07919871, z: 0.12585972, w: 0.75541973} - m_LocalPosition: {x: -0.0152, y: 0.0066, z: 0.0006} + m_LocalRotation: {x: 0.16626577, y: 0.68648773, z: 0.58623344, w: 0.3967628} + m_LocalPosition: {x: 0.041670315, y: -0.042641226, z: 0.026675388} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6680274798026194056} + m_Father: {fileID: 2944632011470922523} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -70.769, y: -58.316, z: 62.152} --- !u!136 &6986205080506681598 @@ -851,12 +848,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5379694325065803518} - m_LocalRotation: {x: 0.15882967, y: -0.015324812, z: 0.1415773, w: 0.97698224} - m_LocalPosition: {x: -0.011, y: 0.0122, z: -0.0004} + m_LocalRotation: {x: -0.0014230459, y: 0.69961065, z: 0.711989, w: -0.060123138} + m_LocalPosition: {x: 0.09830171, y: 0.0087886825, z: 0.011476196} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4543854955624006782} + m_Father: {fileID: 2944632011470922523} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 18.342, y: 0.907, z: 16.637} --- !u!136 &4322167853205774804 @@ -879,7 +876,7 @@ CapsuleCollider: m_Enabled: 1 serializedVersion: 2 m_Radius: 0.017 - m_Height: 0.08 + m_Height: 0.085 m_Direction: 0 m_Center: {x: 0.03, y: 0, z: 0} --- !u!1 &5792021232605144306 @@ -993,12 +990,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6131047696212721910} - m_LocalRotation: {x: 0, y: 0, z: 0.14798203, w: 0.98899007} - m_LocalPosition: {x: -0.0013, y: 0.0044, z: 0.002} + m_LocalRotation: {x: 0.119286686, y: 0.723252, z: 0.6774536, w: 0.061106257} + m_LocalPosition: {x: 0.08794749, y: -0.032912083, z: -0.0023955852} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1880287470229878877} + m_Father: {fileID: 2944632011470922523} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 17.02} --- !u!136 &4386306177358856345 @@ -1021,7 +1018,7 @@ CapsuleCollider: m_Enabled: 1 serializedVersion: 2 m_Radius: 0.019 - m_Height: 0.08 + m_Height: 0.095 m_Direction: 0 m_Center: {x: 0.03, y: 0, z: 0} --- !u!1 &6559206072023338530 @@ -1080,6 +1077,42 @@ CapsuleCollider: m_Height: 0.045 m_Direction: 0 m_Center: {x: -0.01, y: 0.002, z: 0} +--- !u!1 &6739904469040940180 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2944632011470922523} + m_Layer: 21 + m_Name: Palm colliders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2944632011470922523 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6739904469040940180} + 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: 3005062584445871978} + - {fileID: 3176850709659835459} + - {fileID: 5167183940343474804} + - {fileID: 4567095018192920005} + - {fileID: 9002252281847039596} + m_Father: {fileID: 276514911156691508} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6890165559703473977 GameObject: m_ObjectHideFlags: 0 @@ -1089,7 +1122,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8292705626752062474} - - component: {fileID: 5767071501069497735} + - component: {fileID: 3014115217857052780} m_Layer: 21 m_Name: hands:b_l_middle1 m_TagString: Untagged @@ -1110,11 +1143,10 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8788734848617305778} - - {fileID: 9002252281847039596} m_Father: {fileID: 276514911156691508} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!136 &5767071501069497735 +--- !u!136 &3014115217857052780 CapsuleCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1133,10 +1165,10 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.01 - m_Height: 0.08 + m_Radius: 0.009 + m_Height: 0.04 m_Direction: 0 - m_Center: {x: 0, y: 0, z: 0} + m_Center: {x: -0.025, y: -0.002, z: 0} --- !u!1 &6968546230813943272 GameObject: m_ObjectHideFlags: 0 @@ -1285,6 +1317,7 @@ Transform: - {fileID: 4344012406568950252} - {fileID: 4543854955624006782} - {fileID: 6680274798026194056} + - {fileID: 2944632011470922523} m_Father: {fileID: 7859161150566379128} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1453,7 +1486,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4681283137484063003} - - {fileID: 3176850709659835459} m_Father: {fileID: 276514911156691508} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1504,12 +1536,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7537460892723605956} - m_LocalRotation: {x: 0.10394551, y: -0.035774644, z: 0.16829325, w: 0.97958815} - m_LocalPosition: {x: -0.0032, y: 0.0097, z: -0.0022} + m_LocalRotation: {x: 0.11154871, y: 0.7162018, z: 0.6885831, w: -0.021570442} + m_LocalPosition: {x: 0.09284747, y: -0.013380289, z: -0.0012281984} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8292705626752062474} + m_Father: {fileID: 2944632011470922523} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 12.456, y: -2.06, z: 19.272} --- !u!136 &2798374626865133994 @@ -1532,7 +1564,7 @@ CapsuleCollider: m_Enabled: 1 serializedVersion: 2 m_Radius: 0.019 - m_Height: 0.08 + m_Height: 0.095 m_Direction: 0 m_Center: {x: 0.03, y: 0, z: 0} --- !u!1 &7691855109436406083 @@ -1544,7 +1576,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2814274188839192420} - - component: {fileID: 2348314491194319818} + - component: {fileID: 5949439093540659439} m_Layer: 21 m_Name: hands:b_l_pinky1 m_TagString: Untagged @@ -1568,7 +1600,7 @@ Transform: m_Father: {fileID: 4344012406568950252} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!136 &2348314491194319818 +--- !u!136 &5949439093540659439 CapsuleCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1587,10 +1619,10 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.01 - m_Height: 0.08 + m_Radius: 0.009 + m_Height: 0.04 m_Direction: 0 - m_Center: {x: 0, y: 0, z: 0} + m_Center: {x: -0.025, y: 0, z: 0} --- !u!1 &8381418050795135871 GameObject: m_ObjectHideFlags: 0 @@ -1703,12 +1735,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9185279533116550950} - m_LocalRotation: {x: 0.06411149, y: 0.2803437, z: 0.9568114, w: 0.042533815} - m_LocalPosition: {x: 0.0652, y: -0.0028, z: -0.0082} + m_LocalRotation: {x: -0.06771187, y: 0.6963275, z: 0.7144825, w: 0.0076154163} + m_LocalPosition: {x: 0.09665631, y: 0.025908481, z: 0.013545416} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4344012406568950252} + m_Father: {fileID: 2944632011470922523} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -32.074, y: 9.958, z: 172.04} --- !u!136 &919376631072681037 diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Colliding hands/Right Hand Colliding Prefab.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Colliding hands/Right Hand Colliding Prefab.prefab index 7acffc8c..6a8b1931 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Colliding hands/Right Hand Colliding Prefab.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Hands/Colliding hands/Right Hand Colliding Prefab.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1040734993256558561} + - component: {fileID: 8052033317495986407} m_Layer: 21 m_Name: hands:b_r_middle1 m_TagString: Untagged @@ -32,6 +33,29 @@ Transform: m_Father: {fileID: 7300301753511705056} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &8052033317495986407 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 510213892436445458} + 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 + m_Radius: 0.009 + m_Height: 0.04 + m_Direction: 0 + m_Center: {x: 0.025, y: 0.002, z: 0} --- !u!1 &545050055446604646 GameObject: m_ObjectHideFlags: 0 @@ -72,6 +96,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3202702992036788156} + - component: {fileID: 3715643930745057324} m_Layer: 21 m_Name: hands:b_r_middle2 m_TagString: Untagged @@ -95,6 +120,29 @@ Transform: m_Father: {fileID: 1040734993256558561} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &3715643930745057324 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 601029421755497540} + 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 + m_Radius: 0.009 + m_Height: 0.045 + m_Direction: 0 + m_Center: {x: 0.01, y: 0.002, z: 0} --- !u!1 &693732482508742009 GameObject: m_ObjectHideFlags: 0 @@ -130,9 +178,101 @@ Transform: - {fileID: 6538895829321691740} - {fileID: 5696830467213252921} - {fileID: 5892301275037996283} + - {fileID: 5327335418779228248} m_Father: {fileID: 2937067979534166633} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &887719571846875897 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3661448191595045503} + - component: {fileID: 2690371468463167305} + m_Layer: 21 + m_Name: Thumb collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3661448191595045503 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 887719571846875897} + m_LocalRotation: {x: 0.16626577, y: 0.68648773, z: 0.58623344, w: 0.3967628} + m_LocalPosition: {x: 0.041670315, y: -0.042641226, z: 0.026675388} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5327335418779228248} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: -70.769, y: -58.316, z: 62.152} +--- !u!136 &2690371468463167305 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 887719571846875897} + 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 + m_Radius: 0.017 + m_Height: 0.08 + m_Direction: 0 + m_Center: {x: 0.03, y: 0, z: 0} +--- !u!1 &1101234298143553335 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5327335418779228248} + m_Layer: 21 + m_Name: Palm colliders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5327335418779228248 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1101234298143553335} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: -1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1324511023404380750} + - {fileID: 3661448191595045503} + - {fileID: 921185661970552373} + - {fileID: 4460815655617930982} + - {fileID: 3289322961371785253} + m_Father: {fileID: 7300301753511705056} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} --- !u!1 &1102436339779349115 GameObject: m_ObjectHideFlags: 0 @@ -193,10 +333,11 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2252869937798432446} - {fileID: 6375747935274843628} - {fileID: 2937067979534166633} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} --- !u!95 &7768949610396455723 Animator: @@ -219,6 +360,92 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &1813858960336858132 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2252869937798432446} + m_Layer: 21 + m_Name: Hand transform target + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2252869937798432446 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1813858960336858132} + m_LocalRotation: {x: 0.7599481, y: 0.541514, z: -0.17099279, w: -0.31623262} + m_LocalPosition: {x: 0.07, y: 0.03, z: -0.17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7708867950925681239} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1830788337875536387 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 921185661970552373} + - component: {fileID: 4819224731497084625} + m_Layer: 21 + m_Name: Ring collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &921185661970552373 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1830788337875536387} + m_LocalRotation: {x: -0.0014230459, y: 0.69961065, z: 0.711989, w: -0.060123138} + m_LocalPosition: {x: 0.09830171, y: 0.0087886825, z: 0.011476196} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5327335418779228248} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 18.342, y: 0.907, z: 16.637} +--- !u!136 &4819224731497084625 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1830788337875536387} + 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 + m_Radius: 0.017 + m_Height: 0.085 + m_Direction: 0 + m_Center: {x: 0.03, y: 0, z: 0} --- !u!1 &2765068408970169714 GameObject: m_ObjectHideFlags: 0 @@ -228,6 +455,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3769251829760321633} + - component: {fileID: 5988830187266270822} m_Layer: 21 m_Name: hands:b_r_index2 m_TagString: Untagged @@ -251,6 +479,29 @@ Transform: m_Father: {fileID: 2363890510981571639} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &5988830187266270822 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2765068408970169714} + 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 + m_Radius: 0.01 + m_Height: 0.05 + m_Direction: 0 + m_Center: {x: 0.01, y: 0, z: 0} --- !u!1 &3222996441121958636 GameObject: m_ObjectHideFlags: 0 @@ -260,6 +511,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1455560654446748714} + - component: {fileID: 3490267647208294616} m_Layer: 21 m_Name: hands:b_r_pinky1 m_TagString: Untagged @@ -283,6 +535,29 @@ Transform: m_Father: {fileID: 6538895829321691740} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &3490267647208294616 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3222996441121958636} + 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 + m_Radius: 0.009 + m_Height: 0.035 + m_Direction: 0 + m_Center: {x: 0.025, y: 0.002, z: 0} --- !u!1 &3691290172467039833 GameObject: m_ObjectHideFlags: 0 @@ -324,6 +599,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2937067979534166633} + - component: {fileID: 5091721587047321884} + - component: {fileID: 5764046989862461349} m_Layer: 21 m_Name: hands:r_hand_world m_TagString: Untagged @@ -347,6 +624,46 @@ Transform: m_Father: {fileID: 7708867950925681239} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &5091721587047321884 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3888657721968951575} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &5764046989862461349 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3888657721968951575} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 116b8a33d83907d4b9dc092e9baa3639, type: 3} + m_Name: + m_EditorClassIdentifier: + target: {fileID: 2252869937798432446} --- !u!1 &3919569801354096409 GameObject: m_ObjectHideFlags: 0 @@ -356,6 +673,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5696830467213252921} + - component: {fileID: 6416395892737682491} m_Layer: 21 m_Name: hands:b_r_ring1 m_TagString: Untagged @@ -379,6 +697,29 @@ Transform: m_Father: {fileID: 7300301753511705056} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &6416395892737682491 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3919569801354096409} + 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 + m_Radius: 0.009 + m_Height: 0.04 + m_Direction: 0 + m_Center: {x: 0.025, y: 0, z: 0} --- !u!1 &4185741012359743526 GameObject: m_ObjectHideFlags: 0 @@ -388,6 +729,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5892301275037996283} + - component: {fileID: 2137975461030589968} m_Layer: 21 m_Name: hands:b_r_thumb1 m_TagString: Untagged @@ -411,6 +753,29 @@ Transform: m_Father: {fileID: 7300301753511705056} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &2137975461030589968 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4185741012359743526} + 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 + m_Radius: 0.012 + m_Height: 0.045 + m_Direction: 0 + m_Center: {x: 0.01, y: -0.002, z: 0} --- !u!1 &4457237059067407245 GameObject: m_ObjectHideFlags: 0 @@ -420,6 +785,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2516921524329187020} + - component: {fileID: 3641471949121660872} m_Layer: 21 m_Name: hands:b_r_middle3 m_TagString: Untagged @@ -443,6 +809,29 @@ Transform: m_Father: {fileID: 3202702992036788156} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &3641471949121660872 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4457237059067407245} + 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 + m_Radius: 0.008 + m_Height: 0.03 + m_Direction: 0 + m_Center: {x: 0.015, y: 0, z: 0} --- !u!1 &4522101897448615135 GameObject: m_ObjectHideFlags: 0 @@ -452,6 +841,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1248356335288827172} + - component: {fileID: 1533912411679244991} m_Layer: 21 m_Name: hands:b_r_thumb2 m_TagString: Untagged @@ -475,6 +865,29 @@ Transform: m_Father: {fileID: 5892301275037996283} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &1533912411679244991 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4522101897448615135} + 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 + m_Radius: 0.012 + m_Height: 0.045 + m_Direction: 0 + m_Center: {x: 0.01, y: -0.002, z: 0} --- !u!1 &4581792585173532804 GameObject: m_ObjectHideFlags: 0 @@ -484,6 +897,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4174451267192901816} + - component: {fileID: 7674578750026270476} m_Layer: 21 m_Name: hands:b_r_index3 m_TagString: Untagged @@ -507,6 +921,29 @@ Transform: m_Father: {fileID: 3769251829760321633} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &7674578750026270476 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4581792585173532804} + 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 + m_Radius: 0.01 + m_Height: 0.03 + m_Direction: 0 + m_Center: {x: 0.015, y: 0, z: 0} --- !u!1 &5436861181708812795 GameObject: m_ObjectHideFlags: 0 @@ -516,6 +953,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2363890510981571639} + - component: {fileID: 4783864064774963216} m_Layer: 21 m_Name: hands:b_r_index1 m_TagString: Untagged @@ -539,6 +977,29 @@ Transform: m_Father: {fileID: 7300301753511705056} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &4783864064774963216 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5436861181708812795} + 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 + m_Radius: 0.009 + m_Height: 0.04 + m_Direction: 0 + m_Center: {x: 0.025, y: 0.002, z: 0} --- !u!1 &5562601943102729470 GameObject: m_ObjectHideFlags: 0 @@ -548,6 +1009,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3275128011787787335} + - component: {fileID: 8883393763632736373} m_Layer: 21 m_Name: hands:b_r_pinky3 m_TagString: Untagged @@ -571,6 +1033,84 @@ Transform: m_Father: {fileID: 916322465173970778} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &8883393763632736373 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5562601943102729470} + 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 + m_Radius: 0.008 + m_Height: 0.025 + m_Direction: 0 + m_Center: {x: 0.008, y: 0, z: 0} +--- !u!1 &5675301489196619074 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1324511023404380750} + - component: {fileID: 4631915003324200488} + m_Layer: 21 + m_Name: Index collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1324511023404380750 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5675301489196619074} + m_LocalRotation: {x: 0.119286686, y: 0.723252, z: 0.6774536, w: 0.061106257} + m_LocalPosition: {x: 0.08794749, y: -0.032912083, z: -0.0023955852} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5327335418779228248} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 17.02} +--- !u!136 &4631915003324200488 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5675301489196619074} + 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 + m_Radius: 0.019 + m_Height: 0.095 + m_Direction: 0 + m_Center: {x: 0.03, y: 0, z: 0} --- !u!1 &5786747040531885361 GameObject: m_ObjectHideFlags: 0 @@ -580,6 +1120,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 111317593938515463} + - component: {fileID: 5712925273267891514} m_Layer: 21 m_Name: hands:b_r_ring3 m_TagString: Untagged @@ -603,6 +1144,29 @@ Transform: m_Father: {fileID: 108922481214215118} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &5712925273267891514 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5786747040531885361} + 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 + m_Radius: 0.008 + m_Height: 0.025 + m_Direction: 0 + m_Center: {x: 0.015, y: 0, z: 0} --- !u!1 &6036698591444813314 GameObject: m_ObjectHideFlags: 0 @@ -753,6 +1317,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1498078937414902576} + - component: {fileID: 2117998936123800384} m_Layer: 21 m_Name: hands:b_r_thumb3 m_TagString: Untagged @@ -776,6 +1341,29 @@ Transform: m_Father: {fileID: 1248356335288827172} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &2117998936123800384 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6608112546265111660} + 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 + m_Radius: 0.01 + m_Height: 0.033 + m_Direction: 0 + m_Center: {x: 0.015, y: -0.002, z: 0} --- !u!1 &6839077145598928719 GameObject: m_ObjectHideFlags: 0 @@ -785,6 +1373,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 108922481214215118} + - component: {fileID: 4519742811004900486} m_Layer: 21 m_Name: hands:b_r_ring2 m_TagString: Untagged @@ -808,6 +1397,29 @@ Transform: m_Father: {fileID: 5696830467213252921} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &4519742811004900486 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6839077145598928719} + 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 + m_Radius: 0.009 + m_Height: 0.04 + m_Direction: 0 + m_Center: {x: 0.01, y: 0.002, z: 0} --- !u!1 &7071041513583068448 GameObject: m_ObjectHideFlags: 0 @@ -870,6 +1482,61 @@ Transform: m_Father: {fileID: 7300301753511705056} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7783122288028407408 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4460815655617930982} + - component: {fileID: 2652303807040277245} + m_Layer: 21 + m_Name: Pinky collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4460815655617930982 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7783122288028407408} + m_LocalRotation: {x: -0.06771187, y: 0.6963275, z: 0.7144825, w: 0.0076154163} + m_LocalPosition: {x: 0.09665631, y: 0.025908481, z: 0.013545416} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5327335418779228248} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: -32.074, y: 9.958, z: 172.04} +--- !u!136 &2652303807040277245 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7783122288028407408} + 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 + m_Radius: 0.017 + m_Height: 0.08 + m_Direction: 0 + m_Center: {x: 0.03, y: 0, z: 0} --- !u!1 &7804750587780609928 GameObject: m_ObjectHideFlags: 0 @@ -973,6 +1640,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 916322465173970778} + - component: {fileID: 7691745531460669440} m_Layer: 21 m_Name: hands:b_r_pinky2 m_TagString: Untagged @@ -996,3 +1664,81 @@ Transform: m_Father: {fileID: 1455560654446748714} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &7691745531460669440 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8253548113510724487} + 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 + m_Radius: 0.009 + m_Height: 0.025 + m_Direction: 0 + m_Center: {x: 0.01, y: 0.002, z: 0} +--- !u!1 &8257651769211434667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3289322961371785253} + - component: {fileID: 8227723562108441212} + m_Layer: 21 + m_Name: Middle collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3289322961371785253 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8257651769211434667} + m_LocalRotation: {x: 0.11154871, y: 0.7162018, z: 0.6885831, w: -0.021570442} + m_LocalPosition: {x: 0.09284747, y: -0.013380289, z: -0.0012281984} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5327335418779228248} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 12.456, y: -2.06, z: 19.272} +--- !u!136 &8227723562108441212 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8257651769211434667} + 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 + m_Radius: 0.019 + m_Height: 0.095 + m_Direction: 0 + m_Center: {x: 0.03, y: 0, z: 0} diff --git a/Assets/_PROJECT/Components/NewHandPresence/SmartHandPresence.cs b/Assets/_PROJECT/Components/NewHandPresence/SmartHandPresence.cs index c1265eb5..7a95f918 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/SmartHandPresence.cs +++ b/Assets/_PROJECT/Components/NewHandPresence/SmartHandPresence.cs @@ -62,7 +62,7 @@ namespace _PROJECT.NewHandPresence _targetDevice = devices[0]; Debug.Log("Found device: " + _targetDevice.name + _targetDevice.characteristics); - + ControllerInformationScriptableObject controllerInfo = controllerInformation.Find(x => _targetDevice.name.ToLower().Contains(x.controllerName.ToLower())); @@ -70,19 +70,36 @@ namespace _PROJECT.NewHandPresence var transform1 = transform.parent; // Right/Left hand direct position - _spawnedController = Instantiate(controllerInfo.controllerPrefab, - transform1.TransformPoint(Quaternion.Euler(controllerInfo.controllerRotationOffset) * controllerInfo.controllerOffset), - transform1.rotation * Quaternion.Euler(controllerInfo.controllerRotationOffset), - transform1); - _xrControllerAnimator = _spawnedController.GetComponent(); - - _spawnedHandModel = Instantiate(controllerInfo.handPrefab, + // --- Spawn hand model first --- + _spawnedHandModel = Instantiate( + controllerInfo.handPrefab, transform1.TransformPoint(Quaternion.Euler(controllerInfo.handRotationOffset) * controllerInfo.handOffset), - transform1.rotation * Quaternion.Euler(controllerInfo.handRotationOffset), + transform1.rotation * Quaternion.Euler(controllerInfo.handRotationOffset), transform1); _handAnimator = _spawnedHandModel.GetComponent(); + + // --- Find the correct child in the hand prefab --- + Transform attachPoint = null; + if (_spawnedHandModel.name.Contains("Left")) + attachPoint = _spawnedHandModel.transform.Find("hands:l_hand_world"); + else if (_spawnedHandModel.name.Contains("Right")) + attachPoint = _spawnedHandModel.transform.Find("hands:r_hand_world"); + + if (attachPoint == null) + { + Debug.LogWarning("Attach point not found in hand prefab, defaulting to hand root."); + attachPoint = _spawnedHandModel.transform; + } + + // --- Spawn controller under the hand --- + _spawnedController = Instantiate(controllerInfo.controllerPrefab, attachPoint); + _spawnedController.transform.localPosition = controllerInfo.controllerOffset; + _spawnedController.transform.localRotation = Quaternion.Euler(controllerInfo.controllerRotationOffset); + + _xrControllerAnimator = _spawnedController.GetComponent(); } + private void UpdateControllerAnimation() { _xrControllerAnimator.UpdateAnimations(_targetDevice); diff --git a/Assets/_PROJECT/Components/NewHandPresence/TutorialController.cs b/Assets/_PROJECT/Components/NewHandPresence/TutorialController.cs index 15696c79..825be67f 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/TutorialController.cs +++ b/Assets/_PROJECT/Components/NewHandPresence/TutorialController.cs @@ -101,15 +101,15 @@ namespace _PROJECT.NewHandPresence ShowTeleportHint(); break; case TutorialState.WaitForGrip: - SetHandsVisibility(true); + //SetHandsVisibility(true); break; case TutorialState.Grip: - SetHandsVisibility(false); + //SetHandsVisibility(false); CreateBillboard(_grabInteractable.gameObject, "Grab me!"); ShowGripHint(); break; case TutorialState.Done: - SetHandsVisibility(true); + //SetHandsVisibility(true); DestroyBillboard(); break; default: diff --git a/Assets/_PROJECT/Components/Server room/Server rack.prefab b/Assets/_PROJECT/Components/Server room/Server rack.prefab index aeebf574..5f6281bb 100644 --- a/Assets/_PROJECT/Components/Server room/Server rack.prefab +++ b/Assets/_PROJECT/Components/Server room/Server rack.prefab @@ -11,7 +11,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: ac65e655dd40bcd48b72b3f8ddcf45bd, type: 3} propertyPath: m_RootOrder - value: -1 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ac65e655dd40bcd48b72b3f8ddcf45bd, type: 3} @@ -130,7 +130,7 @@ MeshCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 5 - m_Convex: 0 + m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 6074735673208717538, guid: ac65e655dd40bcd48b72b3f8ddcf45bd, type: 3} --- !u!82 &2488785156293713400 @@ -286,4 +286,4 @@ MonoBehaviour: Params: [] OverrideAttenuation: 0 OverrideMinDistance: 1 - OverrideMaxDistance: 6.8 + OverrideMaxDistance: 5 diff --git a/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/Trascans/floor trashcan 1 (1).prefab b/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/Trascans/floor trashcan 1 (1).prefab index e5a36d53..1dc0c0cc 100644 --- a/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/Trascans/floor trashcan 1 (1).prefab +++ b/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/Trascans/floor trashcan 1 (1).prefab @@ -103,7 +103,7 @@ MeshCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 5 - m_Convex: 1 + m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -125435165217083709, guid: ca5de6183cde4e54ebf581fdd9591ee5, type: 3} --- !u!1 &5238444156073539871 diff --git a/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/Trascans/floor trashcan 2.prefab b/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/Trascans/floor trashcan 2.prefab index aba58f04..0391d1f9 100644 --- a/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/Trascans/floor trashcan 2.prefab +++ b/Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/Trascans/floor trashcan 2.prefab @@ -186,7 +186,7 @@ MeshCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 5 - m_Convex: 1 + m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -125435165217083709, guid: ca5de6183cde4e54ebf581fdd9591ee5, type: 3} --- !u!1 &3025434386206445572 diff --git a/Assets/_PROJECT/Prefabs/Furniture_Inside/EM-14.1.prefab b/Assets/_PROJECT/Prefabs/Furniture_Inside/EM-14.1.prefab index 83344142..b77c268c 100644 --- a/Assets/_PROJECT/Prefabs/Furniture_Inside/EM-14.1.prefab +++ b/Assets/_PROJECT/Prefabs/Furniture_Inside/EM-14.1.prefab @@ -32,7 +32,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4938333630919412556 MeshFilter: diff --git a/Assets/_PROJECT/Prefabs/Furniture_Inside/EM-19.1.prefab b/Assets/_PROJECT/Prefabs/Furniture_Inside/EM-19.1.prefab index fb593f11..ba4415cf 100644 --- a/Assets/_PROJECT/Prefabs/Furniture_Inside/EM-19.1.prefab +++ b/Assets/_PROJECT/Prefabs/Furniture_Inside/EM-19.1.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 2919834444392407757} - component: {fileID: 6187474515786373371} - component: {fileID: 496198745691612162} - - component: {fileID: 7709518178388565975} + - component: {fileID: 91138973457814005} m_Layer: 0 m_Name: EM-19.1 m_TagString: Untagged @@ -86,8 +86,8 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &7709518178388565975 -BoxCollider: +--- !u!64 &91138973457814005 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -104,6 +104,7 @@ BoxCollider: m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 7.078571, y: 0.9362375, z: 2.3016322} - m_Center: {x: 3.539285, y: 0.46811822, z: 1.1508161} + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -5495902117074765545, guid: 699113fb3daa6274ca42d9fae39dc6cd, type: 3} diff --git a/Assets/_PROJECT/Prefabs/Furniture_Inside/EM-19.2.prefab b/Assets/_PROJECT/Prefabs/Furniture_Inside/EM-19.2.prefab index c88a68fe..56e83279 100644 --- a/Assets/_PROJECT/Prefabs/Furniture_Inside/EM-19.2.prefab +++ b/Assets/_PROJECT/Prefabs/Furniture_Inside/EM-19.2.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 3433565891224890937} - component: {fileID: 5980075807795860495} - component: {fileID: 126652916762126582} - - component: {fileID: -1041750701434723366} + - component: {fileID: 3563985972252939477} m_Layer: 0 m_Name: EM-19.2 m_TagString: Untagged @@ -32,7 +32,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 152 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0.02, y: 0, z: -75} --- !u!33 &5980075807795860495 MeshFilter: @@ -86,8 +86,8 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &-1041750701434723366 -BoxCollider: +--- !u!64 &3563985972252939477 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -104,6 +104,7 @@ BoxCollider: m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 5.6808934, y: 0.9362376, z: 2.3016322} - m_Center: {x: 2.8404458, y: 0.4681192, z: 1.1508161} + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -5495902117074765545, guid: ae4441afaecb7f94388510f9713142a9, type: 3} diff --git a/Assets/_PROJECT/Prefabs/Furniture_Inside/EM-25.prefab b/Assets/_PROJECT/Prefabs/Furniture_Inside/EM-25.prefab index 5165ff44..2ea060db 100644 --- a/Assets/_PROJECT/Prefabs/Furniture_Inside/EM-25.prefab +++ b/Assets/_PROJECT/Prefabs/Furniture_Inside/EM-25.prefab @@ -11,13 +11,13 @@ GameObject: - component: {fileID: 4341919059122893211} - component: {fileID: 4691236638922869677} - component: {fileID: 1307758809573259092} - - component: {fileID: -8866165681299401014} + - component: {fileID: 818586734765546125} m_Layer: 0 m_Name: EM-25 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &4341919059122893211 Transform: @@ -86,8 +86,8 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &-8866165681299401014 -BoxCollider: +--- !u!64 &818586734765546125 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -104,9 +104,10 @@ BoxCollider: m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 2.6934214, y: 0.6581369, z: 0.45108473} - m_Center: {x: -0.0021285415, y: 0, z: 0.23296005} + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -6264831526926562434, guid: 5fe925d523b69ed4f89d9b0d85cae990, type: 3} --- !u!1001 &6966265280812293182 PrefabInstance: m_ObjectHideFlags: 0 @@ -123,7 +124,7 @@ PrefabInstance: - target: {fileID: 2822197856076152105, guid: d82fea89a8cd2dc40977b2b16d257d88, type: 3} propertyPath: m_StaticEditorFlags - value: 4294967295 + value: 2147483647 objectReference: {fileID: 0} - target: {fileID: 3905765099109632936, guid: d82fea89a8cd2dc40977b2b16d257d88, type: 3} diff --git a/Assets/_PROJECT/Prefabs/Furniture_Inside/Kitchen_small_sink.prefab b/Assets/_PROJECT/Prefabs/Furniture_Inside/Kitchen_small_sink.prefab index bf1ee6bd..cfeedfae 100644 --- a/Assets/_PROJECT/Prefabs/Furniture_Inside/Kitchen_small_sink.prefab +++ b/Assets/_PROJECT/Prefabs/Furniture_Inside/Kitchen_small_sink.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 8818553792229760979} - component: {fileID: 520954435837912549} - component: {fileID: 6054601686838909212} - - component: {fileID: 5871128214041560587} + - component: {fileID: 5827954271023824867} m_Layer: 0 m_Name: Kitchen_small_sink m_TagString: Untagged @@ -86,8 +86,8 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &5871128214041560587 -BoxCollider: +--- !u!64 &5827954271023824867 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -104,6 +104,7 @@ BoxCollider: m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 0.70958424, y: 0.3866297, z: 0.9589028} - m_Center: {x: -0.35479414, y: 0.1928826, z: 0.47888783} + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -5495902117074765545, guid: fe140e95278031b478297f1bbdbabd19, type: 3} diff --git a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-02.prefab b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-02.prefab index 9f63db2f..d1043c27 100644 --- a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-02.prefab +++ b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-02.prefab @@ -1,5 +1,100 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1300287503437720852 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2716506345081405986} + m_Layer: 0 + m_Name: Colliders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2716506345081405986 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1300287503437720852} + 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: 7110661842150398648} + - {fileID: 3302115164258204863} + - {fileID: 5038048307131615906} + - {fileID: 5580688255101848912} + - {fileID: 2735334441785505678} + - {fileID: 5651647197812525230} + - {fileID: 5299312723076338949} + - {fileID: 4634598126040789267} + - {fileID: 8928183926890340544} + m_Father: {fileID: 1562525787766920984} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2263447980545184026 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2735334441785505678} + - component: {fileID: 7221159840371804992} + m_Layer: 0 + m_Name: GameObject (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2735334441785505678 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2263447980545184026} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.3165, y: 0.0518, z: 0.6648} + m_LocalScale: {x: 1, y: 0.3295842, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2716506345081405986} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &7221159840371804992 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2263447980545184026} + 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 + m_Radius: 0.015 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &2590815755946353931 GameObject: m_ObjectHideFlags: 0 @@ -30,7 +125,8 @@ Transform: m_LocalPosition: {x: -22.94, y: 0, z: 8.68} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2716506345081405986} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -89.98, y: 0, z: 0} @@ -104,5 +200,445 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.77185196, y: 0.50000006, z: 0.7000001} - m_Center: {x: -0.0013524592, y: 0, z: 0.35054222} + m_Size: {x: 0.7, y: 0.50000006, z: -0.02} + m_Center: {x: -0.0013524592, y: 0, z: 0.69} +--- !u!1 &3678462132090763668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5038048307131615906} + - component: {fileID: 5522440105903047773} + m_Layer: 0 + m_Name: GameObject (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5038048307131615906 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3678462132090763668} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: -0.322, y: 0.2096, z: 0.3333} + m_LocalScale: {x: 1, y: 0.66676956, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2716506345081405986} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!136 &5522440105903047773 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3678462132090763668} + 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 + m_Radius: 0.02 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &4383428486668839371 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5580688255101848912} + - component: {fileID: 7155333132798296833} + m_Layer: 0 + m_Name: GameObject (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5580688255101848912 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4383428486668839371} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.322, y: 0.2096, z: 0.3333} + m_LocalScale: {x: 1, y: 0.66676956, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2716506345081405986} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!136 &7155333132798296833 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4383428486668839371} + 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 + m_Radius: 0.02 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &4503151811788397062 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4634598126040789267} + - component: {fileID: 1057442211308813359} + m_Layer: 0 + m_Name: GameObject (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4634598126040789267 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4503151811788397062} + m_LocalRotation: {x: -0.000000029802326, y: 0.000000018626453, z: 0.064403646, w: 0.997924} + m_LocalPosition: {x: 0.3435, y: 0.015, z: 0.204} + m_LocalScale: {x: 1, y: 0.36007074, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2716506345081405986} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 7.385} +--- !u!136 &1057442211308813359 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4503151811788397062} + 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 + m_Radius: 0.008 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &4683671260827912868 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7110661842150398648} + - component: {fileID: 1422304767288662812} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7110661842150398648 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4683671260827912868} + m_LocalRotation: {x: 0.6423725, y: -0, z: -0, w: 0.7663926} + m_LocalPosition: {x: 0.3672, y: -0.151, z: 0.344} + m_LocalScale: {x: 1, y: 0.6839013, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2716506345081405986} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 79.938, y: 0, z: 0} +--- !u!136 &1422304767288662812 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4683671260827912868} + 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 + m_Radius: 0.02 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &4818315080602692734 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3302115164258204863} + - component: {fileID: 3433485951184969745} + m_Layer: 0 + m_Name: GameObject (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3302115164258204863 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4818315080602692734} + m_LocalRotation: {x: 0.6423725, y: -0, z: -0, w: 0.7663926} + m_LocalPosition: {x: -0.3672, y: -0.151, z: 0.344} + m_LocalScale: {x: 1, y: 0.6839013, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2716506345081405986} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 79.938, y: 0, z: 0} +--- !u!136 &3433485951184969745 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4818315080602692734} + 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 + m_Radius: 0.02 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6258324396167747386 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5651647197812525230} + - component: {fileID: 4857428937205974577} + m_Layer: 0 + m_Name: GameObject (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5651647197812525230 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6258324396167747386} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.3165, y: 0.0518, z: 0.6648} + m_LocalScale: {x: 1, y: 0.3295842, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2716506345081405986} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &4857428937205974577 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6258324396167747386} + 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 + m_Radius: 0.015 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &7484359906258616135 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5299312723076338949} + - component: {fileID: 3870135275509999665} + m_Layer: 0 + m_Name: GameObject (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5299312723076338949 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7484359906258616135} + m_LocalRotation: {x: 0.000000029802322, y: -0.000000007450581, z: -0.06271966, w: 0.99803126} + m_LocalPosition: {x: -0.3435, y: 0.015, z: 0.204} + m_LocalScale: {x: 1, y: 0.36007074, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2716506345081405986} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -7.192} +--- !u!136 &3870135275509999665 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7484359906258616135} + 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 + m_Radius: 0.008 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &7927956028993209577 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8928183926890340544} + - component: {fileID: 2014081549199839780} + m_Layer: 0 + m_Name: GameObject (8) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8928183926890340544 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7927956028993209577} + m_LocalRotation: {x: -0, y: 0.000000059604638, z: 0.7104022, w: 0.70379597} + m_LocalPosition: {x: -0, y: 0.1949, z: 0.204} + m_LocalScale: {x: 1, y: 0.6387295, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2716506345081405986} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90.535} +--- !u!136 &2014081549199839780 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7927956028993209577} + 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 + m_Radius: 0.008 + m_Height: 1 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-03.1.prefab b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-03.1.prefab index d3623875..c5759941 100644 --- a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-03.1.prefab +++ b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-03.1.prefab @@ -1,5 +1,58 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &343741015845382191 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4377875417747336448} + - component: {fileID: 8386802741988152667} + m_Layer: 0 + m_Name: Collider (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4377875417747336448 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 343741015845382191} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.6581, y: 0.3746, z: 0.107} + m_LocalScale: {x: 0.03855095, y: 0.03365962, z: 0.698046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7184208435468914870} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8386802741988152667 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 343741015845382191} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0.37237328} --- !u!1 &515076025819099546 GameObject: m_ObjectHideFlags: 0 @@ -11,7 +64,6 @@ GameObject: - component: {fileID: 5481304539663986903} - component: {fileID: 6260046604787689625} - component: {fileID: 6625236912954727719} - - component: {fileID: -4950310853377164704} m_Layer: 0 m_Name: M-03.1 m_TagString: Untagged @@ -30,9 +82,10 @@ Transform: m_LocalPosition: {x: -20.309418, y: 0.002746292, z: 8.560373} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 7184208435468914870} m_Father: {fileID: 0} - m_RootOrder: 95 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &6260046604787689625 MeshFilter: @@ -85,13 +138,45 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &-4950310853377164704 +--- !u!1 &851855065866798437 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4437049762160086759} + - component: {fileID: 1454466932237058741} + m_Layer: 0 + m_Name: Collider (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4437049762160086759 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 851855065866798437} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.6581, y: -0.3746, z: 0.107} + m_LocalScale: {x: 0.03855095, y: 0.03365962, z: 0.698046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7184208435468914870} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1454466932237058741 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 515076025819099546} + m_GameObject: {fileID: 851855065866798437} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -104,5 +189,308 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1.400004, y: 0.7999971, z: 0.72918665} - m_Center: {x: -0.6894596, y: -0.38984412, z: 0.36184686} + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0.37237328} +--- !u!1 &1744356289092256980 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7184208435468914870} + m_Layer: 0 + m_Name: Colliders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7184208435468914870 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1744356289092256980} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.7, y: -0.39, z: -0.003} + m_LocalScale: {x: 0.99992996, y: 0.99189997, z: 1.0008} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7522013602662685406} + - {fileID: 4437049762160086759} + - {fileID: 6578828170500283610} + - {fileID: 8813326434677265431} + - {fileID: 4377875417747336448} + - {fileID: 8198402746933741707} + - {fileID: 8792168292526698875} + m_Father: {fileID: 5481304539663986903} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2121103815260515699 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7522013602662685406} + - component: {fileID: 5672100556755819127} + m_Layer: 0 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7522013602662685406 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2121103815260515699} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.702} + m_LocalScale: {x: 0.8950919, y: 1, z: 0.048046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7184208435468914870} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &5672100556755819127 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2121103815260515699} + 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: 1.6, y: 0.80000013, z: 0.7259195} + m_Center: {x: 0, y: 0, z: 0.37237328} +--- !u!1 &6454786988813278284 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8198402746933741707} + - component: {fileID: 8749247790337840351} + m_Layer: 0 + m_Name: Collider (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8198402746933741707 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6454786988813278284} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.6581, y: -0, z: 0.67} + m_LocalScale: {x: 0.03855095, y: 0.70887154, z: 0.052306682} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7184208435468914870} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8749247790337840351 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6454786988813278284} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0.37237328} +--- !u!1 &6585669009029923016 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8792168292526698875} + - component: {fileID: 6152294458334088210} + m_Layer: 0 + m_Name: Collider (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8792168292526698875 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6585669009029923016} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.6683, y: -0, z: 0.67} + m_LocalScale: {x: 0.021059228, y: 0.70887154, z: 0.052306682} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7184208435468914870} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6152294458334088210 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6585669009029923016} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0.37237328} +--- !u!1 &7211218126139711574 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8813326434677265431} + - component: {fileID: 8914521668716267977} + m_Layer: 0 + m_Name: Collider (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8813326434677265431 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7211218126139711574} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.6808, y: 0.3746, z: 0.107} + m_LocalScale: {x: 0.03855095, y: 0.03365962, z: 0.698046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7184208435468914870} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8914521668716267977 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7211218126139711574} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0.37237328} +--- !u!1 &9078367524640349339 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6578828170500283610} + - component: {fileID: 8529346928948255747} + m_Layer: 0 + m_Name: Collider (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6578828170500283610 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9078367524640349339} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.6808, y: -0.3746, z: 0.107} + m_LocalScale: {x: 0.03855095, y: 0.03365962, z: 0.698046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7184208435468914870} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8529346928948255747 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9078367524640349339} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0.37237328} diff --git a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-09.prefab b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-09.prefab index 68fd3e8c..304e9057 100644 --- a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-09.prefab +++ b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-09.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 3714830177508675957} - component: {fileID: 5680935660391852867} - component: {fileID: 2155594234467096506} - - component: {fileID: -6109769784749892616} m_Layer: 0 m_Name: M-09 m_TagString: Untagged @@ -30,7 +29,8 @@ Transform: m_LocalPosition: {x: -22.21951, y: 4.500003, z: 19.947252} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 4609642604378074130} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -85,13 +85,81 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &-6109769784749892616 +--- !u!1 &437574612226353580 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4609642604378074130} + m_Layer: 0 + m_Name: Colliders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4609642604378074130 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 437574612226353580} + 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: 3718105481722967213} + - {fileID: 5673293178166834171} + - {fileID: 7211308431634672313} + - {fileID: 2232576758614206310} + - {fileID: 970249156740918332} + m_Father: {fileID: 3714830177508675957} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &463157372444677731 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2232576758614206310} + - component: {fileID: 6577501258392074126} + m_Layer: 0 + m_Name: Collider (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2232576758614206310 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 463157372444677731} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.02, y: 0, z: 0.471} + m_LocalScale: {x: 0.040950153, y: 0.07224894, z: 0.9145819} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4609642604378074130} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6577501258392074126 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 420773778341536614} + m_GameObject: {fileID: 463157372444677731} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -104,5 +172,217 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1.400004, y: 0.7999968, z: 0.9454399} - m_Center: {x: -0.6894596, y: -0.0000003576278, z: 0.47271994} + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1675846366092990974 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3718105481722967213} + - component: {fileID: 8618919542935123333} + m_Layer: 0 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3718105481722967213 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1675846366092990974} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.019, y: -0, z: 0.012} + m_LocalScale: {x: 0.04730294, y: 0.67838, z: 0.028778238} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4609642604378074130} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8618919542935123333 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1675846366092990974} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &4557001278348661529 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7211308431634672313} + - component: {fileID: 7779507175169981234} + m_Layer: 0 + m_Name: Collider (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7211308431634672313 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4557001278348661529} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.359, y: 0, z: 0.471} + m_LocalScale: {x: 0.040950153, y: 0.07224894, z: 0.9145819} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4609642604378074130} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &7779507175169981234 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4557001278348661529} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &5599537131281569117 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5673293178166834171} + - component: {fileID: 3384868624130396075} + m_Layer: 0 + m_Name: Collider (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5673293178166834171 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5599537131281569117} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.359, y: -0, z: 0.012} + m_LocalScale: {x: 0.04730294, y: 0.67838, z: 0.028778238} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4609642604378074130} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3384868624130396075 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5599537131281569117} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8022463787992186647 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 970249156740918332} + - component: {fileID: 7538659547327116585} + m_Layer: 0 + m_Name: Collider (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &970249156740918332 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8022463787992186647} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.689, y: -0, z: 0.936} + m_LocalScale: {x: 1.4009432, y: 0.79582214, z: 0.023633942} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4609642604378074130} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &7538659547327116585 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8022463787992186647} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-11_Pro.prefab b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-11_Pro.prefab index f2cd9a6c..631206a5 100644 --- a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-11_Pro.prefab +++ b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-11_Pro.prefab @@ -1,5 +1,342 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &503098924653261075 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6941346103650308469} + - component: {fileID: 9211952462788691253} + m_Layer: 0 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6941346103650308469 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 503098924653261075} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.702} + m_LocalScale: {x: 1, y: 1, z: 0.048046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 685499845498138935} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &9211952462788691253 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 503098924653261075} + 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: 1.6, y: 0.80000013, z: 0.7259195} + m_Center: {x: 0, y: 0, z: 0.37237328} +--- !u!1 &1588822469048869864 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2473342392347383562} + - component: {fileID: 6680108448734848288} + m_Layer: 0 + m_Name: Collider (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2473342392347383562 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1588822469048869864} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.725, y: 0.326, z: 0.10723} + m_LocalScale: {x: 0.056064475, y: 0.058848172, z: 0.698046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8121235152450351889} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6680108448734848288 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1588822469048869864} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0.37237328} +--- !u!1 &2612622685635731481 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8121235152450351889} + m_Layer: 0 + m_Name: Colliders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8121235152450351889 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2612622685635731481} + m_LocalRotation: {x: 0.00017452026, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: -0.99993, y: -0.9919001, z: 1.0008001} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4436270456467558305} + - {fileID: 6998813599565780368} + - {fileID: 3833189668891543010} + - {fileID: 2473342392347383562} + - {fileID: 1774899964817130508} + m_Father: {fileID: 7754365941339491261} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0.02, y: 0, z: 0} +--- !u!1 &2774528418753424275 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6998813599565780368} + - component: {fileID: 2104015756093693352} + m_Layer: 0 + m_Name: Collider (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6998813599565780368 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2774528418753424275} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.725, y: -0.326, z: 0.10723} + m_LocalScale: {x: 0.056064475, y: 0.058848172, z: 0.698046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8121235152450351889} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2104015756093693352 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2774528418753424275} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0.37237328} +--- !u!1 &3858420185399993947 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4227659779052598039} + - component: {fileID: 7685368506662407809} + m_Layer: 0 + m_Name: Collider (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4227659779052598039 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3858420185399993947} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.725, y: 0.326, z: 0.10723} + m_LocalScale: {x: 0.056064475, y: 0.058848172, z: 0.698046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 685499845498138935} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &7685368506662407809 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3858420185399993947} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0.37237328} +--- !u!1 &5977008915105451447 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 685499845498138935} + m_Layer: 0 + m_Name: Colliders (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &685499845498138935 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5977008915105451447} + m_LocalRotation: {x: 0, y: 0.00017452026, z: 0, w: 1} + m_LocalPosition: {x: 0.001, y: -0.009, z: 0} + m_LocalScale: {x: -1.0043322, y: -0.9970455, z: 1.0008001} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6941346103650308469} + - {fileID: 7604931311205475093} + - {fileID: 3991874323981351977} + - {fileID: 4227659779052598039} + - {fileID: 4258900815312655390} + m_Father: {fileID: 7754365941196070952} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0.02, z: 0} +--- !u!1 &6391393393900200702 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3833189668891543010} + - component: {fileID: 1465109632234551764} + m_Layer: 0 + m_Name: Collider (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3833189668891543010 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6391393393900200702} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.725, y: -0.326, z: 0.10723} + m_LocalScale: {x: 0.056064475, y: 0.058848172, z: 0.698046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8121235152450351889} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1465109632234551764 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6391393393900200702} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0.37237328} --- !u!1 &6757179987670563246 GameObject: m_ObjectHideFlags: 0 @@ -11,7 +348,6 @@ GameObject: - component: {fileID: 7754365941339491261} - component: {fileID: 1641012317642731915} - component: {fileID: 5042489420522540402} - - component: {fileID: -5666666046803784546} m_Layer: 0 m_Name: M-11_Pro m_TagString: Untagged @@ -32,6 +368,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7754365941196070952} + - {fileID: 8121235152450351889} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -89.98, y: 0, z: 0} @@ -85,27 +422,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &-5666666046803784546 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6757179987670563246} - 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: 1.6, y: 0.80000013, z: 0.7259195} - m_Center: {x: 0, y: 0, z: 0.37237328} --- !u!1 &6757179987812930107 GameObject: m_ObjectHideFlags: 0 @@ -132,10 +448,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6757179987812930107} m_LocalRotation: {x: 0.000000029802322, y: 0.000000059604645, z: -0.7071072, w: 0.70710635} - m_LocalPosition: {x: -0.521, y: -0.236, z: -0.006} + m_LocalPosition: {x: -0.521, y: -0.265, z: -0.002} m_LocalScale: {x: 0.7884001, y: 0.70300007, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 685499845498138935} m_Father: {fileID: 7754365941339491261} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: -90.00001} @@ -189,3 +506,268 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &7272915943785087784 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4436270456467558305} + - component: {fileID: 6703038747917282865} + m_Layer: 0 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4436270456467558305 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7272915943785087784} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.702} + m_LocalScale: {x: 1, y: 1, z: 0.048046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8121235152450351889} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6703038747917282865 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7272915943785087784} + 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: 1.6, y: 0.80000013, z: 0.7259195} + m_Center: {x: 0, y: 0, z: 0.37237328} +--- !u!1 &7718150041146198956 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3991874323981351977} + - component: {fileID: 3817306243414021141} + m_Layer: 0 + m_Name: Collider (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3991874323981351977 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7718150041146198956} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.725, y: -0.326, z: 0.10723} + m_LocalScale: {x: 0.056064475, y: 0.058848172, z: 0.698046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 685499845498138935} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3817306243414021141 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7718150041146198956} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0.37237328} +--- !u!1 &8186008016247880789 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1774899964817130508} + - component: {fileID: 2283145160872856857} + m_Layer: 0 + m_Name: Collider (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1774899964817130508 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8186008016247880789} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.725, y: 0.326, z: 0.10723} + m_LocalScale: {x: 0.056064475, y: 0.058848172, z: 0.698046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8121235152450351889} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2283145160872856857 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8186008016247880789} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0.37237328} +--- !u!1 &8686112904608951271 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4258900815312655390} + - component: {fileID: 3769976245882640405} + m_Layer: 0 + m_Name: Collider (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4258900815312655390 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8686112904608951271} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.725, y: 0.326, z: 0.10723} + m_LocalScale: {x: 0.056064475, y: 0.058848172, z: 0.698046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 685499845498138935} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3769976245882640405 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8686112904608951271} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0.37237328} +--- !u!1 &8949267259146525730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7604931311205475093} + - component: {fileID: 5513465215234806168} + m_Layer: 0 + m_Name: Collider (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7604931311205475093 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8949267259146525730} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.725, y: -0.326, z: 0.10723} + m_LocalScale: {x: 0.056064475, y: 0.058848172, z: 0.698046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 685499845498138935} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &5513465215234806168 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8949267259146525730} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0.37237328} diff --git a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-11_light.prefab b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-11_light.prefab index 55f62f22..cca18d95 100644 --- a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-11_light.prefab +++ b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-11_light.prefab @@ -1,5 +1,58 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1156868675529854378 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1397693201532661440} + - component: {fileID: 6779163810117991780} + m_Layer: 0 + m_Name: Collider (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1397693201532661440 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1156868675529854378} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.725, y: 0.326, z: 0.10723} + m_LocalScale: {x: 0.056064475, y: 0.058848172, z: 0.698046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5835464472103365265} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6779163810117991780 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1156868675529854378} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0.37237328} --- !u!1 &2736713722575992351 GameObject: m_ObjectHideFlags: 0 @@ -11,7 +64,6 @@ GameObject: - component: {fileID: 1414582703734572044} - component: {fileID: 7996877564214640186} - component: {fileID: 4451268015828632259} - - component: {fileID: -2526005445661399551} m_Layer: 0 m_Name: M-11_light m_TagString: Untagged @@ -30,7 +82,8 @@ Transform: m_LocalPosition: {x: -77.547, y: 4.5045, z: -18.938} m_LocalScale: {x: 0.9999302, y: 0.9919017, z: 1.0007998} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 5835464472103365265} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -89.98, y: 0, z: 0} @@ -85,13 +138,240 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &-2526005445661399551 +--- !u!1 &4152406052184429577 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5992120833558140524} + - component: {fileID: 4328728801255318207} + m_Layer: 0 + m_Name: Collider (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5992120833558140524 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4152406052184429577} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.725, y: -0.326, z: 0.10723} + m_LocalScale: {x: 0.056064475, y: 0.058848172, z: 0.698046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5835464472103365265} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &4328728801255318207 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2736713722575992351} + m_GameObject: {fileID: 4152406052184429577} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0.37237328} +--- !u!1 &6467564322160181132 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7039187867055589526} + - component: {fileID: 3548529811181655099} + m_Layer: 0 + m_Name: Collider (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7039187867055589526 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6467564322160181132} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.725, y: 0.326, z: 0.10723} + m_LocalScale: {x: 0.056064475, y: 0.058848172, z: 0.698046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5835464472103365265} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3548529811181655099 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6467564322160181132} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0.37237328} +--- !u!1 &6653078564933318312 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8254529396118418547} + - component: {fileID: 2656610762488211372} + m_Layer: 0 + m_Name: Collider (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8254529396118418547 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6653078564933318312} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.725, y: -0.326, z: 0.10723} + m_LocalScale: {x: 0.056064475, y: 0.058848172, z: 0.698046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5835464472103365265} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2656610762488211372 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6653078564933318312} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0.37237328} +--- !u!1 &6801039216103761204 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5835464472103365265} + m_Layer: 0 + m_Name: Colliders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5835464472103365265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6801039216103761204} + 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: 7247291899988358557} + - {fileID: 8254529396118418547} + - {fileID: 5992120833558140524} + - {fileID: 1397693201532661440} + - {fileID: 7039187867055589526} + m_Father: {fileID: 1414582703734572044} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7783096825103082260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7247291899988358557} + - component: {fileID: 1624905319299492333} + m_Layer: 0 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7247291899988358557 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7783096825103082260} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.702} + m_LocalScale: {x: 1, y: 1, z: 0.048046} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5835464472103365265} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1624905319299492333 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7783096825103082260} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 diff --git a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-14_Blue.prefab b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-14_Blue.prefab index 5d6378e0..ddac60e9 100644 --- a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-14_Blue.prefab +++ b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-14_Blue.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 8223999398554646678} - component: {fileID: 1115350497728856736} - component: {fileID: 6649015321730809433} - - component: {fileID: -4883137734288192353} + - component: {fileID: -4600213949030408330} m_Layer: 0 m_Name: M-14_Blue m_TagString: Untagged @@ -84,8 +84,8 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &-4883137734288192353 -BoxCollider: +--- !u!64 &-4600213949030408330 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -102,6 +102,7 @@ BoxCollider: m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1.025342, y: 1.4027121, z: 0.8774306} - m_Center: {x: 0.0000018775463, y: -0.07153671, z: 0.4386237} + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4711208715938537054, guid: 03f9321ea2f9e3f448099582d9c9c05b, type: 3} diff --git a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-14_Green.prefab b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-14_Green.prefab index 7414d646..8df4d9b6 100644 --- a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-14_Green.prefab +++ b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-14_Green.prefab @@ -73,7 +73,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: -4883137734288192353, guid: 6da1a23399fb43b4cb5edb6bc1cd29ea, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] diff --git a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-14_Yellow Variant.prefab b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-14_Yellow Variant.prefab index 6b224096..28abaa99 100644 --- a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-14_Yellow Variant.prefab +++ b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-14_Yellow Variant.prefab @@ -73,8 +73,42 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: -4883137734288192353, guid: 6da1a23399fb43b4cb5edb6bc1cd29ea, type: 3} + - {fileID: -4600213949030408330, guid: 6da1a23399fb43b4cb5edb6bc1cd29ea, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4934496283046365829, guid: 6da1a23399fb43b4cb5edb6bc1cd29ea, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7011000044237808561} m_SourcePrefab: {fileID: 100100000, guid: 6da1a23399fb43b4cb5edb6bc1cd29ea, type: 3} +--- !u!1 &6251194327347043152 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4934496283046365829, guid: 6da1a23399fb43b4cb5edb6bc1cd29ea, + type: 3} + m_PrefabInstance: {fileID: 1349512153861968341} + m_PrefabAsset: {fileID: 0} +--- !u!64 &7011000044237808561 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6251194327347043152} + 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: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4711208715938537054, guid: 03f9321ea2f9e3f448099582d9c9c05b, type: 3} diff --git a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-20.prefab b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-20.prefab index ffae76eb..4644cee8 100644 --- a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-20.prefab +++ b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-20.prefab @@ -1,5 +1,419 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &67571147951229346 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8971838030776243782} + - component: {fileID: 8524843229814291314} + m_Layer: 0 + m_Name: Collliders (9) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8971838030776243782 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 67571147951229346} + m_LocalRotation: {x: -0.17364825, y: 0.0000000018626447, z: -0, w: 0.9848077} + m_LocalPosition: {x: -0.17899936, y: 0.4950014, z: 0.67900014} + m_LocalScale: {x: 1, y: 1, z: 1.0571002} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7682665409936728290} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: -20, y: 0, z: 0} +--- !u!65 &8524843229814291314 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 67571147951229346} + 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.03, y: 0.03, z: 1.35674} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &846204248737509028 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 69842497675393636} + - component: {fileID: 5332167730636551193} + m_Layer: 0 + m_Name: Collliders (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &69842497675393636 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 846204248737509028} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 1.2540003} + m_LocalScale: {x: 0.87229, y: 0.97093, z: 0.014428447} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7682665409936728290} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &5332167730636551193 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 846204248737509028} + 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.38577133, y: 1.530672, z: 1.35674} + m_Center: {x: -0.00028181076, y: -0.0023109913, z: 0.67837} +--- !u!1 &1669277540129119112 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1495021409644861708} + - component: {fileID: 5884549261650787462} + m_Layer: 0 + m_Name: Collliders (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1495021409644861708 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669277540129119112} + m_LocalRotation: {x: 0.000000027939674, y: -0.11901942, z: 0.000000014901159, w: 0.9928919} + m_LocalPosition: {x: -0.012999535, y: 0.74600184, z: 0.7019999} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7682665409936728290} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: -13.671, z: 0} +--- !u!65 &5884549261650787462 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669277540129119112} + 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.03, y: 0.03, z: 1.35674} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &3310407099895213126 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2573478208730669034} + - component: {fileID: 7939370721427014468} + m_Layer: 0 + m_Name: Collliders (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2573478208730669034 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3310407099895213126} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.37999988} + m_LocalScale: {x: 0.87229, y: 0.97093, z: 0.014428447} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7682665409936728290} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &7939370721427014468 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3310407099895213126} + 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.38577133, y: 1.530672, z: 1.35674} + m_Center: {x: -0.00028181076, y: -0.0023109913, z: 0.67837} +--- !u!1 &4003188462104339177 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8596572094453364854} + - component: {fileID: 3589619072553186302} + m_Layer: 0 + m_Name: Collliders (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8596572094453364854 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4003188462104339177} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.95900023} + m_LocalScale: {x: 0.87229, y: 0.97093, z: 0.014428447} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7682665409936728290} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3589619072553186302 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4003188462104339177} + 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.38577133, y: 1.530672, z: 1.35674} + m_Center: {x: -0.00028181076, y: -0.0023109913, z: 0.67837} +--- !u!1 &4577168959174820567 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7682665409936728290} + m_Layer: 0 + m_Name: Colliders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7682665409936728290 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4577168959174820567} + 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: 3623243767464777332} + - {fileID: 2573478208730669034} + - {fileID: 6580086564194059286} + - {fileID: 8596572094453364854} + - {fileID: 69842497675393636} + - {fileID: 1495021409644861708} + - {fileID: 23126767804553022} + - {fileID: 3077760124486570680} + - {fileID: 2735862169546280726} + - {fileID: 8971838030776243782} + - {fileID: 4923032650169758393} + - {fileID: 7576042025262487151} + m_Father: {fileID: 8012760959865505184} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4631394299727872589 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2735862169546280726} + - component: {fileID: 1310175161462705084} + m_Layer: 0 + m_Name: Collliders (8) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2735862169546280726 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4631394299727872589} + m_LocalRotation: {x: 0.1736481, y: 0.000000007450579, z: -0.000000014901158, w: 0.9848078} + m_LocalPosition: {x: -0.17900023, y: 0, z: 0.67679995} + m_LocalScale: {x: 1, y: 1, z: 1.0571002} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7682665409936728290} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 20, y: 0, z: 0} +--- !u!65 &1310175161462705084 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4631394299727872589} + 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.03, y: 0.03, z: 1.35674} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &4719579530360251391 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6580086564194059286} + - component: {fileID: 3592665301065197521} + m_Layer: 0 + m_Name: Collliders (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6580086564194059286 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4719579530360251391} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.66899985} + m_LocalScale: {x: 0.87229, y: 0.97093, z: 0.014428447} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7682665409936728290} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3592665301065197521 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4719579530360251391} + 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.38577133, y: 1.530672, z: 1.35674} + m_Center: {x: -0.00028181076, y: -0.0023109913, z: 0.67837} --- !u!1 &6442489956621367219 GameObject: m_ObjectHideFlags: 0 @@ -11,7 +425,6 @@ GameObject: - component: {fileID: 8012760959865505184} - component: {fileID: 1326324507059290006} - component: {fileID: 4707533160917893999} - - component: {fileID: 574859100267394266} m_Layer: 0 m_Name: M-20 m_TagString: Untagged @@ -30,9 +443,10 @@ Transform: m_LocalPosition: {x: 4.42, y: -0.6, z: -0.32} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 7682665409936728290} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 15} --- !u!33 &1326324507059290006 MeshFilter: @@ -85,13 +499,204 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &574859100267394266 +--- !u!1 &6795179938613646644 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3077760124486570680} + - component: {fileID: 9167854973047631264} + m_Layer: 0 + m_Name: Collliders (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3077760124486570680 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6795179938613646644} + m_LocalRotation: {x: 0.1736481, y: 0.000000007450579, z: -0.000000014901158, w: 0.9848078} + m_LocalPosition: {x: 0.17900026, y: -0.5032997, z: 0.6767999} + m_LocalScale: {x: 1, y: 1, z: 1.0571002} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7682665409936728290} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 20, y: 0, z: 0} +--- !u!65 &9167854973047631264 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6442489956621367219} + m_GameObject: {fileID: 6795179938613646644} + 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.03, y: 0.03, z: 1.35674} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &7541719040573706789 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4923032650169758393} + - component: {fileID: 1118304321181555509} + m_Layer: 0 + m_Name: Collliders (10) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4923032650169758393 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7541719040573706789} + m_LocalRotation: {x: -0.17364825, y: 0.0000000018626447, z: -0, w: 0.9848077} + m_LocalPosition: {x: -0.17900018, y: -0.49500006, z: 0.679} + m_LocalScale: {x: 1, y: 1, z: 1.0571002} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7682665409936728290} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: -20, y: 0, z: 0} +--- !u!65 &1118304321181555509 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7541719040573706789} + 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.03, y: 0.03, z: 1.35674} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8013244902626617526 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 23126767804553022} + - component: {fileID: 8226028183709941415} + m_Layer: 0 + m_Name: Collliders (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &23126767804553022 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8013244902626617526} + m_LocalRotation: {x: 0.1736481, y: 0.000000007450579, z: -0.000000014901158, w: 0.9848078} + m_LocalPosition: {x: 0.17899989, y: 0.49400032, z: 0.6780002} + m_LocalScale: {x: 1, y: 1, z: 1.0571002} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7682665409936728290} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 20, y: 0, z: 0} +--- !u!65 &8226028183709941415 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8013244902626617526} + 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.03, y: 0.03, z: 1.35674} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8027513651551934953 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3623243767464777332} + - component: {fileID: 5570922214136827496} + m_Layer: 0 + m_Name: Collliders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3623243767464777332 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8027513651551934953} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.08599973} + m_LocalScale: {x: 0.87229, y: 0.97093, z: 0.014428447} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7682665409936728290} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &5570922214136827496 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8027513651551934953} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -106,3 +711,56 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.38577133, y: 1.530672, z: 1.35674} m_Center: {x: -0.00028181076, y: -0.0023109913, z: 0.67837} +--- !u!1 &8427008302447417992 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7576042025262487151} + - component: {fileID: 8528439359746244400} + m_Layer: 0 + m_Name: Collliders (11) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7576042025262487151 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8427008302447417992} + m_LocalRotation: {x: -0.17364825, y: 0.0000000018626447, z: -0, w: 0.9848077} + m_LocalPosition: {x: 0.17900006, y: -0, z: 0.6790001} + m_LocalScale: {x: 1, y: 1, z: 1.0571002} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7682665409936728290} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: -20, y: 0, z: 0} +--- !u!65 &8528439359746244400 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8427008302447417992} + 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.03, y: 0.03, z: 1.35674} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-48.1.prefab b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-48.1.prefab index 41b8efe8..bceae605 100644 --- a/Assets/_PROJECT/Prefabs/Furniture_Inside/M-48.1.prefab +++ b/Assets/_PROJECT/Prefabs/Furniture_Inside/M-48.1.prefab @@ -1,5 +1,151 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &413626544420318879 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2218098360309298315} + m_Layer: 0 + m_Name: Colliders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2218098360309298315 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 413626544420318879} + 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: 6208938195790879753} + - {fileID: 6046978846965783499} + - {fileID: 7680503612267764103} + - {fileID: 5760887298484757129} + - {fileID: 3265949213182177086} + - {fileID: 1192838489612398070} + - {fileID: 243284327920644154} + - {fileID: 34301511785826584} + - {fileID: 8796724416583823266} + m_Father: {fileID: 492281468784399384} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &492658492837538849 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6046978846965783499} + - component: {fileID: 3306401588798475011} + m_Layer: 0 + m_Name: Collider (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6046978846965783499 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492658492837538849} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.000000007631, y: 0, z: 1.564} + m_LocalScale: {x: 1, y: 1, z: 0.026856} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2218098360309298315} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3306401588798475011 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492658492837538849} + 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.39999998, y: 1.0059466, z: 2.1032748} + m_Center: {x: 0.19999999, y: -0.49702668, z: 1.0483625} +--- !u!1 &1493658190600382537 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5760887298484757129} + - component: {fileID: 8725087356503099186} + m_Layer: 0 + m_Name: Collider (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5760887298484757129 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1493658190600382537} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.000000007631, y: 0, z: 0.595} + m_LocalScale: {x: 1, y: 1, z: 0.026856} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2218098360309298315} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8725087356503099186 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1493658190600382537} + 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.39999998, y: 1.0059466, z: 2.1032748} + m_Center: {x: 0.19999999, y: -0.49702668, z: 1.0483625} --- !u!1 &3499216353321035275 GameObject: m_ObjectHideFlags: 0 @@ -11,7 +157,6 @@ GameObject: - component: {fileID: 492281468784399384} - component: {fileID: 8903592120152616494} - component: {fileID: 2932794123161309911} - - component: {fileID: 702247282004651112} m_Layer: 0 m_Name: M-48.1 m_TagString: Untagged @@ -30,7 +175,8 @@ Transform: m_LocalPosition: {x: 0.45, y: 0.0064, z: 2.3277} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2218098360309298315} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 55.730995, z: -130.89499} @@ -84,13 +230,363 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &702247282004651112 +--- !u!1 &3774576562372844833 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 34301511785826584} + - component: {fileID: 3058415562046732869} + m_Layer: 0 + m_Name: Collider (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &34301511785826584 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3774576562372844833} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.348, y: -0.949, z: 0.01} + m_LocalScale: {x: 0.12907973, y: 0.051161665, z: 0.99483967} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2218098360309298315} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3058415562046732869 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3499216353321035275} + m_GameObject: {fileID: 3774576562372844833} + 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.39999998, y: 1.0059466, z: 2.1032748} + m_Center: {x: 0.19999999, y: -0.49702668, z: 1.0483625} +--- !u!1 &4337443422989300069 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7680503612267764103} + - component: {fileID: 1179234655594269276} + m_Layer: 0 + m_Name: Collider (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7680503612267764103 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4337443422989300069} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.000000007631, y: 0, z: 2.046} + m_LocalScale: {x: 1, y: 1, z: 0.026856} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2218098360309298315} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1179234655594269276 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4337443422989300069} + 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.39999998, y: 1.0059466, z: 2.1032748} + m_Center: {x: 0.19999999, y: -0.49702668, z: 1.0483625} +--- !u!1 &4994510831171277403 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 243284327920644154} + - component: {fileID: 7799659735822593570} + m_Layer: 0 + m_Name: Collider (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &243284327920644154 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4994510831171277403} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.348, y: 0.007, z: 0.01} + m_LocalScale: {x: 0.12907973, y: 0.051161665, z: 0.99483967} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2218098360309298315} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &7799659735822593570 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4994510831171277403} + 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.39999998, y: 1.0059466, z: 2.1032748} + m_Center: {x: 0.19999999, y: -0.49702668, z: 1.0483625} +--- !u!1 &5715029386610924463 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1192838489612398070} + - component: {fileID: 9140970995713703271} + m_Layer: 0 + m_Name: Collider (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1192838489612398070 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5715029386610924463} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.0001, y: 0.0067, z: 0.01} + m_LocalScale: {x: 0.12907973, y: 0.054574188, z: 0.99483967} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2218098360309298315} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &9140970995713703271 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5715029386610924463} + 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.39999998, y: 1.0059466, z: 2.1032748} + m_Center: {x: 0.19999999, y: -0.49702668, z: 1.0483625} +--- !u!1 &6028355553154106082 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8796724416583823266} + - component: {fileID: 7953935422413965091} + m_Layer: 0 + m_Name: Collider (8) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8796724416583823266 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6028355553154106082} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.001, y: -0.949, z: 0.01} + m_LocalScale: {x: 0.12907973, y: 0.051161665, z: 0.99483967} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2218098360309298315} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &7953935422413965091 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6028355553154106082} + 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.39999998, y: 1.0059466, z: 2.1032748} + m_Center: {x: 0.19999999, y: -0.49702668, z: 1.0483625} +--- !u!1 &7058838959549939851 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3265949213182177086} + - component: {fileID: 2545108570070150139} + m_Layer: 0 + m_Name: Collider (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3265949213182177086 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7058838959549939851} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.000000007631, y: 0, z: 0.121} + m_LocalScale: {x: 1, y: 1, z: 0.026856} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2218098360309298315} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2545108570070150139 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7058838959549939851} + 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.39999998, y: 1.0059466, z: 2.1032748} + m_Center: {x: 0.19999999, y: -0.49702668, z: 1.0483625} +--- !u!1 &7639587872391209778 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6208938195790879753} + - component: {fileID: 481053909375151287} + m_Layer: 0 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6208938195790879753 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7639587872391209778} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.000000007631, y: 0, z: 1.079} + m_LocalScale: {x: 1, y: 1, z: 0.026856} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2218098360309298315} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &481053909375151287 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7639587872391209778} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 diff --git a/Assets/_PROJECT/Prefabs/Furniture_Inside/Monitor_Keyboard_Mouse.prefab b/Assets/_PROJECT/Prefabs/Furniture_Inside/Monitor_Keyboard_Mouse.prefab index d3cf205f..3bc57c14 100644 --- a/Assets/_PROJECT/Prefabs/Furniture_Inside/Monitor_Keyboard_Mouse.prefab +++ b/Assets/_PROJECT/Prefabs/Furniture_Inside/Monitor_Keyboard_Mouse.prefab @@ -1,5 +1,111 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &216724768625789483 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6853755791337501669} + - component: {fileID: 6579696189153294018} + m_Layer: 0 + m_Name: Collider (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6853755791337501669 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 216724768625789483} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.383, y: -0.007, z: 0.028} + m_LocalScale: {x: 0.44268376, y: 1.2970402, z: 0.05260098} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7082244166044819187} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6579696189153294018 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 216724768625789483} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &796890829202268442 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3515316842144926707} + - component: {fileID: 8357560435954990459} + m_Layer: 0 + m_Name: Collider (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3515316842144926707 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 796890829202268442} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.222, y: -0.004, z: 0.793} + m_LocalScale: {x: 0.058129568, y: 0.31285468, z: 0.103389926} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7082244166044819187} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8357560435954990459 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 796890829202268442} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1944074223223965062 GameObject: m_ObjectHideFlags: 0 @@ -11,7 +117,6 @@ GameObject: - component: {fileID: 3216103312723343253} - component: {fileID: 5907282708653657507} - component: {fileID: 199965121757327706} - - component: {fileID: -1380916667642830638} m_Layer: 0 m_Name: Monitor_Keyboard_Mouse m_TagString: Untagged @@ -30,7 +135,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.40000027, y: 0.40000015, z: 0.40000015} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 7082244166044819187} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 180} @@ -86,13 +192,45 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &-1380916667642830638 +--- !u!1 &3910860427840902660 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7455817069366588125} + - component: {fileID: 4500291942852327569} + m_Layer: 0 + m_Name: Collider (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7455817069366588125 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3910860427840902660} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.119, y: -0.013, z: 0.028} + m_LocalScale: {x: 0.36789143, y: 0.7611611, z: 0.05260098} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7082244166044819187} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &4500291942852327569 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1944074223223965062} + m_GameObject: {fileID: 3910860427840902660} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -105,5 +243,363 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.8941676, y: 1.8235085, z: 1.4183179} - m_Center: {x: -0.14546974, y: 0.09948471, z: 0.7054997} + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &4772375825954354884 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8923443124511387462} + - component: {fileID: 6655425417803743998} + m_Layer: 0 + m_Name: Collider (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8923443124511387462 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4772375825954354884} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.222, y: -0.129, z: 0.499} + m_LocalScale: {x: 0.058129568, y: 0.08104501, z: 0.5085957} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7082244166044819187} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6655425417803743998 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4772375825954354884} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6528955556621957711 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3533928798248265147} + - component: {fileID: 4544862677423115497} + m_Layer: 0 + m_Name: Collider (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3533928798248265147 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6528955556621957711} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.222, y: 0.108, z: 0.476} + m_LocalScale: {x: 0.058129568, y: 0.08104501, z: 0.5085957} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7082244166044819187} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &4544862677423115497 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6528955556621957711} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6698310624694679856 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4458486939286660637} + - component: {fileID: 4474014491132569010} + m_Layer: 0 + m_Name: Collider (8) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4458486939286660637 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6698310624694679856} + m_LocalRotation: {x: -0, y: -0.000000011175868, z: 0.09898793, w: 0.99508864} + m_LocalPosition: {x: -0.3289, y: 0.9134, z: 0.0474} + m_LocalScale: {x: 0.3506631, y: 0.17661797, z: 0.07087456} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7082244166044819187} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 11.362} +--- !u!65 &4474014491132569010 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6698310624694679856} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &7571169256490513271 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1730731593812477915} + - component: {fileID: 199621240822553425} + m_Layer: 0 + m_Name: Collider (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1730731593812477915 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7571169256490513271} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.222, y: -0.01, z: 0.146} + m_LocalScale: {x: 0.058129568, y: 0.32348305, z: 0.23302838} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7082244166044819187} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &199621240822553425 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7571169256490513271} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &7676072609731896813 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5403461799906943793} + - component: {fileID: 655615589125499300} + m_Layer: 0 + m_Name: Collider (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5403461799906943793 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7676072609731896813} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.167, y: -0.0296, z: 0.5708} + m_LocalScale: {x: 0.058129568, y: 1.06475, z: 0.41066003} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7082244166044819187} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &655615589125499300 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7676072609731896813} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8011664040454053799 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7824606029320509021} + - component: {fileID: 3679880559332793341} + m_Layer: 0 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7824606029320509021 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8011664040454053799} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.095, y: -0.011, z: 0.893} + m_LocalScale: {x: 0.058129568, y: 1.5858417, z: 1.0136} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7082244166044819187} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3679880559332793341 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8011664040454053799} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &9170493543151423557 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7082244166044819187} + m_Layer: 0 + m_Name: Colliders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7082244166044819187 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170493543151423557} + 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: 7824606029320509021} + - {fileID: 5403461799906943793} + - {fileID: 7455817069366588125} + - {fileID: 3515316842144926707} + - {fileID: 3533928798248265147} + - {fileID: 1730731593812477915} + - {fileID: 8923443124511387462} + - {fileID: 6853755791337501669} + - {fileID: 4458486939286660637} + m_Father: {fileID: 3216103312723343253} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/_PROJECT/Prefabs/Furniture_Inside/Monitor_alone.prefab b/Assets/_PROJECT/Prefabs/Furniture_Inside/Monitor_alone.prefab index c93667e8..199f0341 100644 --- a/Assets/_PROJECT/Prefabs/Furniture_Inside/Monitor_alone.prefab +++ b/Assets/_PROJECT/Prefabs/Furniture_Inside/Monitor_alone.prefab @@ -1,5 +1,203 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &926723236697798741 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8625992139597579642} + - component: {fileID: 7726996895166773726} + m_Layer: 0 + m_Name: Collider (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8625992139597579642 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 926723236697798741} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.222, y: -0.004, z: 0.793} + m_LocalScale: {x: 0.058129568, y: 0.31285468, z: 0.103389926} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1295456601944157320} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &7726996895166773726 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 926723236697798741} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &2426794413587868889 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2546627276902634140} + - component: {fileID: 3426442161863962655} + m_Layer: 0 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2546627276902634140 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2426794413587868889} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.095, y: -0.011, z: 0.893} + m_LocalScale: {x: 0.058129568, y: 1.5858417, z: 1.0136} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1295456601944157320} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3426442161863962655 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2426794413587868889} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &4204418183230704756 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3108724037804966904} + - component: {fileID: 6412756250206475218} + m_Layer: 0 + m_Name: Collider (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3108724037804966904 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4204418183230704756} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.167, y: -0.0296, z: 0.5708} + m_LocalScale: {x: 0.058129568, y: 1.06475, z: 0.41066003} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1295456601944157320} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6412756250206475218 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4204418183230704756} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &5842951291373096644 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1295456601944157320} + m_Layer: 0 + m_Name: Colliders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1295456601944157320 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5842951291373096644} + 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: 2546627276902634140} + - {fileID: 3108724037804966904} + - {fileID: 590966147127245936} + - {fileID: 8625992139597579642} + - {fileID: 3144305824050550277} + - {fileID: 1539628467813529844} + - {fileID: 6100203642079940078} + - {fileID: 5032277771658825384} + m_Father: {fileID: 7439144503295988311} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5865515589226143812 GameObject: m_ObjectHideFlags: 0 @@ -11,7 +209,6 @@ GameObject: - component: {fileID: 7439144503295988311} - component: {fileID: 1902243343154210913} - component: {fileID: 5285723302554571928} - - component: {fileID: -47946731190107140} m_Layer: 0 m_Name: Monitor_alone m_TagString: Untagged @@ -30,7 +227,8 @@ Transform: m_LocalPosition: {x: -78.59815, y: 4.5123, z: -21.013} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1295456601944157320} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -85,13 +283,45 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &-47946731190107140 +--- !u!1 &6282353488864628099 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1539628467813529844} + - component: {fileID: 765750295823213396} + m_Layer: 0 + m_Name: Collider (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1539628467813529844 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6282353488864628099} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.222, y: 0.108, z: 0.499} + m_LocalScale: {x: 0.058129568, y: 0.08104501, z: 0.5085957} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1295456601944157320} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &765750295823213396 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5865515589226143812} + m_GameObject: {fileID: 6282353488864628099} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -104,5 +334,217 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.37693936, y: 1.597771, z: 1.4094505} - m_Center: {x: 0.113144256, y: -0.013383326, z: 0.70993257} + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &7252477141088149532 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5032277771658825384} + - component: {fileID: 6193378865214235681} + m_Layer: 0 + m_Name: Collider (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5032277771658825384 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7252477141088149532} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.222, y: -0.004, z: 0.149} + m_LocalScale: {x: 0.058129568, y: 0.31285468, z: 0.20959206} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1295456601944157320} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6193378865214235681 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7252477141088149532} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8206160782143072823 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 590966147127245936} + - component: {fileID: 671087655743425829} + m_Layer: 0 + m_Name: Collider (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &590966147127245936 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8206160782143072823} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.119, y: -0.013, z: 0.028} + m_LocalScale: {x: 0.36789143, y: 0.7611611, z: 0.05260098} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1295456601944157320} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &671087655743425829 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8206160782143072823} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8209022643129868885 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3144305824050550277} + - component: {fileID: 5238411415825884772} + m_Layer: 0 + m_Name: Collider (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3144305824050550277 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8209022643129868885} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.222, y: 0.108, z: 0.476} + m_LocalScale: {x: 0.058129568, y: 0.08104501, z: 0.5085957} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1295456601944157320} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &5238411415825884772 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8209022643129868885} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &9198571873994678924 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6100203642079940078} + - component: {fileID: 2881302722357586366} + m_Layer: 0 + m_Name: Collider (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6100203642079940078 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9198571873994678924} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.222, y: -0.129, z: 0.499} + m_LocalScale: {x: 0.058129568, y: 0.08104501, z: 0.5085957} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1295456601944157320} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2881302722357586366 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9198571873994678924} + 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: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 93f55f32..2f27a661 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c8c367db575e9b27783c864486b7c705a56eae14212012b26e2c82695e1b21d -size 63287090 +oid sha256:4cce03acb11d0a5f423ede7f886cc68f5cdd7eaf9193285470e3d9e0f5278693 +size 63633986