diff --git a/Assets/Animations/Player.controller b/Assets/Animations/Player.controller index b89b2fe..03b70ab 100644 --- a/Assets/Animations/Player.controller +++ b/Assets/Animations/Player.controller @@ -130,6 +130,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-1024307004791737801 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player_Death + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 66ae98069ecaa5242aec4f4cae66c9fc, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -204,16 +230,19 @@ AnimatorStateMachine: m_Position: {x: 280, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: -8762590617882576649} - m_Position: {x: 560, y: 10, z: 0} + m_Position: {x: 540, y: 10, z: 0} - serializedVersion: 1 m_State: {fileID: 9170910376667220155} m_Position: {x: 540, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: -3236591453607994996} - m_Position: {x: 560, y: 210, z: 0} + m_Position: {x: 540, y: 210, z: 0} - serializedVersion: 1 m_State: {fileID: -4060753411757630738} m_Position: {x: 750, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1024307004791737801} + m_Position: {x: 750, y: 210, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 45eac04..4237cd2 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -217,6 +217,18 @@ PrefabInstance: propertyPath: m_Name value: SceneStuff objectReference: {fileID: 0} + - target: {fileID: 8524814605665108988, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} + propertyPath: Loop + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8524814605665108988, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} + propertyPath: m_Volume + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 8524814605665108988, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} + propertyPath: m_audioClip + value: + objectReference: {fileID: 8300000, guid: a51c0c2435653b64cbfea4c1a1d92ef6, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} --- !u!4 &720678398 stripped diff --git a/Assets/Scripts/BloodSucker.cs b/Assets/Scripts/BloodSucker.cs index aa5f61c..f6ff5c3 100644 --- a/Assets/Scripts/BloodSucker.cs +++ b/Assets/Scripts/BloodSucker.cs @@ -91,9 +91,10 @@ public class BloodSucker : MonoBehaviour { } void PerformSuck(float deltaTime) { - if(currentTarget.bloodTokens <= 0 || ! vampireEntity.IsAlive()){ + if(currentTarget.bloodTokens <= 0 || vampireEntity.Health <= 0f){ SetIsSucking(false); SetTarget(null); + return; } bloodParticles.gameObject.transform.rotation = Quaternion.FromToRotation(transform.right, currentTarget.transform.position - transform.position); bloodParticles.gameObject.transform.localScale = Vector3.one * (Vector3.Distance(currentTarget.transform.position, transform.position) + 1f) / 4f; diff --git a/Assets/Sound/Test_Vampire.wav b/Assets/Sound/Test_Vampire.wav new file mode 100644 index 0000000..d179267 Binary files /dev/null and b/Assets/Sound/Test_Vampire.wav differ diff --git a/Assets/Sound/Test_Vampire.wav.meta b/Assets/Sound/Test_Vampire.wav.meta new file mode 100644 index 0000000..39bb998 --- /dev/null +++ b/Assets/Sound/Test_Vampire.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a51c0c2435653b64cbfea4c1a1d92ef6 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: