diff --git a/Assets/ResWork/Prefabs/Ingame/Main Camera.prefab b/Assets/ResWork/Prefabs/Ingame/Main Camera.prefab index 3a3e6df8a..d0bfd30ed 100644 --- a/Assets/ResWork/Prefabs/Ingame/Main Camera.prefab +++ b/Assets/ResWork/Prefabs/Ingame/Main Camera.prefab @@ -170,10 +170,10 @@ MonoBehaviour: maxDistance: 1.6 DistanceUp: 1 cameraHeight: 78 - - minDistance: 0 - maxDistance: 0 - DistanceUp: 0 - cameraHeight: 0 + - minDistance: 2 + maxDistance: 3 + DistanceUp: 3.5 + cameraHeight: 78 CamStatus2_x: 4 CamStatus2_up: 1.4 shakeCurve: diff --git a/Assets/Script/Util/RealCamera.cs b/Assets/Script/Util/RealCamera.cs index 13a865009..1d3b50572 100644 --- a/Assets/Script/Util/RealCamera.cs +++ b/Assets/Script/Util/RealCamera.cs @@ -58,6 +58,14 @@ public class RealCamera : MyCoroutine public cCamData[] arr_cCamData; // 0 일반, 1 보스 + void Init_Cam() + { + int index = islockTarget ? 1 : 0; + Set_DistanceUp(false); + minDistance = arr_cCamData[index].minDistance; + VerticalAxis = maxDistance = arr_cCamData[index].maxDistance; + cameraHeight = arr_cCamData[index].cameraHeight; + } public void Add_Rot(float rot) { rotateAround += rot; } public void Set_Rot(float rot) { rotateAround = rot; } public bool IsEnter() { return CamStatus == 0; } @@ -76,12 +84,11 @@ public class RealCamera : MyCoroutine Set_Target(_target); CamStatus = 0; rotateAround = _camrot; - Set_DistanceUp(false); - VerticalAxis = maxDistance = arr_cCamData[0].maxDistance; + Init_Cam(); } public void Set_DistanceUp(bool vertical) { - DistanceUp = vertical ? 0f : arr_cCamData[0].DistanceUp; + DistanceUp = vertical ? 0f : arr_cCamData[islockTarget ? 1 : 0].DistanceUp; } public void Set_InsideBuilding(bool _active) { @@ -93,10 +100,7 @@ public class RealCamera : MyCoroutine } else { - minDistance = arr_cCamData[0].minDistance; - VerticalAxis = maxDistance = arr_cCamData[0].maxDistance; - Set_DistanceUp(false); - cameraHeight = arr_cCamData[0].cameraHeight; + Init_Cam(); } } public void Set_FollowTarget(Actor target) @@ -114,6 +118,7 @@ public class RealCamera : MyCoroutine { tf_lockTarget = locktarget; islockTarget = tf_lockTarget; + Init_Cam(); } public void Set_TargetShow(Transform _target) { @@ -232,8 +237,8 @@ public class RealCamera : MyCoroutine transform.eulerAngles = new Vector3(90f, transform.eulerAngles.y); } } - public float CamStatus2_x = 4f; - public float CamStatus2_up = 1.4f; + public float CamStatus2_x = 4f; // 특정 스킬뷰 + public float CamStatus2_up = 1.4f; // 특정 스킬뷰 void Start_Game() {