MeigoFried/GameVsJam
1
0
Fork 0
Code Issues 14 Pull Requests Packages Projects 1 Releases Wiki Activity

Ich kündige!

Browse Source
This commit is contained in:
Simon Lübeß
2024-04-09 02:05:17 +02:00
parent 4ab8603cfb
commit ef40531dc3
36 changed files with 1116998 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
3d Prototyp/Assets/Animations/NPC.controller
View File

@ -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:

38
3d Prototyp/Assets/Animations/NPCAnimationController.cs
View File

@ -189,19 +189,22 @@ public class NPCAnimationController : MonoBehaviour
animator.SetTrigger("Walk");
yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("Walk"));
MoveTo(dancePlace.position);
yield return new WaitUntil(() => agent.remainingDistance <= agent.stoppingDistance);
animator.ResetTrigger("Walk");
yield return new WaitUntil(() =>
{
Debug.Log(agent.remainingDistance);
return agent.remainingDistance <= agent.stoppingDistance;
});
animator.SetTrigger("TooMuchCaffein");
yield return new WaitForSeconds(1);
yield return new WaitWhile(() => Developer.IsOvercaffeinated);
animator.ResetTrigger("TooMuchCaffein");
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));
@ -212,32 +215,5 @@ public class NPCAnimationController : MonoBehaviour
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();
}
}
}

153098
3d Prototyp/Assets/Animations/SitDownOnToilet.anim Normal file
View File

File diff suppressed because it is too large Load Diff

8
3d Prototyp/Assets/Animations/SitDownOnToilet.anim.meta Normal file
View File

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

148040
3d Prototyp/Assets/Animations/StandUp.anim Normal file
View File

File diff suppressed because it is too large Load Diff

8
3d Prototyp/Assets/Animations/StandUp.anim.meta Normal file
View File

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

82001
3d Prototyp/Assets/Animations/Walk.anim Normal file
View File

File diff suppressed because it is too large Load Diff

8
3d Prototyp/Assets/Animations/Walk.anim.meta Normal file
View File

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

680070
3d Prototyp/Assets/Animations/ÜberkoffeinatedDance.anim Normal file
View File

File diff suppressed because it is too large Load Diff

8
3d Prototyp/Assets/Animations/ÜberkoffeinatedDance.anim.meta Normal file
View File

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