Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
tetra-tower
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Oenos
tetra-tower
Commits
2ca61c5f
Commit
2ca61c5f
authored
Jan 20, 2019
by
18류지석
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
플레이어 애니메이터 수정
parent
ac70cdfd
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
135 additions
and
201 deletions
+135
-201
Player animator.controller
Assets/Animation/Player animator.controller
+75
-175
PlayScene.unity
Assets/Scenes/PlayScene.unity
+20
-0
PlayerController.cs
Assets/Scripts/Characters/PlayerController.cs
+40
-26
No files found.
Assets/Animation/Player animator.controller
View file @
2ca61c5f
...
@@ -8,48 +8,48 @@ AnimatorController:
...
@@ -8,48 +8,48 @@ AnimatorController:
m_Name
:
Player animator
m_Name
:
Player animator
serializedVersion
:
5
serializedVersion
:
5
m_AnimatorParameters
:
m_AnimatorParameters
:
-
m_Name
:
speed
-
m_Name
:
downTrigger
m_Type
:
1
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
910000
0
}
m_Controller
:
{
fileID
:
0
}
-
m_Name
:
ground
-
m_Name
:
upTrigger
m_Type
:
4
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
910000
0
}
m_Controller
:
{
fileID
:
0
}
-
m_Name
:
vspeed
-
m_Name
:
rope
m_Type
:
1
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
910000
0
}
m_Controller
:
{
fileID
:
0
}
-
m_Name
:
run
-
m_Name
:
idle
m_Type
:
4
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
910000
0
}
m_Controller
:
{
fileID
:
0
}
-
m_Name
:
r
ope
-
m_Name
:
r
un
m_Type
:
4
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
910000
0
}
m_Controller
:
{
fileID
:
0
}
-
m_Name
:
attac
k
-
m_Name
:
wal
k
m_Type
:
4
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
910000
0
}
m_Controller
:
{
fileID
:
0
}
-
m_Name
:
jump
-
m_Name
:
ropeUpDown
m_Type
:
4
m_Type
:
1
m_DefaultFloat
:
0
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
910000
0
}
m_Controller
:
{
fileID
:
0
}
m_AnimatorLayers
:
m_AnimatorLayers
:
-
serializedVersion
:
5
-
serializedVersion
:
5
m_Name
:
Base Layer
m_Name
:
Base Layer
...
@@ -63,18 +63,18 @@ AnimatorController:
...
@@ -63,18 +63,18 @@ AnimatorController:
m_IKPass
:
0
m_IKPass
:
0
m_SyncedLayerAffectsTiming
:
0
m_SyncedLayerAffectsTiming
:
0
m_Controller
:
{
fileID
:
9100000
}
m_Controller
:
{
fileID
:
9100000
}
---
!u!1101
&1101
003239652222428
---
!u!1101
&1101
150420884930214
AnimatorStateTransition
:
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
m_Name
:
m_Conditions
:
m_Conditions
:
-
m_ConditionMode
:
4
-
m_ConditionMode
:
1
m_ConditionEvent
:
speed
m_ConditionEvent
:
upTrigger
m_EventTreshold
:
0
.1
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
1102
579710918655568
}
m_DstState
:
{
fileID
:
1102
172410857876100
}
m_Solo
:
0
m_Solo
:
0
m_Mute
:
0
m_Mute
:
0
m_IsExit
:
0
m_IsExit
:
0
...
@@ -87,39 +87,15 @@ AnimatorStateTransition:
...
@@ -87,39 +87,15 @@ AnimatorStateTransition:
m_InterruptionSource
:
0
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
m_CanTransitionToSelf
:
1
---
!u!1101
&1101229355274126362
---
!u!1101
&1101414817990210080
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
AnimatorStateTransition
:
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
m_Name
:
m_Conditions
:
m_Conditions
:
-
m_ConditionMode
:
2
-
m_ConditionMode
:
1
m_ConditionEvent
:
attack
m_ConditionEvent
:
idle
m_EventTreshold
:
0
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
1102579710918655568
}
m_DstState
:
{
fileID
:
1102579710918655568
}
...
@@ -127,15 +103,15 @@ AnimatorStateTransition:
...
@@ -127,15 +103,15 @@ AnimatorStateTransition:
m_Mute
:
0
m_Mute
:
0
m_IsExit
:
0
m_IsExit
:
0
serializedVersion
:
3
serializedVersion
:
3
m_TransitionDuration
:
0
.25
m_TransitionDuration
:
0
m_TransitionOffset
:
0
m_TransitionOffset
:
0
m_ExitTime
:
0.75
m_ExitTime
:
0.75
m_HasExitTime
:
1
m_HasExitTime
:
0
m_HasFixedDuration
:
1
m_HasFixedDuration
:
1
m_InterruptionSource
:
0
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
m_CanTransitionToSelf
:
1
---
!u!1101
&11014
03686856183896
---
!u!1101
&11014
70433672142044
AnimatorStateTransition
:
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_CorrespondingSourceObject
:
{
fileID
:
0
}
...
@@ -143,34 +119,10 @@ AnimatorStateTransition:
...
@@ -143,34 +119,10 @@ AnimatorStateTransition:
m_Name
:
m_Name
:
m_Conditions
:
m_Conditions
:
-
m_ConditionMode
:
1
-
m_ConditionMode
:
1
m_ConditionEvent
:
jump
m_ConditionEvent
:
run
m_EventTreshold
:
0
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
1102172410857876100
}
m_DstState
:
{
fileID
:
1102589759272268450
}
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_Solo
:
0
m_Solo
:
0
m_Mute
:
0
m_Mute
:
0
m_IsExit
:
0
m_IsExit
:
0
...
@@ -183,7 +135,7 @@ AnimatorStateTransition:
...
@@ -183,7 +135,7 @@ AnimatorStateTransition:
m_InterruptionSource
:
0
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
m_CanTransitionToSelf
:
1
---
!u!1101
&1101
699363813845174
---
!u!1101
&1101
824696373131616
AnimatorStateTransition
:
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_CorrespondingSourceObject
:
{
fileID
:
0
}
...
@@ -191,15 +143,15 @@ AnimatorStateTransition:
...
@@ -191,15 +143,15 @@ AnimatorStateTransition:
m_Name
:
m_Name
:
m_Conditions
:
m_Conditions
:
-
m_ConditionMode
:
1
-
m_ConditionMode
:
1
m_ConditionEvent
:
attac
k
m_ConditionEvent
:
wal
k
m_EventTreshold
:
0
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
1102
161114999558710
}
m_DstState
:
{
fileID
:
1102
076038672576614
}
m_Solo
:
0
m_Solo
:
0
m_Mute
:
0
m_Mute
:
0
m_IsExit
:
0
m_IsExit
:
0
serializedVersion
:
3
serializedVersion
:
3
m_TransitionDuration
:
0
.25
m_TransitionDuration
:
0
m_TransitionOffset
:
0
m_TransitionOffset
:
0
m_ExitTime
:
0.75
m_ExitTime
:
0.75
m_HasExitTime
:
0
m_HasExitTime
:
0
...
@@ -207,7 +159,7 @@ AnimatorStateTransition:
...
@@ -207,7 +159,7 @@ AnimatorStateTransition:
m_InterruptionSource
:
0
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
m_CanTransitionToSelf
:
1
---
!u!1101
&1101
760708495811152
---
!u!1101
&1101
867873153303094
AnimatorStateTransition
:
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_CorrespondingSourceObject
:
{
fileID
:
0
}
...
@@ -223,15 +175,15 @@ AnimatorStateTransition:
...
@@ -223,15 +175,15 @@ AnimatorStateTransition:
m_Mute
:
0
m_Mute
:
0
m_IsExit
:
0
m_IsExit
:
0
serializedVersion
:
3
serializedVersion
:
3
m_TransitionDuration
:
0
.25
m_TransitionDuration
:
0
m_TransitionOffset
:
0
m_TransitionOffset
:
0
m_ExitTime
:
0.75
m_ExitTime
:
0.75
m_HasExitTime
:
0
m_HasExitTime
:
0
m_HasFixedDuration
:
1
m_HasFixedDuration
:
0
m_InterruptionSource
:
0
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
m_CanTransitionToSelf
:
1
---
!u!1101
&1101
804471569796780
---
!u!1101
&1101
928950742127702
AnimatorStateTransition
:
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_CorrespondingSourceObject
:
{
fileID
:
0
}
...
@@ -239,10 +191,10 @@ AnimatorStateTransition:
...
@@ -239,10 +191,10 @@ AnimatorStateTransition:
m_Name
:
m_Name
:
m_Conditions
:
m_Conditions
:
-
m_ConditionMode
:
1
-
m_ConditionMode
:
1
m_ConditionEvent
:
run
m_ConditionEvent
:
downTrigger
m_EventTreshold
:
0
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
1102
589759272268450
}
m_DstState
:
{
fileID
:
1102
728463836494206
}
m_Solo
:
0
m_Solo
:
0
m_Mute
:
0
m_Mute
:
0
m_IsExit
:
0
m_IsExit
:
0
...
@@ -250,55 +202,7 @@ AnimatorStateTransition:
...
@@ -250,55 +202,7 @@ AnimatorStateTransition:
m_TransitionDuration
:
0
m_TransitionDuration
:
0
m_TransitionOffset
:
0
m_TransitionOffset
:
0
m_ExitTime
:
0.75
m_ExitTime
:
0.75
m_HasExitTime
:
1
m_HasExitTime
:
0
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_HasFixedDuration
:
1
m_HasFixedDuration
:
1
m_InterruptionSource
:
0
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_OrderedInterruption
:
1
...
@@ -312,9 +216,7 @@ AnimatorState:
...
@@ -312,9 +216,7 @@ AnimatorState:
m_Name
:
PlayerWalkAnim
m_Name
:
PlayerWalkAnim
m_Speed
:
1
m_Speed
:
1
m_CycleOffset
:
0
m_CycleOffset
:
0
m_Transitions
:
m_Transitions
:
[]
-
{
fileID
:
1101003239652222428
}
-
{
fileID
:
1101804471569796780
}
m_StateMachineBehaviours
:
[]
m_StateMachineBehaviours
:
[]
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_IKOnFeet
:
0
m_IKOnFeet
:
0
...
@@ -330,17 +232,16 @@ AnimatorState:
...
@@ -330,17 +232,16 @@ AnimatorState:
m_MirrorParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
m_TimeParameter
:
---
!u!1102
&11021
6111499955871
0
---
!u!1102
&11021
7241085787610
0
AnimatorState
:
AnimatorState
:
serializedVersion
:
5
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
Player
Attack
Anim
m_Name
:
Player
GoingUp
Anim
m_Speed
:
1
m_Speed
:
1
m_CycleOffset
:
0
m_CycleOffset
:
0
m_Transitions
:
m_Transitions
:
[]
-
{
fileID
:
1101386338199190618
}
m_StateMachineBehaviours
:
[]
m_StateMachineBehaviours
:
[]
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_IKOnFeet
:
0
m_IKOnFeet
:
0
...
@@ -356,17 +257,16 @@ AnimatorState:
...
@@ -356,17 +257,16 @@ AnimatorState:
m_MirrorParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
m_TimeParameter
:
---
!u!1102
&1102
172410857876100
---
!u!1102
&1102
579710918655568
AnimatorState
:
AnimatorState
:
serializedVersion
:
5
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
Player
Jump
Anim
m_Name
:
Player
Idle
Anim
m_Speed
:
1
m_Speed
:
1
m_CycleOffset
:
0
m_CycleOffset
:
0
m_Transitions
:
m_Transitions
:
[]
-
{
fileID
:
1101977136918977596
}
m_StateMachineBehaviours
:
[]
m_StateMachineBehaviours
:
[]
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_IKOnFeet
:
0
m_IKOnFeet
:
0
...
@@ -376,23 +276,22 @@ AnimatorState:
...
@@ -376,23 +276,22 @@ AnimatorState:
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
:
c9bb1545cf6846e4d8be1e524730a016
,
type
:
2
}
m_Tag
:
m_Tag
:
m_SpeedParameter
:
m_SpeedParameter
:
m_MirrorParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
m_TimeParameter
:
---
!u!1102
&11025
79710918655568
---
!u!1102
&11025
89759272268450
AnimatorState
:
AnimatorState
:
serializedVersion
:
5
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
Player
Idle
Anim
m_Name
:
Player
Run
Anim
m_Speed
:
1
m_Speed
:
1
m_CycleOffset
:
0
m_CycleOffset
:
0
m_Transitions
:
m_Transitions
:
[]
-
{
fileID
:
1101548181881032348
}
m_StateMachineBehaviours
:
[]
m_StateMachineBehaviours
:
[]
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_IKOnFeet
:
0
m_IKOnFeet
:
0
...
@@ -402,23 +301,22 @@ AnimatorState:
...
@@ -402,23 +301,22 @@ AnimatorState:
m_MirrorParameterActive
:
0
m_MirrorParameterActive
:
0
m_CycleOffsetParameterActive
:
0
m_CycleOffsetParameterActive
:
0
m_TimeParameterActive
:
0
m_TimeParameterActive
:
0
m_Motion
:
{
fileID
:
7400000
,
guid
:
c9bb1545cf6846e4d8be1e524730a016
,
type
:
2
}
m_Motion
:
{
fileID
:
7400000
,
guid
:
4f14906b60be5bb4f8614bc85c385edf
,
type
:
2
}
m_Tag
:
m_Tag
:
m_SpeedParameter
:
m_SpeedParameter
:
m_MirrorParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
m_TimeParameter
:
---
!u!1102
&1102
589759272268450
---
!u!1102
&1102
728463836494206
AnimatorState
:
AnimatorState
:
serializedVersion
:
5
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
Player
Ru
nAnim
m_Name
:
Player
GoingDow
nAnim
m_Speed
:
1
m_Speed
:
1
m_CycleOffset
:
0
m_CycleOffset
:
0
m_Transitions
:
m_Transitions
:
[]
-
{
fileID
:
1101229355274126362
}
m_StateMachineBehaviours
:
[]
m_StateMachineBehaviours
:
[]
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_IKOnFeet
:
0
m_IKOnFeet
:
0
...
@@ -428,7 +326,7 @@ AnimatorState:
...
@@ -428,7 +326,7 @@ AnimatorState:
m_MirrorParameterActive
:
0
m_MirrorParameterActive
:
0
m_CycleOffsetParameterActive
:
0
m_CycleOffsetParameterActive
:
0
m_TimeParameterActive
:
0
m_TimeParameterActive
:
0
m_Motion
:
{
fileID
:
7400000
,
guid
:
4f14906b60be5bb4f8614bc85c385edf
,
type
:
2
}
m_Motion
:
{
fileID
:
0
}
m_Tag
:
m_Tag
:
m_SpeedParameter
:
m_SpeedParameter
:
m_MirrorParameter
:
m_MirrorParameter
:
...
@@ -443,8 +341,7 @@ AnimatorState:
...
@@ -443,8 +341,7 @@ AnimatorState:
m_Name
:
PlayerRopeAnim
m_Name
:
PlayerRopeAnim
m_Speed
:
1
m_Speed
:
1
m_CycleOffset
:
0
m_CycleOffset
:
0
m_Transitions
:
m_Transitions
:
[]
-
{
fileID
:
1101862778996108802
}
m_StateMachineBehaviours
:
[]
m_StateMachineBehaviours
:
[]
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_IKOnFeet
:
0
m_IKOnFeet
:
0
...
@@ -470,27 +367,30 @@ AnimatorStateMachine:
...
@@ -470,27 +367,30 @@ AnimatorStateMachine:
m_ChildStates
:
m_ChildStates
:
-
serializedVersion
:
1
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102579710918655568
}
m_State
:
{
fileID
:
1102579710918655568
}
m_Position
:
{
x
:
1
08
,
y
:
228
,
z
:
0
}
m_Position
:
{
x
:
1
32
,
y
:
264
,
z
:
0
}
-
serializedVersion
:
1
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102172410857876100
}
m_State
:
{
fileID
:
1102172410857876100
}
m_Position
:
{
x
:
72
,
y
:
-
72
,
z
:
0
}
m_Position
:
{
x
:
168
,
y
:
72
,
z
:
0
}
-
serializedVersion
:
1
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102832384910426066
}
m_State
:
{
fileID
:
1102832384910426066
}
m_Position
:
{
x
:
6
48
,
y
:
276
,
z
:
0
}
m_Position
:
{
x
:
6
24
,
y
:
276
,
z
:
0
}
-
serializedVersion
:
1
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102076038672576614
}
m_State
:
{
fileID
:
1102076038672576614
}
m_Position
:
{
x
:
276
,
y
:
420
,
z
:
0
}
m_Position
:
{
x
:
408
,
y
:
276
,
z
:
0
}
-
serializedVersion
:
1
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102589759272268450
}
m_State
:
{
fileID
:
1102589759272268450
}
m_Position
:
{
x
:
-108
,
y
:
372
,
z
:
0
}
m_Position
:
{
x
:
408
,
y
:
324
,
z
:
0
}
-
serializedVersion
:
1
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102
161114999558710
}
m_State
:
{
fileID
:
1102
728463836494206
}
m_Position
:
{
x
:
348
,
y
:
96
,
z
:
0
}
m_Position
:
{
x
:
168
,
y
:
120
,
z
:
0
}
m_ChildStateMachines
:
[]
m_ChildStateMachines
:
[]
m_AnyStateTransitions
:
m_AnyStateTransitions
:
-
{
fileID
:
1101403686856183896
}
-
{
fileID
:
1101150420884930214
}
-
{
fileID
:
1101760708495811152
}
-
{
fileID
:
1101928950742127702
}
-
{
fileID
:
1101699363813845174
}
-
{
fileID
:
1101867873153303094
}
-
{
fileID
:
1101824696373131616
}
-
{
fileID
:
1101470433672142044
}
-
{
fileID
:
1101414817990210080
}
m_EntryTransitions
:
[]
m_EntryTransitions
:
[]
m_StateMachineTransitions
:
{}
m_StateMachineTransitions
:
{}
m_StateMachineBehaviours
:
[]
m_StateMachineBehaviours
:
[]
...
...
Assets/Scenes/PlayScene.unity
View file @
2ca61c5f
...
@@ -677,6 +677,26 @@ Prefab:
...
@@ -677,6 +677,26 @@ Prefab:
propertyPath
:
m_RootOrder
propertyPath
:
m_RootOrder
value
:
5
value
:
5
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
114294925164316638
,
guid
:
3d077a5f727dd1e4780e9265ed26e036
,
type
:
2
}
propertyPath
:
maxSpeed
value
:
3
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
114294925164316638
,
guid
:
3d077a5f727dd1e4780e9265ed26e036
,
type
:
2
}
propertyPath
:
maxDashSpeed
value
:
6
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
61019994424895448
,
guid
:
3d077a5f727dd1e4780e9265ed26e036
,
type
:
2
}
propertyPath
:
m_Size.y
value
:
1.5
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
61019994424895448
,
guid
:
3d077a5f727dd1e4780e9265ed26e036
,
type
:
2
}
propertyPath
:
m_Offset.y
value
:
-0.09
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
...
...
Assets/Scripts/Characters/PlayerController.cs
View file @
2ca61c5f
...
@@ -56,14 +56,17 @@ public class PlayerController : MonoBehaviour
...
@@ -56,14 +56,17 @@ public class PlayerController : MonoBehaviour
private
float
rayDistance
;
private
float
rayDistance
;
[
SerializeField
]
[
SerializeField
]
private
float
ropeUp
,
ropeDown
;
private
float
ropeUp
,
ropeDown
;
// Use this for initialization
enum
PlayerState
{
Idle
,
Walk
,
Run
,
GoingUp
,
GoingDown
,
Rope
}
PlayerState
playerState
,
previousState
;
void
Start
()
void
Start
()
{
{
rb
=
gameObject
.
GetComponent
<
Rigidbody2D
>();
rb
=
gameObject
.
GetComponent
<
Rigidbody2D
>();
anim
=
GetComponent
<
Animator
>();
anim
=
GetComponent
<
Animator
>();
playerState
=
PlayerState
.
Idle
;
previousState
=
PlayerState
.
Idle
;
}
}
// Update is called once per frame
void
Update
()
void
Update
()
{
{
horizontal
=
Input
.
GetAxis
(
"Horizontal"
);
horizontal
=
Input
.
GetAxis
(
"Horizontal"
);
...
@@ -82,15 +85,6 @@ public class PlayerController : MonoBehaviour
...
@@ -82,15 +85,6 @@ public class PlayerController : MonoBehaviour
if
(
GameManager
.
gameState
==
GameState
.
Ingame
)
if
(
GameManager
.
gameState
==
GameState
.
Ingame
)
{
{
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
)
if
(
isGrounded
)
isJumpable
=
true
;
isJumpable
=
true
;
...
@@ -114,11 +108,11 @@ public class PlayerController : MonoBehaviour
...
@@ -114,11 +108,11 @@ public class PlayerController : MonoBehaviour
}
}
if
(
IsInRope
())
if
(
IsInRope
())
{
{
if
(
isIn
Rope
)
if
(
playerState
==
PlayerState
.
Rope
)
{
{
if
(
horizontalRaw
!=
0f
&&
verticalRaw
==
0f
)
if
(
horizontalRaw
!=
0f
&&
verticalRaw
==
0f
)
{
{
isInRope
=
fals
e
;
playerState
=
PlayerState
.
Idl
e
;
rb
.
gravityScale
=
2f
;
rb
.
gravityScale
=
2f
;
StartCoroutine
(
RopeDelay
());
StartCoroutine
(
RopeDelay
());
...
@@ -128,19 +122,20 @@ public class PlayerController : MonoBehaviour
...
@@ -128,19 +122,20 @@ public class PlayerController : MonoBehaviour
}
}
else
if
(
verticalRaw
!=
0
&&
ropeEnabled
&&
horizontalRaw
==
0
)
else
if
(
verticalRaw
!=
0
&&
ropeEnabled
&&
horizontalRaw
==
0
)
{
{
isInRope
=
tru
e
;
playerState
=
PlayerState
.
Rop
e
;
rb
.
gravityScale
=
0f
;
rb
.
gravityScale
=
0f
;
transform
.
position
=
new
Vector2
(
Mathf
.
Round
(
transform
.
position
.
x
-
0.5f
)
+
0.5f
,
transform
.
position
.
y
);
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
,
0f
);
}
}
}
anim
.
SetFloat
(
"ropeUpDown"
,
verticalRaw
);
}
else
else
{
{
isInRope
=
fals
e
;
playerState
=
PlayerState
.
Idl
e
;
rb
.
gravityScale
=
2f
;
rb
.
gravityScale
=
2f
;
}
}
if
(
!
isIn
Rope
)
if
(
playerState
!=
PlayerState
.
Rope
)
{
{
float
vertical
=
rb
.
velocity
.
y
;
float
vertical
=
rb
.
velocity
.
y
;
if
(
jump
)
if
(
jump
)
...
@@ -148,20 +143,20 @@ public class PlayerController : MonoBehaviour
...
@@ -148,20 +143,20 @@ public class PlayerController : MonoBehaviour
if
(
isGrounded
)
if
(
isGrounded
)
{
{
vertical
=
jumpSpeed
;
vertical
=
jumpSpeed
;
anim
.
SetBool
(
"jump"
,
true
);
}
}
else
if
(
isJumpable
)
else
if
(
isJumpable
)
{
{
vertical
=
doubleJumpSpeed
;
vertical
=
doubleJumpSpeed
;
anim
.
SetBool
(
"jump"
,
true
);
isJumpable
=
false
;
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
(
horizontalRaw
!=
0
)
{
{
if
(
horizontal
!=
1
&&
horizontal
!=
-
1
&&
dashStart
==
0
)
if
(
horizontal
!=
1
&&
horizontal
!=
-
1
&&
dashStart
==
0
)
...
@@ -192,6 +187,15 @@ public class PlayerController : MonoBehaviour
...
@@ -192,6 +187,15 @@ public class PlayerController : MonoBehaviour
else
else
rb
.
AddForce
(
horizontalRaw
*
accerlation
*
Time
.
smoothDeltaTime
*
Vector2
.
right
);
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
)
if
(((
horizontalRaw
==
0
)
||
(
rb
.
velocity
.
x
>
0
&&
horizontalRaw
<
0
)
||
(
rb
.
velocity
.
x
<
0
&&
horizontalRaw
>
0
))
&&
(
isGrounded
))
||
(
rb
.
velocity
.
x
<
0
&&
horizontalRaw
>
0
))
&&
(
isGrounded
))
{
{
...
@@ -202,7 +206,17 @@ public class PlayerController : MonoBehaviour
...
@@ -202,7 +206,17 @@ public class PlayerController : MonoBehaviour
else
else
rb
.
velocity
=
new
Vector2
(
Mathf
.
Clamp
(
rb
.
velocity
.
x
,
-
maxSpeed
,
maxSpeed
),
vertical
);
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
;
jump
=
false
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment