# Conflicts:
#	Assets/Scenes/Story1.unity
#	Assets/Scenes/Story1.unity.rej
#	Assets/Scripts/Bullet.cs
#	Assets/Scripts/EnemyHealth.cs
#	Assets/Scripts/Shoot.cs
This commit is contained in:
2026-08-20 11:44:36 +02:00
23 changed files with 464 additions and 187 deletions
+4
View File
@@ -1,3 +1,7 @@
<<<<<<< HEAD
=======
//Oliver
>>>>>>> 392d23632b62942df19732b9e125c98967abd9e4
using UnityEngine;
public class EnemyHealth : MonoBehaviour