Skip to content

tetra-tower
tetra-tower
Commit 0fbf3a4e authored by 18류지석's avatar 18류지석
Browse files
Options

콤보 거의 완성, 공격 거의 완성

parent dfcc65bd
Hide whitespace changes
Inline Side-by-side
Showing with 1467 additions and 297 deletions
Assets/Animation/Player animator.controller → Assets/Animation/Player/Player animator.controller
View file @ 0fbf3a4e
...@@ -50,6 +50,12 @@ AnimatorController: ...@@ -50,6 +50,12 @@ AnimatorController:
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 0 m_DefaultBool: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 9100000}
- m_Name: attack
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers: m_AnimatorLayers:
- serializedVersion: 5 - serializedVersion: 5
m_Name: Base Layer m_Name: Base Layer
...@@ -63,6 +69,66 @@ AnimatorController: ...@@ -63,6 +69,66 @@ AnimatorController:
m_IKPass: 0 m_IKPass: 0
m_SyncedLayerAffectsTiming: 0 m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 9100000}
--- !u!114 &114435780364136698
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 286184da5cd0ee1499e5e585698f25de, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &114686822015001908
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 60bdd8700d3860e4c9a3d3d60b82a0ea, type: 3}
m_Name:
m_EditorClassIdentifier:
playercontroller: {fileID: 0}
playerattack: {fileID: 0}
player: {fileID: 1623439448163086, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
--- !u!206 &206450249066372984
BlendTree:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Blend Tree
m_Childs: []
m_BlendParameter: ropeUpDown
m_BlendParameterY: ropeUpDown
m_MinThreshold: 0
m_MaxThreshold: 1
m_UseAutomaticThresholds: 1
m_NormalizedBlendValues: 0
m_BlendType: 0
--- !u!1101 &1101077261484238540
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102579710918655568}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101150420884930214 --- !u!1101 &1101150420884930214
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -87,6 +153,30 @@ AnimatorStateTransition: ...@@ -87,6 +153,30 @@ AnimatorStateTransition:
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1101 &1101330505740095668
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: attack
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102225149719626110}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101414817990210080 --- !u!1101 &1101414817990210080
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -266,8 +356,10 @@ AnimatorState: ...@@ -266,8 +356,10 @@ AnimatorState:
m_Name: PlayerAttackAnim m_Name: PlayerAttackAnim
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: [] m_Transitions:
m_StateMachineBehaviours: [] - {fileID: 1101077261484238540}
m_StateMachineBehaviours:
- {fileID: 114686822015001908}
m_Position: {x: 50, y: 50, z: 0} m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0 m_IKOnFeet: 0
m_WriteDefaultValues: 1 m_WriteDefaultValues: 1
...@@ -282,31 +374,6 @@ AnimatorState: ...@@ -282,31 +374,6 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102466624416092410
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: attack
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: 04c5cf6d7a7e42e429178ba00bd59688, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102579710918655568 --- !u!1102 &1102579710918655568
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 5
...@@ -397,13 +464,13 @@ AnimatorState: ...@@ -397,13 +464,13 @@ AnimatorState:
m_IKOnFeet: 0 m_IKOnFeet: 0
m_WriteDefaultValues: 1 m_WriteDefaultValues: 1
m_Mirror: 0 m_Mirror: 0
m_SpeedParameterActive: 0 m_SpeedParameterActive: 1
m_MirrorParameterActive: 0 m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0 m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0 m_TimeParameterActive: 0
m_Motion: {fileID: 0} m_Motion: {fileID: 7400000, guid: 4168ff00c9ea64b4897d4a32c26c3d1d, type: 2}
m_Tag: m_Tag:
m_SpeedParameter: m_SpeedParameter: ropeUpDown
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
...@@ -433,12 +500,9 @@ AnimatorStateMachine: ...@@ -433,12 +500,9 @@ AnimatorStateMachine:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 1102728463836494206} m_State: {fileID: 1102728463836494206}
m_Position: {x: 168, y: 120, z: 0} m_Position: {x: 168, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102466624416092410}
m_Position: {x: 203, y: 185, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 1102225149719626110} m_State: {fileID: 1102225149719626110}
m_Position: {x: 238, y: 250, z: 0} m_Position: {x: 168, y: -132, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: m_AnyStateTransitions:
- {fileID: 1101150420884930214} - {fileID: 1101150420884930214}
...@@ -447,6 +511,7 @@ AnimatorStateMachine: ...@@ -447,6 +511,7 @@ AnimatorStateMachine:
- {fileID: 1101824696373131616} - {fileID: 1101824696373131616}
- {fileID: 1101470433672142044} - {fileID: 1101470433672142044}
- {fileID: 1101414817990210080} - {fileID: 1101414817990210080}
- {fileID: 1101330505740095668}
m_EntryTransitions: [] m_EntryTransitions: []
m_StateMachineTransitions: {} m_StateMachineTransitions: {}
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
......
Assets/Animation/Player/PlayerAttackAnim.anim
View file @ 0fbf3a4e
...@@ -35,7 +35,7 @@ AnimationClip: ...@@ -35,7 +35,7 @@ AnimationClip:
m_Level: 0 m_Level: 0
m_CycleOffset: 0 m_CycleOffset: 0
m_HasAdditiveReferencePose: 0 m_HasAdditiveReferencePose: 0
m_LoopTime: 1 m_LoopTime: 0
m_LoopBlend: 0 m_LoopBlend: 0
m_LoopBlendOrientation: 0 m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0 m_LoopBlendPositionY: 0
......
Assets/Animation/Player/PlayerRopeAnim.anim 0 → 100644
View file @ 0fbf3a4e
%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: PlayerRopeAnim
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: 4cad9b4bd77cfcd4c87648fa1a27740b, type: 3}
- time: 0.05
value: {fileID: 21300000, guid: 0f7fbcaf616518b4197f9b2fd1e4b812, type: 3}
- time: 0.1
value: {fileID: 21300000, guid: 36e21c0d3884fbf4c9cc75f5deac1c49, type: 3}
- time: 0.15
value: {fileID: 21300000, guid: 126739f3a7a16744dbbd38c691a83896, type: 3}
- time: 0.2
value: {fileID: 21300000, guid: 0f28207e378bcbc43ba5f3f25e27ad3e, type: 3}
- time: 0.25
value: {fileID: 21300000, guid: 9616f49c3f054c44196158cc37d32248, type: 3}
- time: 0.3
value: {fileID: 21300000, guid: 2ee307457fcfbcf4e8057c7db8bf6961, type: 3}
- time: 0.35
value: {fileID: 21300000, guid: d36737a3366623847a03bcc3552c112a, type: 3}
- time: 0.38333333
value: {fileID: 21300000, guid: d36737a3366623847a03bcc3552c112a, 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: 4cad9b4bd77cfcd4c87648fa1a27740b, type: 3}
- {fileID: 21300000, guid: 0f7fbcaf616518b4197f9b2fd1e4b812, type: 3}
- {fileID: 21300000, guid: 36e21c0d3884fbf4c9cc75f5deac1c49, type: 3}
- {fileID: 21300000, guid: 126739f3a7a16744dbbd38c691a83896, type: 3}
- {fileID: 21300000, guid: 0f28207e378bcbc43ba5f3f25e27ad3e, type: 3}
- {fileID: 21300000, guid: 9616f49c3f054c44196158cc37d32248, type: 3}
- {fileID: 21300000, guid: 2ee307457fcfbcf4e8057c7db8bf6961, type: 3}
- {fileID: 21300000, guid: d36737a3366623847a03bcc3552c112a, type: 3}
- {fileID: 21300000, guid: d36737a3366623847a03bcc3552c112a, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.4
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/Player/PlayerRopeAnim.anim.meta 0 → 100644
View file @ 0fbf3a4e
fileFormatVersion: 2
guid: 4168ff00c9ea64b4897d4a32c26c3d1d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Characters/Player.prefab
View file @ 0fbf3a4e
...@@ -25,6 +25,7 @@ GameObject: ...@@ -25,6 +25,7 @@ GameObject:
- component: {fileID: 61019994424895448} - component: {fileID: 61019994424895448}
- component: {fileID: 114906702720267008} - component: {fileID: 114906702720267008}
- component: {fileID: 95992411616135034} - component: {fileID: 95992411616135034}
- component: {fileID: 114880704145925944}
m_Layer: 0 m_Layer: 0
m_Name: Player m_Name: Player
m_TagString: Player m_TagString: Player
...@@ -32,6 +33,22 @@ GameObject: ...@@ -32,6 +33,22 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!1 &1862495014651308
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4710911479571038}
- component: {fileID: 61129044981816742}
m_Layer: 0
m_Name: AttackColider
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4549734214569802 --- !u!4 &4549734214569802
Transform: Transform:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -39,12 +56,26 @@ Transform: ...@@ -39,12 +56,26 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1623439448163086} m_GameObject: {fileID: 1623439448163086}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 24.9, y: 18, z: 0} m_LocalPosition: {x: 2, y: 1.8, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children:
- {fileID: 4710911479571038}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4710911479571038
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1862495014651308}
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: 4549734214569802}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!50 &50325917162965942 --- !u!50 &50325917162965942
Rigidbody2D: Rigidbody2D:
serializedVersion: 4 serializedVersion: 4
...@@ -90,6 +121,31 @@ BoxCollider2D: ...@@ -90,6 +121,31 @@ BoxCollider2D:
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 0.7, y: 1.5} m_Size: {x: 0.7, y: 1.5}
m_EdgeRadius: 0 m_EdgeRadius: 0
--- !u!61 &61129044981816742
BoxCollider2D:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1862495014651308}
m_Enabled: 0
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -0.42, y: 0}
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.53, y: 1}
m_EdgeRadius: 0
--- !u!95 &95992411616135034 --- !u!95 &95992411616135034
Animator: Animator:
serializedVersion: 3 serializedVersion: 3
...@@ -120,6 +176,7 @@ MonoBehaviour: ...@@ -120,6 +176,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
rbGravityScale: 3 rbGravityScale: 3
rbAttackGravityScale: 3
maxSpeed: 3 maxSpeed: 3
maxDashSpeed: 6 maxDashSpeed: 6
accerlation: 1200 accerlation: 1200
...@@ -148,6 +205,39 @@ MonoBehaviour: ...@@ -148,6 +205,39 @@ MonoBehaviour:
rayDistance: 1 rayDistance: 1
ropeUp: 0.6 ropeUp: 0.6
ropeDown: 0.8 ropeDown: 0.8
playerState: 0
previousState: 0
--- !u!114 &114880704145925944
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1623439448163086}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4ab58a64164eb984d8683df370ddce96, type: 3}
m_Name:
m_EditorClassIdentifier:
state: 0
attackRaw:
- 0
- 0
- 0
attackKeyState: 000000000000000000000000
cancel: 0
playingSkill: 0
comboTime: 1
time: {fileID: 0}
combo: {fileID: 0}
comboArray:
StartTime: 0
anim: {fileID: 0}
aoc: {fileID: 0}
normalAttack:
- {fileID: 7400000, guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6, type: 2}
- {fileID: 7400000, guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6, type: 2}
- {fileID: 7400000, guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6, type: 2}
inventoryManager: {fileID: 0}
--- !u!114 &114906702720267008 --- !u!114 &114906702720267008
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
Assets/Resources/Animations.meta 0 → 100644
View file @ 0fbf3a4e
fileFormatVersion: 2
guid: c36b41dcefe74fb49abfa633f75db5ca
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Animations/normalAttackA.anim 0 → 100644
View file @ 0fbf3a4e
%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: normalAttackA
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.3
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.31666666
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: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.51
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: -0.51
inSlope: 0
outSlope: 0
tangentMode: 34
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.31666666
value: -0.51
inSlope: 0
outSlope: 0
tangentMode: 34
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.x
path: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.08
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: -0.08
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.31666666
value: -0.08
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.y
path: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.53
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: 0.53
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.31666666
value: 0.53
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Size.x
path: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.94
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: 0.94
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.31666666
value: 0.94
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Size.y
path: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: damage
path: AttackColider
classID: 114
script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300000, guid: e1dd1516b9bacd34bb6806f547147d47, type: 3}
- time: 0.05
value: {fileID: 21300000, guid: e1dd1516b9bacd34bb6806f547147d47, type: 3}
- time: 0.1
value: {fileID: 21300000, guid: c191e5872d94f364aa3fa64be8d10967, type: 3}
- time: 0.15
value: {fileID: 21300000, guid: 7cf972a4bd232314ea0f665e8ca511d4, type: 3}
- time: 0.2
value: {fileID: 21300000, guid: 0615a491335c9854680ea778373c616d, type: 3}
- time: 0.25
value: {fileID: 21300000, guid: e1dd1516b9bacd34bb6806f547147d47, type: 3}
- time: 0.3
value: {fileID: 21300000, guid: e1dd1516b9bacd34bb6806f547147d47, type: 3}
- time: 0.35
value: {fileID: 21300000, guid: c191e5872d94f364aa3fa64be8d10967, type: 3}
- time: 0.4
value: {fileID: 21300000, guid: 0527e9dd1805ac943be4ba0b09f47ea4, type: 3}
- time: 0.45
value: {fileID: 21300000, guid: b9bcefb5c62dfd24c874250ffb5738d8, type: 3}
- time: 0.5
value: {fileID: 21300000, guid: 62778b549ef5f9a4fb107af8ee317345, 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: 2942363444
attribute: 3305885265
script: {fileID: 0}
typeID: 61
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2942363444
attribute: 298341484
script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 2942363444
attribute: 413499720
script: {fileID: 0}
typeID: 61
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2942363444
attribute: 1872933342
script: {fileID: 0}
typeID: 61
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2942363444
attribute: 4197328169
script: {fileID: 0}
typeID: 61
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2942363444
attribute: 2368279999
script: {fileID: 0}
typeID: 61
customType: 0
isPPtrCurve: 0
pptrCurveMapping:
- {fileID: 21300000, guid: e1dd1516b9bacd34bb6806f547147d47, type: 3}
- {fileID: 21300000, guid: e1dd1516b9bacd34bb6806f547147d47, type: 3}
- {fileID: 21300000, guid: c191e5872d94f364aa3fa64be8d10967, type: 3}
- {fileID: 21300000, guid: 7cf972a4bd232314ea0f665e8ca511d4, type: 3}
- {fileID: 21300000, guid: 0615a491335c9854680ea778373c616d, type: 3}
- {fileID: 21300000, guid: e1dd1516b9bacd34bb6806f547147d47, type: 3}
- {fileID: 21300000, guid: e1dd1516b9bacd34bb6806f547147d47, type: 3}
- {fileID: 21300000, guid: c191e5872d94f364aa3fa64be8d10967, type: 3}
- {fileID: 21300000, guid: 0527e9dd1805ac943be4ba0b09f47ea4, type: 3}
- {fileID: 21300000, guid: b9bcefb5c62dfd24c874250ffb5738d8, type: 3}
- {fileID: 21300000, guid: 62778b549ef5f9a4fb107af8ee317345, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.51666665
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.3
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.31666666
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: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.51
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: -0.51
inSlope: 0
outSlope: 0
tangentMode: 34
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.31666666
value: -0.51
inSlope: 0
outSlope: 0
tangentMode: 34
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.x
path: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.08
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: -0.08
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.31666666
value: -0.08
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.y
path: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.53
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: 0.53
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.31666666
value: 0.53
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Size.x
path: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.94
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: 0.94
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.31666666
value: 0.94
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Size.y
path: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: damage
path: AttackColider
classID: 114
script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0
m_Events: []
Assets/Resources/Animations/normalAttackA.anim.meta 0 → 100644
View file @ 0fbf3a4e
fileFormatVersion: 2
guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/PlayScene.unity
View file @ 0fbf3a4e
...@@ -260,31 +260,120 @@ RectTransform: ...@@ -260,31 +260,120 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 224174390332342308, guid: 378c41c0af7d4db41895ec01e1f50291, m_CorrespondingSourceObject: {fileID: 224174390332342308, guid: 378c41c0af7d4db41895ec01e1f50291,
type: 2} type: 2}
m_PrefabInternal: {fileID: 179350392} m_PrefabInternal: {fileID: 179350392}
--- !u!1001 &225935757
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_RootOrder
value: 12
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_RootOrder
value: 12
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
type: 2}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1560605499280558, guid: 7c6db9a9ca4150a438bd5114c58a37cf, type: 2}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7c6db9a9ca4150a438bd5114c58a37cf, type: 2}
m_IsPrefabAsset: 0
--- !u!1 &489222433 stripped --- !u!1 &489222433 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 1623439448163086, guid: 3d077a5f727dd1e4780e9265ed26e036, m_CorrespondingSourceObject: {fileID: 1623439448163086, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2} type: 2}
m_PrefabInternal: {fileID: 1618052740} m_PrefabInternal: {fileID: 1618052740}
--- !u!114 &489222434
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 489222433}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4ab58a64164eb984d8683df370ddce96, type: 3}
m_Name:
m_EditorClassIdentifier:
state: 0
attackA: 0
attackB: 0
attackC: 0
cancel: 0
time: {fileID: 1333585343}
combo: {fileID: 1159748691}
keyCoolDown: 1
anim: {fileID: 0}
--- !u!1001 &677608594 --- !u!1001 &677608594
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -552,8 +641,8 @@ RectTransform: ...@@ -552,8 +641,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 100, y: 100} m_AnchoredPosition: {x: -0.000030517, y: 412.9}
m_SizeDelta: {x: 160, y: 30} m_SizeDelta: {x: 449.2, y: 84.2}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1159748691 --- !u!114 &1159748691
MonoBehaviour: MonoBehaviour:
...@@ -576,12 +665,12 @@ MonoBehaviour: ...@@ -576,12 +665,12 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14 m_FontSize: 40
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 10 m_MinSize: 0
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 0 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
...@@ -700,6 +789,48 @@ Transform: ...@@ -700,6 +789,48 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 4 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1317359797
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
propertyPath: m_LocalPosition.x
value: 881.1023
objectReference: {fileID: 0}
- target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
propertyPath: m_LocalPosition.y
value: 401.53445
objectReference: {fileID: 0}
- target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
propertyPath: m_LocalPosition.z
value: 22.914007
objectReference: {fileID: 0}
- target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
propertyPath: m_RootOrder
value: 11
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 62a83d11a7addc342ad436145784e698, type: 2}
m_IsPrefabAsset: 0
--- !u!1001 &1333464572 --- !u!1001 &1333464572
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -775,8 +906,8 @@ RectTransform: ...@@ -775,8 +906,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 100, y: 120} m_AnchoredPosition: {x: 0.80013, y: 470}
m_SizeDelta: {x: 160, y: 30} m_SizeDelta: {x: 447.6, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1333585342 --- !u!114 &1333585342
MonoBehaviour: MonoBehaviour:
...@@ -810,12 +941,12 @@ MonoBehaviour: ...@@ -810,12 +941,12 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14 m_FontSize: 20
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 10 m_MinSize: 2
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 0 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
...@@ -873,9 +1004,55 @@ Prefab: ...@@ -873,9 +1004,55 @@ Prefab:
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 5 value: 5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: time
value:
objectReference: {fileID: 1333585343}
- target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: combo
value:
objectReference: {fileID: 1159748691}
- target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
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_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2} m_SourcePrefab: {fileID: 100100000, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
m_IsPrefabAsset: 0 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 --- !u!1001 &1708140758
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1028,6 +1205,12 @@ Prefab: ...@@ -1028,6 +1205,12 @@ Prefab:
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c179f0931cfabec428a868a6edc543b0, type: 2} m_SourcePrefab: {fileID: 100100000, guid: c179f0931cfabec428a868a6edc543b0, type: 2}
m_IsPrefabAsset: 0 m_IsPrefabAsset: 0
--- !u!114 &1908917313 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 114939219159237616, guid: 62a83d11a7addc342ad436145784e698,
type: 2}
m_PrefabInternal: {fileID: 1317359797}
m_Script: {fileID: 11500000, guid: 674793b622d7c184882dfeb8784bbf92, type: 3}
--- !u!1001 &2042136941 --- !u!1001 &2042136941
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Assets/Scripts/Characters/AttackProperty.cs 0 → 100644
View file @ 0fbf3a4e
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class AttackProperty : MonoBehaviour{
public float damage=0;
public float knockBackMultiplier = 1f;
public int debuffNum = 0;
public EnemyDebuffCase[] debuffType = new EnemyDebuffCase[10];
public int[] debuffTime = new int[10];
}
Assets/Scripts/Characters/AttackProperty.cs.meta 0 → 100644
View file @ 0fbf3a4e
fileFormatVersion: 2
guid: 64f948f7c7aacab409fe963a6f9e0d2a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/Characters/Enemy.cs
View file @ 0fbf3a4e
...@@ -19,10 +19,9 @@ public class Enemy : MonoBehaviour { ...@@ -19,10 +19,9 @@ public class Enemy : MonoBehaviour {
// debuff // debuff
float[] immunity_time = new float[5] { 0.0f, 3.0f, 6.0f, 6.0f, 6.0f };//면역 시간 float[] immunity_time = new float[5] { 0.0f, 3.0f, 6.0f, 6.0f, 6.0f };//면역 시간
bool[] immunity = new bool[] { false, }; //현재 에너미가 디버프 상태에 대해서 면역인지를 체크하는 변수 bool[] immunity = new bool[] { false, }; //현재 에너미가 디버프 상태에 대해서 면역인지를 체크하는 변수
enum debuffCase { fire, ice, stun, blind, charm };
struct EnemyDebuffed struct EnemyDebuffed
{ {
public debuffCase Case; public EnemyDebuffCase Case;
public float debuffTime; public float debuffTime;
} }
...@@ -96,36 +95,36 @@ public class Enemy : MonoBehaviour { ...@@ -96,36 +95,36 @@ public class Enemy : MonoBehaviour {
IEnumerator DebuffCase(EnemyDebuffed sCase) IEnumerator DebuffCase(EnemyDebuffed sCase)
{ {
if (sCase.Case == debuffCase.fire) if (sCase.Case == EnemyDebuffCase.fire)
{ {
StartCoroutine(OnFire(sCase)); StartCoroutine(OnFire(sCase));
} }
else if (sCase.Case == debuffCase.ice && !immunity[(int)debuffCase.ice]) else if (sCase.Case == EnemyDebuffCase.ice && !immunity[(int)EnemyDebuffCase.ice])
{ {
//Enemy 정지하는 코드 필요 //Enemy 정지하는 코드 필요
immunity[(int)debuffCase.ice] = true; immunity[(int)EnemyDebuffCase.ice] = true;
yield return StartCoroutine(DebuffDoing(sCase)); yield return StartCoroutine(DebuffDoing(sCase));
} }
else if (sCase.Case == debuffCase.stun && !immunity[(int)debuffCase.stun]) else if (sCase.Case == EnemyDebuffCase.stun && !immunity[(int)EnemyDebuffCase.stun])
{ {
//Enemy 정지하는 코드 필요 //Enemy 정지하는 코드 필요
immunity[(int)debuffCase.stun] = true; immunity[(int)EnemyDebuffCase.stun] = true;
yield return StartCoroutine(DebuffDoing(sCase)); yield return StartCoroutine(DebuffDoing(sCase));
} }
else if (sCase.Case == debuffCase.blind && !immunity[(int)debuffCase.blind]) else if (sCase.Case == EnemyDebuffCase.blind && !immunity[(int)EnemyDebuffCase.blind])
{ {
//Enemy의 공격이 적중하지 않는 코드 필요 //Enemy의 공격이 적중하지 않는 코드 필요
immunity[(int)debuffCase.stun] = true; immunity[(int)EnemyDebuffCase.stun] = true;
yield return StartCoroutine(DebuffDoing(sCase)); yield return StartCoroutine(DebuffDoing(sCase));
} }
else if (sCase.Case == debuffCase.charm && !immunity[(int)debuffCase.charm]) else if (sCase.Case == EnemyDebuffCase.charm && !immunity[(int)EnemyDebuffCase.charm])
{ {
//Enemy 공격이 플레이어 회복하는 코드 필요 //Enemy 공격이 플레이어 회복하는 코드 필요
immunity[(int)debuffCase.stun] = true; immunity[(int)EnemyDebuffCase.stun] = true;
yield return StartCoroutine(DebuffDoing(sCase)); yield return StartCoroutine(DebuffDoing(sCase));
} }
......
Assets/Scripts/Characters/NewBehaviourScript.cs 0 → 100644
View file @ 0fbf3a4e
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class NewBehaviourScript : MonoBehaviour {
// Use this for initialization
void Start () {
}
// Update is called once per frame
void Update () {
}
}
Assets/Scripts/Characters/NewBehaviourScript.cs.meta 0 → 100644
View file @ 0fbf3a4e
fileFormatVersion: 2
guid: 7f01b427f819dc74294c920de58ba15d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/Characters/PlayerAttack.cs
View file @ 0fbf3a4e
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEditor.Animations;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
public class PlayerAttack : MonoBehaviour { public class PlayerAttack : MonoBehaviour {
public ComboState state; public float[] attackRaw = new float[3];
public float attackA,attackB,attackC; public int[] attackKeyState = new int[3]; //0: released 1: push 2: pushing
public float cancel; public float cancelRaw;
public int cancelKeyState;
public bool playingSkill;
public float comboTime;
public Text time, combo; public Text time, combo;
public static string comboArray; public string comboArray;
public static float StartTime; public float StartTime;
public bool keyCoolDown=true;
public Animator anim; public Animator anim;
public AttackCombo[] AttackArr= { new AttackCombo("화염발사", "ABC", 1.5f,"PlayerRunAnim"), public AnimatorOverrideController aoc;
new AttackCombo("공격A", "A", 0.5f,"PlayerGoingDownAnim"), public AnimationClip[] normalAttack = new AnimationClip[3];
new AttackCombo("공격B", "B", 0.5f,"PlayerWalkAnim"), public InventoryManager inventoryManager;
new AttackCombo("공격C", "C", 0.5f,"PlayerGoingUpAnim"),
new AttackCombo("콩", "AC", 1f,"PlayerIdleAnim"),
new AttackCombo("콩콩콩", "ACB", 2f,"PlayerIdleAnim"),
};
public Queue comboQueue = new Queue();
// Use this for initialization float comboEndTime;
void Start () { bool comboTimeOn;
StartTime = Time.time; PlayerController playerController;
state = ComboState.Idle;
void Awake ()
{
playerController = GetComponent<PlayerController>();
anim = GetComponent<Animator>(); anim = GetComponent<Animator>();
aoc = new AnimatorOverrideController(anim.runtimeAnimatorController);
anim.runtimeAnimatorController = aoc;
} }
// Update is called once per frame
void Update() void Update()
{ {
SetTimeText(comboTime, comboEndTime - Time.time);
for (int i = 0; i < 3; i++)
attackRaw[i] = Input.GetAxisRaw("Fire" + (i+1));
cancelRaw = Input.GetAxisRaw("stop");
attackA = Input.GetAxisRaw("Fire1"); for (int i = 0; i < 3; i++)
attackB = Input.GetAxisRaw("Fire2");
attackC = Input.GetAxisRaw("Fire3");
cancel = Input.GetAxisRaw("stop");
combo.text = comboArray;
float tempTime = Mathf.Clamp(StartTime - Time.time+1f , 0f, 9999f) ;
foreach (AttackCombo c in comboQueue)
{ {
tempTime += c.getTime(); if (attackRaw[i] > 0 && attackKeyState[i] < 2)
attackKeyState[i]++;
else if (attackRaw[i] == 0)
attackKeyState[i] = 0;
} }
if (cancelRaw > 0 && cancelKeyState < 2)
time.text=Mathf.Round(tempTime*10f)/10f+""; cancelKeyState++;
else if (cancelRaw == 0)
cancelKeyState = 0;
if (attackA + attackB + attackC == 0) if (cancelKeyState == 1)
{ {
keyCoolDown = true; comboTimeOn = false;
} }
if (state == ComboState.Idle)
{
if (attackA + attackB + attackC > 0 && keyCoolDown)
{
state = ComboState.Attack;
StartTime = Time.time;
ComboCheck();
} if (!playingSkill)
}
else if (state == ComboState.Attack)
{ {
ComboCheck(); for (int i = 0; i < 3; i++)
//공격중일때 if (attackKeyState[i] == 1)
{
if (Time.time > StartTime) comboArray += (char)('A' + i);
{ CheckCombo();
state = ComboState.Combo; SetComboText();
} break;
}
} }
}
else if (state == ComboState.Combo) public void SetComboText()
{
string conString = "";
if (comboArray.Equals(""))
{ {
ComboCheck(); combo.text = "";
if (comboQueue.Count > 0) //콤보가 남아있다면 return;
{ }
conString += comboArray[0];
for (int i = 1; i < comboArray.Length; i++)
conString += " " + comboArray[i];
combo.text = conString;
}
AttackCombo cur = (AttackCombo)comboQueue.Dequeue(); public void SetTimeText(float fullTime, float currentTime)
print(cur); {
anim.Play(cur.getComboAnim()); if (comboTimeOn)
//실제로는 애니메이션 가져옴 {
state = ComboState.Attack; for (int i = 0; i < 20; i++)
StartTime = Time.time + cur.getTime();
}
else if (Time.time > StartTime + 1f || cancel==1)
{ {
//현재 시간이 마지막 콤보 끝나는 시점보다 1초 지났다면 if (currentTime / fullTime < (i + 1) * 0.05f)
state = ComboState.Idle; {
comboArray = ""; string str = "";
for (int j = 0; j < i + 1; j++) str += "-";
time.text = str;
break;
}
} }
} }
else
if (attackA + attackB + attackC > 0)
{ {
keyCoolDown = false; time.text = "";
} }
} }
public void SkillEnd()
{
if (CheckLongerCombo()) StartCoroutine(SkillEndCoroutine());
else
{
comboArray = "";
StartCoroutine(ComboTextReset());
}
}
IEnumerator ComboTextReset()
{
yield return new WaitForSeconds(1.5f);
SetComboText();
}
IEnumerator SkillEndCoroutine()
{
comboEndTime = Time.time + comboTime;
comboTimeOn = true;
while (Time.time < comboEndTime && comboTimeOn && !playingSkill)
{
yield return null;
}
if (!playingSkill)
{
comboArray = "";
SetComboText();
}
comboTimeOn = false;
}
void ComboCheck() void CheckCombo()
{ {
//들어갈 콤보가 있는지 확인함 List<Item> itemList = inventoryManager.itemList;
if (attackA + attackB + attackC > 0 && keyCoolDown) foreach(Item item in itemList)
{ {
if (attackA == 1) for(int i=0; i< item.skillNum; i++)
{
comboArray += "A";
}
else if (attackB == 1)
{ {
comboArray += "B"; if(item.combo[i].Equals(comboArray))
}
else if (attackC == 1)
{
comboArray += "C";
}
bool success = false;
foreach (AttackCombo com in AttackArr)
{
if (com.Equals(comboArray))
{
comboQueue.Enqueue(com);
success = true;
}
}
if (success==false) //콤보 실행에 실패했다면
{
string temp = comboArray[comboArray.Length - 1]+"";
foreach (AttackCombo com2 in AttackArr) //기본 글자 콤보 실행
{ {
if (com2.Equals(temp)) playerController.playerState = PlayerState.Attack;
{ aoc["PlayerAttackAnim"] = item.animation[i];
comboQueue.Enqueue(com2); anim.SetTrigger("attack");
} item.ComboAction(i);
playingSkill = true;
GetComponent<Rigidbody2D>().velocity = new Vector2(Mathf.Clamp(GetComponent<Rigidbody2D>().velocity.x,-3f,3f), 0);
return;
} }
} }
} }
playerController.playerState = PlayerState.Attack;
aoc["PlayerAttackAnim"] = normalAttack[comboArray[comboArray.Length - 1] - 'A'];
anim.SetTrigger("attack");
playingSkill = true;
GetComponent<Rigidbody2D>().velocity = new Vector2(Mathf.Clamp(GetComponent<Rigidbody2D>().velocity.x, -3f, 3f), 0);
if (!CheckLongerCombo()) comboArray = comboArray[comboArray.Length - 1] + "";
}
bool CheckLongerCombo()
{
List<Item> itemList = inventoryManager.itemList;
foreach(Item item in itemList)
for (int i = 0; i < item.skillNum; i++)
if (item.combo[i].Length > comboArray.Length && item.combo[i].Substring(0, comboArray.Length).Equals(comboArray))
return true;
return false;
} }
} }
Assets/Scripts/Characters/PlayerController.cs
View file @ 0fbf3a4e
...@@ -9,6 +9,8 @@ public class PlayerController : MonoBehaviour ...@@ -9,6 +9,8 @@ public class PlayerController : MonoBehaviour
private Animator anim; private Animator anim;
[SerializeField] [SerializeField]
private float rbGravityScale; private float rbGravityScale;
[SerializeField]
private float rbAttackGravityScale;
// Speeds of player // Speeds of player
[SerializeField] [SerializeField]
private float maxSpeed; private float maxSpeed;
...@@ -30,7 +32,6 @@ public class PlayerController : MonoBehaviour ...@@ -30,7 +32,6 @@ public class PlayerController : MonoBehaviour
// Bool values for jump & doublejump // Bool values for jump & doublejump
private bool isGrounded = true; private bool isGrounded = true;
private bool isJumpable = true; // Can player jump or doublejump? private bool isJumpable = true; // Can player jump or doublejump?
private bool isInRope = false;
private bool isDownPlatform = false; private bool isDownPlatform = false;
private bool ropeEnabled = true; private bool ropeEnabled = true;
// Inputs // Inputs
...@@ -58,17 +59,15 @@ public class PlayerController : MonoBehaviour ...@@ -58,17 +59,15 @@ public class PlayerController : MonoBehaviour
[SerializeField] [SerializeField]
private float ropeUp, ropeDown; private float ropeUp, ropeDown;
enum PlayerState { Idle, Walk, Run, GoingUp, GoingDown, Rope }
PlayerState playerState, previousState; public PlayerState playerState, previousState;
// Use this for initialization
void Start() void Start()
{ {
rb = gameObject.GetComponent<Rigidbody2D>(); rb = gameObject.GetComponent<Rigidbody2D>();
anim = GetComponent<Animator>(); anim = GetComponent<Animator>();
} }
// Update is called once per frame
void Update() void Update()
{ {
horizontal = Input.GetAxis("Horizontal"); horizontal = Input.GetAxis("Horizontal");
...@@ -87,132 +86,139 @@ public class PlayerController : MonoBehaviour ...@@ -87,132 +86,139 @@ public class PlayerController : MonoBehaviour
if (GameManager.gameState == GameState.Ingame) if (GameManager.gameState == GameState.Ingame)
{ {
if (playerState == PlayerState.Attack)
{
rb.gravityScale = rbAttackGravityScale;
return;
}
if (isGrounded) if (isGrounded)
isJumpable = true; isJumpable = true;
if (isGrounded) if (playerState != PlayerState.Attack)
{ {
if (horizontalRaw == 1f) transform.localScale = new Vector3(-1f, transform.localScale.y, transform.localScale.z); if (isGrounded)
else if (horizontalRaw == -1f) transform.localScale = new Vector3(1f, transform.localScale.y, transform.localScale.z); {
} if (horizontalRaw == 1f) transform.localScale = new Vector3(-1f, transform.localScale.y, transform.localScale.z);
else if (horizontalRaw == -1f) transform.localScale = new Vector3(1f, transform.localScale.y, transform.localScale.z);
}
if (verticalRaw == -1 && !isDownPlatform) if (verticalRaw == -1 && !isDownPlatform)
{
RaycastHit2D hit = Physics2D.Raycast(transform.position, Vector2.down, rayDistance, platformLayer);
if (hit.collider != null && rb.velocity.y == 0)
{ {
Room curRoom = MapManager.mapGrid[Player.tx, Player.ty]; RaycastHit2D hit = Physics2D.Raycast(transform.position, Vector2.down, rayDistance, platformLayer);
platformArray = curRoom.GetComponentsInChildren<TilemapCollider2D>(); if (hit.collider != null && rb.velocity.y == 0)
isDownPlatform = true; {
StartCoroutine(DownPlatform()); Room curRoom = MapManager.mapGrid[Player.tx, Player.ty];
platformArray = curRoom.GetComponentsInChildren<TilemapCollider2D>();
isDownPlatform = true;
StartCoroutine(DownPlatform());
}
} }
} if (IsInRope())
if (IsInRope())
{
if (isInRope)
{ {
if (horizontalRaw != 0f && verticalRaw == 0f) if (playerState == PlayerState.Rope)
{ {
isInRope = false; if (horizontalRaw != 0f && verticalRaw == 0f)
playerState = PlayerState.Idle; {
rb.gravityScale = rbGravityScale; playerState = PlayerState.Idle;
StartCoroutine(RopeDelay()); rb.gravityScale = rbGravityScale;
StartCoroutine(RopeDelay());
}
rb.velocity = new Vector2(0f, verticalRaw * ropeSpeed);
}
else if (verticalRaw != 0 && ropeEnabled && horizontalRaw == 0)
{
playerState = PlayerState.Rope;
rb.gravityScale = 0f;
transform.position = new Vector2(Mathf.Round(transform.position.x - 0.5f) + 0.5f, transform.position.y);
rb.velocity = new Vector2(0f, 0f);
} }
rb.velocity = new Vector2(0f, verticalRaw * ropeSpeed); anim.SetFloat("ropeUpDown", verticalRaw);
} }
else if (verticalRaw != 0 && ropeEnabled && horizontalRaw == 0) else
{ {
isInRope = true; playerState = PlayerState.Idle;
playerState = PlayerState.Rope; rb.gravityScale = rbGravityScale;
rb.gravityScale = 0f;
transform.position = new Vector2(Mathf.Round(transform.position.x - 0.5f) + 0.5f, transform.position.y);
rb.velocity = new Vector2(0f, 0f);
} }
if (playerState != PlayerState.Rope)
}
else
{
isInRope = false;
playerState = PlayerState.Idle;
rb.gravityScale = rbGravityScale;
}
if (!isInRope)
{
float vertical = rb.velocity.y;
if (jump)
{ {
if (isGrounded) float vertical = rb.velocity.y;
if (jump)
{ {
vertical = jumpSpeed; if (isGrounded)
{
vertical = jumpSpeed;
}
else if (isJumpable)
{
vertical = doubleJumpSpeed;
isJumpable = false;
}
} }
else if (isJumpable)
if (!isGrounded)
{ {
vertical = doubleJumpSpeed; if (vertical > 0) playerState = PlayerState.GoingUp;
isJumpable = false; else playerState = PlayerState.GoingDown;
rb.gravityScale = rbGravityScale;
} }
}
if (!isGrounded)
{
if (vertical > 0) playerState = PlayerState.GoingUp;
else playerState = PlayerState.GoingDown;
}
if (horizontalRaw != 0) if (horizontalRaw != 0)
{
if (horizontal != 1 && horizontal != -1 && dashStart == 0)
{ {
//짧게 눌렀을 때 if (horizontal != 1 && horizontal != -1 && dashStart == 0)
dashStart = 1; {
//짧게 눌렀을 때
dashStart = 1;
}
}
if (horizontalRaw == 0 && horizontal != 0 && dashStart == 1)
{
//방금 뗐을때
dashStart = 2;
//이제 빠르게 켜면 됨
}
if (dashStart == 2 && horizontalRaw != 0)
{
isDashing = true;
}
if (horizontalRaw == 0 && horizontal == 0)
{
dashStart = 0;
isDashing = false;
} }
}
if (horizontalRaw == 0 && horizontal != 0 && dashStart == 1)
{
//방금 뗐을때
dashStart = 2;
//이제 빠르게 켜면 됨
}
if (dashStart == 2 && horizontalRaw != 0)
{
isDashing = true;
}
if (horizontalRaw == 0 && horizontal == 0)
{
dashStart = 0;
isDashing = false;
}
if (isDashing) if (isDashing)
rb.AddForce(horizontalRaw * dashAccerlation * Time.smoothDeltaTime * Vector2.right); rb.AddForce(horizontalRaw * dashAccerlation * Time.smoothDeltaTime * Vector2.right);
else else
rb.AddForce(horizontalRaw * accerlation * Time.smoothDeltaTime * Vector2.right); rb.AddForce(horizontalRaw * accerlation * Time.smoothDeltaTime * Vector2.right);
if (isGrounded) if (isGrounded)
{
if (horizontalRaw == 0) playerState = PlayerState.Idle;
else
{ {
if (isDashing) playerState = PlayerState.Run; if (horizontalRaw == 0) playerState = PlayerState.Idle;
else playerState = PlayerState.Walk; else
{
if (isDashing) playerState = PlayerState.Run;
else playerState = PlayerState.Walk;
}
} }
}
if (((horizontalRaw == 0) || (rb.velocity.x > 0 && horizontalRaw < 0) if (((horizontalRaw == 0) || (rb.velocity.x > 0 && horizontalRaw < 0)
|| (rb.velocity.x < 0 && horizontalRaw > 0)) && (isGrounded)) || (rb.velocity.x < 0 && horizontalRaw > 0)) && (isGrounded))
{ {
// rb.AddForce(rb.velocity.x * (-100f) * Vector2.right * Time.smoothDeltaTime); // rb.AddForce(rb.velocity.x * (-100f) * Vector2.right * Time.smoothDeltaTime);
rb.velocity = new Vector2(rb.velocity.x / (1.5f), rb.velocity.y); rb.velocity = new Vector2(rb.velocity.x / (1.5f), rb.velocity.y);
}
if (isDashing) rb.velocity = new Vector2(Mathf.Clamp(rb.velocity.x, -maxDashSpeed, maxDashSpeed), vertical);
else
rb.velocity = new Vector2(Mathf.Clamp(rb.velocity.x, -maxSpeed, maxSpeed), vertical);
} }
if (isDashing) rb.velocity = new Vector2(Mathf.Clamp(rb.velocity.x, -maxDashSpeed, maxDashSpeed), vertical);
else
rb.velocity = new Vector2(Mathf.Clamp(rb.velocity.x, -maxSpeed, maxSpeed), vertical);
} }
if (previousState != playerState) if (previousState != playerState)
switch (playerState) switch (playerState)
...@@ -224,6 +230,7 @@ public class PlayerController : MonoBehaviour ...@@ -224,6 +230,7 @@ public class PlayerController : MonoBehaviour
case PlayerState.GoingDown: anim.SetTrigger("downTrigger"); break; case PlayerState.GoingDown: anim.SetTrigger("downTrigger"); break;
case PlayerState.Rope: anim.SetTrigger("rope"); break; case PlayerState.Rope: anim.SetTrigger("rope"); break;
} }
previousState = playerState; previousState = playerState;
} }
...@@ -261,7 +268,7 @@ public class PlayerController : MonoBehaviour ...@@ -261,7 +268,7 @@ public class PlayerController : MonoBehaviour
{ {
Physics2D.IgnoreCollision(element, transform.GetComponent<Collider2D>(), true); Physics2D.IgnoreCollision(element, transform.GetComponent<Collider2D>(), true);
yield return new WaitForSeconds(0.3f); yield return new WaitForSeconds(0.3f);
while (isInRope) yield return new WaitForSeconds(0.1f); while (playerState == PlayerState.Rope) yield return new WaitForSeconds(0.1f);
Physics2D.IgnoreCollision(element, transform.GetComponent<Collider2D>(), false); Physics2D.IgnoreCollision(element, transform.GetComponent<Collider2D>(), false);
isDownPlatform = false; isDownPlatform = false;
} }
......
Assets/Scripts/Enumerators.cs
View file @ 0fbf3a4e
public enum ItemQuality public enum EnemyDebuffCase
{
fire,
ice,
stun,
blind,
charm
};
public enum ItemQuality
{ {
Study, Study,
Ordinary, Ordinary,
...@@ -29,8 +38,7 @@ public enum ItemType ...@@ -29,8 +38,7 @@ public enum ItemType
MasterpieceAdd MasterpieceAdd
} }
public enum PlayerState { Idle, Walk, Run, GoingUp, GoingDown, Rope } public enum PlayerState { Idle, Walk, Run, GoingUp, GoingDown, Rope, Attack }
public enum ComboState {Idle, Combo, Attack}
/// <summary> /// <summary>
/// Enum for game's state. /// Enum for game's state.
......
Assets/Scripts/Item/InventoryManager.cs
View file @ 0fbf3a4e
...@@ -13,6 +13,7 @@ public class InventoryManager : MonoBehaviour { ...@@ -13,6 +13,7 @@ public class InventoryManager : MonoBehaviour {
private void Start() private void Start()
{ {
ui = GameObject.Find("InventoryCanvas").GetComponent<InventoryUI>(); ui = GameObject.Find("InventoryCanvas").GetComponent<InventoryUI>();
GameObject.Find("InventoryCanvas").SetActive(false);
//itemPool //itemPool
itemPool.Add("Bow"); itemPool.Add("Bow");
...@@ -30,7 +31,8 @@ public class InventoryManager : MonoBehaviour { ...@@ -30,7 +31,8 @@ public class InventoryManager : MonoBehaviour {
{ {
yield return null; yield return null;
PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[0]))); PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[0])));
yield return new WaitForSeconds(1f); PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[2])));
/*yield return new WaitForSeconds(1f);
ItemSelect(0); ItemSelect(0);
yield return new WaitForSeconds(1f); yield return new WaitForSeconds(1f);
PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[1]))); PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[1])));
...@@ -43,7 +45,7 @@ public class InventoryManager : MonoBehaviour { ...@@ -43,7 +45,7 @@ public class InventoryManager : MonoBehaviour {
yield return new WaitForSeconds(1f); yield return new WaitForSeconds(1f);
AttachAddon(0, 0); AttachAddon(0, 0);
yield return new WaitForSeconds(1f); yield return new WaitForSeconds(1f);
*/
} }
public void SetOnPosition() public void SetOnPosition()
{ {
......
Assets/Scripts/Item/Item.cs
View file @ 0fbf3a4e
...@@ -8,6 +8,7 @@ public abstract class Item { ...@@ -8,6 +8,7 @@ public abstract class Item {
public ItemQuality quality; public ItemQuality quality;
public int skillNum; public int skillNum;
public string[] combo = new string[3]; //Capital Letters A B C public string[] combo = new string[3]; //Capital Letters A B C
public AnimationClip[] animation = new AnimationClip[3];
public bool[] attachable = new bool[4]; //0: prop 1: matter 2: component 3:theory public bool[] attachable = new bool[4]; //0: prop 1: matter 2: component 3:theory
public Addon[] addons = new Addon[4]; //0: prop 1: matter 2: component 3:theory public Addon[] addons = new Addon[4]; //0: prop 1: matter 2: component 3:theory
public Sprite sprite; public Sprite sprite;
...@@ -27,6 +28,13 @@ public abstract class Item { ...@@ -27,6 +28,13 @@ public abstract class Item {
} }
return false; return false;
} }
public bool ComboAction(int currenSkill)
{
if (currenSkill == 0) PlaySkill1();
else if (currenSkill == 1) PlaySkill2();
else if (currenSkill == 2) PlaySkill3();
return true;
}
public Item() public Item()
{ {
Declare(); Declare();
...@@ -39,6 +47,9 @@ public abstract class Item { ...@@ -39,6 +47,9 @@ public abstract class Item {
combo = new string[3] { "", "", "" }; combo = new string[3] { "", "", "" };
attachable = new bool[4] { false, false, false, false }; attachable = new bool[4] { false, false, false, false };
sprite = null; sprite = null;
animation[0] = null;
animation[1] = null;
animation[2] = null;
sizeInventory = new Vector2(0, 0); sizeInventory = new Vector2(0, 0);
} }
protected virtual void PlaySkill1() protected virtual void PlaySkill1()
......
Assets/Scripts/Item/Items/Bow.cs
View file @ 0fbf3a4e
...@@ -15,6 +15,9 @@ public class Bow : Item { ...@@ -15,6 +15,9 @@ public class Bow : Item {
combo = new string[3] { "BB", "BC", "" }; combo = new string[3] { "BB", "BC", "" };
attachable = new bool[4] { true, true, true, true }; attachable = new bool[4] { true, true, true, true };
sprite = Resources.Load<Sprite>("Sprites/Items/bow"); sprite = Resources.Load<Sprite>("Sprites/Items/bow");
animation[0] = Resources.Load<AnimationClip>("Animations/normalAttackA");
animation[1] = Resources.Load<AnimationClip>("Animations/normalAttackA");
animation[2] = null;
sizeInventory = new Vector2(90, 160); sizeInventory = new Vector2(90, 160);
} }
} }
Assets/Scripts/Item/Items/Ksanife.cs
View file @ 0fbf3a4e
...@@ -15,6 +15,9 @@ public class Ksanife : Item ...@@ -15,6 +15,9 @@ public class Ksanife : Item
combo = new string[3] { "A", "AABAA", "" }; combo = new string[3] { "A", "AABAA", "" };
attachable = new bool[4] { true, true, false, false }; attachable = new bool[4] { true, true, false, false };
sprite = Resources.Load<Sprite>("Sprites/Items/ksanife"); sprite = Resources.Load<Sprite>("Sprites/Items/ksanife");
animation[0] = Resources.Load<AnimationClip>("Animations/normalAttackA");
animation[1] = Resources.Load<AnimationClip>("Animations/normalAttackA");
animation[2] = null;
sizeInventory = new Vector2(160, 160); sizeInventory = new Vector2(160, 160);
} }
} }
Assets/SkillPlay.cs 0 → 100644
View file @ 0fbf3a4e
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class SkillPlay : StateMachineBehaviour {
public PlayerController playercontroller;
public PlayerAttack playerattack;
public GameObject player;
// 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) {
player = GameObject.Find("Player");
playercontroller = player.GetComponent<PlayerController>();
playerattack = player.GetComponent<PlayerAttack>();
}
// 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) {
playercontroller.playerState = PlayerState.Idle;
playerattack.playingSkill = false;
playerattack.SkillEnd();
}
// 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) {
//
//}
// OnStateIK is called right after Animator.OnAnimatorIK(). Code that sets up animation IK (inverse kinematics) should be implemented here.
//override public void OnStateIK(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
//
//}
}
Assets/SkillPlay.cs.meta 0 → 100644
View file @ 0fbf3a4e
fileFormatVersion: 2
guid: 60bdd8700d3860e4c9a3d3d60b82a0ea
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
ProjectSettings/TagManager.asset
View file @ 0fbf3a4e
...@@ -23,7 +23,7 @@ TagManager: ...@@ -23,7 +23,7 @@ TagManager:
- OuterWall - OuterWall
- Item - Item
- Tetris - Tetris
- - PlayerAttack
- -
- -
- -
......
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