random talk

3d Prototyp/Assets/Animations/NPC.controller

@@ -126,7 +126,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: -234762855687092897, guid: 0fdb80f1a2017e743a410bc6cd2090d5, type: 3}
+  m_Motion: {fileID: 7400000, guid: 116fc94de7c8f8845b15606ef71b73eb, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
@@ -153,7 +153,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: -234762855687092897, guid: 0fdb80f1a2017e743a410bc6cd2090d5, type: 3}
+  m_Motion: {fileID: 7400000, guid: 116fc94de7c8f8845b15606ef71b73eb, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
@@ -271,7 +271,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 7272434718706070166, guid: 3ba22caa4e386444482e0e38ab2558f1, type: 3}
+  m_Motion: {fileID: 7400000, guid: f1ba1f0cd41eb754b99fa7584f8fd716, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
@@ -298,7 +298,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 7272434718706070166, guid: 3ba22caa4e386444482e0e38ab2558f1, type: 3}
+  m_Motion: {fileID: 7400000, guid: f1ba1f0cd41eb754b99fa7584f8fd716, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
@@ -399,7 +399,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: -3749703193433276195, guid: 2b97b09b2b672204391a687234eed858, type: 3}
+  m_Motion: {fileID: 7400000, guid: 2cfa63e1687912346bd0843031974a0a, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
@@ -619,37 +619,37 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Walk
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: SitDown
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: TooMuchCaffein
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: DrinkCoffee
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: GetMad
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -964,7 +964,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: -6686394522949657072, guid: 89ba2f766b6843048abf2ab72ff8cb21, type: 3}
+  m_Motion: {fileID: 7400000, guid: 698f1aca2ed9869408e9472586c4b85f, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 

3d Prototyp/Assets/Animations/NPCAnimationController.cs

@@ -16,6 +16,11 @@ public class NPCAnimationController : MonoBehaviour
     private NavMeshAgent agent;
     private Animator animator;
 
+    public Developer Developer;
+
+    [SerializeField]
+    private bool _canTakeNewJob;
+    
     private void Awake()
     {
         agent = GetComponent<NavMeshAgent>();
@@ -25,21 +30,23 @@ public class NPCAnimationController : MonoBehaviour
     }
     private IEnumerator GetToWorkRoutine()
     {
+        yield return TakeLock();
+        
         animator.SetLayerWeight(animator.GetLayerIndex("Typing"), 0);
         animator.SetTrigger("Walk");
         yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("WalkBack"));
         MoveTo(workPosition.position);
         yield return new WaitUntil(() => agent.remainingDistance <= agent.stoppingDistance);
-        animator.ResetTrigger("Walk"); // Setze den Lauf-Trigger zur<75>ck
+        animator.ResetTrigger("Walk"); // Setze den Lauf-Trigger zur<75>ck
         animator.SetTrigger("SitDown");
         yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("Sit"));
         transform.rotation = workPosition.rotation;
         yield return StartCoroutine(FadeLayerWeight(animator.GetLayerIndex("Typing"), 1, 1f));
+        
+        ReleaseLock();
     }
 
-
+    private IEnumerator FadeLayerWeight(int layerIndex, float targetWeight, float duration)
-
-        private IEnumerator FadeLayerWeight(int layerIndex, float targetWeight, float duration)
     {
         float time = 0;
         float startWeight = animator.GetLayerWeight(layerIndex);
@@ -56,15 +63,25 @@ public class NPCAnimationController : MonoBehaviour
 
     public void DrinkCoffee()
     {
-        
-
         StartCoroutine(DrinkCoffeeRoutine());
-
     }
 
+    private IEnumerator TakeLock()
+    {
+        yield return new WaitUntil(() => _canTakeNewJob);
+
+        _canTakeNewJob = false;
+    }
+
+    private void ReleaseLock()
+    {
+        _canTakeNewJob = true;
+    }
+    
     private IEnumerator DrinkCoffeeRoutine()
     {
-
+        yield return TakeLock();
+        
         yield return StartCoroutine(FadeLayerWeight(animator.GetLayerIndex("Coffee"), 1, 1f)); // 1 Sekunde zum Einblenden
         animator.SetTrigger("DrinkCoffee");
         yield return new WaitForSeconds(1.5f);
@@ -78,7 +95,7 @@ public class NPCAnimationController : MonoBehaviour
         animator.ResetTrigger("DrinkCoffee");
         Cup.SetActive(true);
 
-
+        ReleaseLock();
     }
 
     public void GoToToilet()
@@ -88,7 +105,17 @@ public class NPCAnimationController : MonoBehaviour
 
     private IEnumerator GoToToiletRoutine()
     {
+        yield return TakeLock();
+
         yield return StartCoroutine(FadeLayerWeight(animator.GetLayerIndex("Typing"), 0, 1f));
+
+        while (ToiletManager.Instance.IsOccupied)
+        {
+            yield return new WaitForSeconds(2);
+        }
+
+        ToiletManager.Instance.IsOccupied = true;
+        
         // Beginne mit dem Laufen zur Toilette.
         animator.SetTrigger("Walk");
         yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("Walk"));
@@ -97,24 +124,35 @@ public class NPCAnimationController : MonoBehaviour
         yield return new WaitUntil(() => agent.remainingDistance <= agent.stoppingDistance);
         
 
-        // H<>rt auf zu laufen und beginnt zu sitzen.
+        // H<>rt auf zu laufen und beginnt zu sitzen.
-        animator.ResetTrigger("Walk"); // Es ist wichtig, den vorherigen Trigger zur<75>ckzusetzen
+        animator.ResetTrigger("Walk"); // Es ist wichtig, den vorherigen Trigger zur<75>ckzusetzen
         transform.LookAt(new Vector3(toiletLookAtTransform.position.x, toiletLookAtTransform.position.y, toiletLookAtTransform.position.z));
         animator.SetTrigger("SitDown");
+        
         transform.LookAt(new Vector3(toiletLookAtTransform.position.x, toiletLookAtTransform.position.y, toiletLookAtTransform.position.z));
         yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("Ready"));
-        // Stehe auf und gehe zur<75>ck zum Ausgangspunkt.
+        
+        Developer.Pee(1.0, true);
+        
+        ToiletManager.Instance.Toilette.Flush();
+        
+        // Stehe auf und gehe zur<75>ck zum Ausgangspunkt.
         transform.LookAt(new Vector3(toiletLookAtTransform.position.x, toiletLookAtTransform.position.y, toiletLookAtTransform.position.z));
-        animator.ResetTrigger("SitDown"); // Setze den Sitzen-Trigger zur<75>ck
+        animator.ResetTrigger("SitDown"); // Setze den Sitzen-Trigger zur<75>ck
+        
+        ToiletManager.Instance.IsOccupied = false;
+        
         animator.SetTrigger("Walk");
         yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("WalkBack"));
         MoveTo(workPosition.position);
         yield return new WaitUntil(() => agent.remainingDistance <= agent.stoppingDistance);
-        animator.ResetTrigger("Walk"); // Setze den Lauf-Trigger zur<75>ck
+        animator.ResetTrigger("Walk"); // Setze den Lauf-Trigger zur<75>ck
         animator.SetTrigger("SitDown");
         yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("Sit"));
         transform.rotation = workPosition.rotation;
         yield return StartCoroutine(FadeLayerWeight(animator.GetLayerIndex("Typing"), 1, 1f));
+
+        ReleaseLock();
     }
     // Hier kannst du entscheiden, ob der Charakter wieder sitzt oder steht.
     // Beispiel: Setze IsSitting oder IsStanding entsprechend.
@@ -126,12 +164,15 @@ public class NPCAnimationController : MonoBehaviour
 
     private IEnumerator GettingMadRoutine()
     {
+        yield return TakeLock();
+
         animator.SetTrigger("GetMad");
         yield return StartCoroutine(FadeLayerWeight(animator.GetLayerIndex("Coffee"), 1, 2f)); // 1 Sekunde zum Einblenden
         yield return new WaitForSeconds(8f);
         yield return StartCoroutine(FadeLayerWeight(animator.GetLayerIndex("Coffee"), 0, 1f)); // 1 Sekunde zum Ausblenden
         animator.ResetTrigger("GetMad");
-
+        
+        ReleaseLock();
     }
 
     public void CaffeinOverdose()
@@ -141,62 +182,38 @@ public class NPCAnimationController : MonoBehaviour
 
     private IEnumerator CaffeinRoutine()
     {
+        yield return TakeLock();
+
         yield return StartCoroutine(FadeLayerWeight(animator.GetLayerIndex("Typing"), 0, 1f));
         // Beginne mit dem Laufen zur Toilette.
         animator.SetTrigger("Walk");
         yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("Walk"));
         MoveTo(dancePlace.position);
-        yield return new WaitUntil(() => agent.remainingDistance <= agent.stoppingDistance);
+        yield return new WaitUntil(() =>
-        animator.ResetTrigger("Walk");
+        {
+            Debug.Log(agent.remainingDistance);
+            return agent.remainingDistance <= agent.stoppingDistance;
+        });
         animator.SetTrigger("TooMuchCaffein");
-        yield return new WaitForSeconds(8f);
+
-        animator.ResetTrigger("TooMuchCaffein");
+        yield return new WaitForSeconds(1);
+        
+        yield return new WaitWhile(() => Developer.IsOvercaffeinated);
+        
         animator.SetTrigger("Walk");
         yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("WalkBack"));
         MoveTo(workPosition.position);
         yield return new WaitUntil(() => agent.remainingDistance <= agent.stoppingDistance);
         transform.rotation = workPosition.rotation;
-        animator.ResetTrigger("Walk"); // Setze den Lauf-Trigger zur<75>ck
         animator.SetTrigger("SitDown");
         yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("Sit"));
         yield return StartCoroutine(FadeLayerWeight(animator.GetLayerIndex("Typing"), 1, 1f));
-
+        
-
+        ReleaseLock();
-
     }
 
-
-
     private void MoveTo(Vector3 destination)
     {
         agent.destination = destination;
-        
     }
-
-    private void Update()
-    {
-        // Pr<50>ft, ob der Buchstabe 'C' gedr<64>ckt wurde
-        if (Input.GetKeyDown(KeyCode.C))
-        {
-            DrinkCoffee();
-        }
-
-        // Pr<50>ft, ob der Buchstabe 'T' gedr<64>ckt wurde
-        if (Input.GetKeyDown(KeyCode.T))
-        {
-            GoToToilet();
-        }
-
-        // Pr<50>ft, ob der Buchstabe 'M' gedr<64>ckt wurde
-        if (Input.GetKeyDown(KeyCode.M))
-        {
-            GettingMad();
-        }
-        // Pr<50>ft, ob der Buchstabe 'C' gedr<64>ckt wurde
-        if (Input.GetKeyDown(KeyCode.O))
-        {
-            CaffeinOverdose();
-        }
-    }
-
 }

3d Prototyp/Assets/Animations/SitDownOnToilet.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 698f1aca2ed9869408e9472586c4b85f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/Animations/StandUp.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2cfa63e1687912346bd0843031974a0a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/Animations/Walk.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 116fc94de7c8f8845b15606ef71b73eb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/Animations/ÜberkoffeinatedDance.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f1ba1f0cd41eb754b99fa7584f8fd716
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/Blink/Art/Animations/Animations_Starter_Pack/Movement/RunForward.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 25da4039832d81a42a3e7c1f6242ad85
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/CoffeeMachine.cs

@@ -11,6 +11,12 @@ public class CoffeeMachine : MonoBehaviour
     [SerializeField]
     private AudioClip _buttonClick;
 
+    [SerializeField]
+    private AudioClip _deny;
+    
+    [SerializeField]
+    private AudioClip _coffeeMachine;
+    
     [SerializeField]
     private AudioSource _audioSource;
     
@@ -37,32 +43,26 @@ public class CoffeeMachine : MonoBehaviour
 
     private IEnumerator CookCoffeeRoutine()
     {
-        // TODO: Start blinking
+        yield return new WaitForSeconds(0.5f);
-        
-        Debug.Log("Blinky");
-        
-        yield return new WaitForSeconds(2);
-        
-        // SPiele kaffeemaschinen sound
-        Debug.Log("Brrrrr");
 
-        yield return new WaitForSeconds(5);
+        _audioSource.PlayOneShot(_coffeeMachine);
+        
+        yield return new WaitForSeconds(7);
 
-        CoffeePlace coffeePlace = _coffeePlaces.Where(c => c.IsFree()).ToList().GetRandomElement();
+        for (int i = 0; i < 2; i++)
-
-        if (coffeePlace == null)
         {
-            // TODO: Spill coffee
+            CoffeePlace coffeePlace = _coffeePlaces.Where(c => c.IsFree()).ToList().GetRandomElement();
-            Debug.Log("misty kaki");
-        }
-        else
-        {
-            Instantiate(_coffeItemPrefabs.GetRandomElement(), coffeePlace.transform.position, Quaternion.Euler(0, Random.Range(0.0f, 360.0f), 0));
-        }
 
-        yield return new WaitForSeconds(1);
+            if (coffeePlace == null)
-        
+            {
-        // todo: Play pling sound
+                // TODO: Spill coffee
+                Debug.Log("misty kaki");
+            }
+            else
+            {
+                Instantiate(_coffeItemPrefabs.GetRandomElement(), coffeePlace.transform.position, Quaternion.Euler(0, Random.Range(0.0f, 360.0f), 0));
+            }
+        }
         
         _isCooking = false;
     }

3d Prototyp/Assets/Data/GottfriedData.asset

@@ -12,9 +12,20 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 62867debe01c41d89e01687ef2722fcd, type: 3}
   m_Name: GottfriedData
   m_EditorClassIdentifier: 
-  Say_Impossible:
+  VoiceSayItsImpossible:
   - {fileID: 8300000, guid: 9d82386c43ce7944ab7a78305ae045c5, type: 3}
   - {fileID: 8300000, guid: e169dd8360db2cd4dadd12d44c50beab, type: 3}
   - {fileID: 8300000, guid: dcc846c8a9b316547bf051a016e49fa0, type: 3}
   - {fileID: 8300000, guid: 32384529849285849a7aa370e502046f, type: 3}
   - {fileID: 8300000, guid: 1cd31e4d8fd50b6448f51db8abe18403, type: 3}
+  DrinkMate: {fileID: 8300000, guid: d647b03d56624144da03357426647bb1, type: 3}
+  DrinkCoffe: {fileID: 8300000, guid: 73998fb8d43efca4085260ce6a1e7834, type: 3}
+  EatPizza: {fileID: 8300000, guid: 1a7a3de12f9df6f4c9799fe341d5de28, type: 3}
+  Hurt: {fileID: 8300000, guid: 91d676f74045c8541ad059fd4a429bfe, type: 3}
+  StepSounds:
+  - {fileID: 8300000, guid: 3578243e1d52aa34c8c4484e8d4cce39, type: 3}
+  - {fileID: 8300000, guid: 4c66e90cc93a3ed48b72a37d56facbd3, type: 3}
+  - {fileID: 8300000, guid: d21ab49950de24042a34893b19276912, type: 3}
+  - {fileID: 8300000, guid: a63a5ed37d6e0e2468c46137e9384bfb, type: 3}
+  - {fileID: 8300000, guid: cf44f4d419fab844a865ed3dbb123450, type: 3}
+  - {fileID: 8300000, guid: 74711f0ad4013304abdbf5ce17ffc755, type: 3}

3d Prototyp/Assets/DeveloperInfoUi.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -26,6 +27,8 @@ public class DeveloperInfoUi : MonoBehaviour
 
     [SerializeField]
     private Gradient _statusGradient;
+
+    //[SerializeField] private TextMeshProUGUI _fingerText;
     
     void Start()
     {
@@ -35,9 +38,11 @@ public class DeveloperInfoUi : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
-        _happinessImage.color = _statusGradient.Evaluate((float)_developer.CurrentUrgeToUrinate);
+        _happinessImage.color = _statusGradient.Evaluate((float)_developer.CurrentHappiness);
         _caffeineImage.color = _statusGradient.Evaluate((float)_developer.CurrentCaffeination);
         _hungerImage.color = _statusGradient.Evaluate((float)_developer.CurrentHunger);
         _toiletImage.color = _statusGradient.Evaluate((float)_developer.CurrentUrgeToUrinate);
+
+        //_fingerText.text = _developer.FingersLeft.ToString();
     }
 }

3d Prototyp/Assets/GUI/BoxesBanners/Box_Rounded.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 12
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -37,24 +37,24 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
+    wrapU: 1
-    wrapV: 0
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
-  spriteMeshType: 1
+  spriteMeshType: 0
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 1000
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 300, y: 300, z: 300, w: 300}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -112,8 +112,8 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

3d Prototyp/Assets/GUI/ButtonsIcons/IconButton_Large_Blank_Rounded.png.meta

@@ -45,11 +45,11 @@ TextureImporter:
   compressionQuality: 50
   spriteMode: 1
   spriteExtrude: 1
-  spriteMeshType: 1
+  spriteMeshType: 0
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 119, y: 119, z: 119, w: 119}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -113,7 +113,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

3d Prototyp/Assets/GUI/Prefabs/Developer Info.prefab

@@ -1088,10 +1088,10 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7427959759679425662}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.7389691, y: 0.7389691, z: 0.7389691}
+  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 2346580270693795832}
   - {fileID: 5539324385314307754}
@@ -1150,6 +1150,7 @@ MonoBehaviour:
     m_ColorSpace: -1
     m_NumColorKeys: 3
     m_NumAlphaKeys: 2
+  _fingerText: {fileID: 0}
 --- !u!1 &7516305664795462652
 GameObject:
   m_ObjectHideFlags: 0

3d Prototyp/Assets/GUI/Sliders/SlimSlider_Frame.png.meta

@@ -45,11 +45,11 @@ TextureImporter:
   compressionQuality: 50
   spriteMode: 1
   spriteExtrude: 1
-  spriteMeshType: 1
+  spriteMeshType: 0
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 200, y: 102, z: 200, w: 111}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -113,7 +113,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

3d Prototyp/Assets/GUI/Sliders/SlimSlider_Green_Scoller.png.meta

@@ -45,11 +45,11 @@ TextureImporter:
   compressionQuality: 50
   spriteMode: 1
   spriteExtrude: 1
-  spriteMeshType: 1
+  spriteMeshType: 0
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 100, y: 80, z: 100, w: 79}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -113,7 +113,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

3d Prototyp/Assets/GUI/hand-catch-svgrepo-com.png.meta

@@ -0,0 +1,114 @@
+fileFormatVersion: 2
+guid: 4a850894428b5974397bae4c296931b0
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/Models/Consumables/Pizza/PizzaPlastik.mat

@@ -0,0 +1,88 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: PizzaPlastik
+  m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _EMISSION
+  m_InvalidKeywords: []
+  m_LightmapFlags: 2
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 2800000, guid: fa774bc8c6a879b44962145aad21fef9, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: fa774bc8c6a879b44962145aad21fef9, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 1
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []

3d Prototyp/Assets/Models/Consumables/Pizza/PizzaPlastik.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e92aa5e8229dfdf419b5c3a0dca39b8f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/Prefabs/GameManager.prefab

@@ -10,6 +10,9 @@ GameObject:
   m_Component:
   - component: {fileID: 2715764554523923620}
   - component: {fileID: 3650884189301972455}
+  - component: {fileID: 7372041109052800040}
+  - component: {fileID: 7759656673043564915}
+  - component: {fileID: 2818254731145199880}
   m_Layer: 0
   m_Name: GameManager
   m_TagString: Untagged
@@ -44,3 +47,151 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4c31bfd8f0f10f540b73de81aac6d46c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _difficulty: 1
+  NeedFullfilledParticleEffect: {fileID: 1620116211597326, guid: 094c049ae10f1c3419c96c4bce41cf8c, type: 3}
+  ZombieDeathByDisableParticleEffect: {fileID: 0}
+  Needs: []
+  _player: {fileID: 0}
+  _totalGameDurationSeconds: 0
+  _remainingGameDurationSeconds: 0
+  _currentEfficiency: 0
+  _generalNeedDrainScaling: 0.001
+  _developers:
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  _gameRunning:
+    _falseness: 1
+  _needNotificationThreshold: 0.25
+  _maxContextBufferSize: 3
+--- !u!114 &7372041109052800040
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2703668081068178613}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c18f377723b64fd8a8d0261b85b3ba48, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _daysUntilRelease: 7
+  _secondsPerDay: 120
+  _totalTime: 0
+  _sun: {fileID: 0}
+--- !u!114 &7759656673043564915
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2703668081068178613}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8f523547bf5e54c4989863475e2bdbaf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _ambientMusic:
+  - {fileID: 8300000, guid: 680bb3ce77c09334998b4c94313049d0, type: 3}
+  - {fileID: 8300000, guid: 71646a2bfa6761d47ace4395791decfe, type: 3}
+  - {fileID: 8300000, guid: 95f03e199fce21c4c92959821c685f3d, type: 3}
+  _showDownMusic: {fileID: 8300000, guid: 608315f6bbecbd94e8e3bc4e16f7a429, type: 3}
+  _musicTimer: 5
+--- !u!82 &2818254731145199880
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2703668081068178613}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 0}
+  m_PlayOnAwake: 1
+  m_Volume: 0.3
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 32
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4

3d Prototyp/Assets/Prefabs/Player/Gottfried.prefab

@@ -2611,7 +2611,7 @@ MonoBehaviour:
   _maxVelocity: 5
   turningRate: 600
   _targetRotation: {x: 0, y: 0, z: 0, w: 1}
-  jumpForce: 40
+  jumpForce: 80
   jumpCooldown: 0.5
   _groundedTolerance: 0.2
   _groundLayerMask:

3d Prototyp/Assets/Prefabs/Player/Gottfried_uMotion.asset

@@ -20,7 +20,7 @@ MonoBehaviour:
     PoseToolPivotMode:
       valueInternal: 0
     PoseToolMode:
-      valueInternal: 0
+      valueInternal: 1
     PoseMirrorMode:
       valueInternal: 0
     ConfigMode:
@@ -260,34 +260,34 @@ MonoBehaviour:
       valueInternal: 0
     LocalPositionChannelList:
     - CurrentValue:
-        valueInternal: 0
+        valueInternal: 34.09025
       ReferencePoseValue:
-        valueInternal: 0
+        valueInternal: 34.09025
       PoseValueList: []
       ChannelPerClipList:
       - LayerList:
         - CurrentOriginalValue:
-            valueInternal: 0
+            valueInternal: 34.09025
           newKeyListSerialized: 00000000
     - CurrentValue:
-        valueInternal: 1.891
+        valueInternal: 0.55999947
       ReferencePoseValue:
-        valueInternal: 1.891
+        valueInternal: 0.55999947
       PoseValueList: []
       ChannelPerClipList:
       - LayerList:
         - CurrentOriginalValue:
-            valueInternal: 1.891
+            valueInternal: 0.55999947
           newKeyListSerialized: 00000000
     - CurrentValue:
-        valueInternal: 0
+        valueInternal: -2.452814
       ReferencePoseValue:
-        valueInternal: 0
+        valueInternal: -2.452814
       PoseValueList: []
       ChannelPerClipList:
       - LayerList:
         - CurrentOriginalValue:
-            valueInternal: 0
+            valueInternal: -2.452814
           newKeyListSerialized: 00000000
     LocalRotationSelected:
       valueInternal: 0

3d Prototyp/Assets/Prefabs/Player/PlayerAnimationController.controller

@@ -336,7 +336,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 5987713911036300057, guid: 081930da5e255e348940373200bbeaca, type: 3}
+  m_Motion: {fileID: 7400000, guid: 25da4039832d81a42a3e7c1f6242ad85, type: 2}
   m_Tag: 
   m_SpeedParameter: RunSpeed
   m_MirrorParameter: 

3d Prototyp/Assets/Prefabs/Zombie/Zombie.prefab

@@ -92,8 +92,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 856601670117699726}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 1, z: 0, w: -0.00000016292068}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -3.86, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -138,12 +138,16 @@ MonoBehaviour:
   - {fileID: 8300000, guid: 866ac9f78eeaf514aa666667753ff280, type: 3}
   - {fileID: 8300000, guid: daa3c8aa3194de542ab4aa911886644b, type: 3}
   - {fileID: 8300000, guid: 559ec60d7a147d14dbbfc776266dad5e, type: 3}
-  _speed: 0.3
+  _speed: 0.5
-  _rotateSpeed: 180
+  _rotateSpeed: 270
-  _attackRange: 0.8
+  _attackRange: 1.5
-  _idleThresholdFactor: 0.12
+  _jumpForce: 6
+  _idleThresholdFactor: 3
   _noiseDelay: 4
   _noiseTimer: 0
+  _groundLayer:
+    serializedVersion: 2
+    m_Bits: 8
 --- !u!54 &7592819367808213806
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -152,8 +156,8 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 856601670117699726}
   serializedVersion: 4
-  m_Mass: 1
+  m_Mass: 30
-  m_Drag: 0
+  m_Drag: 1
   m_AngularDrag: 0.05
   m_CenterOfMass: {x: 0, y: 0, z: 0}
   m_InertiaTensor: {x: 1, y: 1, z: 1}
@@ -166,7 +170,7 @@ Rigidbody:
     m_Bits: 0
   m_ImplicitCom: 1
   m_ImplicitTensor: 1
-  m_UseGravity: 0
+  m_UseGravity: 1
   m_IsKinematic: 0
   m_Interpolate: 0
   m_Constraints: 80
@@ -206,13 +210,13 @@ AudioSource:
   OutputAudioMixerGroup: {fileID: 0}
   m_audioClip: {fileID: 0}
   m_PlayOnAwake: 1
-  m_Volume: 1
+  m_Volume: 0.5
   m_Pitch: 1
   Loop: 0
   Mute: 0
   Spatialize: 0
   SpatializePostEffects: 0
-  Priority: 128
+  Priority: 69
   DopplerLevel: 1
   MinDistance: 1
   MaxDistance: 500
@@ -250,7 +254,7 @@ AudioSource:
     m_Curve:
     - serializedVersion: 3
       time: 0
-      value: 0
+      value: 1
       inSlope: 0
       outSlope: 0
       tangentMode: 0

3d Prototyp/Assets/Prefabs/Zombie/ZombieAnimationController.controller

@@ -12,6 +12,7 @@ AnimatorState:
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: -2499677071233001700}
+  - {fileID: -6471167266255213614}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -77,6 +78,31 @@ AnimatorStateMachine:
   m_ExitPosition: {x: 110, y: 510, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: 3345498408644874919}
+--- !u!1101 &-6471167266255213614
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Attack
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -4338890450920113477}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25000003
+  m_TransitionOffset: 0
+  m_ExitTime: 0.019070633
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &-4935679139000002796
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -137,9 +163,6 @@ AnimatorStateTransition:
   m_PrefabAsset: {fileID: 0}
   m_Name: 
   m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: Attack
-    m_EventTreshold: 0
   - m_ConditionMode: 1
     m_ConditionEvent: Idle
     m_EventTreshold: 0
@@ -174,19 +197,19 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Idle
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 1
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Attack
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer

3d Prototyp/Assets/Prefabs/ZombieDisableDeathEffect.prefab

@@ -14219,7 +14219,7 @@ AudioSource:
     m_Curve:
     - serializedVersion: 3
       time: 0
-      value: 0
+      value: 1
       inSlope: 0
       outSlope: 0
       tangentMode: 0

3d Prototyp/Assets/Scenes/ZombieTest.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5ff33cd0eb0cb134f9f8e973ef464fbb
+guid: d639884ed3921634abe853ceabf5feb8
 DefaultImporter:
   externalObjects: {}
   userData: 

3d Prototyp/Assets/Scripts/CameraScript.cs

@@ -13,13 +13,17 @@ public class CameraScript : MonoBehaviour
     
     public float Distance = 5.0f;
 
+    public float Angle = 45.0f;
+
     void Start()
     {
         Vector4 position = new Vector4(0, 0, -Distance, 1.0f);
 
-        Matrix4x4 mat = Matrix4x4.Rotate(Quaternion.Euler(45, 0, 0));
+        Quaternion rotation = Quaternion.Euler(Angle, 0, 0);
+        Matrix4x4 mat = Matrix4x4.Rotate(rotation);
 
         _camera.transform.localPosition = mat * position;
+        _camera.transform.localRotation = rotation;
         transform.position = _character.transform.position;
     }
     

3d Prototyp/Assets/Scripts/Character.cs

@@ -58,6 +58,8 @@ public class Character : MonoBehaviour
     public bool CarriesItem => _carriedInteractible;
 
     public PickupInteractible CarriedItem => _carriedInteractible;
+
+    public GottfriedData Data => _data;
     
     // Start is called before the first frame update
     void Start()
@@ -213,13 +215,16 @@ public class Character : MonoBehaviour
         switch (item.ItemType)
         {
             case ItemType.Coffee:
-                developer.GiveDrink(0.4, WantedConsumable.Drink);
+                developer.GiveDrink(0.45, WantedConsumable.Coffee);
+                _audioSource.PlayOneShot(_data.DrinkCoffe);
                 break;
             case ItemType.Mate:
-                developer.GiveDrink(0.4, WantedConsumable.Mate);
+                developer.GiveDrink(0.35, WantedConsumable.Mate);
+                _audioSource.PlayOneShot(_data.DrinkMate);
                 break;
             case ItemType.Pizza:
-                developer.GiveFood(0.25, WantedConsumable.Pizza);
+                developer.GiveFood(0.4, WantedConsumable.Pizza);
+                _audioSource.PlayOneShot(_data.EatPizza);
                 break;
             default:
                 SayItsImpossible();
@@ -240,4 +245,30 @@ public class Character : MonoBehaviour
     {
         _audioSource.PlayOneShot(_data.VoiceSayItsImpossible.GetRandomElement());
     }
+
+    [SerializeField]
+    private bool _canHurt = true;
+    
+    public void Hurt()
+    {
+        if (_canHurt)
+            StartCoroutine(HurtRoutine());
+    }
+
+    private IEnumerator HurtRoutine()
+    {
+        _canHurt = false;
+        
+        _audioSource.PlayOneShot(_data.Hurt);
+        PickupItem(null);
+
+        yield return new WaitForSeconds(1);
+        
+        _canHurt = true;
+    }
+
+    public void PlayStepSound()
+    {
+        _audioSource.PlayOneShot(_data.StepSounds.GetRandomElement());
+    }
 }

3d Prototyp/Assets/Scripts/Data/GottfriedData.cs

@@ -6,6 +6,11 @@ namespace Data
     [CreateAssetMenu(fileName = "GottfriedData", menuName = "DataObjects/GottfriedData", order = 0)]
     public class GottfriedData : ScriptableObject
     {
-        [FormerlySerializedAs("Say_Impossible")] public AudioClip[] VoiceSayItsImpossible;
+        public AudioClip[] VoiceSayItsImpossible;
+        public AudioClip DrinkMate;
+        public AudioClip DrinkCoffe;
+        public AudioClip EatPizza;
+        public AudioClip Hurt;
+        public AudioClip[] StepSounds;
     }
 }

3d Prototyp/Assets/Scripts/Developer.cs

@@ -19,12 +19,12 @@ public struct DeveloperStats
     public double HungerDrainFactor;
     public double UrinationDrainFactor;
     public double HappinessDrainFactor;
+    public double UrinationUrgeFromCoffee;
+    public double UrinationUrgeFromMate;
+    public double UrinationUrgeFromPizza;
 
-    // TODO: Not yet used
-    public double CoffeePreference;
-    public double MatePreference;
     
-    public DeveloperStats(double baseEfficiency, int fingers, double caffeineDrainFactor, double hungerDrainFactor, double urinationDrainFactor, double happinessDrainFactor, double coffeePreference, double matePreference)
+    public DeveloperStats(double baseEfficiency, int fingers, double caffeineDrainFactor, double hungerDrainFactor, double urinationDrainFactor, double happinessDrainFactor, double urinationUrgeFromCoffee, double urinationUrgeFromMate, double urinationUrgeFromPizza)
     {
         BaseEfficiency = baseEfficiency;
         Fingers = fingers;
@@ -32,11 +32,12 @@ public struct DeveloperStats
         HungerDrainFactor = hungerDrainFactor;
         UrinationDrainFactor = urinationDrainFactor;
         HappinessDrainFactor = happinessDrainFactor;
-        CoffeePreference = coffeePreference;
+        UrinationUrgeFromCoffee = urinationUrgeFromCoffee;
-        MatePreference = matePreference;
+        UrinationUrgeFromMate = urinationUrgeFromMate;
+        UrinationUrgeFromPizza = urinationUrgeFromPizza;
     }
     
-    public static readonly DeveloperStats Default = new DeveloperStats(1.0, 10, 1, 1, 1, 1, 0.5, 0.5);
+    public static readonly DeveloperStats Default = new DeveloperStats(1.0, 10, 1, 1, 1, 1, 0.2, 0.2, 0.2);
 }
 
 public class Developer : MonoBehaviour
@@ -47,9 +48,9 @@ public class Developer : MonoBehaviour
     
     [SerializeField]
     private DeveloperStats _baseStats = DeveloperStats.Default;
-
+    
     [SerializeField]
-    private float _talkRange = 2.0f;
+    private float _talkRange = 3.0f;
 
     [Header("Aktuelle Informationen")]
     [SerializeField, ShowOnly]
@@ -122,6 +123,8 @@ public class Developer : MonoBehaviour
     private List<GameObject> _needList = new List<GameObject>();
     private bool _isDead = false;
 
+    [SerializeField] private NPCAnimationController _npcAnimation;
+    
     /// <summary>
     /// indicates wether the Dev is dead or not
     /// </summary>
@@ -146,6 +149,9 @@ public class Developer : MonoBehaviour
     private bool _hasTalkedWhileOvercaffeinated = false;
     private bool _hasTalkedBeforeSleeping = false;
 
+    public bool IsOvercaffeinated => _isOvercaffeinated;
+    public bool IsHyperactive => _isHyperactive;
+    
     void Start()
     {
         _developerNeeds = gameObject.GetComponent<DeveloperNeeds>();
@@ -237,7 +243,14 @@ public class Developer : MonoBehaviour
             _happiness += 0.2;
         }
 
+        if (drinkType == WantedConsumable.Coffee)
+            _urgeToUrinateLevel -= _baseStats.UrinationUrgeFromCoffee;
+        else if (drinkType == WantedConsumable.Mate)
+            _urgeToUrinateLevel -= _baseStats.UrinationUrgeFromMate;
+
         _wantedDrink = WantedConsumable.None;
+        
+        _npcAnimation.DrinkCoffee();
     }
     
     public void GiveFood(double foodAmount, WantedConsumable foodType)
@@ -270,6 +283,8 @@ public class Developer : MonoBehaviour
             _happiness += 0.2;
         }
 
+        _urgeToUrinateLevel -= _baseStats.UrinationUrgeFromPizza;
+
         _wantedFood = WantedConsumable.None;
     }
     
@@ -303,15 +318,23 @@ public class Developer : MonoBehaviour
         _caffeineLevel -= caffeineDrain * _baseStats.CaffeineDrainFactor;
         _hungerLevel -= hungerDrain * _baseStats.HungerDrainFactor;
         _urgeToUrinateLevel -= urinationDrain * _baseStats.UrinationDrainFactor;
-        _happiness -= happinessDrain * _baseStats.UrinationDrainFactor;
+        _happiness -= happinessDrain * _baseStats.HappinessDrainFactor;
 
         _caffeineLevel = Math.Max(_caffeineLevel, 0.0);
         _hungerLevel = Math.Max(_hungerLevel, 0.0);
         _urgeToUrinateLevel = Math.Max(_urgeToUrinateLevel, 0.0);
         _happiness = Math.Max(_happiness, 0.0);
-        
+
         _isHyperactive = _caffeineLevel > 1.0 && _caffeineLevel <= 1.5;
+        
+        bool wasOvercaffeinated = _isOvercaffeinated;
         _isOvercaffeinated = _caffeineLevel > 1.5;
+
+        if (!wasOvercaffeinated && _isOvercaffeinated)
+        {
+            _npcAnimation.CaffeinOverdose();
+        }
+        
         _isSleeping = _caffeineLevel <= 0.0;
 
         if (_caffeineLevel < GameManager.Instance.NeedNotificationThreshold && _caffeineNeed == null)
@@ -347,6 +370,8 @@ public class Developer : MonoBehaviour
             
             _toiletNeed = _developerNeeds.SpawnToiletNeed(_needList.Count);
             _needList.Add(_toiletNeed);
+            
+            _npcAnimation.GoToToilet();
         }
 
         if (_hungerLevel <= 0.0)
@@ -395,7 +420,7 @@ public class Developer : MonoBehaviour
         {
             if (!_hasTalkedBeforeSleeping)
             {
-                Talk("The Developer is very sleepy right now duo to a lack of caffeine, The Developer takes a nap now", 0, true);
+                Talk("The Developer is very sleepy right now duo to a lack of caffeine, The Developer informs Gottfried that he will do a short nap any time soon", 0, true);
                 _privateContextBuffer.Add($"The developer took a refreshing nap but is annoyed that Gottfried forgot to bring him any caffeine before the nap");
                 _hasTalkedBeforeSleeping = true;
             }
@@ -454,11 +479,13 @@ public class Developer : MonoBehaviour
     
     private double CalculateUrinationEfficiency()
     {
-        if (_urgeToUrinateLevel > 1.0)
+        if (_urgeToUrinateLevel > GameManager.Instance.NeedNotificationThreshold)
             return 1.0;
         
         // https://easings.net/#easeOutExpo
-        return Math.Abs(_urgeToUrinateLevel - 1.0) < 0.0001f ? 1.0 : 1.0 - Math.Pow(2, -10 * _urgeToUrinateLevel);
+        return 1.0; //_urgeToUrinateLevel / GameManager.Instance.NeedNotificationThreshold;
+
+        //Math.Abs(_urgeToUrinateLevel - 1.0) < 0.0001f ? 1.0 : 1.0 - Math.Pow(2, -10 * _urgeToUrinateLevel);
     }
     
     private double CalculateHappinessEfficiency()
@@ -552,4 +579,9 @@ public class Developer : MonoBehaviour
             GetComponent<Text2Speech>().Generate(context, shortnessLevel);
         }
     }
+
+    public void PlayStepSound()
+    {
+        _audioSource.PlayOneShot(GameManager.Instance.Player.Data.StepSounds.GetRandomElement());
+    }
 }

3d Prototyp/Assets/Scripts/GameManager.cs

@@ -77,11 +77,35 @@ public partial class GameManager : MonoBehaviourSingleton<GameManager>
     /// </summary>
     public double ExpectedRemainingGameDuration => _remainingGameDurationSeconds / _currentEfficiency;
 
+    private bool _isStarted;
+
+    private float _randomContextTimer = 20f;
+
+    private List<string> _randomContextList = new List<string>() { "The Developer finally fixed a bug that bothered him a lot",
+                                                                   "The Developer tells Gottfried that Richard farted again",
+                                                                   "The Developer is struggling really hard to solve the bug",
+                                                                   "The Developer tells Gottfried about his lovely cat Mautzi",
+                                                                   "The Developer is afraid Zombies might come around",
+                                                                   "The Developer is curious about how Gottfrieds day was so far",
+                                                                   "The Developer blames Gottfried for some random nonsense"};
+    
     public bool IsGameRunning => _gameRunning.IsTrue;
+
+    public bool IsStarted => _isStarted;
     
     private void Start()
     {
-        StartGame();
+        //StartGame();
+    }
+
+    private void Update()
+    {
+        _randomContextTimer -= Time.deltaTime;
+        if (_randomContextTimer < 0)
+        {
+            _randomContextTimer = 30f;
+            AddContext(_randomContextList.GetRandomElement());
+        }
     }
 
 
@@ -89,8 +113,10 @@ public partial class GameManager : MonoBehaviourSingleton<GameManager>
     /// Startet ein neues Spiel.
     /// </summary>
     [ContextMenu("Start Game")]
-    private void StartGame()
+    public void StartGame()
     {
+        _isStarted = true;
+        
         TimeManager.Instance.Init();
 
         _contextBuffer = new CircularBuffer<string>(_maxContextBufferSize);
@@ -103,7 +129,7 @@ public partial class GameManager : MonoBehaviourSingleton<GameManager>
 
         _remainingGameDurationSeconds = _totalGameDurationSeconds;
         
-        ResumeGame();   
+        ResumeGame();
     }
 
     /// <summary>
@@ -153,15 +179,27 @@ public partial class GameManager : MonoBehaviourSingleton<GameManager>
         }
     }
 
+    [SerializeField]
+    private bool _won;
+
+    public bool Won => _won;
+    
+    [SerializeField]
+    private bool _lost;
+
+    public bool Lost => _lost;
+    
     private void EndGame(EndGameCondition endGameCondition)
     {
         if (endGameCondition.IsWin())
         {
             Debug.Log("You won!");
+            _won = true;
         }
         else if (endGameCondition.IsLose())
         {
             Debug.Log("You lost!");
+            _lost = true;
         }
         
         Debug.Log(endGameCondition.GetEndGameMessage());

3d Prototyp/Assets/Scripts/Interaction/Copier.cs

@@ -4,9 +4,16 @@ namespace Interaction
 {
     public class Copier : MonoBehaviour
     {
+        public AudioSource _audioSource;
+
+        public AudioClip _deny;
+        
         public void Copy()
         {
-            Debug.Log("Kopierer erfolgreich benutzt!");
+            if (!_audioSource.isPlaying)
+                _audioSource.Play();
+            else
+                _audioSource.PlayOneShot(_deny);
         }
     }
 }

3d Prototyp/Assets/Scripts/Interaction/VendingMachine.cs

@@ -13,11 +13,34 @@ public class VendingMachine : MonoBehaviour
 
     [SerializeField]
     private float _shootForce;
+
+    [SerializeField]
+    private bool _isReady;
+
+    [SerializeField] private AudioSource _audioSource;
+    
+    [SerializeField] private AudioClip _vendingMachineSound;
+    [SerializeField] private AudioClip _errorSound;
     
     public void DropPiza()
     {
-        PickupInteractible pizza = Instantiate(_pizzaPrefab, _pizzaChute.position, _pizzaChute.rotation);
+        if (_isReady)
+            StartCoroutine(DropPizzaRoutine());
+        else
+            _audioSource.PlayOneShot(_errorSound);
+    }
 
+    private IEnumerator DropPizzaRoutine()
+    {
+        _isReady = false;
+        
+        _audioSource.PlayOneShot(_vendingMachineSound);
+        
+        yield return new WaitForSeconds(2.7f);
+        
+        PickupInteractible pizza = Instantiate(_pizzaPrefab, _pizzaChute.position, _pizzaChute.rotation);
         pizza.GetComponent<Rigidbody>().AddForce(new Vector3(0, 0, _shootForce), ForceMode.Impulse);
+
+        _isReady = true;
     }
 }

3d Prototyp/Assets/Scripts/MusicManager.cs

@@ -3,14 +3,17 @@ using System.Collections;
 using System.Collections.Generic;
 using Unity.VisualScripting;
 using UnityEngine;
+using UnityEngine.Serialization;
 using Utility;
 
 public class MusicManager : MonoBehaviourSingleton<MusicManager>
 {
     [SerializeField]
     private List<AudioClip> _ambientMusic;
+    [FormerlySerializedAs("_showDownMusic")] [SerializeField]
+    private AudioClip _winningMusic;
     [SerializeField]
-    private AudioClip _showDownMusic;
+    private AudioClip _losingMusic;
 
     [SerializeField, ShowOnly]
     private float _musicTimer = 5f;
@@ -18,9 +21,16 @@ public class MusicManager : MonoBehaviourSingleton<MusicManager>
     private AudioSource _audioSource;
     private AudioClip _currentlyPlaying;
     private float _defaultVolume;
-    private bool _showDownTime = false;
+    private ShowDown _showDown = ShowDown.NotYet;
     private bool _doneFading = false;
     private bool _showDownIsPlaying = false;
+    
+    private enum ShowDown
+    {
+        NotYet,
+        AlmostFinished,
+        TimesRunningOut
+    }
 
     // Start is called before the first frame update
     void Start()
@@ -34,10 +44,10 @@ public class MusicManager : MonoBehaviourSingleton<MusicManager>
     {
         CheckForFinalMusic();
 
-        if (!_showDownTime)
+        if (_showDown == ShowDown.NotYet)
         {
             _musicTimer -= Time.deltaTime;
-
+            
             if (_musicTimer <= 0)
             {
                 _musicTimer = _musicCheckInterval;
@@ -47,18 +57,6 @@ public class MusicManager : MonoBehaviourSingleton<MusicManager>
                 }
             }
         }
-        else
-        {
-            if (_doneFading)
-            {
-                if (!_showDownIsPlaying)
-                    PlayShowDownMusic();
-            }
-            else
-            {
-                FadeOutMusic();
-            }
-        }
     }
 
     private void FadeOutMusic()
@@ -70,10 +68,69 @@ public class MusicManager : MonoBehaviourSingleton<MusicManager>
 
     private void CheckForFinalMusic()
     {
-        float timeLeft = (float)GameManager.Instance.ExpectedRemainingGameDuration;
+        ShowDown oldShowDown = _showDown;
-        _showDownTime = timeLeft < 0.9 * _showDownMusic.length;
+        
+        if (TimeManager.Instance.RealLifeSecondsUntilDeadline < 100)
+        {
+            _showDown = ShowDown.TimesRunningOut;
+        }
+        else if (GameManager.Instance.GameProgress > 0.85)
+        {
+            _showDown = ShowDown.AlmostFinished;
+        }
+        else 
+        {
+            _showDown = ShowDown.NotYet;
+        }
+
+        if (!GameManager.Instance.IsStarted)
+        {
+            _showDown = ShowDown.NotYet;
+        }
+        
+        if (oldShowDown != _showDown)
+        {
+            switch (_showDown)
+            {
+                case ShowDown.NotYet:
+                    FadeToClip(_ambientMusic.GetRandomElement());
+                    break;
+                case ShowDown.AlmostFinished:
+                    FadeToClip(_winningMusic);
+                    break;
+                case ShowDown.TimesRunningOut:
+                    FadeToClip(_losingMusic);
+                    break;
+            }
+        }
     }
 
+    private void FadeToClip(AudioClip audioClip)
+    {
+        StartCoroutine(FadeToClipRoutine(audioClip));
+    }
+
+    [SerializeField]
+    private float _fadeDuration = 1.0f;
+    
+    private IEnumerator FadeToClipRoutine(AudioClip audioClip)
+    {
+        float currentTime = 0;
+        float start = _audioSource.volume;
+        while (currentTime < _fadeDuration)
+        {
+            currentTime += Time.deltaTime;
+            _audioSource.volume = Mathf.Lerp(start, 0.0f, currentTime / _fadeDuration);
+            yield return null;
+        }
+        
+        _audioSource.Stop();
+        _audioSource.volume = _defaultVolume;
+        _audioSource.clip = audioClip;
+        _audioSource.loop = true;
+        _audioSource.Play();
+    }
+    
     private void PlayNewMusic()
     {
         if (_currentlyPlaying == null)
@@ -90,14 +147,4 @@ public class MusicManager : MonoBehaviourSingleton<MusicManager>
             _audioSource.Play();
         }
     }
-
-    private void PlayShowDownMusic()
-    {
-        _showDownIsPlaying = true;
-        _audioSource.Stop();
-        _audioSource.volume = _defaultVolume;
-        _audioSource.clip = _showDownMusic;
-        _audioSource.loop = true;
-        _audioSource.Play();
-    }
 }

3d Prototyp/Assets/Scripts/Text2Speech.cs

@@ -11,8 +11,6 @@ using OpenAI_API.Models;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using System.Collections.Generic;
-using Google.Cloud.TextToSpeech.V1;
-using Palmmedia.ReportGenerator.Core;
 
 [Serializable]
 public class TextToSpeechResponse
@@ -140,7 +138,7 @@ public class Text2Speech : MonoBehaviour
 
                 if (filteredVoices.Count > 0)
                 {
-                    // Auswahl einer zuf<75>lligen Stimme aus den gefilterten Ergebnissen
+                    // Auswahl einer zuf<75>lligen Stimme aus den gefilterten Ergebnissen
                     var randomVoice = filteredVoices[UnityEngine.Random.Range(0, filteredVoices.Count)];
 
                     System.Random random = new System.Random();

3d Prototyp/Assets/Scripts/TimeManager.cs

@@ -34,12 +34,34 @@ public class TimeManager : MonoBehaviourSingleton<TimeManager>
     /// Das aktuelle Datum und Uhrzeit im Spiel.
     /// </summary>
     public DateTime CurrentDate => _startDate.AddDays(_totalTime);
+
+    public double RealLifeSecondsUntilDeadline => (Deadline - CurrentDate).TotalDays * _secondsPerDay; 
     
     /// <summary>
     /// Die Deadline des Spiels.
     /// </summary>
     public DateTime Deadline => _deadline;
 
+    public DateTime PredictedEndDate
+    {
+        get
+        {
+            double realSeconds = GameManager.Instance.ExpectedRemainingGameDuration;
+            double gameDays = realSeconds / _secondsPerDay;
+
+            if (double.IsFinite(gameDays))
+            {
+                return CurrentDate.AddDays(gameDays);
+            }
+            else
+            {
+                return DateTime.MaxValue;
+            }
+        }
+    }
+
+    public bool PredictedMissesDeadline => PredictedEndDate > Deadline;
+
     /// <summary>
     /// Wie viele Sekunden ein Tag im Spiel hat
     /// </summary>

3d Prototyp/Assets/Scripts/UiController.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using Interaction;
 using TMPro;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 using UnityEngine.Serialization;
 using UnityEngine.UI;
 
@@ -23,10 +24,53 @@ public class UiController : MonoBehaviour
     private Button _prevActionButton;
     [SerializeField]
     private Button _nextActionButton;
+    
+    [SerializeField]
+    private Image _progressBarImage;
 
+    [SerializeField]
+    private Image _progressBarBorder;
+
+    [SerializeField] private TextMeshProUGUI _progressText;
+    
+    [SerializeField] private TextMeshProUGUI _deadlineText;
+    [SerializeField] private TextMeshProUGUI _currentDateText;
+    [SerializeField] private TextMeshProUGUI _predictedEndText;
+
+    [SerializeField] private Gradient _deadlineTextColors;
+
+    public GameObject WinScreen;
+    public GameObject LoseScreen;
+    public GameObject StartScreen;
+    
     void Update()
     {
+        StartScreen.SetActive(!GameManager.Instance.IsStarted);
+        
         UpdateActionDisplay();
+        UpdateProgressBar();
+        UpdateDeadlineDateStuffTexts();
+        
+        WinScreen.SetActive(GameManager.Instance.Won);
+        LoseScreen.SetActive(GameManager.Instance.Lost);
+    }
+
+    private void UpdateProgressBar()
+    {
+        Vector3 scale = _progressBarImage.rectTransform.localScale;
+        scale.x = (float)GameManager.Instance.GameProgress;
+        
+        _progressBarImage.rectTransform.localScale = scale;
+        _progressBarImage.pixelsPerUnitMultiplier = _progressBarBorder.pixelsPerUnitMultiplier * scale.x;
+        _progressText.text = $"Entwicklungsfortschritt: {GameManager.Instance.GameProgress:##0%}";
+    }
+
+    private void UpdateDeadlineDateStuffTexts()
+    {
+        _currentDateText.text = $"Aktuelle Zeit: {TimeManager.Instance.CurrentDate: dddd dd.MM.yy hh U\\hr}";
+        _deadlineText.text = $"Deadline: {TimeManager.Instance.Deadline: dddd dd.MM.yy hh U\\hr}";
+        _predictedEndText.text = $"Vorraussichtlich fertig: {(TimeManager.Instance.PredictedEndDate == DateTime.MaxValue ? "Nie" : TimeManager.Instance.PredictedEndDate.ToString("dddd dd.MM.yy hh U\\hr"))}";
+        _predictedEndText.color = _deadlineTextColors.Evaluate(TimeManager.Instance.PredictedMissesDeadline ? 0.0f : 1.0f);
     }
 
     private void UpdateActionDisplay()
@@ -63,4 +107,16 @@ public class UiController : MonoBehaviour
         //_prevActionButton.interactable = _pickupper.CanSelectPrevious;
         //_nextActionButton.interactable = _pickupper.CanSelectNext;
     }
+
+    public void Replay()
+    {
+        string currentSceneName = SceneManager.GetActiveScene().name;
+        SceneManager.LoadScene(currentSceneName);
+    }
+
+    public void Exit()
+    {
+        //UnityEditor.EditorApplication.isPlaying = false;
+        Application.Quit();
+    }
 }

3d Prototyp/Assets/Scripts/Utility/Difficulty.cs

@@ -39,7 +39,7 @@ namespace Utility
         public MediumDifficulty()
         {
             Difficulty = Difficulty.Medium;
-            DaysUntilReleaseFactor = 1.5;
+            DaysUntilReleaseFactor = 1.75;
             CaffeineDrainScaling = 1.5;
             HungerDrainScaling = 1.5;
             UrinationDrainScaling = 1.5;

3d Prototyp/Assets/Scripts/Zeitschaltuhr.cs

@@ -58,6 +58,17 @@ public class Zeitschaltuhr : MonoBehaviour, ISerializationCallbackReceiver
 
     void UpdateOn()
     {
+        if (!GameManager.Instance.IsStarted)
+        {
+            bool wasOn = IsOn;
+            IsOn = false;
+            if (IsOn != wasOn)
+            {
+                UpdateChildren();
+            }
+            return;
+        }
+        
         if (_turnOnTimeSpan < _turnOffTimeSpan)
         {
             // beide Zeiten am selben Tag

3d Prototyp/Assets/Scripts/Zombie.cs

@@ -20,11 +20,15 @@ public class Zombie : MonoBehaviour
     [SerializeField]
     private float _attackRange = 1.3f;
     [SerializeField]
+    private float _jumpForce;
+    [SerializeField]
     private float _idleThresholdFactor = 0.2f;
     [SerializeField]
     private float _noiseDelay = 5.0f;
     [SerializeField, ShowOnly]
     private float _noiseTimer;
+    [SerializeField]
+    private LayerMask _groundLayer;
 
     private Rigidbody _rb;
     private AudioSource _audioSource;
@@ -32,7 +36,7 @@ public class Zombie : MonoBehaviour
     private Animator _animator;
     private bool _isAttacking = false;
     private float _idleThreshold;
-    private Quaternion _initialRotation;
+    private Vector3 _initialPosition;
 
 
 
@@ -49,7 +53,7 @@ public class Zombie : MonoBehaviour
         _audioSource = GetComponent<AudioSource>();
         _animator = GetComponent<Animator>();
         _idleThreshold = _speed / _idleThresholdFactor;
-        _initialRotation = transform.rotation;
+        _initialPosition = transform.position;
     }
 
 void Update()
@@ -67,8 +71,9 @@ void Update()
     {
         Vector3 direction = (GameManager.Instance.Player.transform.position - transform.position);
         Quaternion goalRotation = Quaternion.LookRotation(direction);
-        transform.rotation = Quaternion.RotateTowards(transform.rotation, goalRotation, _rotateSpeed * Time.deltaTime);
+        transform.rotation = Quaternion.Euler(0, Quaternion.RotateTowards(transform.rotation, goalRotation, _rotateSpeed * Time.deltaTime).eulerAngles.y, 0);
         float diff = direction.magnitude;
+        //Debug.Log(diff);
         if (diff <= _attackRange && !_isAttacking)
         {
             _animator.SetFloat("Running", 0);
@@ -78,12 +83,21 @@ void Update()
         else
         {
             Vector3 oldPosition = _rb.position;
-            _rb.MovePosition(_rb.position + direction * _speed * Time.deltaTime);
+            Vector3 goalDirection = new Vector3(direction.x, 0.2f, direction.z);
+            if (Physics.Raycast(transform.position + new Vector3(0, 0.1f, 0), goalDirection, 1f, _groundLayer))
+            {
+                Debug.Log("RayCast HIT");
+                //_rb.AddForce(Vector3.up * _jumpForce, ForceMode.Impulse);
+                _rb.MovePosition(_rb.position - transform.forward * Time.deltaTime);
+                _rb.MovePosition(_rb.position + new Vector3(0, _jumpForce, 0) * Time.deltaTime);
+            }
+            _rb.MovePosition(_rb.position + goalDirection * _speed * Time.deltaTime);
             float dist = Vector3.Distance(oldPosition, _rb.position);
+            //Debug.Log($"Distance: {dist}, Threshold: {_idleThreshold * Time.deltaTime}");
             if (dist > _idleThreshold * Time.deltaTime)
             {
                 _animator.SetBool("Idle", false);
-                _animator.SetFloat("Running", 1);
+                _animator.SetFloat("Running", _speed * 3.0f);
             }
             else
             {
@@ -97,14 +111,14 @@ void Update()
     {
         _isAttacking = true;
         _animator.SetBool("Attack", true);
-        yield return new WaitForSeconds(1.5f);
+        yield return new WaitForSeconds(0.5f);
         _animator.SetBool("Attack", false);
         // check if actually hit 
         Vector3 direction = (GameManager.Instance.Player.transform.position - transform.position);
         float diff = direction.magnitude;
-        if (diff <= _attackRange + 0.5f)
+        if (diff <= _attackRange + 0.6f)
         {
-            GameManager.Instance.Player.GetComponent<Character>().PickupItem(null);
+            GameManager.Instance.Player.GetComponent<Character>().Hurt();
         }
         _isAttacking = false;
     }

3d Prototyp/Assets/SoundEffects/CoffeeMachine.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 031f65c7c47ad2d43a955c40683880ad
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/SoundEffects/Deny.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 27e183cf8a3d7ec4b9fbb4671441b7aa
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/SoundEffects/Eat.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 1a7a3de12f9df6f4c9799fe341d5de28
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/SoundEffects/Flush.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: dbf8cf0bf773b7b44ba3d53d05a2b3bc
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/SoundEffects/Music/Sands of Time.mp3.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 127dfea0247c28040a5242a06821ad96
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/SoundEffects/Printer.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 8fdfe5a0863bed240835dda67c736375
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/SoundEffects/Step.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ca64f072f07c0df449514b1b9f93a5dd
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/SoundEffects/Step/Step-01.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 3578243e1d52aa34c8c4484e8d4cce39
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/SoundEffects/Step/Step-02.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 4c66e90cc93a3ed48b72a37d56facbd3
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/SoundEffects/Step/Step-03.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: d21ab49950de24042a34893b19276912
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/SoundEffects/Step/Step-04.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: a63a5ed37d6e0e2468c46137e9384bfb
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/SoundEffects/Step/Step-05.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: cf44f4d419fab844a865ed3dbb123450
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/SoundEffects/Step/Step-06.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 74711f0ad4013304abdbf5ce17ffc755
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/SoundEffects/VendingMachine.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: e126bd25cd99e1a46881dafc0b19ebcb
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/SoundEffects/hurt2.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 91d676f74045c8541ad059fd4a429bfe
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/SoundEffects/openBottle.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: d647b03d56624144da03357426647bb1
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/SoundEffects/sip.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 73998fb8d43efca4085260ce6a1e7834
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/ToiletManager.cs

@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using Utility;
+
+public class ToiletManager : MonoBehaviourSingleton<ToiletManager>
+{
+    public bool IsOccupied;
+
+    public Toilette Toilette;
+}

3d Prototyp/Assets/ToiletManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 459a8de1571412a44927af6c9cc4ef5e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/Assets/Toilette.cs

@@ -0,0 +1,28 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Toilette : MonoBehaviour
+{
+    public AudioSource AudioSource;
+
+    private bool _canFlush = true;
+    
+    public void Flush()
+    {
+        if (_canFlush)
+            StartCoroutine(FlushRoutine());
+        
+    }
+
+    private IEnumerator FlushRoutine()
+    {
+        _canFlush = false;
+        
+        AudioSource.Play();
+
+        yield return new WaitForSeconds(5);
+        
+        _canFlush = true;
+    }
+}

3d Prototyp/Assets/Toilette.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b2aba106a2b6a544b8cf8c12c021528c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

3d Prototyp/License.txt

@@ -4,4 +4,20 @@ TODO: Zu erwähnende Credits:
 Vending Machine by Marcel van Duijn: https://sketchfab.com/3d-models/empty-vending-machine-5839da52996147cbb3a4a2364b1bf894
 
 Sounds:
-Button click microswitch by michaelkoehler: https://freesound.org/people/michaelkoehler/sounds/219015/
+Button click microswitch by michaelkoehler: https://freesound.org/people/michaelkoehler/sounds/219015/
+
+Klospühlung by tosha73: https://freesound.org/people/tosha73/sounds/545577/
+Vending Machine by rjonander6: https://freesound.org/people/rjonander6/sounds/250962/
+Coffee Machine by ReyDros: https://freesound.org/people/ReyDros/sounds/327050/
+Open Bottle by michaelkoehler: https://freesound.org/people/michaelkoehler/sounds/207191/
+Eat Sound by TheDragonsSpark: https://freesound.org/people/TheDragonsSpark/sounds/543386/
+Drink Coffee by EverydayEldritch.com: https://freesound.org/people/EverydayEldritch.com/sounds/627922/
+Printer by Zabuhailo: https://freesound.org/people/Zabuhailo/sounds/145265/
+
+hurt2.wav by thecheeseman: https://freesound.org/people/thecheeseman/sounds/44429/
+
+https://assetstore.unity.com/packages/3d/environments/barrier-traffic-cone-pack-82549
+https://assetstore.unity.com/packages/3d/vehicles/ukraine-free-cars-191822
+https://assetstore.unity.com/packages/3d/vehicles/land/low-poly-playable-vehicles-154577
+
+Music by suno.ai

3d Prototyp/ProjectSettings/EditorBuildSettings.asset

@@ -4,5 +4,8 @@
 EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
-  m_Scenes: []
+  m_Scenes:
+  - enabled: 1
+    path: Assets/Scenes/GameJamScene.unity
+    guid: f1369b80ccf53544f914c438187da217
   m_configObjects: {}

3d Prototyp/ProjectSettings/ProjectSettings.asset

@@ -12,8 +12,8 @@ PlayerSettings:
   targetDevice: 2
   useOnDemandResources: 0
   accelerometerFrequency: 60
-  companyName: DefaultCompany
+  companyName: Nackenbox GmbH
-  productName: 3d Prototyp
+  productName: Game vs Jam
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -139,7 +139,7 @@ PlayerSettings:
   loadStoreDebugModeEnabled: 0
   visionOSBundleVersion: 1.0
   tvOSBundleVersion: 1.0
-  bundleVersion: 0.1
+  bundleVersion: 1.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -161,7 +161,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Standalone: com.DefaultCompany.3d-Prototyp
+    Standalone: com.Nackenbox-GmbH.Game-vs-Jam
   buildNumber:
     Standalone: 0
     VisionOS: 0