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

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

parent 714cad0c
......@@ -22,7 +22,7 @@ AnimationClip:
value: {fileID: 21300000, guid: eadcce843f0992343a9b7218e93f1c70, type: 3}
- time: 0.25
value: {fileID: 21300000, guid: 66029eea961e74942902bdcde04415f8, type: 3}
- time: 0.33333334
- time: 0.5
value: {fileID: 21300000, guid: 240fa090b75870d48b7b41babab381cd, type: 3}
attribute: m_Sprite
path:
......@@ -51,7 +51,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.35000002
m_StopTime: 0.51666665
m_OrientationOffsetY: 0
m_Level: 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
guid: aeea32a402de4054cbaecd2c7d8a4bb2
DefaultImporter:
guid: 99514cc2a01546c4a9a08f486e70e0f0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
......@@ -13,31 +13,37 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: AttackTrigger
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: DamagedTrigger
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: DeadTrigger
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: knockbackTime
m_Type: 1
m_Controller: {fileID: 0}
- m_Name: StunnedTrigger
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 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:
- serializedVersion: 5
m_Name: Base Layer
......@@ -95,6 +101,30 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d2a789ffb946ca045aaaf6896bc26da8, type: 3}
m_Name:
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
AnimatorStateTransition:
m_ObjectHideFlags: 1
......@@ -112,7 +142,31 @@ AnimatorStateTransition:
m_TransitionOffset: 0
m_ExitTime: 0.9942825
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_OrderedInterruption: 1
m_CanTransitionToSelf: 1
......@@ -258,6 +312,32 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
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
AnimatorState:
serializedVersion: 5
......@@ -374,28 +454,32 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102977373053479874}
m_Position: {x: 276, y: -84, z: 0}
m_Position: {x: 264, y: -24, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102455672269219010}
m_Position: {x: 72, y: 48, z: 0}
m_Position: {x: 168, y: 60, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102828359910447394}
m_Position: {x: 324, y: 48, z: 0}
m_Position: {x: 420, y: 60, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102365203996206974}
m_Position: {x: 132, y: 168, z: 0}
m_Position: {x: 60, y: 168, z: 0}
- serializedVersion: 1
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_AnyStateTransitions:
- {fileID: 1101843907484924652}
- {fileID: 1101430029173875726}
- {fileID: 1101114951698309000}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
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_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1102977373053479874}
......@@ -61,7 +61,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!1 &1734061800721222
GameObject:
m_ObjectHideFlags: 1
......@@ -78,7 +78,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!1 &1910706395977056
GameObject:
m_ObjectHideFlags: 1
......@@ -289,6 +289,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2d73d07fdab522c4aa045e1cb6a92e8c, type: 3}
m_Name:
m_EditorClassIdentifier:
debuffState:
fireDuration: 0
monsterID: 117
maxHealth: 55
weight: 10
......@@ -304,7 +306,7 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1734061800721222}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31d57aad92e0a1940b2258c8b7537027, type: 3}
m_Name:
......@@ -371,8 +373,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingLayerID: -2078941185
m_SortingLayer: 6
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 71335108d30aa0e4a90179a09895440e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
......
......@@ -279,6 +279,447 @@ Prefab:
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f6ef1c586e7764c41ba8349325635589, type: 2}
m_IsPrefabAsset: 0
--- !u!1001 &125625237
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1244139631}
m_Modifications:
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.size
value: 9
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.size
value: 4
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.size
value: 4
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.size
value: 6
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.size
value: 26
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.size
value: 9
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.size
value: 4
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.size
value: 4
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.size
value: 6
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.size
value: 26
objectReference: {fileID: 0}
- target: {fileID: 4874486600194970, guid: 7b5317162788b8d4daa13ea5c6dd368b, type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4874486600194970, guid: 7b5317162788b8d4daa13ea5c6dd368b, type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4874486600194970, guid: 7b5317162788b8d4daa13ea5c6dd368b, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4874486600194970, guid: 7b5317162788b8d4daa13ea5c6dd368b, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4874486600194970, guid: 7b5317162788b8d4daa13ea5c6dd368b, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4874486600194970, guid: 7b5317162788b8d4daa13ea5c6dd368b, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4874486600194970, guid: 7b5317162788b8d4daa13ea5c6dd368b, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4874486600194970, guid: 7b5317162788b8d4daa13ea5c6dd368b, type: 2}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[0].X
value: 240000000
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[0].Y
value: 240000000
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[1].X
value: 130000000
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[1].Y
value: 240000000
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[2].X
value: 130000000
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[2].Y
value: 230000000
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[3].X
value: 230000000
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[3].Y
value: 230000000
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[0].x
value: 24
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[0].y
value: 24
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[1].x
value: 13
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[1].y
value: 24
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[2].x
value: 13
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[2].y
value: 23
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[3].x
value: 23
objectReference: {fileID: 0}
- target: {fileID: 66470208273812638, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[3].y
value: 23
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[0].X
value: 76562496
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[0].Y
value: 139531248
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[1].X
value: 76406248
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[1].Y
value: 140000000
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[2].X
value: 76562496
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[2].Y
value: 140000000
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[3].X
value: 76562496
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[3].Y
value: 149531248
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[4].X
value: 76406248
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[4].Y
value: 150000000
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[0].x
value: 7.6562495
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[0].y
value: 13.953125
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[1].x
value: 7.640625
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[1].y
value: 14
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[2].x
value: 7.6562495
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[2].y
value: 14
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[3].x
value: 7.6562495
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[3].y
value: 14.953125
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[4].x
value: 7.640625
objectReference: {fileID: 0}
- target: {fileID: 66646474760707030, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[4].y
value: 15
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[0].X
value: 170000000
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[0].Y
value: 210039056
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[1].X
value: 70000000
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[1].Y
value: 210039056
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[2].X
value: 70000000
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[2].Y
value: 205351568
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[3].X
value: 170000000
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[3].Y
value: 205351568
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[1].Array.data[0].X
value: 70000000
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[1].Array.data[0].Y
value: 110039064
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[1].Array.data[1].X
value: 50000000
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[1].Array.data[1].Y
value: 110039064
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[1].Array.data[2].X
value: 50000000
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[1].Array.data[2].Y
value: 105351560
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[1].Array.data[3].X
value: 70000000
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[1].Array.data[3].Y
value: 105351560
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[0].x
value: 17
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[0].y
value: 21.003906
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[1].x
value: 7
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[1].y
value: 21.003906
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[2].x
value: 7
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[2].y
value: 20.535156
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[3].x
value: 17
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[3].y
value: 20.535156
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[1].Array.data[0].x
value: 7
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[1].Array.data[0].y
value: 11.003906
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[1].Array.data[1].x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[1].Array.data[1].y
value: 11.003906
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[1].Array.data[2].x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[1].Array.data[2].y
value: 10.535156
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[1].Array.data[3].x
value: 7
objectReference: {fileID: 0}
- target: {fileID: 66792933649035248, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
propertyPath: m_CompositePaths.m_Paths.Array.data[1].Array.data[3].y
value: 10.535156
objectReference: {fileID: 0}
- target: {fileID: 1915452461634262, guid: 7b5317162788b8d4daa13ea5c6dd368b, type: 2}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7b5317162788b8d4daa13ea5c6dd368b, type: 2}
m_IsPrefabAsset: 0
--- !u!1001 &179350392
Prefab:
m_ObjectHideFlags: 0
......@@ -667,6 +1108,18 @@ Prefab:
propertyPath: grid
value:
objectReference: {fileID: 1244139631}
- target: {fileID: 114144154128578016, guid: afe4a2cb44239b649a3ffa70af5c2d84,
type: 2}
propertyPath: specialRoomList1.Array.data[8]
value:
objectReference: {fileID: 114792926073732986, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
- target: {fileID: 114144154128578016, guid: afe4a2cb44239b649a3ffa70af5c2d84,
type: 2}
propertyPath: specialRoomList2.Array.data[8]
value:
objectReference: {fileID: 114792926073732986, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: afe4a2cb44239b649a3ffa70af5c2d84, type: 2}
m_IsPrefabAsset: 0
......@@ -737,6 +1190,11 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &892320364 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4874486600194970, guid: 7b5317162788b8d4daa13ea5c6dd368b,
type: 2}
m_PrefabInternal: {fileID: 125625237}
--- !u!1 &1148854461
GameObject:
m_ObjectHideFlags: 0
......@@ -1150,7 +1608,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1787348170}
- {fileID: 892320364}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -1402,7 +1860,17 @@ Prefab:
- target: {fileID: 114402380471012178, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: debuffTime.Array.data[0]
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114402380471012178, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: debuffTime.Array.data[1]
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114402380471012178, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: debuffTime.Array.data[2]
value: 3
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
......@@ -1594,61 +2062,6 @@ Prefab:
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c179f0931cfabec428a868a6edc543b0, type: 2}
m_IsPrefabAsset: 0
--- !u!1001 &1787348169
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1244139631}
m_Modifications:
- target: {fileID: 66792933649035248, guid: 0443c2e9410bbe545bda40dc30fa6a63,
type: 2}
propertyPath: m_ColliderPaths.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4874486600194970, guid: 0443c2e9410bbe545bda40dc30fa6a63, type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4874486600194970, guid: 0443c2e9410bbe545bda40dc30fa6a63, type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4874486600194970, guid: 0443c2e9410bbe545bda40dc30fa6a63, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4874486600194970, guid: 0443c2e9410bbe545bda40dc30fa6a63, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4874486600194970, guid: 0443c2e9410bbe545bda40dc30fa6a63, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4874486600194970, guid: 0443c2e9410bbe545bda40dc30fa6a63, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4874486600194970, guid: 0443c2e9410bbe545bda40dc30fa6a63, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4874486600194970, guid: 0443c2e9410bbe545bda40dc30fa6a63, type: 2}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1915452461634262, guid: 0443c2e9410bbe545bda40dc30fa6a63, type: 2}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0443c2e9410bbe545bda40dc30fa6a63, type: 2}
m_IsPrefabAsset: 0
--- !u!4 &1787348170 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 1787348169}
--- !u!114 &1908917313 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 114939219159237616, guid: 62a83d11a7addc342ad436145784e698,
......
......@@ -31,7 +31,7 @@ public class EnemyMeleeIdle : StateMachineBehaviour {
animator.SetTrigger("TrackTrigger");
return;
}
if (!enemy.KnockbackLock)
if (!enemy.MovementLock)
{
float span = animatorRoot.position.x - origin.x;
......
......@@ -9,8 +9,8 @@ public class Enemy : MonoBehaviour {
// debuff
float[] immunity_time = new float[(int)EnemyDebuffCase.END_POINTER] { 0.0f, 3.0f, 6.0f, 6.0f, 6.0f };
DebuffState[] debuffState;
float fireDuration = 0.0f;
public DebuffState[] debuffState;
public float fireDuration = 0.0f;
// stat
public int monsterID;
......@@ -32,9 +32,10 @@ public class Enemy : MonoBehaviour {
// for movement
private Animator animator;
private float damagedAnimLength;
public bool Invisible { get; private set; }
public bool MovementLock { get; private set; }
public bool KnockbackLock { get; private set; }
public bool DebuffLock { get; private set; }
public float PlayerDistance { get; private set; }
private readonly float knockbackCritPoint = 0.25f;
......@@ -59,13 +60,16 @@ public class Enemy : MonoBehaviour {
DebuffState _temp = DebuffState.Off;
debuffState = new DebuffState[(int)EnemyDebuffCase.END_POINTER] { _temp, _temp, _temp, _temp, _temp };
AnimationClip[] clips = animator.runtimeAnimatorController.animationClips;
foreach (var clip in clips) { if (clip.name.Contains("Damaged")) { damagedAnimLength = clip.length; } }
}
private void Start()
{
MoveDir = (int)NumeratedDir.Left;
currHealth = maxHealth;
Invisible = KnockbackLock = false;
Invisible = MovementLock = false;
dropTable = enemyManager.DropTableByID[monsterID];
//Physics2D.IgnoreCollision(enemyManager.Player.gameObject.GetComponent<Collider2D>(), transform.parent.GetComponent<Collider2D>());
PlayerDistance = Vector2.Distance(enemyManager.Player.transform.position, transform.parent.position);
......@@ -106,8 +110,8 @@ public class Enemy : MonoBehaviour {
{
Vector2 origin = (Vector2)transform.parent.position + new Vector2(Dir * colliderSize.x / 2.0f, colliderSize.y);
Vector2 direction = Vector2.right * Dir;
float distance = 0.02f;
int layerMask = LayerMask.GetMask("Wall", "OuterWall");
float distance = 0.5f;
LayerMask layerMask = LayerMask.GetMask("Wall", "OuterWall");
RaycastHit2D hit = Physics2D.Raycast(origin, direction, distance, layerMask);
WallTest[(Dir + 1) / 2] = (hit.collider != null);
......@@ -117,16 +121,12 @@ public class Enemy : MonoBehaviour {
// - Change direction, and speed of rigidbody of enemy
public void ChangeVelocityX(float val)
{
if (!KnockbackLock && !DebuffLock)
{
Vector2 tempVelocity = transform.parent.GetComponent<Rigidbody2D>().velocity;
tempVelocity.x = val;
transform.parent.GetComponent<Rigidbody2D>().velocity = tempVelocity;
}
ChangeVelocityX_lock(val, new bool[] { MovementLock, KnockbackLock });
}
private void SudoChangeVelocityX(float val)
private void ChangeVelocityX_lock(float val, bool[] lockArray)
{
foreach(var Lock in lockArray) { if (Lock) return; }
Vector2 tempVelocity = transform.parent.GetComponent<Rigidbody2D>().velocity;
tempVelocity.x = val;
transform.parent.GetComponent<Rigidbody2D>().velocity = tempVelocity;
......@@ -134,15 +134,12 @@ public class Enemy : MonoBehaviour {
public void ChangeDir(object dir)
{
if (!KnockbackLock && !DebuffLock)
{
MoveDir = (int)dir;
transform.parent.eulerAngles = ((NumeratedDir)dir == NumeratedDir.Left) ? new Vector2(0, 0) : new Vector2(0, 180);
}
ChangeDir_lock(dir, new bool[] { MovementLock, KnockbackLock });
}
private void SudoChangeDir(object dir)
private void ChangeDir_lock(object dir, bool[] lockArray)
{
foreach (var Lock in lockArray) { if (Lock) return; }
MoveDir = (int)dir;
transform.parent.eulerAngles = ((NumeratedDir)dir == NumeratedDir.Left) ? new Vector2(0, 0) : new Vector2(0, 180);
}
......@@ -150,23 +147,24 @@ public class Enemy : MonoBehaviour {
// - Knockback coroutine
IEnumerator Knockback(float knockbackDist, float knockbackTime)
{
KnockbackLock = true;
MovementLock = true;
bool[] lockArray = new bool[] { false, KnockbackLock };
int knockbackDir = (enemyManager.Player.transform.position.x - transform.parent.position.x >= 0) ? -1 : 1;
float knockbackVelocity = knockbackDir * knockbackDist / knockbackTime;
SudoChangeDir(knockbackDir * -1);
SudoChangeVelocityX(knockbackVelocity);
ChangeDir_lock(knockbackDir * -1, lockArray);
ChangeVelocityX_lock(knockbackVelocity, lockArray);
for (float timer = 0; timer <= knockbackTime; timer += Time.deltaTime)
{
if (CliffTest[(knockbackDir + 1) / 2])
{
SudoChangeVelocityX(0.0f);
ChangeVelocityX_lock(0.0f, lockArray);
yield return new WaitForSeconds(knockbackTime - timer);
break;
}
yield return new WaitForFixedUpdate();
}
KnockbackLock = false;
MovementLock = false;
ChangeVelocityX(0.0f);
}
......@@ -183,10 +181,12 @@ public class Enemy : MonoBehaviour {
return;
}
DebuffApply(attack.debuffTime);
float knockbackDist = attack.damage * attack.knockBackMultiplier / weight;
float knockbackTime = (knockbackDist >= 0.5f) ? 0.5f : knockbackDist;
if (KnockbackLock)
if (MovementLock)
{
StopCoroutine("Knockback");
}
......@@ -194,17 +194,8 @@ public class Enemy : MonoBehaviour {
if (knockbackDist >= knockbackCritPoint)
{
animator.SetFloat("knockbackTime", knockbackTime);
animator.SetTrigger("DamagedTrigger");
}
for(int i = 0; i < (int)EnemyDebuffCase.END_POINTER; i++)
{
if(attack.debuffTime[i] > 0.0f)
{
DebuffApply((EnemyDebuffCase)i, attack.debuffTime[i]);
}
}
}
public void GetDamaged(float damage)
......@@ -219,34 +210,49 @@ public class Enemy : MonoBehaviour {
}
// - Apply debuff
private void DebuffApply(EnemyDebuffCase debuff, float duration)
private void DebuffApply(float[] debuffTime)
{
IEnumerator debuffFunc = null;
int intCase = (int)debuff;
if (debuffState[intCase] == DebuffState.Immune) return;
debuffState[intCase] = DebuffState.On;
switch (debuff)
if(debuffState[(int)EnemyDebuffCase.Ice] == DebuffState.On){
OffDebuff(EnemyDebuffCase.Ice);
}
foreach (int debuff in Enum.GetValues(typeof(EnemyDebuffCase)))
{
if(debuff == (int)EnemyDebuffCase.END_POINTER || debuffTime[debuff] == 0.0f || debuffState[debuff] == DebuffState.Immune)
{
continue;
}
float duration = debuffTime[debuff];
switch ((EnemyDebuffCase)debuff)
{
case EnemyDebuffCase.Fire:
if (fireDuration != 0.0f) { fireDuration += duration; }
else { debuffFunc = OnFire(duration); }
else {
debuffState[debuff] = DebuffState.On;
StartCoroutine(OnFire(duration));
}
break;
case EnemyDebuffCase.Ice:
debuffFunc = OnIce(duration);
debuffState[debuff] = DebuffState.On;
StartCoroutine(OnIce(duration));
break;
case EnemyDebuffCase.Stun:
debuffFunc = OnStun(duration);
if(debuffState[debuff] != DebuffState.On) {
debuffState[debuff] = DebuffState.On;
StartCoroutine(OnStun(duration));
}
break;
case EnemyDebuffCase.Blind:
debuffFunc = OnBlind(duration);
StartCoroutine(OnBlind(duration));
break;
case EnemyDebuffCase.Charm:
debuffFunc = OnCharm(duration);
StartCoroutine(OnCharm(duration));
break;
default:
break;
}
StartCoroutine(debuffFunc);
}
}
// - Debuff coroutine
......@@ -254,15 +260,14 @@ public class Enemy : MonoBehaviour {
{
fireDuration = duration;
float dotGap = 1.0f;
while(true)
{
yield return new WaitForSeconds(dotGap);
fireDuration -= dotGap;
if (fireDuration <= 0.0f) {
fireDuration = 0;
if (fireDuration < 0.0f) {
fireDuration = 0.0f;
break;
}
yield return new WaitForSeconds(1.0f);
GetDamaged(lifeStoneManager.lifeStoneRowNum * 3);
}
debuffState[(int)EnemyDebuffCase.Fire] = DebuffState.Off;
......@@ -270,18 +275,21 @@ public class Enemy : MonoBehaviour {
IEnumerator OnIce(float duration)
{
ChangeVelocityX(0.0f);
DebuffLock = true;
ChangeVelocityX_lock(0.0f, new bool[] { });
KnockbackLock = true;
animator.SetTrigger("StunnedTrigger");
animator.speed = damagedAnimLength / duration;
yield return new WaitForSeconds(duration);
OffDebuff(EnemyDebuffCase.Ice);
}
IEnumerator OnStun(float duration)
{
ChangeVelocityX(0.0f);
DebuffLock = true;
ChangeVelocityX_lock(0.0f, new bool[] { });
animator.SetTrigger("StunnedTrigger");
animator.speed = damagedAnimLength / duration;
yield return new WaitForSeconds(duration);
OffDebuff(EnemyDebuffCase.Ice);
OffDebuff(EnemyDebuffCase.Stun);
yield return null;
}
......@@ -304,8 +312,23 @@ public class Enemy : MonoBehaviour {
private void OffDebuff(EnemyDebuffCase Case)
{
DebuffLock = false;
ImmuneTimer(Case, immunity_time[(int)Case]);
StartCoroutine(ImmuneTimer(Case, immunity_time[(int)Case]));
switch (Case)
{
case EnemyDebuffCase.Ice:
StopCoroutine("OnIce");
KnockbackLock = false;
animator.speed = 1.0f;
animator.SetTrigger("DisableStunTrigger");
break;
case EnemyDebuffCase.Stun:
StopCoroutine("OnStun");
animator.speed = 1.0f;
animator.SetTrigger("DisableStunTrigger");
break;
default:
break;
}
}
// Animation Event
......@@ -360,6 +383,11 @@ public class Enemy : MonoBehaviour {
Invisible = false;
return;
}
public void aaa()
{
Debug.Log("aaa");
}
}
/* Item Drop Index
......
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