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

fix1.2

Browse Source
This commit is contained in:
PBA3H25ABU
2026-08-20 11:35:35 +02:00
parent 1db2ec9a94
commit c35a879034
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/Bullet.cs
+3
View File
@@ -33,6 +33,9 @@ public class Bullet : MonoBehaviour
Destroy(gameObject);
}
<<<<<<< HEAD
>>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
=======
>>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
}
else if(collision.gameObject.tag == "Wall")
Assets/Scripts/Shoot.cs
+11
View File
@@ -11,7 +11,12 @@ 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>();
@@ -20,6 +25,7 @@ public class Shoot : MonoBehaviour
void Update()
{
<<<<<<< HEAD
<<<<<<< HEAD
if ( AR == true && Input.GetKey(KeyCode.Mouse0))
@@ -28,6 +34,11 @@ 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);
}