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
b9146741
Commit
b9146741
authored
May 20, 2019
by
18손재민
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
사격 자세 및 쏘는 모션 다 완성함 ㅅㄱ
parent
c1114d6e
Changes
10
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
12706 additions
and
76 deletions
+12706
-76
AnimTest.cs
Assets/Models/Animation/AnimTest.cs
+12
-2
jackson.controller
Assets/Models/Animation/jackson.controller
+173
-2
jackson_afterShoot.anim
Assets/Models/Animation/jackson_afterShoot.anim
+7767
-0
jackson_afterShoot.anim.meta
Assets/Models/Animation/jackson_afterShoot.anim.meta
+8
-0
jackson_shoot.anim
Assets/Models/Animation/jackson_shoot.anim
+3663
-0
jackson_shoot.anim.meta
Assets/Models/Animation/jackson_shoot.anim.meta
+8
-0
mirror.prefab
Assets/Prefabs/MapObjects/mirror.prefab
+2
-2
oneside mirror.prefab
Assets/Prefabs/MapObjects/oneside mirror.prefab
+0
-0
oneside mirror.prefab.meta
Assets/Prefabs/MapObjects/oneside mirror.prefab.meta
+0
-0
ModelScene.unity
Assets/Scenes/ModelScene.unity
+1073
-70
No files found.
Assets/Models/Animation/AnimTest.cs
View file @
b9146741
...
...
@@ -14,9 +14,19 @@ public class AnimTest : MonoBehaviour
// Update is called once per frame
void
Update
()
{
if
(
Input
.
Get
MouseButtonDown
(
0
))
if
(
Input
.
Get
Key
(
KeyCode
.
A
))
anim
.
SetBool
(
"isWalking"
,
true
);
else
if
(
Input
.
Get
MouseButtonDown
(
1
))
else
if
(
Input
.
Get
Key
(
KeyCode
.
S
))
anim
.
SetBool
(
"isWalking"
,
false
);
else
if
(
Input
.
GetKeyDown
(
KeyCode
.
D
))
{
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
))
anim
.
SetBool
(
"isShooting"
,
false
);
}
}
Assets/Models/Animation/jackson.controller
View file @
b9146741
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1101
&-8058699372396628797
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
m_Conditions
:
-
m_ConditionMode
:
1
m_ConditionEvent
:
shoot
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
-4689632739989332326
}
m_Solo
:
0
m_Mute
:
0
m_IsExit
:
0
serializedVersion
:
3
m_TransitionDuration
:
0.01
m_TransitionOffset
:
0
m_ExitTime
:
2.5075053e-11
m_HasExitTime
:
0
m_HasFixedDuration
:
1
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1102
&-4689632739989332326
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
jackson_afterShoot
m_Speed
:
1
m_CycleOffset
:
0
m_Transitions
:
-
{
fileID
:
8569526177007172718
}
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
:
163253ffd2e161449bec8a11face75cc
,
type
:
2
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
---
!u!91
&9100000
AnimatorController
:
m_ObjectHideFlags
:
0
...
...
@@ -15,6 +67,18 @@ AnimatorController:
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
-
m_Name
:
shoot
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
-
m_Name
:
isShooting
m_Type
:
4
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_AnimatorLayers
:
-
serializedVersion
:
5
m_Name
:
Base Layer
...
...
@@ -117,6 +181,7 @@ AnimatorState:
m_CycleOffset
:
0
m_Transitions
:
-
{
fileID
:
1101671379174742134
}
-
{
fileID
:
2949278334860889428
}
m_StateMachineBehaviours
:
[]
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_IKOnFeet
:
0
...
...
@@ -143,10 +208,16 @@ AnimatorStateMachine:
m_ChildStates
:
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102325047193046568
}
m_Position
:
{
x
:
3
48
,
y
:
-6
0
,
z
:
0
}
m_Position
:
{
x
:
3
30
,
y
:
11
0
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102148780198132122
}
m_Position
:
{
x
:
360
,
y
:
96
,
z
:
0
}
m_Position
:
{
x
:
330
,
y
:
-30
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
5188802425183835566
}
m_Position
:
{
x
:
330
,
y
:
250
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
-4689632739989332326
}
m_Position
:
{
x
:
330
,
y
:
390
,
z
:
0
}
m_ChildStateMachines
:
[]
m_AnyStateTransitions
:
[]
m_EntryTransitions
:
[]
...
...
@@ -157,3 +228,103 @@ AnimatorStateMachine:
m_ExitPosition
:
{
x
:
800
,
y
:
120
,
z
:
0
}
m_ParentStateMachinePosition
:
{
x
:
800
,
y
:
20
,
z
:
0
}
m_DefaultState
:
{
fileID
:
1102325047193046568
}
---
!u!1101
&2949278334860889428
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
m_Conditions
:
-
m_ConditionMode
:
1
m_ConditionEvent
:
isShooting
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
5188802425183835566
}
m_Solo
:
0
m_Mute
:
0
m_IsExit
:
0
serializedVersion
:
3
m_TransitionDuration
:
1.2
m_TransitionOffset
:
0
m_ExitTime
:
0
m_HasExitTime
:
0
m_HasFixedDuration
:
1
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1102
&5188802425183835566
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
:
-
{
fileID
:
7749119414395661710
}
-
{
fileID
:
-8058699372396628797
}
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
:
---
!u!1101
&7749119414395661710
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
m_Conditions
:
-
m_ConditionMode
:
2
m_ConditionEvent
:
isShooting
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
1102325047193046568
}
m_Solo
:
0
m_Mute
:
0
m_IsExit
:
0
serializedVersion
:
3
m_TransitionDuration
:
1.2
m_TransitionOffset
:
0
m_ExitTime
:
0
m_HasExitTime
:
0
m_HasFixedDuration
:
1
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1101
&8569526177007172718
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
m_Conditions
:
[]
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
5188802425183835566
}
m_Solo
:
0
m_Mute
:
0
m_IsExit
:
0
serializedVersion
:
3
m_TransitionDuration
:
0
m_TransitionOffset
:
0
m_ExitTime
:
0
m_HasExitTime
:
1
m_HasFixedDuration
:
0
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
Assets/Models/Animation/jackson_afterShoot.anim
0 → 100644
View file @
b9146741
This diff is collapsed.
Click to expand it.
Assets/Models/Animation/jackson_afterShoot.anim.meta
0 → 100644
View file @
b9146741
fileFormatVersion: 2
guid: 163253ffd2e161449bec8a11face75cc
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Models/Animation/jackson_shoot.anim
0 → 100644
View file @
b9146741
This diff is collapsed.
Click to expand it.
Assets/Models/Animation/jackson_shoot.anim.meta
0 → 100644
View file @
b9146741
fileFormatVersion: 2
guid: 246f18d4dd6608740996f3f3b10def11
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/MapObjects/mirror.prefab
View file @
b9146741
...
...
@@ -152,7 +152,7 @@ PrefabInstance:
-
target
:
{
fileID
:
5956712601805655926
,
guid
:
6cee9ce2ee605c54c957dc68c69cea90
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
value
:
-0.0
5
value
:
-0.0
4
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5956712601805655926
,
guid
:
6cee9ce2ee605c54c957dc68c69cea90
,
type
:
3
}
...
...
@@ -242,7 +242,7 @@ PrefabInstance:
-
target
:
{
fileID
:
5956712601805655926
,
guid
:
6cee9ce2ee605c54c957dc68c69cea90
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
value
:
0.0
5
value
:
0.0
4
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5956712601805655926
,
guid
:
6cee9ce2ee605c54c957dc68c69cea90
,
type
:
3
}
...
...
Assets/Prefabs/
WIP/M
irror.prefab
→
Assets/Prefabs/
MapObjects/oneside m
irror.prefab
View file @
b9146741
File moved
Assets/Prefabs/
WIP/M
irror.prefab.meta
→
Assets/Prefabs/
MapObjects/oneside m
irror.prefab.meta
View file @
b9146741
File moved
Assets/Scenes/ModelScene.unity
View file @
b9146741
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