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
cd70ab84
Commit
cd70ab84
authored
Jun 08, 2019
by
18손재민
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
이제 플레이어의 머리를 레이어를 변경하는 것으로 조작함. 발사 모드 시 메인 카메라에서는 보이지 않지만 거울에는 머리가 보이게 함
parent
ba6b0e6d
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
99 additions
and
88 deletions
+99
-88
jackson.prefab
Assets/Prefabs/MapObjects/jackson.prefab
+71
-71
mirror.prefab
Assets/Prefabs/MapObjects/mirror.prefab
+12
-2
SampleScene.unity
Assets/Scenes/SampleScene.unity
+7
-7
CameraController.cs
Assets/Scripts/CameraController.cs
+6
-5
Player.cs
Assets/Scripts/Player.cs
+1
-1
PlayerController.cs
Assets/Scripts/PlayerController.cs
+1
-1
TagManager.asset
ProjectSettings/TagManager.asset
+1
-1
No files found.
Assets/Prefabs/MapObjects/jackson.prefab
View file @
cd70ab84
This diff is collapsed.
Click to expand it.
Assets/Prefabs/MapObjects/mirror.prefab
View file @
cd70ab84
...
...
@@ -288,10 +288,15 @@ PrefabInstance:
propertyPath
:
TextureSize
value
:
768
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5956712601794644638
,
guid
:
6cee9ce2ee605c54c957dc68c69cea90
,
type
:
3
}
propertyPath
:
ReflectLayers.m_Bits
value
:
5943
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5956712601804180398
,
guid
:
6cee9ce2ee605c54c957dc68c69cea90
,
type
:
3
}
propertyPath
:
m_CullingMask.m_Bits
value
:
1335
value
:
5431
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
6cee9ce2ee605c54c957dc68c69cea90
,
type
:
3
}
...
...
@@ -383,10 +388,15 @@ PrefabInstance:
propertyPath
:
TextureSize
value
:
768
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5956712601794644638
,
guid
:
6cee9ce2ee605c54c957dc68c69cea90
,
type
:
3
}
propertyPath
:
ReflectLayers.m_Bits
value
:
5943
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5956712601804180398
,
guid
:
6cee9ce2ee605c54c957dc68c69cea90
,
type
:
3
}
propertyPath
:
m_CullingMask.m_Bits
value
:
1335
value
:
5431
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
6cee9ce2ee605c54c957dc68c69cea90
,
type
:
3
}
...
...
Assets/Scenes/SampleScene.unity
View file @
cd70ab84
...
...
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity
:
1
m_CustomReflection
:
{
fileID
:
0
}
m_Sun
:
{
fileID
:
170076734
}
m_IndirectSpecularColor
:
{
r
:
0.040
508375
,
g
:
0.050361775
,
b
:
0.08322008
,
a
:
1
}
m_IndirectSpecularColor
:
{
r
:
0.040
745974
,
g
:
0.050543424
,
b
:
0.08338426
,
a
:
1
}
m_UseRadianceAmbientProbe
:
0
---
!u!157
&3
LightmapSettings
:
...
...
@@ -318,7 +318,7 @@ Camera:
m_Depth
:
-1
m_CullingMask
:
serializedVersion
:
2
m_Bits
:
42949672
95
m_Bits
:
38
95
m_RenderingPath
:
-1
m_TargetTexture
:
{
fileID
:
0
}
m_TargetDisplay
:
0
...
...
@@ -788,6 +788,11 @@ PrefabInstance:
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
-
target
:
{
fileID
:
7277015661519863741
,
guid
:
20dee07e28273f049a9093ae4453912f
,
type
:
3
}
propertyPath
:
m_NavMeshData
value
:
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
7277015661519863740
,
guid
:
20dee07e28273f049a9093ae4453912f
,
type
:
3
}
propertyPath
:
m_Name
...
...
@@ -798,11 +803,6 @@ PrefabInstance:
propertyPath
:
m_IsActive
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
7277015661519863741
,
guid
:
20dee07e28273f049a9093ae4453912f
,
type
:
3
}
propertyPath
:
m_NavMeshData
value
:
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
7277015661519863742
,
guid
:
20dee07e28273f049a9093ae4453912f
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
...
...
Assets/Scripts/CameraController.cs
View file @
cd70ab84
...
...
@@ -77,22 +77,23 @@ public class CameraController : MonoBehaviour
rotationX
=
transform
.
eulerAngles
.
y
;
rotationY
=
transform
.
eulerAngles
.
x
;
PlayerController
.
inst
.
isZooming
=
false
;
PlayerController
.
inst
.
currentPlayer
.
GetComponent
<
Animator
>()
.
SetBool
(
"isShooting"
,
true
);
PlayerController
.
inst
.
currentPlayer
.
GetComponent
<
Player
>().
head
.
SetActive
(
false
);
player
.
anim
.
SetBool
(
"isShooting"
,
true
);
player
.
head
.
transform
.
Find
(
"Head 19"
).
gameObject
.
layer
=
LayerMask
.
NameToLayer
(
"Head"
);
}
/// <summary>
/// Zoom out from player.
/// </summary>
/// <returns></returns>
public
IEnumerator
ZoomOutFromPlayer
()
public
IEnumerator
ZoomOutFromPlayer
(
Player
player
)
{
float
startTime
=
Time
.
time
;
Vector3
posDiff
=
(
previousPos
-
transform
.
position
)
/
40
;
float
fovDiff
=
(
mapFov
-
shootingFov
)
/
40f
;
PlayerController
.
inst
.
isZooming
=
true
;
PlayerController
.
inst
.
currentPlayer
.
GetComponent
<
Animator
>().
SetBool
(
"isShooting"
,
false
);
PlayerController
.
inst
.
currentPlayer
.
GetComponent
<
Player
>().
head
.
SetActive
(
true
);
player
.
anim
.
SetBool
(
"isShooting"
,
false
);
player
.
head
.
transform
.
Find
(
"Head 19"
).
gameObject
.
layer
=
LayerMask
.
NameToLayer
(
"Player"
);
player
.
head
.
SetActive
(
true
);
Vector3
tempAngle
=
new
Vector3
(
transform
.
eulerAngles
.
x
>
180
?
transform
.
eulerAngles
.
x
-
360
:
transform
.
eulerAngles
.
x
,
transform
.
eulerAngles
.
y
>
180
?
transform
.
eulerAngles
.
y
-
360
:
transform
.
eulerAngles
.
y
,
transform
.
eulerAngles
.
z
>
180
?
transform
.
eulerAngles
.
z
-
360
:
transform
.
eulerAngles
.
z
);
...
...
Assets/Scripts/Player.cs
View file @
cd70ab84
...
...
@@ -15,7 +15,7 @@ public class Player : MonoBehaviour
public
Transform
shootingArm
;
public
GameObject
shootingFinger
;
public
Quaternion
armRotation
;
Animator
anim
;
public
Animator
anim
;
public
Floor
currentFloor
;
...
...
Assets/Scripts/PlayerController.cs
View file @
cd70ab84
...
...
@@ -141,7 +141,7 @@ public class PlayerController : SingletonBehaviour<PlayerController>
}
else
if
(
Input
.
GetMouseButtonDown
(
1
)
&&
isPlayerShooting
)
{
StartCoroutine
(
Camera
.
main
.
GetComponent
<
CameraController
>().
ZoomOutFromPlayer
());
StartCoroutine
(
Camera
.
main
.
GetComponent
<
CameraController
>().
ZoomOutFromPlayer
(
currentPlayer
));
}
}
}
...
...
ProjectSettings/TagManager.asset
View file @
cd70ab84
...
...
@@ -20,7 +20,7 @@ TagManager:
-
Wall
-
PostProcessing
-
RenderTexture
-
-
Head
-
-
-
...
...
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