From a90c5c1f5463c6a26884e20c4da2731f19e278f5 Mon Sep 17 00:00:00 2001 From: Soulaha Balde Date: Wed, 19 Oct 2022 10:20:18 -0400 Subject: [PATCH] Added follow camera --- Assets/Scenes/Grappling/Grappling.unity | 208 +++++++++++++++++++++++- Packages/manifest.json | 1 + Packages/packages-lock.json | 9 + 3 files changed, 215 insertions(+), 3 deletions(-) diff --git a/Assets/Scenes/Grappling/Grappling.unity b/Assets/Scenes/Grappling/Grappling.unity index 8af2716..d1cd363 100644 --- a/Assets/Scenes/Grappling/Grappling.unity +++ b/Assets/Scenes/Grappling/Grappling.unity @@ -511,7 +511,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1211811536} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.64, y: 4.15, z: 0} + m_LocalPosition: {x: 4.54, y: 5.06, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -548,6 +548,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f45bd04209bb424e8b1f5271cb16ab0, type: 3} m_Name: m_EditorClassIdentifier: + maxGrappleDist: 200 grappleableLayer: serializedVersion: 2 m_Bits: 2147483647 @@ -596,6 +597,7 @@ GameObject: - component: {fileID: 1530935837} - component: {fileID: 1530935836} - component: {fileID: 1530935839} + - component: {fileID: 1530935840} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -661,8 +663,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1530935835} - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 0, y: 5.7, z: 20.24} + m_LocalRotation: {x: 0, y: 0.9993161, z: -0.036978364, w: 1e-45} + m_LocalPosition: {x: 4.54, y: 6.64, z: 21.32} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -702,6 +704,40 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!114 &1530935840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1530935835} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowDebugText: 0 + m_ShowCameraFrustum: 0 + m_IgnoreTimeScale: 0 + m_WorldUpOverride: {fileID: 0} + m_UpdateMethod: 0 + m_BlendUpdateMethod: 1 + m_DefaultBlend: + m_Style: 1 + m_Time: 2 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_CustomBlends: {fileID: 0} + m_CameraCutEvent: + m_PersistentCalls: + m_Calls: [] + m_CameraActivatedEvent: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1547983496 GameObject: m_ObjectHideFlags: 0 @@ -896,6 +932,101 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1866383020 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1866383021} + - component: {fileID: 1866383024} + - component: {fileID: 1866383023} + - component: {fileID: 1866383025} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1866383021 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1866383020} + m_LocalRotation: {x: -0.009548949, y: -0.9603454, z: 0.27667135, w: 0.03314507} + m_LocalPosition: {x: 5.325717, y: -4.3235893, z: 37.48282} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2129712289} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1866383023 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1866383020} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: 0, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0.5 + m_VerticalDamping: 0.5 + m_ScreenX: 0.5 + m_ScreenY: 0.5 + m_DeadZoneWidth: 0.67 + m_DeadZoneHeight: 0.59 + m_SoftZoneWidth: 0.8 + m_SoftZoneHeight: 0.8 + m_BiasX: -0.00000504347 + m_BiasY: 0 + m_CenterOnActivate: 1 +--- !u!114 &1866383024 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1866383020} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1866383025 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1866383020} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa7155796051b734daa718462081dc5f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 0 + m_FollowOffset: {x: 0, y: 1.5799999, z: 21.32} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 --- !u!1 &1882391193 GameObject: m_ObjectHideFlags: 0 @@ -1027,3 +1158,74 @@ LineRenderer: generateLightingData: 0 m_UseWorldSpace: 1 m_Loop: 0 +--- !u!1 &2129712287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2129712289} + - component: {fileID: 2129712288} + m_Layer: 0 + m_Name: CM vcam1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2129712288 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2129712287} + 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: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 1211811540} + m_Follow: {fileID: 1211811540} + m_Lens: + FieldOfView: 60 + OrthographicSize: 5 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 1866383021} +--- !u!4 &2129712289 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2129712287} + m_LocalRotation: {x: 0, y: 0.9993161, z: -0.036978364, w: 1e-45} + m_LocalPosition: {x: 4.54, y: 6.64, z: 21.32} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1866383021} + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Packages/manifest.json b/Packages/manifest.json index 8d5ab3e..54aa953 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.unity.cinemachine": "2.8.9", "com.unity.collab-proxy": "1.17.2", "com.unity.ide.rider": "3.0.16", "com.unity.ide.visualstudio": "2.0.16", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 0a555a5..5450c32 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -9,6 +9,15 @@ }, "url": "https://packages.unity.com" }, + "com.unity.cinemachine": { + "version": "2.8.9", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.31" + }, + "url": "https://packages.unity.com" + }, "com.unity.collab-proxy": { "version": "1.17.2", "depth": 0,