PBA3H25ABU/ClearTheZone
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixe 2

Browse Source
This commit is contained in:
PBA3H25ABU
2026-08-20 11:50:34 +02:00
parent 6d9fee91db
commit cf0d5e24ad
8 changed files with 323 additions and 2360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/Shoot.cs
+6 -27
View File
@@ -14,53 +14,32 @@ public class Shoot : MonoBehaviour
void Start()
{
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
if (weapon == null)
weapon = FindFirstObjectByType<WeaponReload>();
>>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
=======
if (weapon == null)
weapon = FindFirstObjectByType<WeaponReload>();
>>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
=======
=======
if (weapon == null)
weapon = FindFirstObjectByType<WeaponReload>();
>>>>>>> 85ece045864c59c50ed55097c35e2c15b9051a0f
>>>>>>> 392d23632b62942df19732b9e125c98967abd9e4
if (weapon == null)
weapon = FindFirstObjectByType<WeaponReload>();
if (weapon == null)
weapon = FindFirstObjectByType<WeaponReload>();
}
void Update()
{
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< 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)
=======
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)
=======
if (AR == true && Input.GetKey(KeyCode.Mouse0))
=======
if (PauseMenu.GameIsPaused) return;
if (AR == true && Input.GetKey(KeyCode.Mouse0) && Time.time >= nextShotTime)
>>>>>>> 85ece045864c59c50ed55097c35e2c15b9051a0f
>>>>>>> 392d23632b62942df19732b9e125c98967abd9e4
{
Shot(spawnPointAR);
nextShotTime = Time.time + fireRate;