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
c185370d
Commit
c185370d
authored
Jul 24, 2019
by
18신대성
Committed by
18손재민
Jul 24, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
캐릭터 에임들어가는거 표시WIP
parent
e74d4b08
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
102 additions
and
0 deletions
+102
-0
jackson.prefab
Assets/Prefabs/MapObjects/jackson.prefab
+93
-0
Player.cs
Assets/Scripts/Player.cs
+9
-0
No files found.
Assets/Prefabs/MapObjects/jackson.prefab
View file @
c185370d
...
@@ -1346,6 +1346,7 @@ Transform:
...
@@ -1346,6 +1346,7 @@ Transform:
-
{
fileID
:
494213313239497179
}
-
{
fileID
:
494213313239497179
}
-
{
fileID
:
7259129854443835404
}
-
{
fileID
:
7259129854443835404
}
-
{
fileID
:
5896328348636738805
}
-
{
fileID
:
5896328348636738805
}
-
{
fileID
:
6898176959538870970
}
m_Father
:
{
fileID
:
0
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
...
@@ -1440,6 +1441,7 @@ MonoBehaviour:
...
@@ -1440,6 +1441,7 @@ MonoBehaviour:
anim
:
{
fileID
:
0
}
anim
:
{
fileID
:
0
}
currentFloor
:
{
fileID
:
0
}
currentFloor
:
{
fileID
:
0
}
selectPointer
:
{
fileID
:
6250617794677575084
}
selectPointer
:
{
fileID
:
6250617794677575084
}
aimLight
:
{
fileID
:
1841943088953102479
}
---
!u!1
&494213313239918029
---
!u!1
&494213313239918029
GameObject
:
GameObject
:
m_ObjectHideFlags
:
0
m_ObjectHideFlags
:
0
...
@@ -2491,6 +2493,97 @@ Transform:
...
@@ -2491,6 +2493,97 @@ Transform:
m_Father
:
{
fileID
:
494213313239497109
}
m_Father
:
{
fileID
:
494213313239497109
}
m_RootOrder
:
0
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
-0.43300003
,
y
:
180.887
,
z
:
116.005005
}
m_LocalEulerAnglesHint
:
{
x
:
-0.43300003
,
y
:
180.887
,
z
:
116.005005
}
---
!u!1
&2393636697257586900
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
6898176959538870970
}
-
component
:
{
fileID
:
1841943088953102479
}
m_Layer
:
8
m_Name
:
Spot Light
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
0
---
!u!4
&6898176959538870970
Transform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2393636697257586900
}
m_LocalRotation
:
{
x
:
0.7071068
,
y
:
0
,
z
:
0
,
w
:
0.7071068
}
m_LocalPosition
:
{
x
:
0
,
y
:
5
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
494213313239497131
}
m_RootOrder
:
4
m_LocalEulerAnglesHint
:
{
x
:
90
,
y
:
0
,
z
:
0
}
---
!u!108
&1841943088953102479
Light
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2393636697257586900
}
m_Enabled
:
1
serializedVersion
:
9
m_Type
:
0
m_Color
:
{
r
:
1
,
g
:
0
,
b
:
0
,
a
:
1
}
m_Intensity
:
0
m_Range
:
2.5
m_SpotAngle
:
60
m_InnerSpotAngle
:
1
m_CookieSize
:
10
m_Shadows
:
m_Type
:
0
m_Resolution
:
-1
m_CustomResolution
:
-1
m_Strength
:
1
m_Bias
:
0.05
m_NormalBias
:
0.4
m_NearPlane
:
0.2
m_CullingMatrixOverride
:
e00
:
1
e01
:
0
e02
:
0
e03
:
0
e10
:
0
e11
:
1
e12
:
0
e13
:
0
e20
:
0
e21
:
0
e22
:
1
e23
:
0
e30
:
0
e31
:
0
e32
:
0
e33
:
1
m_UseCullingMatrixOverride
:
0
m_Cookie
:
{
fileID
:
0
}
m_DrawHalo
:
0
m_Flare
:
{
fileID
:
0
}
m_RenderMode
:
0
m_CullingMask
:
serializedVersion
:
2
m_Bits
:
4294967295
m_RenderingLayerMask
:
1
m_Lightmapping
:
4
m_LightShadowCasterMode
:
0
m_AreaSize
:
{
x
:
1
,
y
:
1
}
m_BounceIntensity
:
1
m_ColorTemperature
:
6570
m_UseColorTemperature
:
0
m_BoundingSphereOverride
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
m_UseBoundingSphereOverride
:
0
m_ShadowRadius
:
0
m_ShadowAngle
:
0
---
!u!1
&3233955354714130270
---
!u!1
&3233955354714130270
GameObject
:
GameObject
:
m_ObjectHideFlags
:
0
m_ObjectHideFlags
:
0
...
...
Assets/Scripts/Player.cs
View file @
c185370d
...
@@ -21,6 +21,7 @@ public class Player : MonoBehaviour
...
@@ -21,6 +21,7 @@ public class Player : MonoBehaviour
public
Floor
currentFloor
;
public
Floor
currentFloor
;
public
GameObject
selectPointer
;
public
GameObject
selectPointer
;
public
Light
aimLight
;
/// <summary>
/// <summary>
/// Set this player as the current player.
/// Set this player as the current player.
...
@@ -93,13 +94,21 @@ public class Player : MonoBehaviour
...
@@ -93,13 +94,21 @@ public class Player : MonoBehaviour
{
{
float
time
=
Time
.
time
;
float
time
=
Time
.
time
;
float
endTime
=
startTime
+
2
;
float
endTime
=
startTime
+
2
;
aimLight
.
gameObject
.
SetActive
(
true
);
while
(
time
<=
endTime
)
while
(
time
<=
endTime
)
{
{
aimLight
.
intensity
+=
1
;
aimLight
.
spotAngle
-=
((
2
*
Time
.
deltaTime
)
/
60
);
yield
return
null
;
yield
return
null
;
time
=
Time
.
time
;
time
=
Time
.
time
;
if
(!
Input
.
GetMouseButton
(
0
))
if
(!
Input
.
GetMouseButton
(
0
))
{
aimLight
.
intensity
=
0
;
aimLight
.
spotAngle
=
60
;
aimLight
.
gameObject
.
SetActive
(
false
);
break
;
break
;
}
}
}
if
(
time
>
endTime
)
if
(
time
>
endTime
)
{
{
GameManager
.
inst
.
isPlayerShooting
=
true
;
GameManager
.
inst
.
isPlayerShooting
=
true
;
...
...
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