Merge branch 'master' of...

Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/sommersemester-2019/unity/turtle-takeover-reloaded

Assets/_Game/Graphics/Particles/PS_Lightning.prefab

@@ -28,7 +28,7 @@ Transform:
   m_GameObject: {fileID: 5515192567392965344}
   m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0

Assets/_Game/Prefabs/Entities/Player.prefab

@@ -122,7 +122,7 @@ MonoBehaviour:
   PlayerModel: {fileID: 7684202323498604895}
   explosionFX: {fileID: 3849051887377255970, guid: 6dfb3bf841f5c5e448b6360edfb447cb,
     type: 3}
-  hitFX: {fileID: 1931807616638471954, guid: f1b49542c5ad6ea7a9954f01300c3246, type: 3}
+  hitFX: {fileID: 5515192567392965344, guid: c6768d08d6b534c4cbd1a87150cb4cc0, type: 3}
   laserSFX: {fileID: 3685833347554059012}
   hoverSFX: {fileID: 8118261163504278534}
   pickupSFX: {fileID: 615738391135021819}

Assets/_Game/Scripts/AI/BasicAI.cs

@@ -75,6 +75,7 @@ public class BasicAI : MonoBehaviour
 				bullet.transform.position = transform.position;
 				bullet.transform.rotation = Quaternion.Euler(0, 180, 0);
 				bullet.activate();
+				th.shotSFX.PlayOneShot(th.shotSFX.clip);
 				StartCoroutine("ShotDelay");
 			}