Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
man-in-the-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
4
Issues
4
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MIM
man-in-the-mirror
Commits
9b28305f
Commit
9b28305f
authored
Jun 04, 2019
by
18신대성
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
이번엔 진짜 제대로 움직임
AnimTest에서 참고해서 보시오.
parent
18cdb90b
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
1986 additions
and
3383 deletions
+1986
-3383
AnimTest.cs
Assets/Models/Animation/AnimTest.cs
+24
-12
jackson.controller
Assets/Models/Animation/jackson.controller
+4
-151
jacksonTest.controller
Assets/Models/Animation/jacksonTest.controller
+84
-0
jacksonTest.controller.meta
Assets/Models/Animation/jacksonTest.controller.meta
+8
-0
jackson_afterShoot.anim
Assets/Models/Animation/jackson_afterShoot.anim
+730
-1516
jackson_shoot.anim
Assets/Models/Animation/jackson_shoot.anim
+218
-538
jackson_walk.anim
Assets/Models/Animation/jackson_walk.anim
+564
-1150
jackson.prefab
Assets/Prefabs/MapObjects/jackson.prefab
+35
-4
ModelScene.meta
Assets/Scenes/ModelScene.meta
+8
-0
ModelScene.unity
Assets/Scenes/ModelScene.unity
+311
-12
No files found.
Assets/Models/Animation/AnimTest.cs
View file @
9b28305f
...
...
@@ -5,32 +5,44 @@ using UnityEngine;
public
class
AnimTest
:
MonoBehaviour
{
Animator
anim
;
[
Range
(-
1
,
1
)]
public
float
xAngle
=
0
;
public
Transform
aimObject
;
public
Transform
target
;
Quaternion
aimRotation
;
bool
isShooting
=
false
;
private
void
Start
()
{
anim
=
gameObject
.
GetComponent
<
Animator
>();
aimRotation
=
aimObject
.
rotation
;
}
// Update is called once per frame
void
Update
()
{
if
(
Input
.
GetKey
(
KeyCode
.
A
))
if
(
Input
.
GetKey
Down
(
KeyCode
.
W
))
anim
.
SetBool
(
"isWalking"
,
true
);
else
if
(
Input
.
GetKey
(
KeyCode
.
S
))
else
if
(
Input
.
GetKey
Down
(
KeyCode
.
S
))
anim
.
SetBool
(
"isWalking"
,
false
);
else
if
(
Input
.
GetKeyDown
(
KeyCode
.
D
))
if
(
Input
.
GetKeyDown
(
KeyCode
.
Q
))
{
anim
.
SetTrigger
(
"shoot"
);
}
else
if
(
Input
.
GetKey
(
KeyCode
.
F
))
anim
.
ResetTrigger
(
"shoot"
);
else
if
(
Input
.
GetKey
(
KeyCode
.
G
))
anim
.
SetBool
(
"isShooting"
,
true
);
else
if
(
Input
.
GetKey
(
KeyCode
.
H
))
isShooting
=
true
;
}
else
if
(
Input
.
GetKeyDown
(
KeyCode
.
E
))
{
anim
.
SetBool
(
"isShooting"
,
false
);
isShooting
=
false
;
}
if
(
Input
.
GetKeyDown
(
KeyCode
.
T
))
anim
.
SetTrigger
(
"shoot"
);
anim
.
SetLayerWeight
(
1
,
Mathf
.
Abs
(
xAngle
));
anim
.
SetFloat
(
"xAngle"
,
xAngle
);
if
(
isShooting
)
{
aimObject
.
LookAt
(
target
,
new
Vector3
(
0
,
1
,
0
));
}
else
{
aimObject
.
rotation
=
aimRotation
;
}
}
}
Assets/Models/Animation/jackson.controller
View file @
9b28305f
...
...
@@ -25,31 +25,6 @@ AnimatorStateTransition:
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1101
&-5683320443410448867
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
m_Conditions
:
-
m_ConditionMode
:
3
m_ConditionEvent
:
xAngle
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
-3498359792548386283
}
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!1102
&-4689632739989332326
AnimatorState
:
serializedVersion
:
5
...
...
@@ -102,33 +77,6 @@ AnimatorStateTransition:
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1102
&-3498359792548386283
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
3
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
jackson_shootUp
m_Speed
:
0
m_CycleOffset
:
0
m_Transitions
:
-
{
fileID
:
4351087080226294261
}
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
:
45ebfca57564d694ebacfdbad1cdc14d
,
type
:
2
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
---
!u!1101
&-3364404105209571130
AnimatorStateTransition
:
m_ObjectHideFlags
:
3
...
...
@@ -193,25 +141,19 @@ AnimatorController:
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
910000
0
}
m_Controller
:
{
fileID
:
0
}
-
m_Name
:
shoot
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
910000
0
}
m_Controller
:
{
fileID
:
0
}
-
m_Name
:
isShooting
m_Type
:
4
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
9100000
}
-
m_Name
:
xAngle
m_Type
:
1
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
9100000
}
m_Controller
:
{
fileID
:
0
}
m_AnimatorLayers
:
-
serializedVersion
:
5
m_Name
:
Base Layer
...
...
@@ -225,18 +167,6 @@ AnimatorController:
m_IKPass
:
0
m_SyncedLayerAffectsTiming
:
0
m_Controller
:
{
fileID
:
9100000
}
-
serializedVersion
:
5
m_Name
:
Gun
m_StateMachine
:
{
fileID
:
2864463361444553920
}
m_Mask
:
{
fileID
:
0
}
m_Motions
:
[]
m_Behaviours
:
[]
m_BlendingMode
:
0
m_SyncedLayerIndex
:
-1
m_DefaultWeight
:
0
m_IKPass
:
0
m_SyncedLayerAffectsTiming
:
0
m_Controller
:
{
fileID
:
9100000
}
---
!u!1101
&9886059457719643
AnimatorStateTransition
:
m_ObjectHideFlags
:
3
...
...
@@ -381,7 +311,7 @@ AnimatorStateMachine:
m_Position
:
{
x
:
330
,
y
:
110
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102148780198132122
}
m_Position
:
{
x
:
330
,
y
:
-
3
0
,
z
:
0
}
m_Position
:
{
x
:
330
,
y
:
-
1
0
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
5188802425183835566
}
m_Position
:
{
x
:
330
,
y
:
250
,
z
:
0
}
...
...
@@ -398,31 +328,6 @@ AnimatorStateMachine:
m_ExitPosition
:
{
x
:
800
,
y
:
120
,
z
:
0
}
m_ParentStateMachinePosition
:
{
x
:
800
,
y
:
20
,
z
:
0
}
m_DefaultState
:
{
fileID
:
1102325047193046568
}
---
!u!1107
&2864463361444553920
AnimatorStateMachine
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Gun
m_ChildStates
:
-
serializedVersion
:
1
m_State
:
{
fileID
:
2968166197113719018
}
m_Position
:
{
x
:
420
,
y
:
170
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
-3498359792548386283
}
m_Position
:
{
x
:
420
,
y
:
10
,
z
:
0
}
m_ChildStateMachines
:
[]
m_AnyStateTransitions
:
[]
m_EntryTransitions
:
[]
m_StateMachineTransitions
:
{}
m_StateMachineBehaviours
:
[]
m_AnyStatePosition
:
{
x
:
50
,
y
:
20
,
z
:
0
}
m_EntryPosition
:
{
x
:
50
,
y
:
120
,
z
:
0
}
m_ExitPosition
:
{
x
:
800
,
y
:
120
,
z
:
0
}
m_ParentStateMachinePosition
:
{
x
:
800
,
y
:
20
,
z
:
0
}
m_DefaultState
:
{
fileID
:
2968166197113719018
}
---
!u!1101
&2949278334860889428
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
...
...
@@ -448,33 +353,6 @@ AnimatorStateTransition:
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1102
&2968166197113719018
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
3
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
jackson_shootDown
m_Speed
:
0
m_CycleOffset
:
0
m_Transitions
:
-
{
fileID
:
-5683320443410448867
}
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
:
f99d61cdf18e3574d928b14edbfc5095
,
type
:
2
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
---
!u!1101
&3313625409909738067
AnimatorStateTransition
:
m_ObjectHideFlags
:
3
...
...
@@ -500,31 +378,6 @@ AnimatorStateTransition:
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1101
&4351087080226294261
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
m_Conditions
:
-
m_ConditionMode
:
4
m_ConditionEvent
:
xAngle
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
2968166197113719018
}
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!1102
&5188802425183835566
AnimatorState
:
serializedVersion
:
5
...
...
Assets/Models/Animation/jacksonTest.controller
0 → 100644
View file @
9b28305f
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1107
&-3458520467945117866
AnimatorStateMachine
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Base Layer
m_ChildStates
:
-
serializedVersion
:
1
m_State
:
{
fileID
:
4020103918096964613
}
m_Position
:
{
x
:
300
,
y
:
80
,
z
:
0
}
m_ChildStateMachines
:
[]
m_AnyStateTransitions
:
[]
m_EntryTransitions
:
[]
m_StateMachineTransitions
:
{}
m_StateMachineBehaviours
:
[]
m_AnyStatePosition
:
{
x
:
50
,
y
:
20
,
z
:
0
}
m_EntryPosition
:
{
x
:
50
,
y
:
120
,
z
:
0
}
m_ExitPosition
:
{
x
:
800
,
y
:
120
,
z
:
0
}
m_ParentStateMachinePosition
:
{
x
:
800
,
y
:
20
,
z
:
0
}
m_DefaultState
:
{
fileID
:
4020103918096964613
}
---
!u!91
&9100000
AnimatorController
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
jacksonTest
serializedVersion
:
5
m_AnimatorParameters
:
-
m_Name
:
Shoot
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
9100000
}
-
m_Name
:
xAngle
m_Type
:
1
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
9100000
}
m_AnimatorLayers
:
-
serializedVersion
:
5
m_Name
:
Base Layer
m_StateMachine
:
{
fileID
:
-3458520467945117866
}
m_Mask
:
{
fileID
:
0
}
m_Motions
:
[]
m_Behaviours
:
[]
m_BlendingMode
:
0
m_SyncedLayerIndex
:
-1
m_DefaultWeight
:
0
m_IKPass
:
0
m_SyncedLayerAffectsTiming
:
0
m_Controller
:
{
fileID
:
9100000
}
---
!u!1102
&4020103918096964613
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
jackson_shoot
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
:
246f18d4dd6608740996f3f3b10def11
,
type
:
2
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
Assets/Models/Animation/jacksonTest.controller.meta
0 → 100644
View file @
9b28305f
fileFormatVersion: 2
guid: 3902a5d4a758c1341bb08755c3ade608
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Models/Animation/jackson_afterShoot.anim
View file @
9b28305f
This diff is collapsed.
Click to expand it.
Assets/Models/Animation/jackson_shoot.anim
View file @
9b28305f
This diff is collapsed.
Click to expand it.
Assets/Models/Animation/jackson_walk.anim
View file @
9b28305f
This diff is collapsed.
Click to expand it.
Assets/Prefabs/MapObjects/jackson.prefab
View file @
9b28305f
...
...
@@ -611,12 +611,12 @@ Transform:
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
494213313239917623
}
m_LocalRotation
:
{
x
:
-0.6
340379
,
y
:
-0.28484744
,
z
:
0.24146542
,
w
:
0.677164
9
}
m_LocalPosition
:
{
x
:
0
,
y
:
0.0015373576
,
z
:
0
}
m_LocalRotation
:
{
x
:
-0.6
962765
,
y
:
-0.15482675
,
z
:
-0.093045264
,
w
:
-0.694672
9
}
m_LocalPosition
:
{
x
:
-0.00018190424
,
y
:
0.00006683348
,
z
:
0.000018853983
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
-
{
fileID
:
494213313239497169
}
m_Father
:
{
fileID
:
49421331323949710
9
}
m_Father
:
{
fileID
:
783880066181120618
9
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!1
&494213313239917627
...
...
@@ -996,7 +996,7 @@ Transform:
m_LocalPosition
:
{
x
:
0.0004561563
,
y
:
0.0006748411
,
z
:
0.0006479613
}
m_LocalScale
:
{
x
:
0.9999999
,
y
:
1.0000001
,
z
:
1
}
m_Children
:
-
{
fileID
:
494213313239496727
}
-
{
fileID
:
7838800661811206189
}
m_Father
:
{
fileID
:
494213313239497105
}
m_RootOrder
:
1
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
...
...
@@ -2452,6 +2452,37 @@ Transform:
m_Father
:
{
fileID
:
494213313239497177
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!1
&2234791412925868981
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
7838800661811206189
}
m_Layer
:
0
m_Name
:
rightAim
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!4
&7838800661811206189
Transform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2234791412925868981
}
m_LocalRotation
:
{
x
:
0.8480542
,
y
:
0.5298395
,
z
:
-0.0045657963
,
w
:
-0.0073076477
}
m_LocalPosition
:
{
x
:
0.00002
,
y
:
0.00173
,
z
:
0.00002
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
-
{
fileID
:
494213313239496727
}
m_Father
:
{
fileID
:
494213313239497109
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
-0.43300003
,
y
:
180.887
,
z
:
116.005005
}
---
!u!1
&3233955354714130270
GameObject
:
m_ObjectHideFlags
:
0
...
...
Assets/Scenes/ModelScene.meta
0 → 100644
View file @
9b28305f
fileFormatVersion: 2
guid: ae6df86ab9243f74f8c5e9aab2cbca92
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/ModelScene.unity
View file @
9b28305f
This diff is collapsed.
Click to expand it.
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