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
3637db00
Commit
3637db00
authored
May 23, 2019
by
18손재민
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
팔 각도 조정 WIP
parent
30e0829e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
105 additions
and
10 deletions
+105
-10
jackson.prefab
Assets/Prefabs/MapObjects/jackson.prefab
+4
-4
SampleScene.unity
Assets/Scenes/SampleScene.unity
+92
-0
PlayerController.cs
Assets/Scripts/PlayerController.cs
+9
-6
No files found.
Assets/Prefabs/MapObjects/jackson.prefab
View file @
3637db00
...
@@ -611,9 +611,9 @@ Transform:
...
@@ -611,9 +611,9 @@ Transform:
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
494213313239917623
}
m_GameObject
:
{
fileID
:
494213313239917623
}
m_LocalRotation
:
{
x
:
-0.6340379
,
y
:
-0.284847
53
,
z
:
0.24146551
,
w
:
0.67716485
}
m_LocalRotation
:
{
x
:
-0.6340379
,
y
:
-0.284847
44
,
z
:
0.24146542
,
w
:
0.6771649
}
m_LocalPosition
:
{
x
:
0
.000005839104
,
y
:
0.0015373584
,
z
:
-0.0000003303768
}
m_LocalPosition
:
{
x
:
0
,
y
:
0.0015373576
,
z
:
0
}
m_LocalScale
:
{
x
:
0.9999998
,
y
:
0.99999994
,
z
:
1
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
m_Children
:
-
{
fileID
:
494213313239497169
}
-
{
fileID
:
494213313239497169
}
m_Father
:
{
fileID
:
494213313239497109
}
m_Father
:
{
fileID
:
494213313239497109
}
...
@@ -1432,7 +1432,7 @@ MonoBehaviour:
...
@@ -1432,7 +1432,7 @@ MonoBehaviour:
m_Name
:
m_Name
:
m_EditorClassIdentifier
:
m_EditorClassIdentifier
:
head
:
{
fileID
:
3233955354714130270
}
head
:
{
fileID
:
3233955354714130270
}
shootingArm
:
{
fileID
:
494213313239917623
}
shootingArm
:
{
fileID
:
0
}
---
!u!1
&494213313239918029
---
!u!1
&494213313239918029
GameObject
:
GameObject
:
m_ObjectHideFlags
:
0
m_ObjectHideFlags
:
0
...
...
Assets/Scenes/SampleScene.unity
View file @
3637db00
...
@@ -308,6 +308,98 @@ MonoBehaviour:
...
@@ -308,6 +308,98 @@ MonoBehaviour:
m_Name
:
m_Name
:
m_EditorClassIdentifier
:
m_EditorClassIdentifier
:
dragSpeed
:
10
dragSpeed
:
10
---
!u!1
&1400030325
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
1400030329
}
-
component
:
{
fileID
:
1400030328
}
-
component
:
{
fileID
:
1400030327
}
-
component
:
{
fileID
:
1400030326
}
m_Layer
:
0
m_Name
:
Test
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!65
&1400030326
BoxCollider
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1400030325
}
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
0
m_Enabled
:
1
serializedVersion
:
2
m_Size
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Center
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!23
&1400030327
MeshRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1400030325
}
m_Enabled
:
1
m_CastShadows
:
1
m_ReceiveShadows
:
1
m_DynamicOccludee
:
1
m_MotionVectors
:
1
m_LightProbeUsage
:
1
m_ReflectionProbeUsage
:
1
m_RenderingLayerMask
:
1
m_RendererPriority
:
0
m_Materials
:
-
{
fileID
:
10303
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_StaticBatchInfo
:
firstSubMesh
:
0
subMeshCount
:
0
m_StaticBatchRoot
:
{
fileID
:
0
}
m_ProbeAnchor
:
{
fileID
:
0
}
m_LightProbeVolumeOverride
:
{
fileID
:
0
}
m_ScaleInLightmap
:
1
m_ReceiveGI
:
1
m_PreserveUVs
:
0
m_IgnoreNormalsForChartDetection
:
0
m_ImportantGI
:
0
m_StitchLightmapSeams
:
1
m_SelectedEditorRenderState
:
3
m_MinimumChartSize
:
4
m_AutoUVMaxDistance
:
0.5
m_AutoUVMaxAngle
:
89
m_LightmapParameters
:
{
fileID
:
0
}
m_SortingLayerID
:
0
m_SortingLayer
:
0
m_SortingOrder
:
0
---
!u!33
&1400030328
MeshFilter
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1400030325
}
m_Mesh
:
{
fileID
:
10202
,
guid
:
0000000000000000e000000000000000
,
type
:
0
}
---
!u!4
&1400030329
Transform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1400030325
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
-0.7071068
,
w
:
0.7071068
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
0.1
,
y
:
0.1
,
z
:
0.1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
8
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
-90
}
---
!u!114
&2102809461
stripped
---
!u!114
&2102809461
stripped
MonoBehaviour
:
MonoBehaviour
:
m_CorrespondingSourceObject
:
{
fileID
:
7277015661519863741
,
guid
:
20dee07e28273f049a9093ae4453912f
,
m_CorrespondingSourceObject
:
{
fileID
:
7277015661519863741
,
guid
:
20dee07e28273f049a9093ae4453912f
,
...
...
Assets/Scripts/PlayerController.cs
View file @
3637db00
...
@@ -76,12 +76,6 @@ public class PlayerController : SingletonBehaviour<PlayerController>
...
@@ -76,12 +76,6 @@ public class PlayerController : SingletonBehaviour<PlayerController>
{
{
StartCoroutine
(
Camera
.
main
.
GetComponent
<
CameraController
>().
ZoomOutFromPlayer
());
StartCoroutine
(
Camera
.
main
.
GetComponent
<
CameraController
>().
ZoomOutFromPlayer
());
}
}
if
(
isPlayerShooting
)
{
Quaternion
destinationRotation
=
Quaternion
.
Euler
(
new
Vector3
(
transform
.
eulerAngles
.
x
,
Camera
.
main
.
transform
.
eulerAngles
.
y
,
currentPlayer
.
transform
.
eulerAngles
.
z
));
currentPlayer
.
transform
.
rotation
=
Quaternion
.
Lerp
(
currentPlayer
.
transform
.
rotation
,
destinationRotation
,
Time
.
deltaTime
*
10
);
currentPlayer
.
shootingArm
.
transform
.
LookAt
(
Camera
.
main
.
transform
.
position
+
new
Vector3
(
1
,
0
,
0
));
}
}
}
}
}
...
@@ -89,5 +83,14 @@ public class PlayerController : SingletonBehaviour<PlayerController>
...
@@ -89,5 +83,14 @@ public class PlayerController : SingletonBehaviour<PlayerController>
{
{
if
(
currentPlayer
!=
null
&&
currentPlayer
.
GetComponent
<
NavMeshAgent
>().
velocity
.
magnitude
>
0
)
if
(
currentPlayer
!=
null
&&
currentPlayer
.
GetComponent
<
NavMeshAgent
>().
velocity
.
magnitude
>
0
)
transform
.
rotation
=
Quaternion
.
LookRotation
(
currentPlayer
.
GetComponent
<
NavMeshAgent
>().
velocity
.
normalized
);
transform
.
rotation
=
Quaternion
.
LookRotation
(
currentPlayer
.
GetComponent
<
NavMeshAgent
>().
velocity
.
normalized
);
if
(
isPlayerShooting
)
{
Quaternion
destinationRotation
=
Quaternion
.
Euler
(
new
Vector3
(
transform
.
eulerAngles
.
x
,
Camera
.
main
.
transform
.
eulerAngles
.
y
,
currentPlayer
.
transform
.
eulerAngles
.
z
));
currentPlayer
.
transform
.
rotation
=
Quaternion
.
Lerp
(
currentPlayer
.
transform
.
rotation
,
destinationRotation
,
Time
.
deltaTime
*
10
);
Debug
.
Log
(
currentPlayer
.
shootingArm
.
transform
.
position
);
Debug
.
Log
(
currentPlayer
.
shootingArm
.
transform
.
eulerAngles
);
Debug
.
Log
(
Camera
.
main
.
transform
.
position
);
Debug
.
Log
(
Camera
.
main
.
transform
.
eulerAngles
);
}
}
}
}
}
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