fix1
This commit is contained in:
@@ -10,13 +10,24 @@ public class Shoot : MonoBehaviour
|
||||
[SerializeField] bool Pistole = true;
|
||||
void Start()
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
if (weapon == null)
|
||||
weapon = FindFirstObjectByType<WeaponReload>();
|
||||
>>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
|
||||
if ( AR == true && Input.GetKey(KeyCode.Mouse0))
|
||||
=======
|
||||
if (PauseMenu.GameIsPaused) return;
|
||||
|
||||
if (AR == true && Input.GetKey(KeyCode.Mouse0) && Time.time >= nextShotTime)
|
||||
>>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
|
||||
{
|
||||
Shot(spawnPointAR);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user