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

Revert "Reapply "fix1.2""

Browse Source 
This reverts commit dea33b7613.
This commit is contained in:
PBA3H25ABU
2026-08-20 11:38:49 +02:00
parent dea33b7613
commit a3ead4845c
3 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/Shoot.cs
-11
View File
@@ -11,12 +11,7 @@ public class Shoot : MonoBehaviour
void Start()
{
<<<<<<< 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>();
@@ -25,7 +20,6 @@ public class Shoot : MonoBehaviour
void Update()
{
<<<<<<< HEAD
<<<<<<< HEAD
if ( AR == true && Input.GetKey(KeyCode.Mouse0))
@@ -34,11 +28,6 @@ public class Shoot : MonoBehaviour
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)
{
Shot(spawnPointAR);
}