이제 에임한데 위치쯤 갔는데도 안맞으면 강제로 트리거 발동하게 함

Assets/Prefabs/Objects/camera.prefab

@@ -759,7 +759,7 @@ GameObject:
   - component: {fileID: 439939669}
   - component: {fileID: 896145114}
   - component: {fileID: 7514060783340336889}
-  - component: {fileID: 1382926052388863002}
+  - component: {fileID: 1747759991329878593}
   m_Layer: 0
   m_Name: camera
   m_TagString: CameraTurret
@@ -842,8 +842,8 @@ NavMeshObstacle:
   m_CarveOnlyStationary: 1
   m_Center: {x: 0, y: 0.5, z: 0}
   m_TimeToStationary: 0.5
---- !u!136 &1382926052388863002
-CapsuleCollider:
+--- !u!135 &1747759991329878593
+SphereCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -852,10 +852,9 @@ CapsuleCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 1
   m_Enabled: 1
-  m_Radius: 0.24
-  m_Height: 0.7
-  m_Direction: 1
-  m_Center: {x: 0, y: 0.5, z: 0}
+  serializedVersion: 2
+  m_Radius: 0.23
+  m_Center: {x: 0, y: 0.47, z: 0}
 --- !u!1 &6001025753464815807
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/SelectStage.unity

@@ -542,25 +542,13 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 209951667, guid: 8115fd4d1a1025b4fb05e45fc5fa6578, type: 3}
-      propertyPath: m_Color.r
-      value: 0.41509432
-      objectReference: {fileID: 0}
-    - target: {fileID: 209951667, guid: 8115fd4d1a1025b4fb05e45fc5fa6578, type: 3}
-      propertyPath: m_Color.g
-      value: 0.41509432
-      objectReference: {fileID: 0}
-    - target: {fileID: 209951667, guid: 8115fd4d1a1025b4fb05e45fc5fa6578, type: 3}
-      propertyPath: m_Color.b
-      value: 0.41509432
-      objectReference: {fileID: 0}
-    - target: {fileID: 209951667, guid: 8115fd4d1a1025b4fb05e45fc5fa6578, type: 3}
-      propertyPath: m_Color.a
-      value: 0.8745098
-      objectReference: {fileID: 0}
     - target: {fileID: 12888245, guid: 8115fd4d1a1025b4fb05e45fc5fa6578, type: 3}
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 707928317, guid: 8115fd4d1a1025b4fb05e45fc5fa6578, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8115fd4d1a1025b4fb05e45fc5fa6578, type: 3}

Assets/Scripts/Bullets/Bullet.cs

@@ -17,10 +17,20 @@ public abstract class Bullet : MonoBehaviour
         GameManager.inst.isBulletFlying = false;
     }
 
-    public void Init(Vector3 velocity)
+    IEnumerator ForceInteract(Collider col, float _time)
+    {
+        yield return new WaitForSeconds(_time);
+        OnTriggerEnter(col);
+    }
+
+    public void Init(Vector3 velocity, Collider col)
     {
         GameManager.inst.isBulletFlying = true;
         GetComponent<Rigidbody>().velocity = velocity;
-        Destroy(gameObject, MapManager.inst.currentMap.maxMapSize / velocity.magnitude);
+        float flightTime;
+        if (col != null) flightTime = (col.transform.position - transform.position).magnitude / velocity.magnitude;
+        else flightTime = MapManager.inst.currentMap.maxMapSize / velocity.magnitude;
+        StartCoroutine(ForceInteract(col, flightTime));
+        Destroy(gameObject, flightTime + 0.5f);
     }    
 }

Assets/Scripts/CameraController.cs

@@ -91,7 +91,7 @@ public class CameraController : MonoBehaviour
         for (i = 0; i < cameraMoveDuration; i += 1)
         {
             yield return new WaitForSeconds(0.01f);
-            if (Input.GetMouseButtonDown(0))
+            if (Input.GetMouseButtonDown(0) || !StageSelector.inst.gameSettings["zoomAnim"])
                 break;
             transform.position += posDiff;
             transform.eulerAngles += new Vector3(angleDiff, 0, 0);
@@ -140,7 +140,7 @@ public class CameraController : MonoBehaviour
         for (i = 0; i < cameraMoveDuration; i += 1)
         {
             yield return new WaitForSeconds(0.01f);
-            if (Input.GetMouseButtonDown(0))
+            if (Input.GetMouseButtonDown(0) || !StageSelector.inst.gameSettings["zoomAnim"])
                 break;
             transform.position += posDiff;
             transform.eulerAngles += angleDiff;

Assets/Scripts/Player.cs

@@ -25,9 +25,10 @@ public class Player : MonoBehaviour
     public VLight aimLight;
 
     public bool canShoot = false;
+    public Collider lastCol = null;
+    private Collider beforeRay = null;
     private GameObject currentBullet;
     private float lastShoot;
-    private Collider beforeRay = null;
 
     /// <summary>
     /// Set this player as the current player.
@@ -153,7 +154,7 @@ public class Player : MonoBehaviour
         Bullet newBullet = MapManager.inst.bulletFactory.MakeBullet(bulletCode);
         newBullet.transform.position = shootingFinger.transform.position;
         newBullet.transform.LookAt(shootingArm.transform.forward + newBullet.transform.position);
-        newBullet.Init(shootingArm.transform.forward * 3);
+        newBullet.Init(shootingArm.transform.forward * 3, lastCol);
         currentBullet = newBullet.gameObject;
         PlayerController.inst.bulletList.RemoveAt(0);
         GameManager.inst.bulletUIGenerator.RemoveBulletUI();
@@ -164,6 +165,7 @@ public class Player : MonoBehaviour
     public void OffAllOutline()
     {
         canShoot = false;
+        if (beforeRay != null) lastCol = beforeRay;
         laser.GetComponent<LineRenderer>().startColor = Color.red;
         laser.GetComponent<LineRenderer>().endColor = Color.red;
         if (beforeRay != null)

Assets/Scripts/StageSelector.cs

@@ -17,7 +17,8 @@ public class StageSelector : SingletonBehaviour<StageSelector>
     public Dictionary<string, bool> gameSettings = new Dictionary<string, bool>()
     {
         { "postProcessing", true },
-        { "sound", true }
+        { "sound", true },
+        { "zoomAnim", true }
     };
 
     [Header("맵 추가시 반드시 바꿔줘야하는 값.각 카테고리마다의 스테이지 수")]