Weapon

idk
2025-10-29 12:52:07 +01:00 · 2021-11-12 08:23:51 +01:00
parent 6e13025624
commit dd4da20ec3
10 changed files with 1725 additions and 463 deletions
--- a/Assets/Prefabs/Player/Player
+++ b/Assets/Prefabs/Player/Player
@@ -266,7 +266,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 9064841067161443684}
-  m_Layer: 0
+  m_Layer: 7
  m_Name: Right_Hand_REF
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -297,7 +297,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 2781132594439880980}
-  m_Layer: 0
+  m_Layer: 7
  m_Name: Left_Hand_REF
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -385,6 +385,94 @@ MonoBehaviour:
  totalAmmunition: 64
  bulletExit: {fileID: 5922641287523208729}
  allowAction: 1
+--- !u!1 &4179802636391483292
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2655064791458186669}
+  - component: {fileID: 6237022232134764314}
+  - component: {fileID: 7196982599235120773}
+  m_Layer: 0
+  m_Name: WeaponCamera
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2655064791458186669
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4179802636391483292}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6272346181657429396}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!20 &6237022232134764314
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4179802636391483292}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 3
+  m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.1
+  far clip plane: 1000
+  field of view: 61.4
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: 1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 128
+  m_RenderingPath: 1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!114 &7196982599235120773
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4179802636391483292}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &4824770690127859843
 GameObject:
  m_ObjectHideFlags: 0
@@ -566,7 +654,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 2695726321628216464}
-  m_Layer: 0
+  m_Layer: 7
  m_Name: BulletExitPoint
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -613,6 +701,7 @@ GameObject:
  - component: {fileID: 7198056240135858432}
  - component: {fileID: 3208778597385635596}
  - component: {fileID: 8473162599388710253}
+  - component: {fileID: 9002763652799938533}
  m_Layer: 0
  m_Name: Player Animation Test
  m_TagString: Player
@@ -763,6 +852,7 @@ MonoBehaviour:
  syncMode: 0
  syncInterval: 0.1
  playerCamera: {fileID: 6272346181657429396}
+  weaponCamera: {fileID: 0}
  playerNeck: {fileID: 981273033772084037}
  mouseSensitivity: 4
  maxCameraAngle: 90
@@ -984,6 +1074,8 @@ MonoBehaviour:
  shootAnim: {fileID: 4276885029697240453}
  weaponHolder: {fileID: 3682030003239559187}
  GunRotation: {fileID: 7768205653369755348}
+  mCamera: {fileID: 6272346181657429395}
+  limitAmmunition: 1
 --- !u!114 &8473162599388710253
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -996,6 +1088,24 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 323a821a5fef23a45aa5333ce1f55202, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!114 &9002763652799938533
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6272346181302961293}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 98dadd30ba25ec34db3b45d0dca2827b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncMode: 0
+  syncInterval: 0.1
+  currentWeaponIndex: 0
+  allWeapons: []
+  activeWeapons: []
+  cam: {fileID: 6272346181657429395}
 --- !u!1 &6272346181657429393
 GameObject:
  m_ObjectHideFlags: 0
@@ -1029,6 +1139,7 @@ Transform:
  - {fileID: 4074665071222326704}
  - {fileID: 1979435770070801855}
  - {fileID: 1468248131875751636}
+  - {fileID: 2655064791458186669}
  m_Father: {fileID: 981273033772084037}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1039,7 +1150,7 @@ Camera:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6272346181657429393}
-  m_Enabled: 1
+  m_Enabled: 0
  serializedVersion: 2
  m_ClearFlags: 1
  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
@@ -1060,10 +1171,10 @@ Camera:
  field of view: 61.4
  orthographic: 0
  orthographic size: 5
-  m_Depth: -1
+  m_Depth: 0
  m_CullingMask:
    serializedVersion: 2
-    m_Bits: 4294967295
+    m_Bits: 119
  m_RenderingPath: -1
  m_TargetTexture: {fileID: 0}
  m_TargetDisplay: 0
@@ -1401,14 +1512,90 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: -8391933466715459243, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: -8203754323188703182, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: -7054223159285474668, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: -5922622823359544968, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: -2638991995655067945, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: -2221209126115689913, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: -1980471935049097083, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: -1604755613463741856, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
    - target: {fileID: 919132149155446097, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
      propertyPath: m_Name
      value: M92
      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_TagString
+      value: Weapon
+      objectReference: {fileID: 0}
+    - target: {fileID: 1726362074032003892, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 1855436591146390978, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 3037560442690355669, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 4069185504284304746, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 4338342771885537534, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 4440277073990949090, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
    - target: {fileID: 5866666021909216657, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
      propertyPath: m_Controller
      value: 
      objectReference: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2}
+    - target: {fileID: 6952977719256411990, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 7036213049465896255, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 7913327932472438409, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
 --- !u!1 &3682030003239559187 stripped
@@ -1479,67 +1666,67 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.49565774
+      value: 0.49762657
      objectReference: {fileID: 0}
    - target: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0.4028321
+      value: 0.386114
      objectReference: {fileID: 0}
    - target: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0.47084302
+      value: 0.48171118
      objectReference: {fileID: 0}
    - target: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.z
-      value: 0.6085693
+      value: 0.60929316
      objectReference: {fileID: 0}
    - target: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.5662176
+      value: 0.6168926
      objectReference: {fileID: 0}
    - target: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0.8008484
+      value: 0.7642771
      objectReference: {fileID: 0}
    - target: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0.04959982
+      value: 0.05403893
      objectReference: {fileID: 0}
    - target: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.z
-      value: -0.18862498
+      value: -0.18001123
      objectReference: {fileID: 0}
    - target: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.6432096
+      value: 0.6961628
      objectReference: {fileID: 0}
    - target: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.x
-      value: -0.7010284
+      value: -0.6589092
      objectReference: {fileID: 0}
    - target: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0.02918151
+      value: 0.012771033
      objectReference: {fileID: 0}
    - target: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.z
-      value: 0.30657643
+      value: 0.28466263
      objectReference: {fileID: 0}
    - target: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.64756745
+      value: 0.70013154
      objectReference: {fileID: 0}
    - target: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.x
-      value: -0.6947033
+      value: -0.6528746
      objectReference: {fileID: 0}
    - target: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.y
-      value: -0.034390952
+      value: -0.017168753
      objectReference: {fileID: 0}
    - target: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.z
-      value: -0.3112249
+      value: -0.28857553
      objectReference: {fileID: 0}
    - target: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_Name
@@ -1547,35 +1734,35 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.556481
+      value: 0.60796833
      objectReference: {fileID: 0}
    - target: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0.80733955
+      value: 0.77107567
      objectReference: {fileID: 0}
    - target: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.y
-      value: -0.048747048
+      value: -0.05325729
      objectReference: {fileID: 0}
    - target: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.z
-      value: 0.19014606
+      value: 0.18160518
      objectReference: {fileID: 0}
    - target: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.4882959
+      value: 0.4907071
      objectReference: {fileID: 0}
    - target: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0.41018188
+      value: 0.39377818
      objectReference: {fileID: 0}
    - target: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.y
-      value: -0.4844513
+      value: -0.49410793
      objectReference: {fileID: 0}
    - target: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3}
      propertyPath: m_LocalRotation.z
-      value: -0.59885305
+      value: -0.6000022
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 01316cb596562384da845bc519fb90de, type: 3}
--- a/Assets/Scenes/TestScene.unity
+++ b/Assets/Scenes/TestScene.unity
--- a/Assets/Scripts/DebugCanvas.cs
+++ b/Assets/Scripts/DebugCanvas.cs
@@ -8,6 +8,7 @@ using Mirror;
 public class DebugCanvas : MonoBehaviour
 {
    public TextMeshProUGUI DebugTextGrounded;
+    public TextMeshProUGUI DebugTextAmmunition;
    public TextMeshProUGUI DebugTextClientServer;
    public GameObject Player;
    public GameObject GameManager;
@@ -17,6 +18,7 @@ public class DebugCanvas : MonoBehaviour
    private void Start()
    {
        GameManager = GameObject.Find("GameManager");
+
    }
    private void Update()
    {
@@ -36,10 +38,12 @@ public class DebugCanvas : MonoBehaviour
        {
            DebugTextGrounded.text = "isGrounded: " + Player.GetComponent<PlayerController>().isGrounded.ToString();

+            DebugTextAmmunition.text = Player.GetComponent<Shoot>().CurAmmo.ToString() + " / " + Player.GetComponent<Shoot>().TotalAmmo.ToString();
            deltaTime += (Time.deltaTime - deltaTime) * 0.1f;
            float fps = 1.0f / deltaTime;
            fpsText.text = Mathf.Ceil(fps).ToString() + "FPS";
        }
        
    }
+
 }
--- a/Assets/Scripts/Player/PlayerMouseLook.cs
+++ b/Assets/Scripts/Player/PlayerMouseLook.cs
@@ -7,6 +7,7 @@ public class PlayerMouseLook : NetworkBehaviour
 {
    [Header("Mouse Look")]
    [SerializeField] private Transform playerCamera = null;
+    [SerializeField] private Transform weaponCamera = null;
    [SerializeField] private Transform playerNeck = null;
    [SerializeField] private float mouseSensitivity = 4.0f;

@@ -35,7 +36,7 @@ public class PlayerMouseLook : NetworkBehaviour
        {
            controller = GetComponent<CharacterController>();

-            playerCamera.gameObject.SetActive(true);
+            playerCamera.gameObject.GetComponent<Camera>().enabled = true;
            neckLength = Vector3.Distance(playerNeck.position,playerCamera.position);

            if (lockCursor)
--- a/Assets/Scripts/Weapons/Shoot.cs
+++ b/Assets/Scripts/Weapons/Shoot.cs
@@ -2,108 +2,141 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using Mirror;
-
+using TMPro;
 public class Shoot : NetworkBehaviour
 {
    [SerializeField] GameObject muzzle;
    [SerializeField] ShootAnimation shootAnim;
    [SerializeField] GameObject weaponHolder;
    [SerializeField] GameObject GunRotation;
-    
+    [SerializeField] Camera mCamera;
+    [SerializeField] bool limitAmmunition = true;

-    Ammunition ammunition;
    private Weapon weapon;
    private RaycastHit crosshairHitPoint;
-    private Camera mCamera;
    private Vector3 _pointDirection;
    private Quaternion _lookRotation;
    private Vector3 hitpos;
    private RaycastHit hit;
    private Ray ray;
-    private void Start()
-    {
-        if (isLocalPlayer)
-        {
-            mCamera = Camera.main;
+    private bool updateCanvas = true;
+    private int curAmmo = 1, totalAmmo = 1;
+
+    public int CurAmmo { get => curAmmo; set => curAmmo = value; }
+    public int TotalAmmo { get => totalAmmo; set => totalAmmo = value; }
+
+    private void Start() {
+        
+        if (isLocalPlayer) {
            weapon = weaponHolder.GetComponent<Weapon>();
            shootAnim.OnSwitchWeapon(weapon.Firerate);
+            curAmmo = weapon.CurrentAmmunition;
+            totalAmmo = weapon.TotalAmmunition;
        }
    }

-    private void Update()
-    {
-        Debug.Log("Test");
-        if (isLocalPlayer)
-        {
-            if (Input.GetButtonDown("Fire"))
-            {
+    private void Update() {
+        if (isLocalPlayer) {
+            if (updateCanvas) {
+                curAmmo = weapon.CurrentAmmunition;
+                totalAmmo = weapon.TotalAmmunition;
+                updateCanvas = false;
+            }
+            if (Input.GetButtonDown("Fire")) {
+                updateCanvas = true;
                CmdFireBullet();
            }
-            if (Input.GetButtonDown("Reload"))
-            {
+            if (Input.GetButtonDown("Reload")) {
+                updateCanvas = true;
                CmdReloadWeapon();
            }
+            
        }
    }

-
    [Command]
-    private void CmdReloadWeapon()
-    {
-        if (GetComponent<Ammunition>() != null && weapon.AllowAction)
-        {
-            GetComponent<Ammunition>().reloadWeapon(weapon);
+    private void CmdReloadWeapon() {
+        if (weapon.AllowAction && limitAmmunition) {
+            reloadWeapon(weapon);
        }
    }

   [Command]
    // This code will be executed on the Server.
-    private void CmdFireBullet()
-    {
-        ray = new Ray(mCamera.transform.position, mCamera.transform.forward);
-        if(Physics.Raycast(ray, out crosshairHitPoint, 5000f)){
-
-            hitpos = crosshairHitPoint.point;
-        }
-        else
-        {
-            hitpos = mCamera.transform.position + mCamera.transform.forward * 5000;
+    private void CmdFireBullet() {
+        ray = new Ray(mCamera.transform.position, mCamera.transform.forward); // Raycast from Camera
+        if(Physics.Raycast(ray, out crosshairHitPoint, 5000f)) { // Check if Raycast is beyond 5000
+            hitpos = crosshairHitPoint.point; // If hitpoint is under 5000
+        } else { 
+            hitpos = mCamera.transform.position + mCamera.transform.forward * 5000; 
        }
        _pointDirection = hitpos - muzzle.transform.position;
        _lookRotation = Quaternion.LookRotation(_pointDirection);
-        GunRotation.transform.rotation = Quaternion.RotateTowards(GunRotation.transform.rotation, _lookRotation, 1f);
+        GunRotation.transform.rotation = Quaternion.RotateTowards(GunRotation.transform.rotation, _lookRotation, 1f); // Point weapon to raycast hitpoint from camera

-        if (weapon.AllowAction)
-        {
-            if (Physics.Raycast(muzzle.transform.position, muzzle.transform.forward, out hit) && weapon.CurrentAmmunition > 0)
-            {
-                shootAnimation();
+        if (weapon.AllowAction) { // If not reloading etc.
+            if (Physics.Raycast(muzzle.transform.position, muzzle.transform.forward, out hit) && weapon.CurrentAmmunition > 0) { // Raycast from Bullet Exit Point to camera raycast 
+                shootAnimation(); // Start Shoot Animation
                Debug.DrawLine(muzzle.transform.position, hit.point);
-                Debug.Log(hit.transform.name);
-                if (hit.transform.gameObject.GetComponent<Player>() != null)
-                {
-                    Debug.Log("GETROFFEN------------------");
-                    hit.transform.gameObject.GetComponent<Player>().RemoveHealth(20);
+
+                bulletHole(GameObject.CreatePrimitive(PrimitiveType.Sphere), hit); // Creates bullethole where raycast hits
+
+                if (hit.transform.gameObject.GetComponent<Player>() != null) { // If hit object is a player
+                    Debug.Log("-->HIT PLAYER: " + hit.transform.name);
+                    hit.transform.gameObject.GetComponent<Player>().RemoveHealth(weapon.Damage); 
                }
            }
-            if (GetComponent<Ammunition>() != null)
-            {
-                GetComponent<Ammunition>().subtractAmmunition(weapon);
+            if (limitAmmunition) {
+                subtractAmmunition(weapon); // Subtract Ammunition 
            }
            StartCoroutine(fireRate());
-        }
-        
+        }        
    }
-    [Client]
-    void shootAnimation()
+
+    void bulletHole(GameObject holeObject, RaycastHit hit)
    {
+        holeObject.transform.localScale = new Vector3(0.2f, 0.2f, 0.2f);
+        holeObject.transform.position = hit.point;
+    }
+
+    [Client]
+    void shootAnimation() {
        shootAnim.recoil(0.1f);
    }
-    IEnumerator fireRate()
-    {
+
+
+    IEnumerator fireRate() {
        weapon.AllowAction = false;
-        yield return new WaitForSeconds(60f/weapon.Firerate);
+        yield return new WaitForSeconds(60f/weapon.Firerate); // Waits for firerate seconds
        weapon.AllowAction = true;
    }

+    private bool subtractAmmunition(Weapon weapon) { // Subtracts Ammunition from weapon 
+        if (weapon.CurrentAmmunition > 0) {
+            weapon.CurrentAmmunition -= 1;
+            return true;
+        }
+        return false;
+    }
+
+    private bool reloadWeapon(Weapon weapon) {  // Reloads Ammunition from weapon 
+        if (weapon.AllowAction && weapon.TotalAmmunition > 0) {
+            weapon.AllowAction = false;
+            int dif = weapon.MagazinSize - weapon.CurrentAmmunition;
+            if (weapon.TotalAmmunition >= dif) {
+                weapon.CurrentAmmunition += dif;
+                weapon.TotalAmmunition -= dif;
+            }
+            else {
+                weapon.CurrentAmmunition += weapon.TotalAmmunition;
+                weapon.TotalAmmunition = 0;
+            }
+            weapon.AllowAction = true;
+            Debug.Log("Reloaded");
+            return true;
+        }
+        return false;
+    }
+
+
 }
--- a/Assets/Scripts/Weapons/Weapon.cs
+++ b/Assets/Scripts/Weapons/Weapon.cs
@@ -10,7 +10,7 @@ public class Weapon : MonoBehaviour
    }
    [SerializeField] weaponKinds weaponKind;
    [SerializeField] bool active = false;
-    [SerializeField] float damage = 0;
+    [SerializeField] int damage = 0;
    [SerializeField] float firerate = 0;
    [SerializeField] int roundsPerShot = 1;
    [SerializeField] float recoilStrength = 0;
@@ -22,7 +22,7 @@ public class Weapon : MonoBehaviour

    public bool Active { get => active; set => active = value; }
    public weaponKinds WeaponKind { get => weaponKind; set => weaponKind = value; }
-    public float Damage { get => damage; set => damage = value; }
+    public int Damage { get => damage; set => damage = value; }
    public float Firerate { get => firerate; set => firerate = value; }
    public int RoundsPerShot { get => roundsPerShot; set => roundsPerShot = value; }
    public float RecoilStrength { get => recoilStrength; set => recoilStrength = value; }
--- a/Assets/Scripts/Weapons/WeaponManager.cs
+++ b/Assets/Scripts/Weapons/WeaponManager.cs
@@ -1,57 +1,64 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using Mirror;

-public class WeaponManager : MonoBehaviour
+
+public class WeaponManager : NetworkBehaviour
 {
    public int currentWeaponIndex = 0;
    public List<GameObject> allWeapons = new List<GameObject>();
    public GameObject[] activeWeapons;

-    [SerializeField] GameObject cam;
+    [SerializeField] Camera cam;

    private void Awake()
    {
        activeWeapons = new GameObject[4];
    }

-    void Update() { 
-        if(Input.GetAxis("Mouse ScrollWheel") > 0f){ // Scroll up
-            if (currentWeaponIndex <= 0) 
-            { currentWeaponIndex = activeWeapons.Length; }
-            else { currentWeaponIndex--; }
-        }
-        if (Input.GetAxis("Mouse ScrollWheel") < 0f){ // Scroll down
-            if (currentWeaponIndex >= activeWeapons.Length) 
-            { currentWeaponIndex = 0; }
-            else {  currentWeaponIndex++; }
-        }
-
-
-        if (Input.GetButton("Interact")) // e
-        { 
-            if (Physics.Raycast(cam.transform.position, cam.transform.forward, out RaycastHit hit))
-            {
-                Debug.DrawLine(cam.transform.position, hit.point);
-                if (allWeapons.Contains(hit.transform.gameObject) && !searchInArray(activeWeapons, hit.transform.gameObject)) // If Object is a weapon and the weapon is not in the current active weapons
-                {
-                    switch (hit.transform.GetComponent<Weapon>().WeaponKind.ToString()) // Adding weapon to inventory slot
-                    {
-                        case "Rifle": activeWeapons[0] = hit.transform.gameObject; break;
-                        case "Pistole": activeWeapons[1] = hit.transform.gameObject; break;
-                        case "Knife": activeWeapons[2] = hit.transform.gameObject; break;
-                        case "Granade": activeWeapons[3] = hit.transform.gameObject; break;
-                        default: break;
-                    }                    
-                }                
+    void Update() {
+        if (isLocalPlayer) {
+            if(Input.GetAxis("Mouse ScrollWheel") > 0f){ // Scroll up
+                if (currentWeaponIndex <= 0) 
+                { currentWeaponIndex = activeWeapons.Length; }
+                else { currentWeaponIndex--; }
+            }else if (Input.GetAxis("Mouse ScrollWheel") < 0f){ // Scroll down
+                if (currentWeaponIndex >= activeWeapons.Length) 
+                { currentWeaponIndex = 0; }
+                else {  currentWeaponIndex++; }
+            }
+
+
+            if (Input.GetButton("Interact")) // e
+            {
+                CmdPickupWeapon();
+            
+            }else if (Input.GetButton("Drop")) // q Droping weapon
+            {
+                activeWeapons[currentWeaponIndex] = null;
            }
-        }
-        if (Input.GetButton("Drop")) // q Droping weapon
-        {
-            activeWeapons[currentWeaponIndex] = null;
        }
    }

+    [Command]
+    private void CmdPickupWeapon() {
+        if (Physics.Raycast(cam.transform.position, cam.transform.forward, out RaycastHit hit))
+        {
+            Debug.DrawLine(cam.transform.position, hit.point);
+            if (hit.transform.tag == "Weapon") // If Object is a weapon and the weapon is not in the current active weapons
+            {
+                switch (hit.transform.GetComponent<Weapon>().WeaponKind.ToString()) // Adding weapon to inventory slot
+                {
+                    case "Rifle": activeWeapons[0] = hit.transform.gameObject; break;
+                    case "Pistole": activeWeapons[1] = hit.transform.gameObject; break;
+                    case "Knife": activeWeapons[2] = hit.transform.gameObject; break;
+                    case "Granade": activeWeapons[3] = hit.transform.gameObject; break;
+                    default: break;
+                }
+            }
+        }
+    }

    private bool searchInArray(GameObject[] arr, GameObject searchObj)
    {