From 3b1d880963fc13c340652a77cc1816c9a33274e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Gro=C3=9F?= Date: Sun, 13 Jun 2021 04:25:33 +0200 Subject: [PATCH] Fixed player being enabled while using grabber/being in network view --- Assets/Models/Mainzkraut.unity | 1509 +++++++++--------------------- Assets/Scripts/GameManager.cs | 1 + Assets/Scripts/Network/Switch.cs | 1 + 3 files changed, 447 insertions(+), 1064 deletions(-) diff --git a/Assets/Models/Mainzkraut.unity b/Assets/Models/Mainzkraut.unity index 82d229c..4f34797 100644 --- a/Assets/Models/Mainzkraut.unity +++ b/Assets/Models/Mainzkraut.unity @@ -699,6 +699,63 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 458460280} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &486343018 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3129800593820501904, guid: c8ee16aeadb4789418878c77a39029fd, type: 3} + propertyPath: m_Name + value: Spot + objectReference: {fileID: 0} + - target: {fileID: 3129800593820501905, guid: c8ee16aeadb4789418878c77a39029fd, type: 3} + propertyPath: m_RootOrder + value: 29 + objectReference: {fileID: 0} + - target: {fileID: 3129800593820501905, guid: c8ee16aeadb4789418878c77a39029fd, type: 3} + propertyPath: m_LocalPosition.x + value: 2.79 + objectReference: {fileID: 0} + - target: {fileID: 3129800593820501905, guid: c8ee16aeadb4789418878c77a39029fd, type: 3} + propertyPath: m_LocalPosition.y + value: 2.84 + objectReference: {fileID: 0} + - target: {fileID: 3129800593820501905, guid: c8ee16aeadb4789418878c77a39029fd, type: 3} + propertyPath: m_LocalPosition.z + value: 4.04 + objectReference: {fileID: 0} + - target: {fileID: 3129800593820501905, guid: c8ee16aeadb4789418878c77a39029fd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3129800593820501905, guid: c8ee16aeadb4789418878c77a39029fd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3129800593820501905, guid: c8ee16aeadb4789418878c77a39029fd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3129800593820501905, guid: c8ee16aeadb4789418878c77a39029fd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3129800593820501905, guid: c8ee16aeadb4789418878c77a39029fd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3129800593820501905, guid: c8ee16aeadb4789418878c77a39029fd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3129800593820501905, guid: c8ee16aeadb4789418878c77a39029fd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c8ee16aeadb4789418878c77a39029fd, type: 3} --- !u!1 &506618578 GameObject: m_ObjectHideFlags: 0 @@ -1134,7 +1191,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 1.7317073, y: 1} + m_SensorSize: {x: 1.8551402, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -1143,231 +1200,10 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 1669835644} ---- !u!1 &562112248 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 562112252} - - component: {fileID: 562112251} - - component: {fileID: 562112250} - - component: {fileID: 562112249} - - component: {fileID: 562112253} - m_Layer: 0 - m_Name: RobArmTarget - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!135 &562112249 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 562112248} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 1 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &562112250 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 562112248} - m_Enabled: 0 - 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: 10303, guid: 0000000000000000f000000000000000, type: 0} - 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 &562112251 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 562112248} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &562112252 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 562112248} - m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: -5, y: 5, z: 0} - m_LocalScale: {x: 2.4093482, y: 2.4093482, z: 2.4093482} - m_Children: [] - m_Father: {fileID: 1005526110} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!95 &562112253 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 562112248} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: c03b7a4ca9a6fca4caa64cdde720272a, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1001 &564853562 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} - propertyPath: m_LocalScale.x - value: 0.21 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} - propertyPath: m_LocalScale.y - value: 0.21 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} - propertyPath: m_LocalScale.z - value: 0.21 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} - propertyPath: m_LocalPosition.x - value: -28.333 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} - propertyPath: m_LocalPosition.y - value: 2.913 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} - propertyPath: m_LocalPosition.z - value: 21.353 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} - propertyPath: m_LocalRotation.w - value: 0.4974324 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} - propertyPath: m_LocalRotation.x - value: -0.4974324 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} - propertyPath: m_LocalRotation.y - value: -0.50255454 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} - propertyPath: m_LocalRotation.z - value: -0.5025545 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -90.587 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} - propertyPath: m_Name - value: peddalo - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} --- !u!1 &564853563 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} - m_PrefabInstance: {fileID: 564853562} - m_PrefabAsset: {fileID: 0} ---- !u!64 &564853564 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 564853563} - m_Material: {fileID: 13400000, guid: c12ec53ebdccaf54cbc593829039199b, type: 2} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -5495902117074765545, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} ---- !u!114 &564853565 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 564853563} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1dd01c3c2c2957047b7d50418f02cc31, type: 3} - m_Name: - m_EditorClassIdentifier: - piston: {fileID: 1064765945} ---- !u!4 &564853568 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9fad91bbf22395e4aadc98929b1d8bdf, type: 3} - m_PrefabInstance: {fileID: 564853562} + m_CorrespondingSourceObject: {fileID: 6016390517744551983, guid: 1fdbda4481aab5e48830fbc7d84e6d89, type: 3} + m_PrefabInstance: {fileID: 6899491116292673092} m_PrefabAsset: {fileID: 0} --- !u!1 &615377720 GameObject: @@ -1570,103 +1406,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 6314262857863842713, guid: cd2709ce625391747b56d49b13717da0, type: 3} m_PrefabInstance: {fileID: 628834931} m_PrefabAsset: {fileID: 0} ---- !u!1 &654142256 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 654142257} - - component: {fileID: 654142260} - - component: {fileID: 654142259} - - component: {fileID: 654142258} - m_Layer: 0 - m_Name: TargetMarker - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &654142257 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 654142256} - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: -5.35, y: 2.64, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1005526110} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!64 &654142258 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 654142256} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &654142259 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 654142256} - 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: 1a39a9cf9ccd3444388d4432cbd64b90, 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 &654142260 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 654142256} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &676052346 PrefabInstance: m_ObjectHideFlags: 0 @@ -2213,106 +1952,107 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1005526107 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - propertyPath: m_LocalScale.x - value: 0.41505 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - propertyPath: m_LocalScale.y - value: 0.41505 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - propertyPath: m_LocalScale.z - value: 0.41505 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - propertyPath: m_LocalPosition.x - value: -23.14 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - propertyPath: m_LocalPosition.y - value: 1.850399 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - propertyPath: m_LocalPosition.z - value: 1.7279625 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - propertyPath: m_Name - value: bendy-thing - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} --- !u!1 &1005526108 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - m_PrefabInstance: {fileID: 1005526107} + m_CorrespondingSourceObject: {fileID: 9036662207266744508, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + m_PrefabInstance: {fileID: 8190294791091046838} m_PrefabAsset: {fileID: 0} ---- !u!114 &1005526109 -MonoBehaviour: +--- !u!82 &1005526109 +AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1005526108} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: babb9069bf6a6d646a632cd5453ccf7c, type: 3} - m_Name: - m_EditorClassIdentifier: - isInUse: 0 - gameManager: {fileID: 0} - grabber: {fileID: 1642666853} - localCamera: {fileID: 1406100826} - target: {fileID: 562112248} - armSpeed: 10 - armRotationSpeed: 100 - targetConstraints: {x: 9, y: 8, z: 9} - targetMarker: {fileID: 654142256} ---- !u!4 &1005526110 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - m_PrefabInstance: {fileID: 1005526107} - m_PrefabAsset: {fileID: 0} + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1.29 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 8.72 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1009788887 GameObject: m_ObjectHideFlags: 0 @@ -2392,138 +2132,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1009788887} m_CullTransparentMesh: 1 ---- !u!1 &1064765945 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1064765946} - - component: {fileID: 1064765951} - - component: {fileID: 1064765950} - - component: {fileID: 1064765949} - - component: {fileID: 1064765948} - - component: {fileID: 1064765947} - m_Layer: 0 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1064765946 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064765945} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.75, y: -0.87, z: 0} - m_LocalScale: {x: 4.411397, y: 2.4039, z: 2.4039} - m_Children: [] - m_Father: {fileID: 564853568} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &1064765947 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064765945} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 81e286437f8d9e842ba5e9fbc49eb4ff, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!111 &1064765948 -Animation: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064765945} - m_Enabled: 1 - serializedVersion: 3 - m_Animation: {fileID: 0} - m_Animations: [] - m_WrapMode: 0 - m_PlayAutomatically: 1 - m_AnimatePhysics: 1 - m_CullingType: 0 ---- !u!65 &1064765949 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064765945} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1064765950 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064765945} - 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: 10303, guid: 0000000000000000f000000000000000, type: 0} - 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 &1064765951 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1064765945} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1080246812 GameObject: m_ObjectHideFlags: 0 @@ -3815,76 +3423,17 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1385107269} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1406100824 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1406100825} - - component: {fileID: 1406100826} - m_Layer: 0 - m_Name: cam - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1406100825 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1406100824} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: -0, z: 3.33} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2089766037} - m_Father: {fileID: 2088848900} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1406100826 +--- !u!114 &1406100826 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 1406100826, guid: 8e888e6301e0f8849b447ca43b6994b1, type: 3} + m_PrefabInstance: {fileID: 5794393863676864562} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1406100824} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} m_Name: m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: - m_StreamingVersion: 20170927 - m_Priority: 0 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 39.84 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - m_SensorSize: {x: 1.7317073, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 2089766037} --- !u!1 &1456002061 GameObject: m_ObjectHideFlags: 0 @@ -3934,36 +3483,107 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1477063784 +--- !u!1 &1477063784 stripped GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 1477063784, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + m_PrefabInstance: {fileID: 8190294791091046838} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1477063785} - m_Layer: 0 - m_Name: GrabSpot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1477063785 -Transform: +--- !u!82 &1477063785 +AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1477063784} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: 2.25, z: -0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1642666852} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.718 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1480896498 GameObject: m_ObjectHideFlags: 0 @@ -4421,130 +4041,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1633799269} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1642666851 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 45e2df81224d2974bb8690912a24294b, type: 3} - m_PrefabInstance: {fileID: 1999897925} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1642666852 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 45e2df81224d2974bb8690912a24294b, type: 3} - m_PrefabInstance: {fileID: 1999897925} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1642666853 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1642666851} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e87edfb1d767ebb4c8fbb533f8a6afae, type: 3} - m_Name: - m_EditorClassIdentifier: - radius: 1 - grabSpot: {fileID: 1477063784} - grabbedObject: {fileID: 0} ---- !u!120 &1642666854 -LineRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1642666851} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 0 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 074f09ecafc9f374b9bd9ee0f4dc28b6, 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_Positions: - - {x: 0, y: 0, z: 0} - - {x: 0, y: 0, z: 1} - m_Parameters: - serializedVersion: 3 - widthMultiplier: 1 - widthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.032785416 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - colorGradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - numCornerVertices: 0 - numCapVertices: 0 - alignment: 0 - textureMode: 0 - shadowBias: 0.5 - generateLightingData: 0 - m_UseWorldSpace: 1 - m_Loop: 0 --- !u!1 &1659854244 GameObject: m_ObjectHideFlags: 0 @@ -5567,34 +5063,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1868338004} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1888521979 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6480623767174774313, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - m_PrefabInstance: {fileID: 1005526107} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1888521980 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -5652912853496928964, guid: 91b6617e305657f4aaedcb53c718e7e6, type: 3} - m_PrefabInstance: {fileID: 1005526107} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1888521981 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1888521979} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: efa89c87015118842aedfe169a130b47, type: 3} - m_Name: - m_EditorClassIdentifier: - ChainLength: 4 - Target: {fileID: 562112252} - Pole: {fileID: 2019109334} - Iterations: 10 - Delta: 0.001 - SnapBackStrength: 1 --- !u!1 &1924626443 GameObject: m_ObjectHideFlags: 0 @@ -5710,75 +5178,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 3.9999998, y: 2, z: 1.9901603} m_Center: {x: 0.00000000905079, y: -0.000000003107224, z: -0.09901552} ---- !u!1001 &1999897925 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1888521980} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 45e2df81224d2974bb8690912a24294b, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 45e2df81224d2974bb8690912a24294b, type: 3} - propertyPath: m_LocalScale.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 45e2df81224d2974bb8690912a24294b, type: 3} - propertyPath: m_LocalScale.y - value: 0.50000006 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 45e2df81224d2974bb8690912a24294b, type: 3} - propertyPath: m_LocalScale.z - value: 0.50000006 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 45e2df81224d2974bb8690912a24294b, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 45e2df81224d2974bb8690912a24294b, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 45e2df81224d2974bb8690912a24294b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 45e2df81224d2974bb8690912a24294b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 45e2df81224d2974bb8690912a24294b, type: 3} - propertyPath: m_LocalRotation.x - value: 1.7763566e-15 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 45e2df81224d2974bb8690912a24294b, type: 3} - propertyPath: m_LocalRotation.y - value: -1.065814e-14 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 45e2df81224d2974bb8690912a24294b, type: 3} - propertyPath: m_LocalRotation.z - value: 4.960631e-16 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 45e2df81224d2974bb8690912a24294b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 45e2df81224d2974bb8690912a24294b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 45e2df81224d2974bb8690912a24294b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 45e2df81224d2974bb8690912a24294b, type: 3} - propertyPath: m_Name - value: grappa - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 45e2df81224d2974bb8690912a24294b, type: 3} --- !u!1 &2007571029 GameObject: m_ObjectHideFlags: 0 @@ -5942,102 +5341,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2015836321} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &2019109333 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2019109334} - - component: {fileID: 2019109337} - - component: {fileID: 2019109336} - - component: {fileID: 2019109335} - m_Layer: 0 - m_Name: Pole - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2019109334 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2019109333} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.29, y: 11.57, z: 0.13926506} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1005526110} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &2019109335 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2019109333} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &2019109336 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2019109333} - 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: 10303, guid: 0000000000000000f000000000000000, type: 0} - 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 &2019109337 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2019109333} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2033690144 GameObject: m_ObjectHideFlags: 0 @@ -10361,123 +9664,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &2088848899 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: e9004f3ffa0267848b43397aa2cd2b24, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e9004f3ffa0267848b43397aa2cd2b24, type: 3} - propertyPath: m_LocalScale.x - value: 0.29683 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e9004f3ffa0267848b43397aa2cd2b24, type: 3} - propertyPath: m_LocalScale.y - value: 0.29683 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e9004f3ffa0267848b43397aa2cd2b24, type: 3} - propertyPath: m_LocalScale.z - value: 0.29683 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e9004f3ffa0267848b43397aa2cd2b24, type: 3} - propertyPath: m_LocalPosition.x - value: -14.61 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e9004f3ffa0267848b43397aa2cd2b24, type: 3} - propertyPath: m_LocalPosition.y - value: 6.03 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e9004f3ffa0267848b43397aa2cd2b24, type: 3} - propertyPath: m_LocalPosition.z - value: -4.47 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e9004f3ffa0267848b43397aa2cd2b24, type: 3} - propertyPath: m_LocalRotation.w - value: 0.92095506 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e9004f3ffa0267848b43397aa2cd2b24, type: 3} - propertyPath: m_LocalRotation.x - value: 0.11051833 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e9004f3ffa0267848b43397aa2cd2b24, type: 3} - propertyPath: m_LocalRotation.y - value: -0.37100583 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e9004f3ffa0267848b43397aa2cd2b24, type: 3} - propertyPath: m_LocalRotation.z - value: 0.0445222 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e9004f3ffa0267848b43397aa2cd2b24, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 13.686 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e9004f3ffa0267848b43397aa2cd2b24, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -43.884 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e9004f3ffa0267848b43397aa2cd2b24, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: e9004f3ffa0267848b43397aa2cd2b24, type: 3} - propertyPath: m_Name - value: cctv - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e9004f3ffa0267848b43397aa2cd2b24, type: 3} ---- !u!4 &2088848900 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e9004f3ffa0267848b43397aa2cd2b24, type: 3} - m_PrefabInstance: {fileID: 2088848899} - m_PrefabAsset: {fileID: 0} ---- !u!1 &2089766036 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2089766037} - - component: {fileID: 2089766038} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2089766037 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2089766036} - m_LocalRotation: {x: -0.09304553, y: 0.37576634, z: -0.08753864, w: 0.9178667} - m_LocalPosition: {x: 43.35518, y: -29.42143, z: -20.498535} - m_LocalScale: {x: 3.3689313, y: 3.3689318, z: 3.3689318} - m_Children: [] - m_Father: {fileID: 1406100825} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2089766038 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2089766036} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &60889539378096550 PrefabInstance: m_ObjectHideFlags: 0 @@ -10660,6 +9846,63 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} +--- !u!1001 &5794393863676864562 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6333024221946806746, guid: 8e888e6301e0f8849b447ca43b6994b1, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6333024221946806746, guid: 8e888e6301e0f8849b447ca43b6994b1, type: 3} + propertyPath: m_LocalPosition.x + value: -14.61 + objectReference: {fileID: 0} + - target: {fileID: 6333024221946806746, guid: 8e888e6301e0f8849b447ca43b6994b1, type: 3} + propertyPath: m_LocalPosition.y + value: 6.03 + objectReference: {fileID: 0} + - target: {fileID: 6333024221946806746, guid: 8e888e6301e0f8849b447ca43b6994b1, type: 3} + propertyPath: m_LocalPosition.z + value: -4.47 + objectReference: {fileID: 0} + - target: {fileID: 6333024221946806746, guid: 8e888e6301e0f8849b447ca43b6994b1, type: 3} + propertyPath: m_LocalRotation.w + value: 0.92095506 + objectReference: {fileID: 0} + - target: {fileID: 6333024221946806746, guid: 8e888e6301e0f8849b447ca43b6994b1, type: 3} + propertyPath: m_LocalRotation.x + value: 0.11051833 + objectReference: {fileID: 0} + - target: {fileID: 6333024221946806746, guid: 8e888e6301e0f8849b447ca43b6994b1, type: 3} + propertyPath: m_LocalRotation.y + value: -0.37100583 + objectReference: {fileID: 0} + - target: {fileID: 6333024221946806746, guid: 8e888e6301e0f8849b447ca43b6994b1, type: 3} + propertyPath: m_LocalRotation.z + value: 0.0445222 + objectReference: {fileID: 0} + - target: {fileID: 6333024221946806746, guid: 8e888e6301e0f8849b447ca43b6994b1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 13.686 + objectReference: {fileID: 0} + - target: {fileID: 6333024221946806746, guid: 8e888e6301e0f8849b447ca43b6994b1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -43.884 + objectReference: {fileID: 0} + - target: {fileID: 6333024221946806746, guid: 8e888e6301e0f8849b447ca43b6994b1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6676792422491872096, guid: 8e888e6301e0f8849b447ca43b6994b1, type: 3} + propertyPath: m_Name + value: cctv + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8e888e6301e0f8849b447ca43b6994b1, type: 3} --- !u!1001 &6314262857868363667 PrefabInstance: m_ObjectHideFlags: 0 @@ -10741,6 +9984,63 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd2709ce625391747b56d49b13717da0, type: 3} +--- !u!1001 &6899491116292673092 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6016390517744551983, guid: 1fdbda4481aab5e48830fbc7d84e6d89, type: 3} + propertyPath: m_Name + value: peddalo + objectReference: {fileID: 0} + - target: {fileID: 6356078671219987093, guid: 1fdbda4481aab5e48830fbc7d84e6d89, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6356078671219987093, guid: 1fdbda4481aab5e48830fbc7d84e6d89, type: 3} + propertyPath: m_LocalPosition.x + value: -28.333 + objectReference: {fileID: 0} + - target: {fileID: 6356078671219987093, guid: 1fdbda4481aab5e48830fbc7d84e6d89, type: 3} + propertyPath: m_LocalPosition.y + value: 2.913 + objectReference: {fileID: 0} + - target: {fileID: 6356078671219987093, guid: 1fdbda4481aab5e48830fbc7d84e6d89, type: 3} + propertyPath: m_LocalPosition.z + value: 21.353 + objectReference: {fileID: 0} + - target: {fileID: 6356078671219987093, guid: 1fdbda4481aab5e48830fbc7d84e6d89, type: 3} + propertyPath: m_LocalRotation.w + value: 0.4974324 + objectReference: {fileID: 0} + - target: {fileID: 6356078671219987093, guid: 1fdbda4481aab5e48830fbc7d84e6d89, type: 3} + propertyPath: m_LocalRotation.x + value: -0.4974324 + objectReference: {fileID: 0} + - target: {fileID: 6356078671219987093, guid: 1fdbda4481aab5e48830fbc7d84e6d89, type: 3} + propertyPath: m_LocalRotation.y + value: -0.50255454 + objectReference: {fileID: 0} + - target: {fileID: 6356078671219987093, guid: 1fdbda4481aab5e48830fbc7d84e6d89, type: 3} + propertyPath: m_LocalRotation.z + value: -0.5025545 + objectReference: {fileID: 0} + - target: {fileID: 6356078671219987093, guid: 1fdbda4481aab5e48830fbc7d84e6d89, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 6356078671219987093, guid: 1fdbda4481aab5e48830fbc7d84e6d89, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6356078671219987093, guid: 1fdbda4481aab5e48830fbc7d84e6d89, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90.587 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1fdbda4481aab5e48830fbc7d84e6d89, type: 3} --- !u!1001 &7288094137546172433 PrefabInstance: m_ObjectHideFlags: 0 @@ -10802,6 +10102,87 @@ PrefabInstance: objectReference: {fileID: 8338988565591873055} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9c489a8547f4d9e4387da15a4ff82c81, type: 3} +--- !u!1001 &8190294791091046838 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 654142258, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1005526109, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + propertyPath: moveClip + value: + objectReference: {fileID: 8300000, guid: 5c33895e0bb8014479d8f62314b03c98, type: 3} + - target: {fileID: 1005526109, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + propertyPath: sfxSource + value: + objectReference: {fileID: 1005526109} + - target: {fileID: 1005526109, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + propertyPath: localCamera + value: + objectReference: {fileID: 1406100826} + - target: {fileID: 1005526109, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + propertyPath: interactSound + value: + objectReference: {fileID: 8300000, guid: 66f5a01951ce1964993ffc0dda57c1df, type: 3} + - target: {fileID: 1005526109, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + propertyPath: interactSource + value: + objectReference: {fileID: 1477063785} + - target: {fileID: 8512784930535944710, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8512784930535944710, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + propertyPath: m_LocalPosition.x + value: -23.14 + objectReference: {fileID: 0} + - target: {fileID: 8512784930535944710, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + propertyPath: m_LocalPosition.y + value: 1.850399 + objectReference: {fileID: 0} + - target: {fileID: 8512784930535944710, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + propertyPath: m_LocalPosition.z + value: 1.7279625 + objectReference: {fileID: 0} + - target: {fileID: 8512784930535944710, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8512784930535944710, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8512784930535944710, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8512784930535944710, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8512784930535944710, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8512784930535944710, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8512784930535944710, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9036662207266744508, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} + propertyPath: m_Name + value: bendy-thing + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9f35cac420ae1af408d80c91cd5b2ea9, type: 3} --- !u!4 &8338988565591873055 stripped Transform: m_CorrespondingSourceObject: {fileID: 4135013735270702856, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 7fb779c..eab4a8f 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -42,6 +42,7 @@ public class GameManager : MonoBehaviour //Leave network view with x if (Keyboard.current.xKey.wasPressedThisFrame && networkView) { + player.GetComponent().enabled = true; SetActiveCamera(networkCamera); activeNode.GetComponent().DisableNode(); activeNode = null; diff --git a/Assets/Scripts/Network/Switch.cs b/Assets/Scripts/Network/Switch.cs index c2a6ccd..4939a3b 100644 --- a/Assets/Scripts/Network/Switch.cs +++ b/Assets/Scripts/Network/Switch.cs @@ -36,6 +36,7 @@ public class Switch : MonoBehaviour gameManager.activeNode = debugNode.gameObject; gameManager.SetActiveCamera(gameManager.networkCamera); debugNode.SendMessage("SetActiveNode", debugNode.GetComponent()); + gameManager.player.GetComponent().enabled = false; } } }