From 4d22979299d37a111a8b92da3a1a8e831895f5eb Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Thu, 26 Jan 2023 15:33:10 +0100 Subject: [PATCH] fix poses aznd colliders --- Assets/Models/Blender/Base_Station.blend.meta | 2 +- Assets/Models/Blender/Iron Man.blend.meta | 2 +- Assets/Models/Blender/Lamp.blend.meta | 2 +- .../Models/Blender/LegoDarthVader.blend.meta | 2 +- Assets/Models/Blender/LegoDeadPool.blend.meta | 2 +- Assets/Models/Blender/NetworkBox.obj.meta | 2 +- Assets/Models/Blender/WindowUK.blend.meta | 2 +- Assets/Models/Blender/batman.blend.meta | 2 +- Assets/Models/Blender/doors.blend.meta | 2 +- Assets/Models/Blender/laser_cutter.blend.meta | 2 +- Assets/Models/Blender/laser_cutter.obj.meta | 2 +- Assets/Models/Blender/prises.blend.meta | 2 +- Assets/Models/Blender/prises_12.blend.meta | 2 +- Assets/Models/Blender/shelf.blend.meta | 2 +- Assets/Models/laser_cutter Variant.prefab | 72 +- Assets/Scenes/FabLab/FabLab.unity | 1034 ++++++++++++++++- Assets/Scripts/Catalog.prefab | 2 + 17 files changed, 1090 insertions(+), 46 deletions(-) diff --git a/Assets/Models/Blender/Base_Station.blend.meta b/Assets/Models/Blender/Base_Station.blend.meta index 0914ae8..70a9784 100644 --- a/Assets/Models/Blender/Base_Station.blend.meta +++ b/Assets/Models/Blender/Base_Station.blend.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/Assets/Models/Blender/Iron Man.blend.meta b/Assets/Models/Blender/Iron Man.blend.meta index 98f05bd..b38bba8 100644 --- a/Assets/Models/Blender/Iron Man.blend.meta +++ b/Assets/Models/Blender/Iron Man.blend.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/Assets/Models/Blender/Lamp.blend.meta b/Assets/Models/Blender/Lamp.blend.meta index b073b45..7bcaf5d 100644 --- a/Assets/Models/Blender/Lamp.blend.meta +++ b/Assets/Models/Blender/Lamp.blend.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/Assets/Models/Blender/LegoDarthVader.blend.meta b/Assets/Models/Blender/LegoDarthVader.blend.meta index 07118ef..b43eed5 100644 --- a/Assets/Models/Blender/LegoDarthVader.blend.meta +++ b/Assets/Models/Blender/LegoDarthVader.blend.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/Assets/Models/Blender/LegoDeadPool.blend.meta b/Assets/Models/Blender/LegoDeadPool.blend.meta index 48e280f..43bf47d 100644 --- a/Assets/Models/Blender/LegoDeadPool.blend.meta +++ b/Assets/Models/Blender/LegoDeadPool.blend.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/Assets/Models/Blender/NetworkBox.obj.meta b/Assets/Models/Blender/NetworkBox.obj.meta index 30e95aa..7b078d1 100644 --- a/Assets/Models/Blender/NetworkBox.obj.meta +++ b/Assets/Models/Blender/NetworkBox.obj.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/Assets/Models/Blender/WindowUK.blend.meta b/Assets/Models/Blender/WindowUK.blend.meta index e705fa9..37c4fcc 100644 --- a/Assets/Models/Blender/WindowUK.blend.meta +++ b/Assets/Models/Blender/WindowUK.blend.meta @@ -42,7 +42,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/Assets/Models/Blender/batman.blend.meta b/Assets/Models/Blender/batman.blend.meta index 785a561..7bcafd0 100644 --- a/Assets/Models/Blender/batman.blend.meta +++ b/Assets/Models/Blender/batman.blend.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/Assets/Models/Blender/doors.blend.meta b/Assets/Models/Blender/doors.blend.meta index b21dadd..71f8f83 100644 --- a/Assets/Models/Blender/doors.blend.meta +++ b/Assets/Models/Blender/doors.blend.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/Assets/Models/Blender/laser_cutter.blend.meta b/Assets/Models/Blender/laser_cutter.blend.meta index 13e3b62..42b5b6a 100644 --- a/Assets/Models/Blender/laser_cutter.blend.meta +++ b/Assets/Models/Blender/laser_cutter.blend.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/Assets/Models/Blender/laser_cutter.obj.meta b/Assets/Models/Blender/laser_cutter.obj.meta index 89b638f..acc6e8e 100644 --- a/Assets/Models/Blender/laser_cutter.obj.meta +++ b/Assets/Models/Blender/laser_cutter.obj.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/Assets/Models/Blender/prises.blend.meta b/Assets/Models/Blender/prises.blend.meta index 164ca28..dcd4e8c 100644 --- a/Assets/Models/Blender/prises.blend.meta +++ b/Assets/Models/Blender/prises.blend.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/Assets/Models/Blender/prises_12.blend.meta b/Assets/Models/Blender/prises_12.blend.meta index 6c49fc4..2f3e544 100644 --- a/Assets/Models/Blender/prises_12.blend.meta +++ b/Assets/Models/Blender/prises_12.blend.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/Assets/Models/Blender/shelf.blend.meta b/Assets/Models/Blender/shelf.blend.meta index 4d32eea..b9decdf 100644 --- a/Assets/Models/Blender/shelf.blend.meta +++ b/Assets/Models/Blender/shelf.blend.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/Assets/Models/laser_cutter Variant.prefab b/Assets/Models/laser_cutter Variant.prefab index 98b60e1..68443d8 100644 --- a/Assets/Models/laser_cutter Variant.prefab +++ b/Assets/Models/laser_cutter Variant.prefab @@ -1,5 +1,50 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &313858705905898755 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8789718434954805042} + - component: {fileID: 6834399328009390} + m_Layer: 0 + m_Name: feet + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8789718434954805042 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 313858705905898755} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3757830412632022307} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6834399328009390 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 313858705905898755} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.8411522, y: 0.54700136, z: 0.23476017} + m_Center: {x: 0.0036040545, y: 0.33968043, z: 0.00015434623} --- !u!1001 &4313590370818001808 PrefabInstance: m_ObjectHideFlags: 0 @@ -73,11 +118,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3} propertyPath: m_LocalPosition.x - value: 0.305 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3} propertyPath: m_LocalPosition.z - value: 0.356 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3} propertyPath: m_LocalRotation.w @@ -97,6 +142,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f094d17760f73b04cadf055698f721fd, type: 3} +--- !u!4 &3757830412632022307 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1151388028547126963, guid: f094d17760f73b04cadf055698f721fd, type: 3} + m_PrefabInstance: {fileID: 4313590370818001808} + m_PrefabAsset: {fileID: 0} --- !u!1 &3971500078747236033 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: f094d17760f73b04cadf055698f721fd, type: 3} @@ -118,3 +168,21 @@ MonoBehaviour: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} wallMount: 0 +--- !u!1 &5372884136690798104 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8164078558771037576, guid: f094d17760f73b04cadf055698f721fd, type: 3} + m_PrefabInstance: {fileID: 4313590370818001808} + m_PrefabAsset: {fileID: 0} +--- !u!65 &8389039092655941960 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5372884136690798104} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1.018, y: 0.40484798, z: 0.784} + m_Center: {x: 0, y: 0.802576, z: 0} diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index 2e8b4b4..a8c2405 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -6008,6 +6008,11 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!1 &184943415 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} + m_PrefabInstance: {fileID: 1782748917} + m_PrefabAsset: {fileID: 0} --- !u!1001 &193352389 PrefabInstance: m_ObjectHideFlags: 0 @@ -6095,15 +6100,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.x - value: 1.6129999 + value: 0.29407597 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.y - value: -0.431 + value: 0.7307205 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.z - value: 0.705 + value: 0.4126253 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalRotation.w @@ -6214,6 +6219,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 481a02167edfebe44883f5868f8a27f9, type: 3} +--- !u!1 &206099318 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} + m_PrefabInstance: {fileID: 1043384079} + m_PrefabAsset: {fileID: 0} --- !u!1001 &242326302 PrefabInstance: m_ObjectHideFlags: 0 @@ -6346,7 +6356,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 475244, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} propertyPath: m_RootOrder - value: 3 + value: 7 objectReference: {fileID: 0} - target: {fileID: 475244, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} propertyPath: m_LocalPosition.x @@ -8448,11 +8458,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3181859954724409103, guid: 45459df2bf234d23182a573a1308c331, type: 3} propertyPath: m_RootOrder - value: 13 + value: 17 objectReference: {fileID: 0} - target: {fileID: 3181859954724409103, guid: 45459df2bf234d23182a573a1308c331, type: 3} propertyPath: m_LocalPosition.x - value: 1.6895242 + value: 1.653 objectReference: {fileID: 0} - target: {fileID: 3181859954724409103, guid: 45459df2bf234d23182a573a1308c331, type: 3} propertyPath: m_LocalPosition.y @@ -10680,7 +10690,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24438 + m_Name: pb_Mesh38658 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -12117,6 +12127,174 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1 &679781015 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} + m_PrefabInstance: {fileID: 73665484} + m_PrefabAsset: {fileID: 0} +--- !u!64 &679781018 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 679781015} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -2763777930776191228, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} +--- !u!114 &679781019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 679781015} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffefbea063cab884ca33e5a449e5c22c, type: 3} + m_Name: + m_EditorClassIdentifier: + attachmentFlags: 44 + attachmentOffset: {fileID: 0} + catchingSpeedThreshold: -1 + releaseVelocityStyle: 1 + releaseVelocityTimeOffset: -0.011 + scaleReleaseVelocity: 1.1 + scaleReleaseVelocityThreshold: -1 + scaleReleaseVelocityCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + restoreOriginalParent: 0 + onPickUp: + m_PersistentCalls: + m_Calls: [] + onDetachFromHand: + m_PersistentCalls: + m_Calls: [] + onHeldUpdate: + m_PersistentCalls: + m_Calls: [] + interactable: {fileID: 0} +--- !u!54 &679781020 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 679781015} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &679781021 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 679781015} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7418c7dd8f977d4e969202d3fa7e926, type: 3} + m_Name: + m_EditorClassIdentifier: + poseEditorExpanded: 1 + blendEditorExpanded: 1 + poseNames: + - Batman2 (MAIN) + overridePreviewLeftHandPrefab: {fileID: 1000013348574242, guid: 638779290bce1af49b356f33dcc6fccf, type: 3} + overridePreviewRightHandPrefab: {fileID: 1000010304998954, guid: 6def53d002137b747aec0b29551e0e25, type: 3} + skeletonMainPose: {fileID: 11400000, guid: 8f255f7cded4ca54a98e29d41074390c, type: 2} + skeletonAdditionalPoses: [] + showLeftPreview: 0 + showRightPreview: 0 + previewLeftInstance: {fileID: 0} + previewRightInstance: {fileID: 0} + previewPoseSelection: 0 + blendingBehaviours: [] + scale: 1 +--- !u!114 &679781022 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 679781015} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b93b6a877adcbf94c89a9d6e0c0e844d, type: 3} + m_Name: + m_EditorClassIdentifier: + activateActionSetOnAttach: + actionSetPath: + hideHandOnAttach: 1 + hideSkeletonOnAttach: 0 + hideControllerOnAttach: 0 + handAnimationOnPickup: 0 + setRangeOfMotionOnPickup: -1 + useHandObjectAttachmentPoint: 1 + attachEaseIn: 0 + snapAttachEaseInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + snapAttachEaseInTime: 0.15 + snapAttachEaseInCompleted: 0 + skeletonPoser: {fileID: 0} + handFollowTransform: 1 + highlightOnHover: 1 + hideHighlight: [] + hoverPriority: 0 --- !u!1001 &701060716 PrefabInstance: m_ObjectHideFlags: 0 @@ -14141,6 +14319,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 808552922} + - component: {fileID: 808552923} m_Layer: 0 m_Name: Imprimantes 3D m_TagString: Untagged @@ -14156,7 +14335,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 808552921} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -10.991924, y: 6.67572, z: -12.824374} + m_LocalPosition: {x: -9.673, y: 5.514, z: -12.532} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -14167,6 +14346,22 @@ Transform: m_Father: {fileID: 45957245} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &808552923 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808552921} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1001 &815680570 PrefabInstance: m_ObjectHideFlags: 0 @@ -15356,7 +15551,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24532 + m_Name: pb_Mesh38752 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -15539,15 +15734,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.x - value: 1.613 + value: 0.29407597 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.y - value: -0.431 + value: 0.7307205 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.z - value: -0.304 + value: -0.5963745 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalRotation.w @@ -15938,7 +16133,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} propertyPath: m_LocalPosition.x - value: 1.5843244 + value: 1.524 objectReference: {fileID: 0} - target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3} propertyPath: m_LocalPosition.y @@ -16650,6 +16845,19 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} m_PrefabInstance: {fileID: 1043384079} m_PrefabAsset: {fileID: 0} +--- !u!65 &1043384083 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 206099318} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 75.90477, y: 2.0928357, z: 52.05211} + m_Center: {x: -0.6608171, y: 0.012211082, z: -0.9670556} --- !u!1001 &1051499707 PrefabInstance: m_ObjectHideFlags: 0 @@ -16913,6 +17121,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 905368309636460435, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} m_PrefabInstance: {fileID: 1061192323} m_PrefabAsset: {fileID: 0} +--- !u!1 &1078827216 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} + m_PrefabInstance: {fileID: 1993409012} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1094837478 PrefabInstance: m_ObjectHideFlags: 0 @@ -17866,6 +18079,27 @@ Transform: m_Father: {fileID: 45957245} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1178181452 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} + m_PrefabInstance: {fileID: 293073268} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1178181453 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1178181452} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1001 &1180503447 PrefabInstance: m_ObjectHideFlags: 0 @@ -18554,6 +18788,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 481a02167edfebe44883f5868f8a27f9, type: 3} +--- !u!1 &1252785545 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} + m_PrefabInstance: {fileID: 1329833007} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1269162462 PrefabInstance: m_ObjectHideFlags: 0 @@ -18715,7 +18954,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3} propertyPath: m_RootOrder - value: 5 + value: 9 objectReference: {fileID: 0} - target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3} propertyPath: m_LocalPosition.x @@ -18771,7 +19010,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24046 + m_Name: pb_Mesh38258 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -18935,7 +19174,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23826 + m_Name: pb_Mesh38034 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -19118,15 +19357,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.x - value: 1.3312488 + value: 0.012325287 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.y - value: -1.149927 + value: 0.011793137 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalPosition.z - value: 0.3568 + value: 0.06442547 objectReference: {fileID: 0} - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} propertyPath: m_LocalRotation.w @@ -19168,13 +19407,19 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 7152506842566364840, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} m_SourcePrefab: {fileID: 100100000, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} --- !u!4 &1317084064 stripped Transform: m_CorrespondingSourceObject: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} m_PrefabInstance: {fileID: 1317084063} m_PrefabAsset: {fileID: 0} +--- !u!1 &1329133061 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} + m_PrefabInstance: {fileID: 1821824933} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1329833007 PrefabInstance: m_ObjectHideFlags: 0 @@ -19237,13 +19482,29 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} m_PrefabInstance: {fileID: 1329833007} m_PrefabAsset: {fileID: 0} +--- !u!114 &1329833009 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1252785545} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!43 &1337872386 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23992 + m_Name: pb_Mesh38204 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -19487,6 +19748,27 @@ Transform: m_CorrespondingSourceObject: {fileID: 664630144483340838, guid: adfde29e3d582c24988c04bafc8090e3, type: 3} m_PrefabInstance: {fileID: 1351782646} m_PrefabAsset: {fileID: 0} +--- !u!1 &1360353322 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} + m_PrefabInstance: {fileID: 670219874} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1360353323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1360353322} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1001 &1370273503 PrefabInstance: m_ObjectHideFlags: 0 @@ -20418,6 +20700,27 @@ Transform: m_CorrespondingSourceObject: {fileID: 4812896578459389604, guid: 7c648947d00d08049bf9af26d1bc3db8, type: 3} m_PrefabInstance: {fileID: 1481052597} m_PrefabAsset: {fileID: 0} +--- !u!1 &1511459648 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8a039318f27391cdb025c7bd542c092, type: 3} + m_PrefabInstance: {fileID: 765875806} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1511459649 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1511459648} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1001 &1532826547 PrefabInstance: m_ObjectHideFlags: 0 @@ -21918,6 +22221,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 180 objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} + propertyPath: m_Materials.Array.size + value: 4 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} + propertyPath: m_Materials.Array.data[4] + value: + objectReference: {fileID: 2100000, guid: e7f8455d46288cb12b49d5367b543018, type: 2} - target: {fileID: 919132149155446097, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_Name value: WindowUK (1) @@ -22307,6 +22618,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 7304097665698855045, guid: 7520016a817d68f4685d157d457ebed1, type: 3} m_PrefabInstance: {fileID: 1646934832} m_PrefabAsset: {fileID: 0} +--- !u!1 &1656502076 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} + m_PrefabInstance: {fileID: 1916827214} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1658380578 PrefabInstance: m_ObjectHideFlags: 0 @@ -26196,6 +26512,22 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} m_PrefabInstance: {fileID: 1782748917} m_PrefabAsset: {fileID: 0} +--- !u!114 &1782748919 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 184943415} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1 &1796368673 GameObject: m_ObjectHideFlags: 0 @@ -26537,6 +26869,22 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} m_PrefabInstance: {fileID: 1821824933} m_PrefabAsset: {fileID: 0} +--- !u!114 &1821824935 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1329133061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} + m_Name: + m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!4 &1822718828 stripped Transform: m_CorrespondingSourceObject: {fileID: 5554971243091150254, guid: 124ae331af1b2e845b7de5a2ccb168d4, type: 3} @@ -27815,6 +28163,24 @@ Transform: m_CorrespondingSourceObject: {fileID: 905368309636460435, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} m_PrefabInstance: {fileID: 1904638475} m_PrefabAsset: {fileID: 0} +--- !u!1 &1912084198 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} + m_PrefabInstance: {fileID: 1627809129} + m_PrefabAsset: {fileID: 0} +--- !u!65 &1912084201 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1912084198} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 75.904724, y: 1.9592506, z: 52.05211} + m_Center: {x: -0.66081756, y: -0.05456853, z: -0.9670693} --- !u!1001 &1914260020 PrefabInstance: m_ObjectHideFlags: 0 @@ -27951,6 +28317,169 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} m_PrefabInstance: {fileID: 1916827214} m_PrefabAsset: {fileID: 0} +--- !u!64 &1916827218 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1656502076} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 588533648186748948, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} +--- !u!114 &1916827219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1656502076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffefbea063cab884ca33e5a449e5c22c, type: 3} + m_Name: + m_EditorClassIdentifier: + attachmentFlags: 44 + attachmentOffset: {fileID: 0} + catchingSpeedThreshold: -1 + releaseVelocityStyle: 1 + releaseVelocityTimeOffset: -0.011 + scaleReleaseVelocity: 1.1 + scaleReleaseVelocityThreshold: -1 + scaleReleaseVelocityCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + restoreOriginalParent: 0 + onPickUp: + m_PersistentCalls: + m_Calls: [] + onDetachFromHand: + m_PersistentCalls: + m_Calls: [] + onHeldUpdate: + m_PersistentCalls: + m_Calls: [] + interactable: {fileID: 0} +--- !u!54 &1916827220 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1656502076} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1916827221 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1656502076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7418c7dd8f977d4e969202d3fa7e926, type: 3} + m_Name: + m_EditorClassIdentifier: + poseEditorExpanded: 1 + blendEditorExpanded: 1 + poseNames: + - Batman (MAIN) + overridePreviewLeftHandPrefab: {fileID: 1000013348574242, guid: 638779290bce1af49b356f33dcc6fccf, type: 3} + overridePreviewRightHandPrefab: {fileID: 1000010304998954, guid: 6def53d002137b747aec0b29551e0e25, type: 3} + skeletonMainPose: {fileID: 11400000, guid: 35307d4a9be0d3749b7d98d276ba243e, type: 2} + skeletonAdditionalPoses: [] + showLeftPreview: 0 + showRightPreview: 0 + previewLeftInstance: {fileID: 0} + previewRightInstance: {fileID: 0} + previewPoseSelection: 0 + blendingBehaviours: [] + scale: 1 +--- !u!114 &1916827222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1656502076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b93b6a877adcbf94c89a9d6e0c0e844d, type: 3} + m_Name: + m_EditorClassIdentifier: + activateActionSetOnAttach: + actionSetPath: + hideHandOnAttach: 1 + hideSkeletonOnAttach: 0 + hideControllerOnAttach: 0 + handAnimationOnPickup: 0 + setRangeOfMotionOnPickup: -1 + useHandObjectAttachmentPoint: 1 + attachEaseIn: 0 + snapAttachEaseInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + snapAttachEaseInTime: 0.15 + snapAttachEaseInCompleted: 0 + skeletonPoser: {fileID: 0} + handFollowTransform: 1 + highlightOnHover: 1 + hideHighlight: [] + hoverPriority: 0 --- !u!1 &1941597267 GameObject: m_ObjectHideFlags: 0 @@ -28980,7 +29509,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23962 + m_Name: pb_Mesh38174 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -29598,6 +30127,337 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} m_PrefabInstance: {fileID: 1993409012} m_PrefabAsset: {fileID: 0} +--- !u!64 &1993409016 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1078827216} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 119786298737061702, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} +--- !u!114 &1993409017 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1078827216} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffefbea063cab884ca33e5a449e5c22c, type: 3} + m_Name: + m_EditorClassIdentifier: + attachmentFlags: 44 + attachmentOffset: {fileID: 0} + catchingSpeedThreshold: -1 + releaseVelocityStyle: 1 + releaseVelocityTimeOffset: -0.011 + scaleReleaseVelocity: 1.1 + scaleReleaseVelocityThreshold: -1 + scaleReleaseVelocityCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + restoreOriginalParent: 0 + onPickUp: + m_PersistentCalls: + m_Calls: [] + onDetachFromHand: + m_PersistentCalls: + m_Calls: [] + onHeldUpdate: + m_PersistentCalls: + m_Calls: [] + interactable: {fileID: 0} +--- !u!54 &1993409018 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1078827216} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1993409019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1078827216} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7418c7dd8f977d4e969202d3fa7e926, type: 3} + m_Name: + m_EditorClassIdentifier: + poseEditorExpanded: 1 + blendEditorExpanded: 1 + poseNames: + - Deadpool (MAIN) + overridePreviewLeftHandPrefab: {fileID: 1000013348574242, guid: 638779290bce1af49b356f33dcc6fccf, type: 3} + overridePreviewRightHandPrefab: {fileID: 1000010304998954, guid: 6def53d002137b747aec0b29551e0e25, type: 3} + skeletonMainPose: {fileID: 11400000, guid: 1ecf6a6a04df83c4f8034b438340a3b8, type: 2} + skeletonAdditionalPoses: [] + showLeftPreview: 0 + showRightPreview: 0 + previewLeftInstance: {fileID: 0} + previewRightInstance: {fileID: 0} + previewPoseSelection: 0 + blendingBehaviours: [] + scale: 1 +--- !u!114 &1993409020 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1078827216} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b93b6a877adcbf94c89a9d6e0c0e844d, type: 3} + m_Name: + m_EditorClassIdentifier: + activateActionSetOnAttach: + actionSetPath: + hideHandOnAttach: 1 + hideSkeletonOnAttach: 0 + hideControllerOnAttach: 0 + handAnimationOnPickup: 0 + setRangeOfMotionOnPickup: -1 + useHandObjectAttachmentPoint: 1 + attachEaseIn: 0 + snapAttachEaseInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + snapAttachEaseInTime: 0.15 + snapAttachEaseInCompleted: 0 + skeletonPoser: {fileID: 0} + handFollowTransform: 1 + highlightOnHover: 1 + hideHighlight: [] + hoverPriority: 0 +--- !u!1 &2003753303 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} + m_PrefabInstance: {fileID: 593389671} + m_PrefabAsset: {fileID: 0} +--- !u!64 &2003753306 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2003753303} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 1366794835595815834, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} +--- !u!114 &2003753307 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2003753303} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffefbea063cab884ca33e5a449e5c22c, type: 3} + m_Name: + m_EditorClassIdentifier: + attachmentFlags: 44 + attachmentOffset: {fileID: 0} + catchingSpeedThreshold: -1 + releaseVelocityStyle: 1 + releaseVelocityTimeOffset: -0.011 + scaleReleaseVelocity: 1.1 + scaleReleaseVelocityThreshold: -1 + scaleReleaseVelocityCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + restoreOriginalParent: 0 + onPickUp: + m_PersistentCalls: + m_Calls: [] + onDetachFromHand: + m_PersistentCalls: + m_Calls: [] + onHeldUpdate: + m_PersistentCalls: + m_Calls: [] + interactable: {fileID: 0} +--- !u!54 &2003753308 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2003753303} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &2003753309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2003753303} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7418c7dd8f977d4e969202d3fa7e926, type: 3} + m_Name: + m_EditorClassIdentifier: + poseEditorExpanded: 1 + blendEditorExpanded: 1 + poseNames: + - IronMan (MAIN) + overridePreviewLeftHandPrefab: {fileID: 1000013348574242, guid: 638779290bce1af49b356f33dcc6fccf, type: 3} + overridePreviewRightHandPrefab: {fileID: 1000010304998954, guid: 6def53d002137b747aec0b29551e0e25, type: 3} + skeletonMainPose: {fileID: 11400000, guid: d7f3fc46cc98d35468f6906385bd39f0, type: 2} + skeletonAdditionalPoses: [] + showLeftPreview: 0 + showRightPreview: 0 + previewLeftInstance: {fileID: 0} + previewRightInstance: {fileID: 0} + previewPoseSelection: 0 + blendingBehaviours: [] + scale: 1 +--- !u!114 &2003753310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2003753303} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b93b6a877adcbf94c89a9d6e0c0e844d, type: 3} + m_Name: + m_EditorClassIdentifier: + activateActionSetOnAttach: + actionSetPath: + hideHandOnAttach: 1 + hideSkeletonOnAttach: 0 + hideControllerOnAttach: 0 + handAnimationOnPickup: 0 + setRangeOfMotionOnPickup: -1 + useHandObjectAttachmentPoint: 1 + attachEaseIn: 0 + snapAttachEaseInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + snapAttachEaseInTime: 0.15 + snapAttachEaseInCompleted: 0 + skeletonPoser: {fileID: 0} + handFollowTransform: 1 + highlightOnHover: 1 + hideHighlight: [] + hoverPriority: 0 --- !u!1001 &2030655353 PrefabInstance: m_ObjectHideFlags: 0 @@ -33113,6 +33973,120 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &2086709267 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2086709268} + - component: {fileID: 2086709272} + - component: {fileID: 2086709271} + - component: {fileID: 2086709270} + - component: {fileID: 2086709269} + m_Layer: 10 + m_Name: Trash + m_TagString: Trash + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2086709268 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2086709267} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.04, y: 0.04, z: 0.04} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1527984575637916538} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &2086709269 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2086709267} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 +--- !u!135 &2086709270 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2086709267} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &2086709271 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2086709267} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 0e4be7523f64df641b9ac39f39093c91, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2086709272 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2086709267} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!43 &2089282922 Mesh: m_ObjectHideFlags: 0 @@ -33407,15 +34381,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.x - value: 1.6129999 + value: 0.29407597 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.y - value: -0.431 + value: 0.7307205 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalPosition.z - value: 0.211 + value: -0.08137417 objectReference: {fileID: 0} - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} propertyPath: m_LocalRotation.w @@ -33549,7 +34523,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 189206775354744917, guid: 5bf5739ad1a7c7e44a6b131d8321738c, type: 3} propertyPath: m_RootOrder - value: 15 + value: 14 objectReference: {fileID: 0} - target: {fileID: 189206775354744917, guid: 5bf5739ad1a7c7e44a6b131d8321738c, type: 3} propertyPath: m_LocalPosition.x @@ -33687,7 +34661,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1527984575184472644, guid: 1805c511e7b7f0e49afb0651e27725b4, type: 3} propertyPath: m_RootOrder - value: 6 + value: 10 objectReference: {fileID: 0} - target: {fileID: 1527984575184472644, guid: 1805c511e7b7f0e49afb0651e27725b4, type: 3} propertyPath: m_LocalPosition.x @@ -33773,11 +34747,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4347744863477460091, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} propertyPath: m_RootOrder - value: 14 + value: 18 objectReference: {fileID: 0} - target: {fileID: 4347744863477460091, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} propertyPath: m_LocalPosition.x - value: 1.2375174 + value: 1.518 objectReference: {fileID: 0} - target: {fileID: 4347744863477460091, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} propertyPath: m_LocalPosition.y @@ -33785,7 +34759,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4347744863477460091, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} propertyPath: m_LocalPosition.z - value: -15.980917 + value: -15.675 objectReference: {fileID: 0} - target: {fileID: 4347744863477460091, guid: b193c053d289cac43b3ddd2b6c501447, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Scripts/Catalog.prefab b/Assets/Scripts/Catalog.prefab index 40ddf33..673b321 100644 --- a/Assets/Scripts/Catalog.prefab +++ b/Assets/Scripts/Catalog.prefab @@ -321,3 +321,5 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] interactable: {fileID: 0} + largeFurnitureModel: {fileID: 0} + index: 0