From a82255ee8156c3079aadfbd323bc09322456ba93 Mon Sep 17 00:00:00 2001 From: IDMhan Date: Tue, 21 Nov 2023 04:46:47 +0900 Subject: [PATCH] Closes #55 In Ship Camera Follow Offset revoke when end interaction --- BlueWater/Assets/02.Scripts/CameraManager.cs | 4 +++- .../RPG Indicator/RpgIndicatorHDRP.unitypackage.meta | 7 ------- .../Assets/RPG Indicator/RpgIndicatorURP.unitypackage.meta | 7 ------- 3 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 BlueWater/Assets/RPG Indicator/RpgIndicatorHDRP.unitypackage.meta delete mode 100644 BlueWater/Assets/RPG Indicator/RpgIndicatorURP.unitypackage.meta diff --git a/BlueWater/Assets/02.Scripts/CameraManager.cs b/BlueWater/Assets/02.Scripts/CameraManager.cs index f2c117bc3..5c666b38c 100644 --- a/BlueWater/Assets/02.Scripts/CameraManager.cs +++ b/BlueWater/Assets/02.Scripts/CameraManager.cs @@ -28,6 +28,7 @@ namespace BlueWaterProject [Required("보트안 카메라를 넣어주세요.")] public CinemachineVirtualCamera inShipCam; + private Vector3 inShipCamOrigenalOffset; public float sensitivity = 0.01f; @@ -44,6 +45,7 @@ namespace BlueWaterProject protected override void OnAwake() { MainCam = Camera.main; + inShipCamOrigenalOffset = inShipCam.GetCinemachineComponent().m_FollowOffset; } private void Start() @@ -181,7 +183,7 @@ namespace BlueWaterProject var transform1 = GameManager.Inst.InShipPlayer.transform; inShipCam.Follow = transform1; inShipCam.LookAt = transform1; - var targetOffset = new Vector3(0, 20, -10); + var targetOffset = inShipCamOrigenalOffset; StartSmoothTransition(targetOffset); } } diff --git a/BlueWater/Assets/RPG Indicator/RpgIndicatorHDRP.unitypackage.meta b/BlueWater/Assets/RPG Indicator/RpgIndicatorHDRP.unitypackage.meta deleted file mode 100644 index 931e8f0df..000000000 --- a/BlueWater/Assets/RPG Indicator/RpgIndicatorHDRP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 15978934df642964d83e02a48645ca70 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/RPG Indicator/RpgIndicatorURP.unitypackage.meta b/BlueWater/Assets/RPG Indicator/RpgIndicatorURP.unitypackage.meta deleted file mode 100644 index 1c6609a2c..000000000 --- a/BlueWater/Assets/RPG Indicator/RpgIndicatorURP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9a3a3c3e8c9b17b49b7212296547d096 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: