Skip to content

tetra-tower
tetra-tower
Commit 958700b5 authored by 18손재민's avatar 18손재민
Browse files
Options

Merge remote-tracking branch 'origin/master' into tetris

parents 4c09838b af4d49a5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8734 additions and 428 deletions
Assets/Animation/Enemy/Goblin.meta 0 → 100644
View file @ 958700b5
fileFormatVersion: 2
guid: bfd88a18bdc2e3b4a9e9f91c0bcaa7b7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Animation/Enemy/Goblin/GameObject.controller 0 → 100644
View file @ 958700b5
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: GameObject
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 1107295271287990198}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &1102377462485751694
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: New Animation
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: 0c30e1483f0e2b84eb68c22964b14ffa, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &1107295271287990198
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102377462485751694}
m_Position: {x: 200, y: 0, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1102377462485751694}
Assets/Animation/Enemy/Goblin/GameObject.controller.meta 0 → 100644
View file @ 958700b5
fileFormatVersion: 2
guid: c375d2807a0f70d4385b48b7971dfa9c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Animation/Enemy/Goblin/Goblin Attack.anim 0 → 100644
View file @ 958700b5
%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 Attack
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.083333336
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.18333334
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.8333333
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.9
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Enabled
path: Hitbox
classID: 61
script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300000, guid: b0d499510f5dd4144bc2b110a4fba53c, type: 3}
- time: 0.016666668
value: {fileID: 21300000, guid: 37e5cfde8d3541845a184c4d6ab25e21, type: 3}
- time: 0.083333336
value: {fileID: 21300000, guid: 2806c6904b006114bad1fb3f64d64c14, type: 3}
- time: 0.18333334
value: {fileID: 21300000, guid: 6234b3bf70d0272478b444abdd572f09, type: 3}
- time: 0.25
value: {fileID: 21300000, guid: f7d12f4a971df594c8d297610a3f9e57, type: 3}
- time: 0.8333333
value: {fileID: 21300000, guid: b2382ef0803ec1c4c811783916c7aa49, 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: 3579746941
attribute: 3305885265
script: {fileID: 0}
typeID: 61
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 21300000, guid: b0d499510f5dd4144bc2b110a4fba53c, type: 3}
- {fileID: 21300000, guid: 37e5cfde8d3541845a184c4d6ab25e21, type: 3}
- {fileID: 21300000, guid: 2806c6904b006114bad1fb3f64d64c14, type: 3}
- {fileID: 21300000, guid: 6234b3bf70d0272478b444abdd572f09, type: 3}
- {fileID: 21300000, guid: f7d12f4a971df594c8d297610a3f9e57, type: 3}
- {fileID: 21300000, guid: b2382ef0803ec1c4c811783916c7aa49, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.9
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
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:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.083333336
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.18333334
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.8333333
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.9
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Enabled
path: Hitbox
classID: 61
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0
m_Events: []
Assets/Animation/Enemy/Goblin/Goblin Attack.anim.meta 0 → 100644
View file @ 958700b5
fileFormatVersion: 2
guid: d3e09b2950d21e94e8144eec0a93ee38
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Animation/Enemy/Goblin/Goblin Damaged.anim 0 → 100644
View file @ 958700b5
%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 Damaged
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: eadcce843f0992343a9b7218e93f1c70, type: 3}
- time: 0.25
value: {fileID: 21300000, guid: 66029eea961e74942902bdcde04415f8, type: 3}
- time: 0.33333334
value: {fileID: 21300000, guid: 240fa090b75870d48b7b41babab381cd, 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: eadcce843f0992343a9b7218e93f1c70, type: 3}
- {fileID: 21300000, guid: 66029eea961e74942902bdcde04415f8, type: 3}
- {fileID: 21300000, guid: 240fa090b75870d48b7b41babab381cd, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.35000002
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: []
Assets/Animation/Enemy/Goblin/Goblin Damaged.anim.meta 0 → 100644
View file @ 958700b5
fileFormatVersion: 2
guid: 9fd0a4272dcf9844b940854afc5c69ea
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Animation/Enemy/Goblin/Goblin Hit.anim 0 → 100644
View file @ 958700b5
%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 Hit
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: eadcce843f0992343a9b7218e93f1c70, type: 3}
- time: 0.016666668
value: {fileID: 21300000, guid: 66029eea961e74942902bdcde04415f8, type: 3}
- time: 0.033333335
value: {fileID: 21300000, guid: 240fa090b75870d48b7b41babab381cd, 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: eadcce843f0992343a9b7218e93f1c70, type: 3}
- {fileID: 21300000, guid: 66029eea961e74942902bdcde04415f8, type: 3}
- {fileID: 21300000, guid: 240fa090b75870d48b7b41babab381cd, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.050000004
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: []
Assets/Animation/Enemy/Goblin/Goblin Hit.anim.meta 0 → 100644
View file @ 958700b5
fileFormatVersion: 2
guid: 0a3d0364cdede114f95de5ff89b5d39c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Animation/Enemy/Goblin/Goblin Idle.anim 0 → 100644
View file @ 958700b5
%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 Idle
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: 71335108d30aa0e4a90179a09895440e, 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: 71335108d30aa0e4a90179a09895440e, 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: []
Assets/Animation/Enemy/Goblin/Goblin Idle.anim.meta 0 → 100644
View file @ 958700b5
fileFormatVersion: 2
guid: 2929b46a5e5dded43a97e01a91cd676a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Animation/Enemy/melee.controller
View file @ 958700b5
......@@ -8,60 +8,30 @@ AnimatorController:
m_Name: melee
serializedVersion: 5
m_AnimatorParameters:
- m_Name: patrolRange
m_Type: 1
m_DefaultFloat: 2
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: attackRange
m_Type: 1
m_DefaultFloat: 2
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: movementSpeedPatrol
m_Type: 1
m_DefaultFloat: 1
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: movementSpeedTrack
m_Type: 1
m_DefaultFloat: 2
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: TrackTrigger
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: noticeRange
m_Type: 1
m_DefaultFloat: 3
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: AttackTrigger
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: attackDuration
m_Type: 1
m_DefaultFloat: 1
m_Controller: {fileID: 9100000}
- m_Name: DamagedTrigger
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: attackDelay
m_Type: 1
m_DefaultFloat: 1
m_Controller: {fileID: 9100000}
- m_Name: DeadTrigger
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
......@@ -75,7 +45,7 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!114 &114566440929010514
--- !u!114 &114316214165794054
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
......@@ -83,11 +53,9 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e92be6a4d81dc134fbe2097609bb180b, type: 3}
m_Script: {fileID: 11500000, guid: 752c7d4f7a0f1444c84cadeae1fab1d7, type: 3}
m_Name:
m_EditorClassIdentifier:
castingSprite: {fileID: 21300000, guid: 9588a72c7c886de4a999bf6cc7948b84, type: 3}
attackingSprite: {fileID: 21300000, guid: a6edaaede1a4aea42a1e9fea0eec397e, type: 3}
--- !u!114 &114878841526562312
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -110,6 +78,27 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d2a789ffb946ca045aaaf6896bc26da8, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1101 &1101117024733671452
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions: []
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.9942825
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101563152619324414
AnimatorStateTransition:
m_ObjectHideFlags: 1
......@@ -140,20 +129,17 @@ AnimatorStateTransition:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: TrackTrigger
m_EventTreshold: 0
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102455672269219010}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0.1783799
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_ExitTime: 1.0027776
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
......@@ -165,6 +151,9 @@ AnimatorStateTransition:
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: TrackTrigger
m_EventTreshold: 0
- m_ConditionMode: 1
m_ConditionEvent: TrackTrigger
m_EventTreshold: 0
......@@ -182,6 +171,57 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101843907484924652
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: DamagedTrigger
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102365203996206974}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 4.168036e-10
m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &1102365203996206974
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Damaged
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101117024733671452}
m_StateMachineBehaviours:
- {fileID: 114316214165794054}
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: 9fd0a4272dcf9844b940854afc5c69ea, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102455672269219010
AnimatorState:
serializedVersion: 5
......@@ -203,7 +243,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 0}
m_Motion: {fileID: 7400000, guid: 2929b46a5e5dded43a97e01a91cd676a, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
......@@ -220,8 +260,7 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101581218500765106}
m_StateMachineBehaviours:
- {fileID: 114566440929010514}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
......@@ -230,7 +269,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 0}
m_Motion: {fileID: 7400000, guid: d3e09b2950d21e94e8144eec0a93ee38, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
......@@ -257,7 +296,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 0}
m_Motion: {fileID: 7400000, guid: 2929b46a5e5dded43a97e01a91cd676a, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
......@@ -280,13 +319,17 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 1102828359910447394}
m_Position: {x: 324, y: 48, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102365203996206974}
m_Position: {x: 132, y: 168, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_AnyStateTransitions:
- {fileID: 1101843907484924652}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: -12, y: 168, z: 0}
m_AnyStatePosition: {x: 192, y: 264, z: 0}
m_EntryPosition: {x: 36, y: -84, z: 0}
m_ExitPosition: {x: 348, y: 240, z: 0}
m_ExitPosition: {x: -24, y: 276, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1102977373053479874}
Assets/MeleeAttack.cs → Assets/Damaged.cs
View file @ 958700b5
......@@ -2,63 +2,37 @@
using System.Collections.Generic;
using UnityEngine;
public class MeleeAttack : StateMachineBehaviour {
float timer;
float attackDelay;
float attackDuration;
public Sprite castingSprite;
public Sprite attackingSprite;
Sprite prevSprite;
public class Damaged : StateMachineBehaviour {
enum SubState
{
BEFOREATTACK,
CASTING,
ATTACKING
}
SubState subState;
// 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) {
prevSprite = animator.GetComponent<SpriteRenderer>().sprite;
attackDelay = animator.GetFloat("attackDelay");
attackDuration = animator.GetFloat("attackDuration");
subState = SubState.BEFOREATTACK;
timer = 0.0f;
}
RuntimeAnimatorController ac;
float knockbackTime;
Vector3 leftsideAngle = new Vector3(0, 0, 0);
Vector3 rightsideAngle = new Vector3(0, 180, 0);
// OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks
override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
timer += Time.deltaTime;
if (timer < attackDelay)
// 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) {
ac = animator.runtimeAnimatorController;
foreach(var clip in ac.animationClips)
{
if (subState == SubState.BEFOREATTACK)
if (clip.name.Contains("Damaged"))
{
subState = SubState.CASTING;
animator.GetComponent<SpriteRenderer>().sprite = castingSprite;
knockbackTime = clip.length;
}
// action during casting attack
}
else if (timer < attackDelay + attackDuration)
{
if (subState == SubState.CASTING)
{
subState = SubState.ATTACKING;
animator.GetComponent<SpriteRenderer>().sprite = attackingSprite;
animator.transform.GetChild(0).GetComponents<BoxCollider2D>()[0].enabled = true;
}
}
else
{
animator.SetTrigger("TrackTrigger");
}
Transform playerTransform = EnemyManager.Instance.player.transform;
Transform pivotTransform = animator.transform.parent;
pivotTransform.eulerAngles = (playerTransform.position.x - pivotTransform.position.x < 0) ? leftsideAngle : rightsideAngle;
}
// OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks
override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
}
// OnStateExit is called when a transition ends and the state machine finishes evaluating this state
override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
animator.GetComponent<SpriteRenderer>().sprite = prevSprite;
animator.transform.GetChild(0).GetComponents<BoxCollider2D>()[0].enabled = false;
}
//override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
//
//}
// OnStateMove is called right after Animator.OnAnimatorMove(). Code that processes and affects root motion should be implemented here
//override public void OnStateMove(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
......
Assets/MeleeAttack.cs.meta → Assets/Damaged.cs.meta
View file @ 958700b5
fileFormatVersion: 2
guid: e92be6a4d81dc134fbe2097609bb180b
guid: 752c7d4f7a0f1444c84cadeae1fab1d7
MonoImporter:
externalObjects: {}
serializedVersion: 2
......
Assets/Data/dropData_exam.csv 0 → 100644
View file @ 958700b5
스테이지,ID,이름,드랍하지 않음,생명석 1개,생명석 2개,생명석 3개,생명석 4개,생명석 5개,금 포션,자수정 포션,습작 아이템,범작,수작,걸작 아이템,습작 애드온,범작,수작,걸작 애드온
고대유적,,,,,,,,,,,,,,,,,,
고대유적,42,전갈,7,4,1,0,0,0,0,0,2,0,0,0,2,1,0,0
고대유적,101,고블린,7,4,1,0,0,0,0,0,2,0,0,0,2,1,0,0
고대유적,102,고블린 보초병,4,3,0,0,0,0,0,0,0,0,0,0,1,0,0,0
고대유적,103,날쌘 고블린,3,5,1,0,0,0,0,0,2,0,0,0,2,1,0,0
고대유적,1050,나태한 고블린,3,5,1,0,0,0,0,0,1,0,0,0,1,3,0,0
고대유적,104,고블린 챔피언,1,8,4,2,0,0,3,0,2,4,2,0,2,1,0,0
고대유적,1060,밤의 사제,0,2,1,0,0,0,3,0,2,6,3,0,1,5,2,0
고대유적,1070,고물 보블린,0,3,0,0,0,0,3,0,1,7,5,1,2,6,4,1
고대유적,111,거대 거미,2,4,3,1,0,0,0,0,2,1,0,0,2,2,0,0
고대유적,112,독 거미,3,4,1,0,0,0,0,0,1,0,0,0,1,1,0,0
고대유적,121,도둑 까마귀,0,3,1,0,0,0,4,0,5,2,1,0,7,4,1,0
고대유적,113,야생 늑대,1,2,4,1,0,0,0,0,1,3,1,0,2,3,1,0
고대유적,1140,고블린 라이더,1,3,5,1,0,0,3,0,3,4,1,0,3,3,1,0
고대유적,122,흡혈 박쥐,3,3,1,0,0,0,0,0,2,1,0,0,3,1,0,0
고대유적,1230,새끼 박쥐,5,4,0,0,0,0,0,0,1,0,0,0,2,0,0,0
고대유적,115,엘리게이터-1,1,4,6,3,1,0,2,0,5,5,3,1,3,1,1,0
고대유적,116,엘리게이터-2,1,4,6,3,1,0,2,0,5,5,3,1,3,1,1,0
고대유적,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,,,
라거 섬,,,,,,,,,,,,,,,,,,
라거 섬,,,,,,,,,,,,,,,,,,
라거 섬,,,,,,,,,,,,,,,,,,
라거 섬,,,,,,,,,,,,,,,,,,
라거 섬,,,,,,,,,,,,,,,,,,
라거 섬,,,,,,,,,,,,,,,,,,
라거 섬,,,,,,,,,,,,,,,,,,
라거 섬,,,,,,,,,,,,,,,,,,
라거 섬,,,,,,,,,,,,,,,,,,
라거 섬,,,,,,,,,,,,,,,,,,
라거 섬,,,,,,,,,,,,,,,,,,
도시,,,,,,,,,,,,,,,,,,
도시,,고위 마법사,,,,,,,,,,,,,,,,
도시,,황실 기사,,,,,,,,,,,,,,,,
도시,,학자,,,,,,,,,,,,,,,,
도시,,보초병,,,,,,,,,,,,,,,,
도시,,일반 마법사,,,,,,,,,,,,,,,,
도시,,폰,,,,,,,,,,,,,,,,
도시,,나이트,,,,,,,,,,,,,,,,
도시,,비숍,,,,,,,,,,,,,,,,
도시,,룩,,,,,,,,,,,,,,,,
도시,,심복,,,,,,,,,,,,,,,,
도시,,성직자,,,,,,,,,,,,,,,,
도시,,고위 성직자,,,,,,,,,,,,,,,,
도시,,정예 기사,,,,,,,,,,,,,,,,
폐허,,,,,,,,,,,,,,,,,,
폐허,,용암 융합체,,,,,,,,,,,,,,,,
폐허,,백골 야수,,,,,,,,,,,,,,,,
폐허,,백골 마법사,,,,,,,,,,,,,,,,
폐허,,언데드 학자,,,,,,,,,,,,,,,,
폐허,,언데드 성직자,,,,,,,,,,,,,,,,
폐허,,묘비왕자,,,,,,,,,,,,,,,,
폐허,,,,,,,,,,,,,,,,,,
폐허,,,,,,,,,,,,,,,,,,
폐허,,,,,,,,,,,,,,,,,,
폐허,,,,,,,,,,,,,,,,,,
폐허,,,,,,,,,,,,,,,,,,
폐허,,,,,,,,,,,,,,,,,,
공통,,,,,,,,,,,,,,,,,,
공통,,,,,,,,,,,,,,,,,,
공통,,,,,,,,,,,,,,,,,,
공통,,,,,,,,,,,,,,,,,,
공통,,,,,,,,,,,,,,,,,,
공통,,,,,,,,,,,,,,,,,,
공통,,,,,,,,,,,,,,,,,,
공통,,,,,,,,,,,,,,,,,,
공통,,,,,,,,,,,,,,,,,,
공통,,,,,,,,,,,,,,,,,,
공통,,,,,,,,,,,,,,,,,,
공통,,,,,,,,,,,,,,,,,,
공통,,,,,,,,,,,,,,,,,,
공통,,,,,,,,,,,,,,,,,,
공통,,,,,,,,,,,,,,,,,,
공통,,,,,,,,,,,,,,,,,,
공통,,,,,,,,,,,,,,,,,,
\ No newline at end of file
Assets/Data/exam.csv.meta → Assets/Data/dropData_exam.csv.meta
View file @ 958700b5
fileFormatVersion: 2
guid: d9afd12fd1d36c44ca21c7240fa5fdf4
guid: 6216895c658a2af40890a4446cc10a8c
TextScriptImporter:
externalObjects: {}
userData:
......
Assets/Data/exam.csv deleted 100644 → 0
View file @ 4c09838b
monsterid,name,itemid,prob
1,몬스터1,2,0.3
2,몬스터2,5,0.5
3,몬스터3,4,1
\ No newline at end of file
Assets/Prefabs/Characters/Enemy.meta 0 → 100644
View file @ 958700b5
fileFormatVersion: 2
guid: bb3eb2ded0f22ca4d80028ece95ec8a4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Characters/Enemy.prefab deleted 100644 → 0
View file @ 4c09838b
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1840123207372878}
m_IsPrefabAsset: 1
--- !u!1 &1840123207372878
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4193857223660800}
- component: {fileID: 114770369240601290}
m_Layer: 0
m_Name: Enemy
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4193857223660800
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1840123207372878}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114770369240601290
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1840123207372878}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2d73d07fdab522c4aa045e1cb6a92e8c, type: 3}
m_Name:
m_EditorClassIdentifier:
Assets/Prefabs/Characters/DummyScorpion.prefab → Assets/Prefabs/Characters/Enemy/DummyScorpion.prefab
View file @ 958700b5
......@@ -186,7 +186,16 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2d73d07fdab522c4aa045e1cb6a92e8c, type: 3}
m_Name:
m_EditorClassIdentifier:
playerMaxHealth: 0
monsterID: 42
maxHealth: 0
weight: 0
patrolRange: 0
noticeRange: 0
attackRange: 0
patrolSpeed: 0
trackSpeed: 0
attackDelay: 0
attackDuration: 0
--- !u!212 &212906216626823524
SpriteRenderer:
m_ObjectHideFlags: 1
......
Assets/Prefabs/Characters/Enemy/Goblin.prefab 0 → 100644
View file @ 958700b5
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1636491341446076}
m_IsPrefabAsset: 1
--- !u!1 &1225288737757304
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4015301101001556}
- component: {fileID: 212540714587432698}
- component: {fileID: 95413729269184064}
- component: {fileID: 114138317320723260}
m_Layer: 0
m_Name: Body
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1636491341446076
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4639192263818050}
- component: {fileID: 50293901552157806}
- component: {fileID: 61254635014177320}
- component: {fileID: 114715916143850132}
m_Layer: 0
m_Name: Goblin
m_TagString: Enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1910706395977056
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4140258981397796}
- component: {fileID: 61362187134790794}
- component: {fileID: 114468655689627186}
m_Layer: 0
m_Name: Hitbox
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4015301101001556
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1225288737757304}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.15799999, y: 0.40100002, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4140258981397796}
m_Father: {fileID: 4639192263818050}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4140258981397796
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1910706395977056}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4015301101001556}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4639192263818050
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1636491341446076}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 6.876, y: 1.034, z: -0.1645136}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4015301101001556}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!50 &50293901552157806
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1636491341446076}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 30
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 4
--- !u!61 &61254635014177320
BoxCollider2D:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1636491341446076}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.08, y: 0.325}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.55, y: 1.1}
m_EdgeRadius: 0
--- !u!61 &61362187134790794
BoxCollider2D:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1910706395977056}
m_Enabled: 0
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -0.1784066, y: -0.042574346}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 0.8, y: 0.8}
newSize: {x: 0.8, y: 0.8}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.38642097, y: 0.71485126}
m_EdgeRadius: 0
--- !u!95 &95413729269184064
Animator:
serializedVersion: 3
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1225288737757304}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: a2991abac35f9ff4b933c50e1d598f38, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &114138317320723260
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1225288737757304}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f12bf401d26646a488bc32ca7e3845be, type: 3}
m_Name:
m_EditorClassIdentifier:
monsterID: 101
maxHealth: 5
weight: 3
patrolRange: 2
noticeRange: 2
attackRange: 1
patrolSpeed: 2.5
trackSpeed: 3.5
playerDistance: 0
--- !u!114 &114468655689627186
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1910706395977056}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 908a1b16b9926f747807d321c5ecc8af, type: 3}
m_Name:
m_EditorClassIdentifier:
damage: 1
--- !u!114 &114715916143850132
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1636491341446076}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31d57aad92e0a1940b2258c8b7537027, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!212 &212540714587432698
SpriteRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1225288737757304}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 71335108d30aa0e4a90179a09895440e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.8, y: 0.8}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 1
Assets/Prefabs/Characters/Enemy.prefab.meta → Assets/Prefabs/Characters/Enemy/Goblin.prefab.meta
View file @ 958700b5
fileFormatVersion: 2
guid: 9b5ddc79f9c10db4791cfabc9f744a67
guid: a164c147037e89448820f7387c724c42
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
......
Assets/Prefabs/Characters/Player.prefab
View file @ 958700b5
......@@ -44,6 +44,7 @@ GameObject:
- component: {fileID: 61129044981816742}
- component: {fileID: 114402380471012178}
- component: {fileID: 60342798607647292}
- component: {fileID: 114190796731463818}
m_Layer: 0
m_Name: AttackColider
m_TagString: Untagged
......@@ -194,6 +195,22 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &114190796731463818
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1862495014651308}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
m_Name:
m_EditorClassIdentifier:
damage: 0
knockBackMultiplier: 1
debuffNum: 0
debuffType:
debuffTime: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
--- !u!114 &114294925164316638
MonoBehaviour:
m_ObjectHideFlags: 1
......
Assets/Prefabs/EnemyManager.prefab
View file @ 958700b5
......@@ -51,3 +51,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fc7c7899a8a94c24cb9eb34d432133ce, type: 3}
m_Name:
m_EditorClassIdentifier:
player: {fileID: 1623439448163086, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
dropTableData: {fileID: 4900000, guid: 6216895c658a2af40890a4446cc10a8c, type: 3}
dropItemList: []
enemyPrefab:
- {fileID: 1636491341446076, guid: a164c147037e89448820f7387c724c42, type: 2}
Assets/Prefabs/Rooms/SpecialRoom/Room Start.prefab
View file @ 958700b5
......@@ -66,6 +66,36 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1155119655637100
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4246741997967170}
m_Layer: 0
m_Name: enemy spot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1300488586797916
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4041060012527204}
m_Layer: 0
m_Name: location (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1374969573655854
GameObject:
m_ObjectHideFlags: 0
......@@ -87,6 +117,36 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1476714204197126
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4499200582098472}
m_Layer: 0
m_Name: location
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1533921180904704
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4571824144707074}
m_Layer: 0
m_Name: location (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1757396921859174
GameObject:
m_ObjectHideFlags: 0
......@@ -103,6 +163,22 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1793875229757898
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4519224550781046}
- component: {fileID: 114498254109604890}
m_Layer: 0
m_Name: goblin
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1807602546426908
GameObject:
m_ObjectHideFlags: 0
......@@ -143,6 +219,19 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4041060012527204
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1300488586797916}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 12, y: 13, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4519224550781046}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4046658494286920
Transform:
m_ObjectHideFlags: 1
......@@ -169,6 +258,48 @@ Transform:
m_Father: {fileID: 4703804699120632}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4246741997967170
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1155119655637100}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4519224550781046}
m_Father: {fileID: 4703804699120632}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4499200582098472
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1476714204197126}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 7.5, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4519224550781046}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4519224550781046
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1793875229757898}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4499200582098472}
- {fileID: 4041060012527204}
m_Father: {fileID: 4246741997967170}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4533920169483982
Transform:
m_ObjectHideFlags: 1
......@@ -182,6 +313,19 @@ Transform:
m_Father: {fileID: 4703804699120632}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4571824144707074
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1533921180904704}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4601865151722282
Transform:
m_ObjectHideFlags: 1
......@@ -224,6 +368,7 @@ Transform:
- {fileID: 4533920169483982}
- {fileID: 4629351736916292}
- {fileID: 4827540825580114}
- {fileID: 4246741997967170}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -1010,6 +1155,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b5ed2c384310eb6408bb42c91b195e15, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &114498254109604890
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1793875229757898}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2d27745292051704a87740def5391766, type: 3}
m_Name:
m_EditorClassIdentifier:
enemyPrefab: {fileID: 1636491341446076, guid: a164c147037e89448820f7387c724c42,
type: 2}
--- !u!212 &212423219453141376
SpriteRenderer:
m_ObjectHideFlags: 1
......
Assets/Prefabs/Rooms/SpecialRoom/Room Start_enemyAdded.prefab 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Prefabs/Rooms/SpecialRoom/Room Start_enemyAdded.prefab.meta 0 → 100644
View file @ 958700b5
fileFormatVersion: 2
guid: c7a987df794900341bf68b8263f6e205
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/TetrisMap/TestTools.prefab
View file @ 958700b5
This diff is collapsed.
Assets/Prefabs/UI/In-Game UI/LifeStoneUI.prefab
View file @ 958700b5
......@@ -83,7 +83,7 @@ MonoBehaviour:
lifeStoneLocation: {x: 7, y: 7}
standardImage: {fileID: 1001509239983906, guid: a48de94a6ab80f746aec69a02812f1e3,
type: 2}
lifeStoneRowNum: 8
lifeStoneRowNum: 6
lifeStoneSize: 40
sprites:
- {fileID: 21300004, guid: eff441d843b9c664e97a81fcb39d8410, type: 3}
......
Assets/Resources/Animations/bowAttack1.anim
View file @ 958700b5
......@@ -21,7 +21,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
......@@ -282,7 +282,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
......
Assets/Scenes/PlayScene.unity
View file @ 958700b5
......@@ -267,6 +267,10 @@ Prefab:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1161003025175732, guid: 378c41c0af7d4db41895ec01e1f50291, type: 2}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 378c41c0af7d4db41895ec01e1f50291, type: 2}
m_IsPrefabAsset: 0
......@@ -692,6 +696,12 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 1939101680453256, guid: c179f0931cfabec428a868a6edc543b0,
type: 2}
m_PrefabInternal: {fileID: 1711972807}
--- !u!114 &1206751493 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 114920782405449110, guid: c179f0931cfabec428a868a6edc543b0,
type: 2}
m_PrefabInternal: {fileID: 1711972807}
m_Script: {fileID: 11500000, guid: 7fe540ec78947fc449eabc76bd87823d, type: 3}
--- !u!224 &1209430809 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 224402251087470820, guid: c179f0931cfabec428a868a6edc543b0,
......@@ -894,12 +904,6 @@ Prefab:
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7c6db9a9ca4150a438bd5114c58a37cf, type: 2}
m_IsPrefabAsset: 0
--- !u!114 &1488344233 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 114177053965581520, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
m_PrefabInternal: {fileID: 1708140758}
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
--- !u!4 &1604462410 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4884929250924374, guid: e6794ab8e2e4c6340a23b382e9497cbb,
......@@ -948,7 +952,7 @@ Prefab:
type: 2}
propertyPath: time
value:
objectReference: {fileID: 1488344233}
objectReference: {fileID: 1930185415}
- target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: combo
......@@ -959,6 +963,11 @@ Prefab:
propertyPath: inventoryManager
value:
objectReference: {fileID: 2035175000}
- target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: lifeStoneManager
value:
objectReference: {fileID: 1206751493}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
m_IsPrefabAsset: 0
......@@ -1013,11 +1022,11 @@ Prefab:
m_Modifications:
- target: {fileID: 4884929250924374, guid: e6794ab8e2e4c6340a23b382e9497cbb, type: 2}
propertyPath: m_LocalPosition.x
value: -955.5
value: -462
objectReference: {fileID: 0}
- target: {fileID: 4884929250924374, guid: e6794ab8e2e4c6340a23b382e9497cbb, type: 2}
propertyPath: m_LocalPosition.y
value: -530
value: -542
objectReference: {fileID: 0}
- target: {fileID: 4884929250924374, guid: e6794ab8e2e4c6340a23b382e9497cbb, type: 2}
propertyPath: m_LocalPosition.z
......@@ -1146,6 +1155,12 @@ Prefab:
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c179f0931cfabec428a868a6edc543b0, type: 2}
m_IsPrefabAsset: 0
--- !u!114 &1930185415 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 114177053965581520, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
m_PrefabInternal: {fileID: 1708140758}
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
--- !u!114 &2035175000 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 114939219159237616, guid: 62a83d11a7addc342ad436145784e698,
......
Assets/Scenes/testEnemy.unity 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Scenes/testEnemy.unity.meta 0 → 100644
View file @ 958700b5
fileFormatVersion: 2
guid: d8ffac868de800c4a908dafa57f9f713
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/testEnemyPattern.unity 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Scenes/testEnemyPattern.unity.meta 0 → 100644
View file @ 958700b5
fileFormatVersion: 2
guid: 7f2a5cd3b45ab364a9b2e39e41de53e2
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/Characters/Animator State.meta 0 → 100644
View file @ 958700b5
fileFormatVersion: 2
guid: 8c086f6d5e8a93542b5b6d3d56d87609
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/MeleeIdle.cs → Assets/Scripts/Characters/Animator State/MeleeIdle.cs
View file @ 958700b5
......@@ -6,35 +6,37 @@ public class MeleeIdle : StateMachineBehaviour {
Vector2 origin;
float patrolRange;
float movementSpeed;
float patrolSpeed;
float noticeRange;
GameObject player;
Vector3 leftsideAngle = new Vector3(0, 0, 0);
Vector3 rightsideAngle = new Vector3(0, 180, 0);
Transform animatorRoot;
// 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) {
// 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) {
origin = animator.transform.position;
patrolRange = animator.GetFloat("patrolRange");
noticeRange = animator.GetFloat("noticeRange");
movementSpeed = animator.GetFloat("movementSpeedPatrol");
player = GameObject.Find("Player");
}
patrolRange = animator.GetComponent<Enemy>().patrolRange;
noticeRange = animator.GetComponent<Enemy>().noticeRange;
patrolSpeed = animator.GetComponent<Enemy>().patrolSpeed;
player = EnemyManager.Instance.player;
animatorRoot = animator.transform.parent;
}
// OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks
override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
if (Vector2.Distance(player.transform.position, animator.transform.position) < noticeRange)
if (animator.GetComponent<Enemy>().playerDistance < noticeRange)
{
animator.SetTrigger("TrackTrigger");
return;
}
Vector2 currPosition = animator.transform.position;
Vector2 movingDistance = -1 * animator.transform.right * movementSpeed * Time.deltaTime; // go left first
animator.GetComponent<Rigidbody2D>().MovePosition(currPosition + movingDistance);
if(Mathf.Abs(animator.transform.position.x - origin.x) > patrolRange)
Vector2 currPosition = animatorRoot.position;
Vector2 movingDistance = -1 * animatorRoot.right * patrolSpeed * Time.deltaTime; // go left first
animatorRoot.gameObject.GetComponent<Rigidbody2D>().MovePosition(currPosition + movingDistance);
if(Mathf.Abs(animatorRoot.position.x - origin.x) > patrolRange)
{
animator.transform.eulerAngles = (origin.x < animator.transform.position.x) ? leftsideAngle : rightsideAngle;
animatorRoot.eulerAngles = (origin.x < animatorRoot.position.x) ? leftsideAngle : rightsideAngle;
}
}
......
Assets/MeleeTrack.cs → Assets/Scripts/Characters/Animator State/MeleeTrack.cs
View file @ 958700b5
......@@ -4,49 +4,54 @@ using UnityEngine;
public class MeleeTrack : StateMachineBehaviour {
GameObject player;
float movementSpeed;
float trackSpeed;
float attackRange;
Vector3 leftsideAngle = new Vector3(0, 0, 0);
Vector3 rightsideAngle = new Vector3(0, 180, 0);
readonly float dirChangeTime = 0.5f;
IEnumerator dirChange;
Transform pivotTransform;
readonly int maxFrame = 10;
int frameCounter;
Vector2 centerOfBody;
// 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) {
movementSpeed = animator.GetFloat("movementSpeedTrack");
attackRange = animator.GetFloat("attackRange");
player = GameObject.Find("Player");
dirChange = DirChange(animator);
animator.GetComponent<MonoBehaviour>().StartCoroutine(dirChange);
trackSpeed = animator.GetComponent<Enemy>().trackSpeed;
attackRange = animator.GetComponent<Enemy>().attackRange;
player = EnemyManager.Instance.player;
pivotTransform = animator.transform.parent;
float halfHeight = pivotTransform.gameObject.GetComponent<BoxCollider2D>().size.y / 2.0f;
Vector2 rootPosition2D = pivotTransform.position;
centerOfBody = new Vector2(0, halfHeight) + rootPosition2D;
frameCounter = 0;
}
// OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks
override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
if (Vector2.Distance(player.transform.position, animator.transform.position) < attackRange)
frameCounter += 1;
if (frameCounter >= maxFrame)
{
pivotTransform.eulerAngles = (player.transform.position.x - pivotTransform.position.x < 0) ? leftsideAngle : rightsideAngle;
frameCounter = 0;
}
if (animator.GetComponent<Enemy>().playerDistance < attackRange)
{
animator.SetTrigger("AttackTrigger");
return;
}
Vector2 currPosition = animator.transform.position;
Vector2 movingDistance = animator.transform.right * movementSpeed * Time.deltaTime * -1;
animator.GetComponent<Rigidbody2D>().MovePosition(currPosition + movingDistance);
}
IEnumerator DirChange(Animator animator)
{
while (true)
{
animator.transform.eulerAngles = (player.transform.position.x - animator.transform.position.x < 0) ? leftsideAngle : rightsideAngle;
yield return new WaitForSeconds(dirChangeTime);
}
}
Vector2 currPosition = pivotTransform.position;
Vector2 movingDistance = pivotTransform.right * trackSpeed * Time.deltaTime * -1;
pivotTransform.gameObject.GetComponent<Rigidbody2D>().MovePosition(currPosition + movingDistance);
// OnStateExit is called when a transition ends and the state machine finishes evaluating this state
override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
animator.GetComponent<MonoBehaviour>().StopCoroutine(dirChange);
}
// OnStateExit is called when a transition ends and the state machine finishes evaluating this state
//override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
//
//}
// OnStateMove is called right after Animator.OnAnimatorMove(). Code that processes and affects root motion should be implemented here
//override public void OnStateMove(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
//
......
Assets/Scripts/Characters/AttackProperty.cs
View file @ 958700b5
This diff is collapsed.
Assets/Scripts/Characters/Enemy.cs
View file @ 958700b5
This diff is collapsed.
Assets/Scripts/Characters/EnemyAttackInfo.cs 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Scripts/Characters/EnemyAttackInfo.cs.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Scripts/Characters/EnemyCollision.cs 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Scripts/Characters/EnemyCollision.cs.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Scripts/Characters/EnemyManager.cs
View file @ 958700b5
This diff is collapsed.
Assets/Scripts/Characters/EnemyMelee.cs 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Scripts/Characters/EnemyMelee.cs.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Scripts/Characters/Player.cs
View file @ 958700b5
This diff is collapsed.
Assets/Scripts/Characters/PlayerAttack.cs
View file @ 958700b5
This diff is collapsed.
Assets/Scripts/Characters/PlayerAttackInfo.cs 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Scripts/Characters/PlayerAttackInfo.cs.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Scripts/Enumerators.cs
View file @ 958700b5
This diff is collapsed.
Assets/Scripts/Item/Addons.meta
View file @ 958700b5
This diff is collapsed.
Assets/Scripts/Item/InventoryManager.cs
View file @ 958700b5
This diff is collapsed.
Assets/Scripts/TetrisMap/Test.cs
View file @ 958700b5
This diff is collapsed.
Assets/Scripts/enemySpot.cs 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Scripts/enemySpot.cs.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/attack.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/attack/goblin_attack1.png.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/attack/goblin_attack2.png.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/attack/goblin_attack3.png 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/attack/goblin_attack3.png.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/attack/goblin_attack4.png 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/attack/goblin_attack4.png.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/attack/goblin_attack5.png 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/attack/goblin_attack5.png.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/attack/goblin_attack6.png 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/attack/goblin_attack6.png.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/goblin.png 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/goblin.png.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/goblin_walk.aseprite 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/goblin_walk.aseprite.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/hit.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/hit/goblin_death.aseprite 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/hit/goblin_death.aseprite.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/hit/goblin_hit1.png 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/hit/goblin_hit1.png.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/hit/goblin_hit2.png 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/hit/goblin_hit2.png.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/hit/goblin_hit3.png 0 → 100644
View file @ 958700b5
This diff is collapsed.
Assets/Sprites/Enemy/Goblin/hit/goblin_hit3.png.meta 0 → 100644
View file @ 958700b5
This diff is collapsed.
ProjectSettings/InputManager.asset
View file @ 958700b5
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