From d6c64a1e33f109424c867175e32f2d6d9327301c Mon Sep 17 00:00:00 2001
From: Malik Rafsanjani <pro.malikakbar2357@gmail.com>
Date: Sat, 8 Apr 2023 20:22:20 +0700
Subject: [PATCH] fix: add colider for hitting enemy

---
 Assets/Prefabs/Arrow Variant.prefab          | 20 +++++++++++++++++---
 Assets/Scripts/Player/Weapons/PlayerArrow.cs |  1 -
 Assets/Scripts/Player/Weapons/PlayerBow.cs   | 14 ++++++--------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/Assets/Prefabs/Arrow Variant.prefab b/Assets/Prefabs/Arrow Variant.prefab
index f383554..9f1391f 100644
--- a/Assets/Prefabs/Arrow Variant.prefab	
+++ b/Assets/Prefabs/Arrow Variant.prefab	
@@ -90,14 +90,28 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5605313144142574835}
   serializedVersion: 2
-  m_Mass: 0.05
+  m_Mass: 0.1
   m_Drag: 0
-  m_AngularDrag: 0.05
+  m_AngularDrag: 0
   m_UseGravity: 0
   m_IsKinematic: 0
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
+--- !u!136 &8899688315378107407
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5605313144142574835}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.3
+  m_Height: 20
+  m_Direction: 1
+  m_Center: {x: 0, y: 0, z: -1}
 --- !u!114 &5707969127914954734
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -111,4 +125,4 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   damage: 200
-  torque: 10
+  torque: 0
diff --git a/Assets/Scripts/Player/Weapons/PlayerArrow.cs b/Assets/Scripts/Player/Weapons/PlayerArrow.cs
index e536ea9..f50e2a1 100644
--- a/Assets/Scripts/Player/Weapons/PlayerArrow.cs
+++ b/Assets/Scripts/Player/Weapons/PlayerArrow.cs
@@ -36,6 +36,5 @@ public class PlayerArrow : MonoBehaviour
         rb.velocity = Vector3.zero;
         rb.angularVelocity = Vector3.zero;
         rb.isKinematic = true;
-        transform.SetParent(other.transform);
     }
 }
diff --git a/Assets/Scripts/Player/Weapons/PlayerBow.cs b/Assets/Scripts/Player/Weapons/PlayerBow.cs
index 94cd251..a6a949e 100644
--- a/Assets/Scripts/Player/Weapons/PlayerBow.cs
+++ b/Assets/Scripts/Player/Weapons/PlayerBow.cs
@@ -18,7 +18,7 @@ public class PlayerBow : MonoBehaviour
 
     void Awake()
     {
-        ReloadArrow();
+        //ReloadArrow();
     }
 
     public void Reload()
@@ -30,10 +30,9 @@ public class PlayerBow : MonoBehaviour
 
     void Update()
     {
-        if (Input.GetKeyDown(KeyCode.J))
+        if (Input.GetMouseButtonDown(0))
         {
-            Debug.Log("Click J");
-            Shoot(5);
+            Shoot();
         }
     }
 
@@ -50,13 +49,12 @@ public class PlayerBow : MonoBehaviour
         isReload = false;
     }
 
-    public void Shoot(float power)
+    public void Shoot()
     {
-        Debug.Log("isReload: " + isReload);
         curArrow = Instantiate(playerArrowPrefab, transform.position, arrowSpawnPoint.transform.rotation);
         var force = curArrow.transform.forward;
-        curArrow.GetComponent<Rigidbody>().AddRelativeForce(force * -20);
-        Reload();
+        curArrow.GetComponent<Rigidbody>().AddRelativeForce(force * -40);
+        // Reload();
     }
 
     public bool IsReady()
-- 
GitLab