Ich kündige!
This commit is contained in:
parent
4ab8603cfb
commit
ef40531dc3
|
@ -126,7 +126,7 @@ AnimatorState:
|
||||||
m_MirrorParameterActive: 0
|
m_MirrorParameterActive: 0
|
||||||
m_CycleOffsetParameterActive: 0
|
m_CycleOffsetParameterActive: 0
|
||||||
m_TimeParameterActive: 0
|
m_TimeParameterActive: 0
|
||||||
m_Motion: {fileID: -234762855687092897, guid: 0fdb80f1a2017e743a410bc6cd2090d5, type: 3}
|
m_Motion: {fileID: 7400000, guid: 116fc94de7c8f8845b15606ef71b73eb, type: 2}
|
||||||
m_Tag:
|
m_Tag:
|
||||||
m_SpeedParameter:
|
m_SpeedParameter:
|
||||||
m_MirrorParameter:
|
m_MirrorParameter:
|
||||||
|
@ -153,7 +153,7 @@ AnimatorState:
|
||||||
m_MirrorParameterActive: 0
|
m_MirrorParameterActive: 0
|
||||||
m_CycleOffsetParameterActive: 0
|
m_CycleOffsetParameterActive: 0
|
||||||
m_TimeParameterActive: 0
|
m_TimeParameterActive: 0
|
||||||
m_Motion: {fileID: -234762855687092897, guid: 0fdb80f1a2017e743a410bc6cd2090d5, type: 3}
|
m_Motion: {fileID: 7400000, guid: 116fc94de7c8f8845b15606ef71b73eb, type: 2}
|
||||||
m_Tag:
|
m_Tag:
|
||||||
m_SpeedParameter:
|
m_SpeedParameter:
|
||||||
m_MirrorParameter:
|
m_MirrorParameter:
|
||||||
|
@ -271,7 +271,7 @@ AnimatorState:
|
||||||
m_MirrorParameterActive: 0
|
m_MirrorParameterActive: 0
|
||||||
m_CycleOffsetParameterActive: 0
|
m_CycleOffsetParameterActive: 0
|
||||||
m_TimeParameterActive: 0
|
m_TimeParameterActive: 0
|
||||||
m_Motion: {fileID: 7272434718706070166, guid: 3ba22caa4e386444482e0e38ab2558f1, type: 3}
|
m_Motion: {fileID: 7400000, guid: f1ba1f0cd41eb754b99fa7584f8fd716, type: 2}
|
||||||
m_Tag:
|
m_Tag:
|
||||||
m_SpeedParameter:
|
m_SpeedParameter:
|
||||||
m_MirrorParameter:
|
m_MirrorParameter:
|
||||||
|
@ -298,7 +298,7 @@ AnimatorState:
|
||||||
m_MirrorParameterActive: 0
|
m_MirrorParameterActive: 0
|
||||||
m_CycleOffsetParameterActive: 0
|
m_CycleOffsetParameterActive: 0
|
||||||
m_TimeParameterActive: 0
|
m_TimeParameterActive: 0
|
||||||
m_Motion: {fileID: 7272434718706070166, guid: 3ba22caa4e386444482e0e38ab2558f1, type: 3}
|
m_Motion: {fileID: 7400000, guid: f1ba1f0cd41eb754b99fa7584f8fd716, type: 2}
|
||||||
m_Tag:
|
m_Tag:
|
||||||
m_SpeedParameter:
|
m_SpeedParameter:
|
||||||
m_MirrorParameter:
|
m_MirrorParameter:
|
||||||
|
@ -399,7 +399,7 @@ AnimatorState:
|
||||||
m_MirrorParameterActive: 0
|
m_MirrorParameterActive: 0
|
||||||
m_CycleOffsetParameterActive: 0
|
m_CycleOffsetParameterActive: 0
|
||||||
m_TimeParameterActive: 0
|
m_TimeParameterActive: 0
|
||||||
m_Motion: {fileID: -3749703193433276195, guid: 2b97b09b2b672204391a687234eed858, type: 3}
|
m_Motion: {fileID: 7400000, guid: 2cfa63e1687912346bd0843031974a0a, type: 2}
|
||||||
m_Tag:
|
m_Tag:
|
||||||
m_SpeedParameter:
|
m_SpeedParameter:
|
||||||
m_MirrorParameter:
|
m_MirrorParameter:
|
||||||
|
@ -619,37 +619,37 @@ AnimatorController:
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: Walk
|
- m_Name: Walk
|
||||||
m_Type: 9
|
m_Type: 9
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: SitDown
|
- m_Name: SitDown
|
||||||
m_Type: 9
|
m_Type: 9
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: TooMuchCaffein
|
- m_Name: TooMuchCaffein
|
||||||
m_Type: 9
|
m_Type: 9
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: DrinkCoffee
|
- m_Name: DrinkCoffee
|
||||||
m_Type: 9
|
m_Type: 9
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
- m_Name: GetMad
|
- m_Name: GetMad
|
||||||
m_Type: 9
|
m_Type: 9
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 0
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000}
|
||||||
m_AnimatorLayers:
|
m_AnimatorLayers:
|
||||||
- serializedVersion: 5
|
- serializedVersion: 5
|
||||||
m_Name: Base Layer
|
m_Name: Base Layer
|
||||||
|
@ -964,7 +964,7 @@ AnimatorState:
|
||||||
m_MirrorParameterActive: 0
|
m_MirrorParameterActive: 0
|
||||||
m_CycleOffsetParameterActive: 0
|
m_CycleOffsetParameterActive: 0
|
||||||
m_TimeParameterActive: 0
|
m_TimeParameterActive: 0
|
||||||
m_Motion: {fileID: -6686394522949657072, guid: 89ba2f766b6843048abf2ab72ff8cb21, type: 3}
|
m_Motion: {fileID: 7400000, guid: 698f1aca2ed9869408e9472586c4b85f, type: 2}
|
||||||
m_Tag:
|
m_Tag:
|
||||||
m_SpeedParameter:
|
m_SpeedParameter:
|
||||||
m_MirrorParameter:
|
m_MirrorParameter:
|
||||||
|
|
|
@ -189,19 +189,22 @@ public class NPCAnimationController : MonoBehaviour
|
||||||
animator.SetTrigger("Walk");
|
animator.SetTrigger("Walk");
|
||||||
yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("Walk"));
|
yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("Walk"));
|
||||||
MoveTo(dancePlace.position);
|
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");
|
animator.SetTrigger("TooMuchCaffein");
|
||||||
|
|
||||||
|
yield return new WaitForSeconds(1);
|
||||||
|
|
||||||
yield return new WaitWhile(() => Developer.IsOvercaffeinated);
|
yield return new WaitWhile(() => Developer.IsOvercaffeinated);
|
||||||
|
|
||||||
animator.ResetTrigger("TooMuchCaffein");
|
|
||||||
animator.SetTrigger("Walk");
|
animator.SetTrigger("Walk");
|
||||||
yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("WalkBack"));
|
yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("WalkBack"));
|
||||||
MoveTo(workPosition.position);
|
MoveTo(workPosition.position);
|
||||||
yield return new WaitUntil(() => agent.remainingDistance <= agent.stoppingDistance);
|
yield return new WaitUntil(() => agent.remainingDistance <= agent.stoppingDistance);
|
||||||
transform.rotation = workPosition.rotation;
|
transform.rotation = workPosition.rotation;
|
||||||
animator.ResetTrigger("Walk"); // Setze den Lauf-Trigger zur<75>ck
|
|
||||||
animator.SetTrigger("SitDown");
|
animator.SetTrigger("SitDown");
|
||||||
yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("Sit"));
|
yield return new WaitUntil(() => animator.GetCurrentAnimatorStateInfo(0).IsName("Sit"));
|
||||||
yield return StartCoroutine(FadeLayerWeight(animator.GetLayerIndex("Typing"), 1, 1f));
|
yield return StartCoroutine(FadeLayerWeight(animator.GetLayerIndex("Typing"), 1, 1f));
|
||||||
|
@ -212,32 +215,5 @@ public class NPCAnimationController : MonoBehaviour
|
||||||
private void MoveTo(Vector3 destination)
|
private void MoveTo(Vector3 destination)
|
||||||
{
|
{
|
||||||
agent.destination = 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();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 698f1aca2ed9869408e9472586c4b85f
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 7400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2cfa63e1687912346bd0843031974a0a
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 7400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 116fc94de7c8f8845b15606ef71b73eb
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 7400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f1ba1f0cd41eb754b99fa7584f8fd716
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 7400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 25da4039832d81a42a3e7c1f6242ad85
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 7400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -22,3 +22,10 @@ MonoBehaviour:
|
||||||
DrinkCoffe: {fileID: 8300000, guid: 73998fb8d43efca4085260ce6a1e7834, type: 3}
|
DrinkCoffe: {fileID: 8300000, guid: 73998fb8d43efca4085260ce6a1e7834, type: 3}
|
||||||
EatPizza: {fileID: 8300000, guid: 1a7a3de12f9df6f4c9799fe341d5de28, type: 3}
|
EatPizza: {fileID: 8300000, guid: 1a7a3de12f9df6f4c9799fe341d5de28, type: 3}
|
||||||
Hurt: {fileID: 8300000, guid: 91d676f74045c8541ad059fd4a429bfe, 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}
|
||||||
|
|
|
@ -20,7 +20,7 @@ MonoBehaviour:
|
||||||
PoseToolPivotMode:
|
PoseToolPivotMode:
|
||||||
valueInternal: 0
|
valueInternal: 0
|
||||||
PoseToolMode:
|
PoseToolMode:
|
||||||
valueInternal: 0
|
valueInternal: 1
|
||||||
PoseMirrorMode:
|
PoseMirrorMode:
|
||||||
valueInternal: 0
|
valueInternal: 0
|
||||||
ConfigMode:
|
ConfigMode:
|
||||||
|
@ -260,34 +260,34 @@ MonoBehaviour:
|
||||||
valueInternal: 0
|
valueInternal: 0
|
||||||
LocalPositionChannelList:
|
LocalPositionChannelList:
|
||||||
- CurrentValue:
|
- CurrentValue:
|
||||||
valueInternal: 0
|
valueInternal: 34.09025
|
||||||
ReferencePoseValue:
|
ReferencePoseValue:
|
||||||
valueInternal: 0
|
valueInternal: 34.09025
|
||||||
PoseValueList: []
|
PoseValueList: []
|
||||||
ChannelPerClipList:
|
ChannelPerClipList:
|
||||||
- LayerList:
|
- LayerList:
|
||||||
- CurrentOriginalValue:
|
- CurrentOriginalValue:
|
||||||
valueInternal: 0
|
valueInternal: 34.09025
|
||||||
newKeyListSerialized: 00000000
|
newKeyListSerialized: 00000000
|
||||||
- CurrentValue:
|
- CurrentValue:
|
||||||
valueInternal: 1.891
|
valueInternal: 0.55999947
|
||||||
ReferencePoseValue:
|
ReferencePoseValue:
|
||||||
valueInternal: 1.891
|
valueInternal: 0.55999947
|
||||||
PoseValueList: []
|
PoseValueList: []
|
||||||
ChannelPerClipList:
|
ChannelPerClipList:
|
||||||
- LayerList:
|
- LayerList:
|
||||||
- CurrentOriginalValue:
|
- CurrentOriginalValue:
|
||||||
valueInternal: 1.891
|
valueInternal: 0.55999947
|
||||||
newKeyListSerialized: 00000000
|
newKeyListSerialized: 00000000
|
||||||
- CurrentValue:
|
- CurrentValue:
|
||||||
valueInternal: 0
|
valueInternal: -2.452814
|
||||||
ReferencePoseValue:
|
ReferencePoseValue:
|
||||||
valueInternal: 0
|
valueInternal: -2.452814
|
||||||
PoseValueList: []
|
PoseValueList: []
|
||||||
ChannelPerClipList:
|
ChannelPerClipList:
|
||||||
- LayerList:
|
- LayerList:
|
||||||
- CurrentOriginalValue:
|
- CurrentOriginalValue:
|
||||||
valueInternal: 0
|
valueInternal: -2.452814
|
||||||
newKeyListSerialized: 00000000
|
newKeyListSerialized: 00000000
|
||||||
LocalRotationSelected:
|
LocalRotationSelected:
|
||||||
valueInternal: 0
|
valueInternal: 0
|
||||||
|
|
|
@ -336,7 +336,7 @@ AnimatorState:
|
||||||
m_MirrorParameterActive: 0
|
m_MirrorParameterActive: 0
|
||||||
m_CycleOffsetParameterActive: 0
|
m_CycleOffsetParameterActive: 0
|
||||||
m_TimeParameterActive: 0
|
m_TimeParameterActive: 0
|
||||||
m_Motion: {fileID: 5987713911036300057, guid: 081930da5e255e348940373200bbeaca, type: 3}
|
m_Motion: {fileID: 7400000, guid: 25da4039832d81a42a3e7c1f6242ad85, type: 2}
|
||||||
m_Tag:
|
m_Tag:
|
||||||
m_SpeedParameter: RunSpeed
|
m_SpeedParameter: RunSpeed
|
||||||
m_MirrorParameter:
|
m_MirrorParameter:
|
||||||
|
|
|
@ -59320,7 +59320,7 @@ Transform:
|
||||||
m_GameObject: {fileID: 1309782456}
|
m_GameObject: {fileID: 1309782456}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: 34.09025, y: 0.55999947, z: -2.452814}
|
m_LocalPosition: {x: 34.09025, y: 0.478, z: -2.452814}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
|
@ -95986,13 +95986,25 @@ PrefabInstance:
|
||||||
serializedVersion: 3
|
serializedVersion: 3
|
||||||
m_TransformParent: {fileID: 0}
|
m_TransformParent: {fileID: 0}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 612344298038858568, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
||||||
|
propertyPath: m_Enabled
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 808511809418027853, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
||||||
|
propertyPath: m_Enabled
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 875641321233070394, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
||||||
|
propertyPath: m_Enabled
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 958156999735417459, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
- target: {fileID: 958156999735417459, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
value: 34.09025
|
value: 34.09025
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 958156999735417459, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
- target: {fileID: 958156999735417459, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
||||||
propertyPath: m_LocalPosition.y
|
propertyPath: m_LocalPosition.y
|
||||||
value: 0.55999947
|
value: 0.478
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 958156999735417459, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
- target: {fileID: 958156999735417459, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
||||||
propertyPath: m_LocalPosition.z
|
propertyPath: m_LocalPosition.z
|
||||||
|
@ -96026,14 +96038,54 @@ PrefabInstance:
|
||||||
propertyPath: m_LocalEulerAnglesHint.z
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1269903724513248089, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
||||||
|
propertyPath: m_Enabled
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2738968731800608845, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
||||||
|
propertyPath: m_Enabled
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4358061821856006199, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
||||||
|
propertyPath: m_Enabled
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4424945577896426611, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
||||||
|
propertyPath: m_Enabled
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4452093830615906366, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
||||||
|
propertyPath: m_Enabled
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 5522155941026358655, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
- target: {fileID: 5522155941026358655, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
||||||
propertyPath: groundDrag
|
propertyPath: groundDrag
|
||||||
value: 10
|
value: 10
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8157005795946923844, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
||||||
|
propertyPath: m_Enabled
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8345059765388153377, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
||||||
|
propertyPath: m_Enabled
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
- target: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: Gottfried
|
value: Gottfried
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9017657623670109072, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9027508417417347048, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
||||||
|
propertyPath: m_Enabled
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9135568448293277664, guid: 7c7f0805c6bdc4f41bd65ec128f6b658, type: 3}
|
||||||
|
propertyPath: m_Enabled
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_RemovedGameObjects: []
|
m_RemovedGameObjects: []
|
||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
|
|
|
@ -59,6 +59,8 @@ public class Character : MonoBehaviour
|
||||||
|
|
||||||
public PickupInteractible CarriedItem => _carriedInteractible;
|
public PickupInteractible CarriedItem => _carriedInteractible;
|
||||||
|
|
||||||
|
public GottfriedData Data => _data;
|
||||||
|
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
|
@ -264,4 +266,9 @@ public class Character : MonoBehaviour
|
||||||
|
|
||||||
_canHurt = true;
|
_canHurt = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void PlayStepSound()
|
||||||
|
{
|
||||||
|
_audioSource.PlayOneShot(_data.StepSounds.GetRandomElement());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,10 +6,11 @@ namespace Data
|
||||||
[CreateAssetMenu(fileName = "GottfriedData", menuName = "DataObjects/GottfriedData", order = 0)]
|
[CreateAssetMenu(fileName = "GottfriedData", menuName = "DataObjects/GottfriedData", order = 0)]
|
||||||
public class GottfriedData : ScriptableObject
|
public class GottfriedData : ScriptableObject
|
||||||
{
|
{
|
||||||
[FormerlySerializedAs("Say_Impossible")] public AudioClip[] VoiceSayItsImpossible;
|
public AudioClip[] VoiceSayItsImpossible;
|
||||||
public AudioClip DrinkMate;
|
public AudioClip DrinkMate;
|
||||||
public AudioClip DrinkCoffe;
|
public AudioClip DrinkCoffe;
|
||||||
public AudioClip EatPizza;
|
public AudioClip EatPizza;
|
||||||
public AudioClip Hurt;
|
public AudioClip Hurt;
|
||||||
|
public AudioClip[] StepSounds;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -575,4 +575,9 @@ public class Developer : MonoBehaviour
|
||||||
GetComponent<Text2Speech>().Generate(context, shortnessLevel);
|
GetComponent<Text2Speech>().Generate(context, shortnessLevel);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void PlayStepSound()
|
||||||
|
{
|
||||||
|
_audioSource.PlayOneShot(GameManager.Instance.Player.Data.StepSounds.GetRandomElement());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ca64f072f07c0df449514b1b9f93a5dd
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
|
@ -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:
|
Binary file not shown.
|
@ -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:
|
Binary file not shown.
|
@ -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:
|
Binary file not shown.
|
@ -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:
|
Binary file not shown.
|
@ -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:
|
Binary file not shown.
|
@ -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:
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue