Commit cfa04ecd authored by 15김민규's avatar 15김민규

디버프 3종(화상 빙결 기절) 구현

parent 714cad0c
...@@ -22,7 +22,7 @@ AnimationClip: ...@@ -22,7 +22,7 @@ AnimationClip:
value: {fileID: 21300000, guid: eadcce843f0992343a9b7218e93f1c70, type: 3} value: {fileID: 21300000, guid: eadcce843f0992343a9b7218e93f1c70, type: 3}
- time: 0.25 - time: 0.25
value: {fileID: 21300000, guid: 66029eea961e74942902bdcde04415f8, type: 3} value: {fileID: 21300000, guid: 66029eea961e74942902bdcde04415f8, type: 3}
- time: 0.33333334 - time: 0.5
value: {fileID: 21300000, guid: 240fa090b75870d48b7b41babab381cd, type: 3} value: {fileID: 21300000, guid: 240fa090b75870d48b7b41babab381cd, type: 3}
attribute: m_Sprite attribute: m_Sprite
path: path:
...@@ -51,7 +51,7 @@ AnimationClip: ...@@ -51,7 +51,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0 m_AdditiveReferencePoseTime: 0
m_StartTime: 0 m_StartTime: 0
m_StopTime: 0.35000002 m_StopTime: 0.51666665
m_OrientationOffsetY: 0 m_OrientationOffsetY: 0
m_Level: 0 m_Level: 0
m_CycleOffset: 0 m_CycleOffset: 0
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Goblin Stunned
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300000, guid: 66029eea961e74942902bdcde04415f8, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 21300000, guid: 66029eea961e74942902bdcde04415f8, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0
m_Events:
- time: 0
functionName: aaa
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
fileFormatVersion: 2 fileFormatVersion: 2
guid: aeea32a402de4054cbaecd2c7d8a4bb2 guid: 99514cc2a01546c4a9a08f486e70e0f0
DefaultImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 7400000
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
...@@ -13,31 +13,37 @@ AnimatorController: ...@@ -13,31 +13,37 @@ AnimatorController:
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 0}
- m_Name: AttackTrigger - m_Name: AttackTrigger
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: 9100000} m_Controller: {fileID: 0}
- m_Name: DamagedTrigger - m_Name: DamagedTrigger
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: 9100000} m_Controller: {fileID: 0}
- m_Name: DeadTrigger - m_Name: DeadTrigger
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: 9100000} m_Controller: {fileID: 0}
- m_Name: knockbackTime - m_Name: StunnedTrigger
m_Type: 1 m_Type: 9
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 0}
- m_Name: DisableStunTrigger
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers: m_AnimatorLayers:
- serializedVersion: 5 - serializedVersion: 5
m_Name: Base Layer m_Name: Base Layer
...@@ -95,6 +101,30 @@ MonoBehaviour: ...@@ -95,6 +101,30 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d2a789ffb946ca045aaaf6896bc26da8, type: 3} m_Script: {fileID: 11500000, guid: d2a789ffb946ca045aaaf6896bc26da8, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1101 &1101114951698309000
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: StunnedTrigger
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102142326564126658}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101117024733671452 --- !u!1101 &1101117024733671452
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -112,7 +142,31 @@ AnimatorStateTransition: ...@@ -112,7 +142,31 @@ AnimatorStateTransition:
m_TransitionOffset: 0 m_TransitionOffset: 0
m_ExitTime: 0.9942825 m_ExitTime: 0.9942825
m_HasExitTime: 1 m_HasExitTime: 1
m_HasFixedDuration: 1 m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101374430603555350
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: DisableStunTrigger
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102455672269219010}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
...@@ -258,6 +312,32 @@ AnimatorState: ...@@ -258,6 +312,32 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102142326564126658
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Stunned
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101374430603555350}
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: 99514cc2a01546c4a9a08f486e70e0f0, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102365203996206974 --- !u!1102 &1102365203996206974
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 5
...@@ -374,28 +454,32 @@ AnimatorStateMachine: ...@@ -374,28 +454,32 @@ AnimatorStateMachine:
m_ChildStates: m_ChildStates:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 1102977373053479874} m_State: {fileID: 1102977373053479874}
m_Position: {x: 276, y: -84, z: 0} m_Position: {x: 264, y: -24, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 1102455672269219010} m_State: {fileID: 1102455672269219010}
m_Position: {x: 72, y: 48, z: 0} m_Position: {x: 168, y: 60, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 1102828359910447394} m_State: {fileID: 1102828359910447394}
m_Position: {x: 324, y: 48, z: 0} m_Position: {x: 420, y: 60, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 1102365203996206974} m_State: {fileID: 1102365203996206974}
m_Position: {x: 132, y: 168, z: 0} m_Position: {x: 60, y: 168, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 1102078500202870446} m_State: {fileID: 1102078500202870446}
m_Position: {x: -84, y: 168, z: 0} m_Position: {x: 384, y: 264, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102142326564126658}
m_Position: {x: 288, y: 168, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: m_AnyStateTransitions:
- {fileID: 1101843907484924652} - {fileID: 1101843907484924652}
- {fileID: 1101430029173875726} - {fileID: 1101430029173875726}
- {fileID: 1101114951698309000}
m_EntryTransitions: [] m_EntryTransitions: []
m_StateMachineTransitions: {} m_StateMachineTransitions: {}
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 192, y: 264, z: 0} m_AnyStatePosition: {x: 192, y: 264, z: 0}
m_EntryPosition: {x: 36, y: -84, z: 0} m_EntryPosition: {x: 36, y: -24, z: 0}
m_ExitPosition: {x: -60, y: 264, z: 0} m_ExitPosition: {x: -60, y: 264, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1102977373053479874} m_DefaultState: {fileID: 1102977373053479874}
...@@ -61,7 +61,7 @@ GameObject: ...@@ -61,7 +61,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!1 &1734061800721222 --- !u!1 &1734061800721222
GameObject: GameObject:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -78,7 +78,7 @@ GameObject: ...@@ -78,7 +78,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!1 &1910706395977056 --- !u!1 &1910706395977056
GameObject: GameObject:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -289,6 +289,8 @@ MonoBehaviour: ...@@ -289,6 +289,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2d73d07fdab522c4aa045e1cb6a92e8c, type: 3} m_Script: {fileID: 11500000, guid: 2d73d07fdab522c4aa045e1cb6a92e8c, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
debuffState:
fireDuration: 0
monsterID: 117 monsterID: 117
maxHealth: 55 maxHealth: 55
weight: 10 weight: 10
...@@ -304,7 +306,7 @@ MonoBehaviour: ...@@ -304,7 +306,7 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1734061800721222} m_GameObject: {fileID: 1734061800721222}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31d57aad92e0a1940b2258c8b7537027, type: 3} m_Script: {fileID: 11500000, guid: 31d57aad92e0a1940b2258c8b7537027, type: 3}
m_Name: m_Name:
...@@ -371,8 +373,8 @@ SpriteRenderer: ...@@ -371,8 +373,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: -2078941185
m_SortingLayer: 0 m_SortingLayer: 6
m_SortingOrder: 0 m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 71335108d30aa0e4a90179a09895440e, type: 3} m_Sprite: {fileID: 21300000, guid: 71335108d30aa0e4a90179a09895440e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
......
This diff is collapsed.
...@@ -31,7 +31,7 @@ public class EnemyMeleeIdle : StateMachineBehaviour { ...@@ -31,7 +31,7 @@ public class EnemyMeleeIdle : StateMachineBehaviour {
animator.SetTrigger("TrackTrigger"); animator.SetTrigger("TrackTrigger");
return; return;
} }
if (!enemy.KnockbackLock) if (!enemy.MovementLock)
{ {
float span = animatorRoot.position.x - origin.x; float span = animatorRoot.position.x - origin.x;
......
...@@ -13,7 +13,7 @@ public class EnemyMeleeTrack : StateMachineBehaviour { ...@@ -13,7 +13,7 @@ public class EnemyMeleeTrack : StateMachineBehaviour {
int frameCounter = 0; int frameCounter = 0;
// OnStateEnter is called when a transition starts and the state machine starts to evaluate this state // OnStateEnter is called when a transition starts and the state machine starts to evaluate this state
override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) { override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
animatorRoot = animator.transform.parent; animatorRoot = animator.transform.parent;
enemy = animator.GetComponent<Enemy>(); enemy = animator.GetComponent<Enemy>();
player = EnemyManager.Instance.Player; player = EnemyManager.Instance.Player;
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment