Skip to content

tetra-tower
tetra-tower
Commit 4f0e0a0f authored by 15김민규's avatar 15김민규
Browse files
Options

피격 구현중

parent d55b29e1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2210 additions and 377 deletions
Assets/Animation/Enemy/Goblin/Goblin Attack.anim
View file @ 4f0e0a0f
......@@ -15,7 +15,62 @@ AnimationClip:
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
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
......@@ -28,7 +83,7 @@ AnimationClip:
value: {fileID: 21300000, guid: 6234b3bf70d0272478b444abdd572f09, type: 3}
- time: 0.25
value: {fileID: 21300000, guid: f7d12f4a971df594c8d297610a3f9e57, type: 3}
- time: 0.26666668
- time: 0.8333333
value: {fileID: 21300000, guid: b2382ef0803ec1c4c811783916c7aa49, type: 3}
attribute: m_Sprite
path:
......@@ -41,6 +96,13 @@ AnimationClip:
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
......@@ -60,7 +122,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.28333336
m_StopTime: 0.9
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
......@@ -75,23 +137,64 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
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:
- time: 0.18333334
functionName: AttackOn
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 0.26666668
functionName: AttackOff
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
m_Events: []
Assets/Animation/Enemy/Goblin/Goblin Damaged.anim 0 → 100644
View file @ 4f0e0a0f
%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 @ 4f0e0a0f
fileFormatVersion: 2
guid: 9fd0a4272dcf9844b940854afc5c69ea
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Animation/Enemy/melee.controller
View file @ 4f0e0a0f
......@@ -13,13 +13,25 @@ AnimatorController:
m_DefaultFloat: 0
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_Controller: {fileID: 9100000}
- m_Name: DamagedTrigger
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: DeadTrigger
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
......@@ -55,6 +67,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
......@@ -92,9 +125,9 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0.1783799
m_TransitionOffset: 0
m_ExitTime: 0.75
m_ExitTime: 1.0027776
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
......@@ -107,6 +140,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
......@@ -124,19 +160,42 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &1102455672269219010
--- !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: Track
m_Name: Damaged
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101563152619324414}
m_StateMachineBehaviours:
- {fileID: 114878841526562312}
- {fileID: 1101117024733671452}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
......@@ -145,23 +204,25 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 2929b46a5e5dded43a97e01a91cd676a, type: 2}
m_Motion: {fileID: 7400000, guid: 9fd0a4272dcf9844b940854afc5c69ea, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102511294738534312
--- !u!1102 &1102455672269219010
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Goblin Attack
m_Name: Track
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Transitions:
- {fileID: 1101563152619324414}
m_StateMachineBehaviours:
- {fileID: 114878841526562312}
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
......@@ -170,7 +231,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: d3e09b2950d21e94e8144eec0a93ee38, type: 2}
m_Motion: {fileID: 7400000, guid: 2929b46a5e5dded43a97e01a91cd676a, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
......@@ -202,31 +263,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102914248177040374
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Goblin Hit
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: 0a3d0364cdede114f95de5ff89b5d39c, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102977373053479874
AnimatorState:
serializedVersion: 5
......@@ -272,18 +308,16 @@ AnimatorStateMachine:
m_State: {fileID: 1102828359910447394}
m_Position: {x: 324, y: 48, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102914248177040374}
m_Position: {x: 359, y: 113, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102511294738534312}
m_Position: {x: 394, y: 178, z: 0}
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/Prefabs/Characters/Enemy/Goblin.prefab
View file @ 4f0e0a0f
......@@ -42,14 +42,14 @@ GameObject:
- component: {fileID: 114715916143850132}
m_Layer: 0
m_Name: Goblin
m_TagString: Untagged
m_TagString: Enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1910706395977056
GameObject:
m_ObjectHideFlags: 0
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
......@@ -73,7 +73,8 @@ Transform:
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: []
m_Children:
- {fileID: 4140258981397796}
m_Father: {fileID: 4639192263818050}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -84,11 +85,11 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1910706395977056}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.15799999, y: 0.40100002, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4639192263818050}
m_RootOrder: 1
m_Father: {fileID: 4015301101001556}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4639192263818050
Transform:
......@@ -101,7 +102,6 @@ Transform:
m_LocalScale: {x: 2, y: 2, z: 1}
m_Children:
- {fileID: 4015301101001556}
- {fileID: 4140258981397796}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -208,12 +208,14 @@ MonoBehaviour:
maxHealth: 5
weight: 3
patrolRange: 2
noticeRange: 1
noticeRange: 2
attackRange: 2
patrolSpeed: 3
trackSpeed: 5
patrolSpeed: 5
trackSpeed: 7
attackDelay: 1
attackDuration: 1
invincible: 0
playerDistance: 0
--- !u!114 &114468655689627186
MonoBehaviour:
m_ObjectHideFlags: 1
......
Assets/Prefabs/Characters/Player.prefab
View file @ 4f0e0a0f
......@@ -42,6 +42,7 @@ GameObject:
m_Component:
- component: {fileID: 4710911479571038}
- component: {fileID: 61129044981816742}
- component: {fileID: 114190796731463818}
m_Layer: 0
m_Name: AttackColider
m_TagString: Untagged
......@@ -164,6 +165,22 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &114190796731463818
MonoBehaviour:
m_ObjectHideFlags: 1
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
......@@ -176,7 +193,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
rbGravityScale: 3
rbAttackGravityScale: 3
rbAttackGravityScale: 0.5
maxSpeed: 3
maxDashSpeed: 6
accerlation: 1200
......@@ -185,7 +202,7 @@ MonoBehaviour:
doubleJumpSpeed: 10
dashAccerlation: 2000
isDashing: 0
platformArray: []
platformCollider: {fileID: 0}
horizontal: 0
horizontalRaw: 0
dashStart: 0
......@@ -218,13 +235,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4ab58a64164eb984d8683df370ddce96, type: 3}
m_Name:
m_EditorClassIdentifier:
state: 0
attackRaw:
- 0
- 0
- 0
attackKeyState: 000000000000000000000000
cancel: 0
cancelRaw: 0
cancelKeyState: 0
playingSkill: 0
comboTime: 1
time: {fileID: 0}
......
Assets/Prefabs/Rooms/SpecialRoom/Room Start.prefab
View file @ 4f0e0a0f
......@@ -48,6 +48,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
......@@ -69,6 +99,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: 4954405879701532}
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
......@@ -85,6 +145,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: 114445107722596842}
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
......@@ -125,6 +201,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: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4046658494286920
Transform:
m_ObjectHideFlags: 1
......@@ -151,6 +240,49 @@ 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: 5
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: 4954405879701532}
- {fileID: 4041060012527204}
m_Father: {fileID: 4246741997967170}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4533920169483982
Transform:
m_ObjectHideFlags: 1
......@@ -205,9 +337,23 @@ Transform:
- {fileID: 4046658494286920}
- {fileID: 4533920169483982}
- {fileID: 4629351736916292}
- {fileID: 4246741997967170}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4954405879701532
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: 2.5, y: 9, 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!50 &50345644875107800
Rigidbody2D:
serializedVersion: 4
......@@ -942,6 +1088,19 @@ MonoBehaviour:
leftDoorInfo: 010101
rightDoorInfo: 010101
concept: 01010101
--- !u!114 &114445107722596842
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!251 &251975355083752976
PlatformEffector2D:
m_ObjectHideFlags: 1
......
Assets/Prefabs/TetrisMap/TestTools.prefab
View file @ 4f0e0a0f
......@@ -11,6 +11,24 @@ Prefab:
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1083421967201116}
m_IsPrefabAsset: 1
--- !u!1 &1032651290031920
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 224555317234529244}
- component: {fileID: 222292291363323858}
- component: {fileID: 114832875222754254}
- component: {fileID: 114840539871592468}
m_Layer: 5
m_Name: Summon Enemy
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1083421967201116
GameObject:
m_ObjectHideFlags: 0
......@@ -97,6 +115,23 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1279937962526270
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 224862086684140376}
- component: {fileID: 222952941986391158}
- component: {fileID: 114152357279119286}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1286002651420570
GameObject:
m_ObjectHideFlags: 1
......@@ -244,7 +279,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1083421967201116}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -955.5, y: -530, z: 0}
m_LocalPosition: {x: -398, y: -568, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 224395958577644168}
......@@ -330,6 +365,39 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114152357279119286
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1279937962526270}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Summon Enemy
--- !u!114 &114197899296498466
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -798,7 +866,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 114213890665286158}
m_MethodName: ClearRoom
m_MethodName: UpgradeStage
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
......@@ -870,6 +938,85 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114832875222754254
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1032651290031920}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114840539871592468
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1032651290031920}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 114832875222754254}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 114213890665286158}
m_MethodName: SummonEnemy
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &114864808174081420
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -911,6 +1058,13 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1501351517308982}
m_CullTransparentMesh: 0
--- !u!222 &222292291363323858
CanvasRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1032651290031920}
m_CullTransparentMesh: 0
--- !u!222 &222315919489052834
CanvasRenderer:
m_ObjectHideFlags: 1
......@@ -967,6 +1121,13 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1161693701796258}
m_CullTransparentMesh: 0
--- !u!222 &222952941986391158
CanvasRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1279937962526270}
m_CullTransparentMesh: 0
--- !u!222 &222977622312510518
CanvasRenderer:
m_ObjectHideFlags: 1
......@@ -1005,7 +1166,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224395958577644168}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
......@@ -1064,6 +1225,7 @@ RectTransform:
- {fileID: 224612213790397690}
- {fileID: 224071041299093070}
- {fileID: 224667404527337120}
- {fileID: 224555317234529244}
- {fileID: 224008356030171754}
m_Father: {fileID: 4884929250924374}
m_RootOrder: 0
......@@ -1128,6 +1290,25 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224555317234529244
RectTransform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1032651290031920}
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: 224862086684140376}
m_Father: {fileID: 224395958577644168}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 190, y: -140}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224612213790397690
RectTransform:
m_ObjectHideFlags: 1
......@@ -1221,3 +1402,21 @@ RectTransform:
m_AnchoredPosition: {x: 190, y: 70}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224862086684140376
RectTransform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1279937962526270}
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: 224555317234529244}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
Assets/Resources/Animations/normalAttackA.anim
View file @ 4f0e0a0f
......@@ -21,7 +21,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
......@@ -351,7 +351,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
......
Assets/Scenes/PlayScene.unity
View file @ 4f0e0a0f
......@@ -1019,40 +1019,9 @@ Prefab:
propertyPath: inventoryManager
value:
objectReference: {fileID: 1908917313}
- target: {fileID: 114294925164316638, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: rbAttackGravityScale
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 61129044981816742, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
m_IsPrefabAsset: 0
--- !u!1 &1618052741 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1862495014651308, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
m_PrefabInternal: {fileID: 1618052740}
--- !u!114 &1618052742
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1618052741}
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!1001 &1708140758
Prefab:
m_ObjectHideFlags: 0
......
Assets/Scenes/testEnemy.unity 0 → 100644
View file @ 4f0e0a0f
This diff is collapsed.
Assets/Scenes/testEnemy.unity.meta 0 → 100644
View file @ 4f0e0a0f
fileFormatVersion: 2
guid: d8ffac868de800c4a908dafa57f9f713
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/testEnemyPattern.unity
View file @ 4f0e0a0f
......@@ -155,134 +155,6 @@ Prefab:
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f6ef1c586e7764c41ba8349325635589, type: 2}
m_IsPrefabAsset: 0
--- !u!1 &174890837
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 1501351517308982, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 174890838}
- component: {fileID: 174890841}
- component: {fileID: 174890840}
- component: {fileID: 174890839}
m_Layer: 5
m_Name: Summon Enemy
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &174890838
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 224667404527337120, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 174890837}
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: 440165795}
m_Father: {fileID: 1708140759}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 190, y: -140}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &174890839
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 114685218848006942, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 174890837}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 174890840}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1708140760}
m_MethodName: SummonEnemy
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &174890840
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 114573939713302164, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 174890837}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &174890841
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 222231136650734454, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 174890837}
m_CullTransparentMesh: 0
--- !u!1001 &179350392
Prefab:
m_ObjectHideFlags: 0
......@@ -430,85 +302,6 @@ Prefab:
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c7a987df794900341bf68b8263f6e205, type: 2}
m_IsPrefabAsset: 0
--- !u!1 &440165794
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 1944793276666558, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 440165795}
- component: {fileID: 440165797}
- component: {fileID: 440165796}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &440165795
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 224543215425431206, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 440165794}
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: 174890838}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &440165796
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 114605948540917444, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 440165794}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Summon Enemy
--- !u!222 &440165797
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 222419263267172472, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 440165794}
m_CullTransparentMesh: 0
--- !u!1 &489222433 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1623439448163086, guid: 3d077a5f727dd1e4780e9265ed26e036,
......@@ -1053,30 +846,9 @@ Prefab:
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114685218848006942, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: UpgradeStage
objectReference: {fileID: 0}
- target: {fileID: 224008356030171754, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e6794ab8e2e4c6340a23b382e9497cbb, type: 2}
m_IsPrefabAsset: 0
--- !u!224 &1708140759 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 224395958577644168, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
m_PrefabInternal: {fileID: 1708140758}
--- !u!114 &1708140760 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 114213890665286158, guid: e6794ab8e2e4c6340a23b382e9497cbb,
type: 2}
m_PrefabInternal: {fileID: 1708140758}
m_Script: {fileID: 11500000, guid: 4f70662cea9642244afe9d8a44fa3211, type: 3}
--- !u!1001 &1711972807
Prefab:
m_ObjectHideFlags: 0
......
Assets/Scripts/Characters/Animator State/MeleeIdle.cs
View file @ 4f0e0a0f
......@@ -26,7 +26,7 @@ public class MeleeIdle : StateMachineBehaviour {
// 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, animatorRoot.position) < noticeRange)
if (animator.GetComponent<Enemy>().playerDistance < noticeRange)
{
animator.SetTrigger("TrackTrigger");
return;
......
Assets/Scripts/Characters/Animator State/MeleeTrack.cs
View file @ 4f0e0a0f
......@@ -10,7 +10,7 @@ public class MeleeTrack : StateMachineBehaviour {
Vector3 rightsideAngle = new Vector3(0, 180, 0);
readonly float dirChangeTime = 0.5f;
Transform animatorRoot;
int maxFrame = 10;
readonly int maxFrame = 10;
int frameCounter;
Vector2 centerOfBody;
......@@ -24,14 +24,18 @@ public class MeleeTrack : StateMachineBehaviour {
float halfHeight = animatorRoot.gameObject.GetComponent<BoxCollider2D>().size.y / 2.0f;
Vector2 rootPosition2D = animatorRoot.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) {
frameCounter += 1;
if (Vector2.Distance(player.transform.position, centerOfBody) < attackRange)
if (frameCounter >= maxFrame)
{
animatorRoot.eulerAngles = (player.transform.position.x - animatorRoot.position.x < 0) ? leftsideAngle : rightsideAngle;
frameCounter = 0;
}
if (animator.GetComponent<Enemy>().playerDistance < attackRange)
{
animator.SetTrigger("AttackTrigger");
return;
......@@ -39,13 +43,8 @@ public class MeleeTrack : StateMachineBehaviour {
Vector2 currPosition = animatorRoot.position;
Vector2 movingDistance = animatorRoot.right * trackSpeed * Time.deltaTime * -1;
if(frameCounter >= maxFrame)
{
animatorRoot.eulerAngles = (player.transform.position.x - animatorRoot.position.x < 0) ? leftsideAngle : rightsideAngle;
frameCounter = 0;
}
animatorRoot.gameObject.GetComponent<Rigidbody2D>().MovePosition(currPosition + movingDistance);
}
// OnStateExit is called when a transition ends and the state machine finishes evaluating this state
......
Assets/Scripts/Characters/AttackProperty.cs
View file @ 4f0e0a0f
......@@ -3,9 +3,18 @@ using System.Collections.Generic;
using UnityEngine;
public class AttackProperty : MonoBehaviour{
public float damage=0;
public float damage = 0;
public float knockBackMultiplier = 1f;
public int debuffNum = 0;
public EnemyDebuffCase[] debuffType = new EnemyDebuffCase[10];
public int[] debuffTime = new int[10];
private void OnTriggerEnter2D(Collider2D collision)
{
if (collision.CompareTag("Enemy"))
{
Debug.Log("Ugh!");
collision.transform.GetChild(0).GetComponent<Enemy>().GetDamaged(damage);
}
}
}
Assets/Scripts/Characters/Enemy.cs
View file @ 4f0e0a0f
......@@ -28,32 +28,45 @@ public class Enemy : MonoBehaviour {
public float attackRange;
public float patrolSpeed;
public float trackSpeed;
public float attackDelay;
public float attackDuration;
private float playerMaxHealth; //다른 스크립트에 있는 플레이어 최대체력 가져와야함
private float currHealth;
// debuff
float[] immunity_time = new float[5] { 0.0f, 3.0f, 6.0f, 6.0f, 6.0f };//면역 시간
bool[] immunity = new bool[] { false, }; //현재 에너미가 디버프 상태에 대해서 면역인지를 체크하는 변수
// [HideInInspector]
// enemy manager
private EnemyManager enemyManager;
// for animation
[HideInInspector]
public float playerDistance;
public bool gotKnockback;
RuntimeAnimatorController ac;
// drop item
// method
// Awake & Start
// method
// Standard Method
private void Awake()
{
enemyManager = EnemyManager.Instance;
ac = GetComponent<Animator>().runtimeAnimatorController;
}
private void Start()
{
this.currHealth = maxHealth;
playerDistance = Vector2.Distance(enemyManager.player.transform.position, transform.parent.position);
}
private void Update()
{
playerDistance = Vector2.Distance(enemyManager.player.transform.position, transform.parent.position);
if (gotKnockback)
{
}
}
// hit by player or debuff
......@@ -63,12 +76,9 @@ public class Enemy : MonoBehaviour {
gameObject.SetActive(false);
return;
}
float knockback_dist = damage * unitDist / weight;
gameObject.GetComponent<Animator>().SetTrigger("DamagedTrigger");
}
IEnumerator DebuffCase(EnemyDebuffed sCase)
{
......
Assets/Scripts/Characters/EnemyMelee.cs
View file @ 4f0e0a0f
......@@ -3,12 +3,4 @@ using System.Collections.Generic;
using UnityEngine;
public class EnemyMelee : Enemy {
public void AttackOn()
{
transform.parent.Find("Hitbox").GetComponent<BoxCollider2D>().enabled = true;
}
public void AttackOff()
{
transform.parent.Find("Hitbox").GetComponent<BoxCollider2D>().enabled = false;
}
}
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