From a9141c6dc58f6bae172b6ae9aa13c39bf4470c62 Mon Sep 17 00:00:00 2001 From: KG0104 <76601263+KG0104@users.noreply.github.com> Date: Thu, 30 Sep 2021 17:56:29 +0200 Subject: [PATCH] snail hiding v0.1 --- .../Enemies/Bosses/Snail/schnecke.controller | 114 ++++++++++++++++-- .../Scripts/Enemies/Boss/BossCollision.cs | 1 + 2DGame/Assets/Scripts/Enemies/Boss/Hiding.cs | 1 + 3 files changed, 105 insertions(+), 11 deletions(-) diff --git a/2DGame/Assets/Animations/Enemies/Bosses/Snail/schnecke.controller b/2DGame/Assets/Animations/Enemies/Bosses/Snail/schnecke.controller index 41a9427..576479c 100644 --- a/2DGame/Assets/Animations/Enemies/Bosses/Snail/schnecke.controller +++ b/2DGame/Assets/Animations/Enemies/Bosses/Snail/schnecke.controller @@ -20,22 +20,22 @@ AnimatorStateMachine: m_Position: {x: 40, y: 80, z: 0} - serializedVersion: 1 m_State: {fileID: -6473195209341380491} - m_Position: {x: 420, y: 70, z: 0} + m_Position: {x: 450, y: 320, z: 0} - serializedVersion: 1 m_State: {fileID: -8009146185026353738} - m_Position: {x: 420, y: -50, z: 0} + m_Position: {x: 450, y: 210, z: 0} - serializedVersion: 1 m_State: {fileID: -1227584970688120990} - m_Position: {x: 420, y: -140, z: 0} + m_Position: {x: 450, y: 130, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 1561062677216112093} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 440, y: 170, z: 0} + m_AnyStatePosition: {x: 470, y: 410, z: 0} m_EntryPosition: {x: 60, y: 230, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} + m_ExitPosition: {x: 460, y: 60, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -7029625387216270796} --- !u!1102 &-8009146185026353738 @@ -102,7 +102,8 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -6842351801538661532} - m_StateMachineBehaviours: [] + m_StateMachineBehaviours: + - {fileID: -3277386159553480751} m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 m_WriteDefaultValues: 1 @@ -154,7 +155,8 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 8516544769702582279} - m_StateMachineBehaviours: [] + m_StateMachineBehaviours: + - {fileID: 2139167724840486148} m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 m_WriteDefaultValues: 1 @@ -169,6 +171,18 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!114 &-6461797696833005783 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7fff9c31e35cb464397ea641a77e0875, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1102 &-5998362775817029800 AnimatorState: serializedVersion: 6 @@ -259,6 +273,30 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!114 &-3277386159553480751 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1147e02bd640fe844a14f51473d15fc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-2158322185708939268 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1147e02bd640fe844a14f51473d15fc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1102 &-1227584970688120990 AnimatorState: serializedVersion: 6 @@ -270,7 +308,8 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] - m_StateMachineBehaviours: [] + m_StateMachineBehaviours: + - {fileID: -6461797696833005783} m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 m_WriteDefaultValues: 1 @@ -297,7 +336,8 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 1122053722246780174} - m_StateMachineBehaviours: [] + m_StateMachineBehaviours: + - {fileID: 2914368653008950878} m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 m_WriteDefaultValues: 1 @@ -327,6 +367,7 @@ AnimatorState: - {fileID: -7507392501452899040} m_StateMachineBehaviours: - {fileID: -4865427143545621587} + - {fileID: 5779999772698085708} m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 m_WriteDefaultValues: 1 @@ -413,7 +454,10 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isHiding + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -6473195209341380491} m_Solo: 0 @@ -427,7 +471,19 @@ AnimatorStateTransition: m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 + m_CanTransitionToSelf: 0 +--- !u!114 &2139167724840486148 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1147e02bd640fe844a14f51473d15fc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1101 &2266490165401247311 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -453,6 +509,42 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!114 &2914368653008950878 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1147e02bd640fe844a14f51473d15fc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &5779999772698085708 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1147e02bd640fe844a14f51473d15fc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &6678846749763340138 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1147e02bd640fe844a14f51473d15fc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &8406148847610217153 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/2DGame/Assets/Scripts/Enemies/Boss/BossCollision.cs b/2DGame/Assets/Scripts/Enemies/Boss/BossCollision.cs index 314f1a1..1f7addd 100644 --- a/2DGame/Assets/Scripts/Enemies/Boss/BossCollision.cs +++ b/2DGame/Assets/Scripts/Enemies/Boss/BossCollision.cs @@ -27,6 +27,7 @@ public class BossCollision : MonoBehaviour { boss.bossHealth--; Destroy(collision.gameObject); + invulnerable = true; //StartCoroutine("GetInvincible"); } } diff --git a/2DGame/Assets/Scripts/Enemies/Boss/Hiding.cs b/2DGame/Assets/Scripts/Enemies/Boss/Hiding.cs index 6992821..591b429 100644 --- a/2DGame/Assets/Scripts/Enemies/Boss/Hiding.cs +++ b/2DGame/Assets/Scripts/Enemies/Boss/Hiding.cs @@ -29,5 +29,6 @@ public class Hiding : StateMachineBehaviour override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) { animator.SetBool("isHiding", false); + bossCollision.invulnerable = false; } } -- 2.44.0