Skip to content

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

Merge branch 'master' into tetris

parents af70e9f8 4bbe3878
Show whitespace changes
Inline Side-by-side
Showing with 483 additions and 205 deletions
Assets/Animation/Player animator.controller
View file @ f09feb42
......@@ -8,44 +8,44 @@ AnimatorController:
m_Name: Player animator
serializedVersion: 5
m_AnimatorParameters:
- m_Name: speed
m_Type: 1
- m_Name: downTrigger
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: ground
m_Type: 4
- m_Name: upTrigger
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: vspeed
m_Type: 1
- m_Name: rope
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: run
m_Type: 4
- m_Name: idle
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: rope
m_Type: 4
- m_Name: run
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: attack
m_Type: 4
- m_Name: walk
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: jump
m_Type: 4
- m_Name: ropeUpDown
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
......@@ -63,18 +63,18 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &1101003239652222428
--- !u!1101 &1101150420884930214
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 4
m_ConditionEvent: speed
m_EventTreshold: 0.1
- m_ConditionMode: 1
m_ConditionEvent: upTrigger
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102579710918655568}
m_DstState: {fileID: 1102172410857876100}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
......@@ -87,39 +87,15 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101229355274126362
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: run
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102076038672576614}
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: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101386338199190618
--- !u!1101 &1101414817990210080
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: attack
- m_ConditionMode: 1
m_ConditionEvent: idle
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102579710918655568}
......@@ -127,15 +103,15 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101403686856183896
--- !u!1101 &1101470433672142044
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
......@@ -143,34 +119,10 @@ AnimatorStateTransition:
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: jump
m_ConditionEvent: run
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102172410857876100}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101548181881032348
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 3
m_ConditionEvent: speed
m_EventTreshold: 0.1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102076038672576614}
m_DstState: {fileID: 1102589759272268450}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
......@@ -183,7 +135,7 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101699363813845174
--- !u!1101 &1101824696373131616
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
......@@ -191,15 +143,15 @@ AnimatorStateTransition:
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: attack
m_ConditionEvent: walk
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102161114999558710}
m_DstState: {fileID: 1102076038672576614}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
......@@ -207,7 +159,7 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101760708495811152
--- !u!1101 &1101867873153303094
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
......@@ -223,15 +175,15 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101804471569796780
--- !u!1101 &1101928950742127702
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
......@@ -239,10 +191,10 @@ AnimatorStateTransition:
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: run
m_ConditionEvent: downTrigger
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102589759272268450}
m_DstState: {fileID: 1102728463836494206}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
......@@ -250,55 +202,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101862778996108802
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: rope
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102579710918655568}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101977136918977596
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: jump
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102579710918655568}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
......@@ -312,9 +216,7 @@ AnimatorState:
m_Name: PlayerWalkAnim
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101003239652222428}
- {fileID: 1101804471569796780}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
......@@ -330,17 +232,16 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102161114999558710
--- !u!1102 &1102172410857876100
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: PlayerAttackAnim
m_Name: PlayerGoingUpAnim
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101386338199190618}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
......@@ -350,23 +251,22 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 0}
m_Motion: {fileID: 7400000, guid: 44ed96ed5e7417f43abd7860211d6c11, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102172410857876100
--- !u!1102 &1102579710918655568
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: PlayerJumpAnim
m_Name: PlayerIdleAnim
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101977136918977596}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
......@@ -376,23 +276,22 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 0}
m_Motion: {fileID: 7400000, guid: c9bb1545cf6846e4d8be1e524730a016, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102579710918655568
--- !u!1102 &1102589759272268450
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: PlayerIdleAnim
m_Name: PlayerRunAnim
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101548181881032348}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
......@@ -402,23 +301,22 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: c9bb1545cf6846e4d8be1e524730a016, type: 2}
m_Motion: {fileID: 7400000, guid: 4f14906b60be5bb4f8614bc85c385edf, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102589759272268450
--- !u!1102 &1102728463836494206
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: PlayerRunAnim
m_Name: PlayerGoingDownAnim
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101229355274126362}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
......@@ -428,7 +326,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 4f14906b60be5bb4f8614bc85c385edf, type: 2}
m_Motion: {fileID: 7400000, guid: f91c870ab8e91fd449c7928c7b149a1f, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
......@@ -443,8 +341,7 @@ AnimatorState:
m_Name: PlayerRopeAnim
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101862778996108802}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
......@@ -470,27 +367,30 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102579710918655568}
m_Position: {x: 108, y: 228, z: 0}
m_Position: {x: 132, y: 264, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102172410857876100}
m_Position: {x: 72, y: -72, z: 0}
m_Position: {x: 168, y: 72, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102832384910426066}
m_Position: {x: 648, y: 276, z: 0}
m_Position: {x: 624, y: 276, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102076038672576614}
m_Position: {x: 276, y: 420, z: 0}
m_Position: {x: 408, y: 276, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102589759272268450}
m_Position: {x: -108, y: 372, z: 0}
m_Position: {x: 408, y: 324, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102161114999558710}
m_Position: {x: 348, y: 96, z: 0}
m_State: {fileID: 1102728463836494206}
m_Position: {x: 168, y: 120, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 1101403686856183896}
- {fileID: 1101760708495811152}
- {fileID: 1101699363813845174}
- {fileID: 1101150420884930214}
- {fileID: 1101928950742127702}
- {fileID: 1101867873153303094}
- {fileID: 1101824696373131616}
- {fileID: 1101470433672142044}
- {fileID: 1101414817990210080}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
......
Assets/Animation/Player/PlayerGoingDownAnim.anim 0 → 100644
View file @ f09feb42
%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: PlayerGoingDownAnim
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: c2f9f5a4cddceda4e941d2505563f825, 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: c2f9f5a4cddceda4e941d2505563f825, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 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: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0
m_Events: []
Assets/Animation/Player/PlayerGoingDownAnim.anim.meta 0 → 100644
View file @ f09feb42
fileFormatVersion: 2
guid: f91c870ab8e91fd449c7928c7b149a1f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Animation/Player/PlayerGoingUpAnim.anim 0 → 100644
View file @ f09feb42
%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: PlayerGoingUpAnim
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: d8d54addde630d14aafacc31de2e47c7, 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: d8d54addde630d14aafacc31de2e47c7, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 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: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0
m_Events: []
Assets/Animation/Player/PlayerGoingUpAnim.anim.meta 0 → 100644
View file @ f09feb42
fileFormatVersion: 2
guid: 44ed96ed5e7417f43abd7860211d6c11
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/Characters/Player.prefab
View file @ f09feb42
......@@ -59,7 +59,7 @@ Rigidbody2D:
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 2
m_GravityScale: 5
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
......@@ -77,7 +77,7 @@ BoxCollider2D:
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: -0.1}
m_Offset: {x: 0, y: -0.09}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
......@@ -88,7 +88,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.7, y: 1.4}
m_Size: {x: 0.7, y: 1.5}
m_EdgeRadius: 0
--- !u!95 &95992411616135034
Animator:
......@@ -119,10 +119,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f289cad4933d4bf42ae5c82c57bd88e4, type: 3}
m_Name:
m_EditorClassIdentifier:
maxSpeed: 5
maxDashSpeed: 10
rbGravityScale: 3
maxSpeed: 3
maxDashSpeed: 6
accerlation: 1200
jumpSpeed: 10
jumpSpeed: 11
ropeSpeed: 3
doubleJumpSpeed: 10
dashAccerlation: 2000
......
Assets/Scripts/Characters/PlayerController.cs
View file @ f09feb42
......@@ -8,6 +8,8 @@ public class PlayerController : MonoBehaviour
private Rigidbody2D rb; // RigidBody2D of this game object
private Animator anim;
[SerializeField]
private float rbGravityScale;
// Speeds of player
[SerializeField]
private float maxSpeed;
......@@ -29,7 +31,6 @@ public class PlayerController : MonoBehaviour
// Bool values for jump & doublejump
private bool isGrounded = true;
private bool isJumpable = true; // Can player jump or doublejump?
private bool isInRope = false;
private bool isDownPlatform = false;
private bool ropeEnabled = true;
// Inputs
......@@ -56,14 +57,17 @@ public class PlayerController : MonoBehaviour
private float rayDistance;
[SerializeField]
private float ropeUp, ropeDown;
// Use this for initialization
enum PlayerState { Idle, Walk, Run, GoingUp, GoingDown, Rope}
PlayerState playerState,previousState;
void Start()
{
rb = gameObject.GetComponent<Rigidbody2D>();
anim = GetComponent<Animator>();
playerState = PlayerState.Idle;
previousState = PlayerState.Idle;
}
// Update is called once per frame
void Update()
{
horizontal = Input.GetAxis("Horizontal");
......@@ -82,15 +86,6 @@ public class PlayerController : MonoBehaviour
if (GameManager.gameState == GameState.Ingame && MapManager.isDoorClosing != true)
{
anim.SetBool("rope", isInRope);
anim.SetBool("run", isDashing);
anim.SetBool("ground", isGrounded);
anim.SetFloat("vspeed", rb.velocity.y);
anim.SetFloat("speed", Mathf.Abs(rb.velocity.x));
if (isGrounded || isInRope)
{
anim.SetBool("jump", false);
}
if (isGrounded)
isJumpable = true;
......@@ -114,12 +109,12 @@ public class PlayerController : MonoBehaviour
}
if (IsInRope())
{
if (isInRope)
if (playerState == PlayerState.Rope)
{
if (horizontalRaw != 0f && verticalRaw == 0f)
{
isInRope = false;
rb.gravityScale = 2f;
playerState = PlayerState.Idle;
rb.gravityScale = rbGravityScale;
StartCoroutine(RopeDelay());
}
......@@ -128,19 +123,20 @@ public class PlayerController : MonoBehaviour
}
else if (verticalRaw != 0 && ropeEnabled && horizontalRaw == 0)
{
isInRope = true;
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);
}
}
anim.SetFloat("ropeUpDown", verticalRaw);
}
else
{
isInRope = false;
rb.gravityScale = 2f;
playerState = PlayerState.Idle;
rb.gravityScale = rbGravityScale;
}
if (!isInRope)
if (playerState != PlayerState.Rope)
{
float vertical = rb.velocity.y;
if (jump)
......@@ -148,20 +144,20 @@ public class PlayerController : MonoBehaviour
if (isGrounded)
{
vertical = jumpSpeed;
anim.SetBool("jump", true);
}
else if (isJumpable)
{
vertical = doubleJumpSpeed;
anim.SetBool("jump", true);
isJumpable = false;
}
}
if (!isGrounded)
{
if (vertical > 0) playerState = PlayerState.GoingUp;
else playerState = PlayerState.GoingDown;
}
//rb.velocity = new Vector2(horizontal * speed * Time.smoothDeltaTime, vertical);
// rb.velocity = new Vector2(rb.velocity.x, vertical);
if (horizontalRaw != 0)
{
if (horizontal != 1 && horizontal != -1 && dashStart == 0)
......@@ -192,6 +188,15 @@ public class PlayerController : MonoBehaviour
else
rb.AddForce(horizontalRaw * accerlation * Time.smoothDeltaTime * Vector2.right);
if (isGrounded)
{
if (horizontalRaw == 0) playerState = PlayerState.Idle;
else
{
if (isDashing) playerState = PlayerState.Run;
else playerState = PlayerState.Walk;
}
}
if (((horizontalRaw == 0) || (rb.velocity.x > 0 && horizontalRaw < 0)
|| (rb.velocity.x < 0 && horizontalRaw > 0)) && (isGrounded))
{
......@@ -202,7 +207,17 @@ public class PlayerController : MonoBehaviour
else
rb.velocity = new Vector2(Mathf.Clamp(rb.velocity.x, -maxSpeed, maxSpeed), vertical);
}
if(previousState != playerState)
switch (playerState)
{
case PlayerState.Idle: anim.SetTrigger("idle"); break;
case PlayerState.Walk: anim.SetTrigger("walk"); break;
case PlayerState.Run: anim.SetTrigger("run"); break;
case PlayerState.GoingUp: anim.SetTrigger("upTrigger"); break;
case PlayerState.GoingDown: anim.SetTrigger("downTrigger"); break;
case PlayerState.Rope: anim.SetTrigger("rope"); break;
}
previousState = playerState;
}
jump = false;
}
......@@ -234,7 +249,7 @@ public class PlayerController : MonoBehaviour
{
element.enabled = false;
yield return new WaitForSeconds(0.3f);
while(isInRope) yield return new WaitForSeconds(0.1f);
while(playerState == PlayerState.Rope) yield return new WaitForSeconds(0.1f);
element.enabled = true;
isDownPlatform = false;
}
......
Assets/Sprites/Player/goingdown.meta 0 → 100644
View file @ f09feb42
fileFormatVersion: 2
guid: 45bb2ce35c41f334497f5dd868082217
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Sprites/Player/goingdown/jump2.png.meta 0 → 100644
View file @ f09feb42
fileFormatVersion: 2
guid: c2f9f5a4cddceda4e941d2505563f825
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 6
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: c09e8e3bf16d57344a4567a4d491afc9
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Assets/Sprites/Player/goingup.meta 0 → 100644
View file @ f09feb42
fileFormatVersion: 2
guid: f99f5101ae1b7b8449e74cfe45853872
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Sprites/Player/goingup/jump1.png.meta 0 → 100644
View file @ f09feb42
fileFormatVersion: 2
guid: d8d54addde630d14aafacc31de2e47c7
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 6
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 64
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: cfcb40e6fc5174d479d2ab3aef50c3b5
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
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