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
99b0af01
Commit
99b0af01
authored
Jul 03, 2019
by
18신대성
Committed by
18손재민
Jul 03, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
카메라 트리거 생성
리무브시 바닥에 assign 없애기 넣음
parent
26d17af8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
1 deletion
+17
-1
camera.prefab
Assets/Prefabs/Objects/camera.prefab
+15
-0
Briefcase.cs
Assets/Scripts/Interactors/Briefcase.cs
+1
-1
Map.cs
Assets/Scripts/Map/Map.cs
+1
-0
No files found.
Assets/Prefabs/Objects/camera.prefab
View file @
99b0af01
...
@@ -90,6 +90,7 @@ GameObject:
...
@@ -90,6 +90,7 @@ GameObject:
-
component
:
{
fileID
:
439939669
}
-
component
:
{
fileID
:
439939669
}
-
component
:
{
fileID
:
896145114
}
-
component
:
{
fileID
:
896145114
}
-
component
:
{
fileID
:
7514060783340336889
}
-
component
:
{
fileID
:
7514060783340336889
}
-
component
:
{
fileID
:
1176797860003478902
}
m_Layer
:
0
m_Layer
:
0
m_Name
:
camera
m_Name
:
camera
m_TagString
:
Untagged
m_TagString
:
Untagged
...
@@ -161,6 +162,20 @@ NavMeshObstacle:
...
@@ -161,6 +162,20 @@ NavMeshObstacle:
m_CarveOnlyStationary
:
1
m_CarveOnlyStationary
:
1
m_Center
:
{
x
:
0
,
y
:
0.5
,
z
:
0
}
m_Center
:
{
x
:
0
,
y
:
0.5
,
z
:
0
}
m_TimeToStationary
:
0.5
m_TimeToStationary
:
0.5
---
!u!136
&1176797860003478902
CapsuleCollider
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6001025753464815805
}
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
0
m_Enabled
:
1
m_Radius
:
0.26
m_Height
:
0.57
m_Direction
:
1
m_Center
:
{
x
:
0
,
y
:
0.42
,
z
:
0
}
---
!u!1
&6001025753464815807
---
!u!1
&6001025753464815807
GameObject
:
GameObject
:
m_ObjectHideFlags
:
0
m_ObjectHideFlags
:
0
...
...
Assets/Scripts/Interactors/Briefcase.cs
View file @
99b0af01
...
@@ -49,7 +49,7 @@ public class Briefcase : MonoBehaviour, IObject, IPlayerInteractor
...
@@ -49,7 +49,7 @@ public class Briefcase : MonoBehaviour, IObject, IPlayerInteractor
if
(
GameManager
.
nCase
>=
0
)
if
(
GameManager
.
nCase
>=
0
)
MapManager
.
inst
.
currentMap
.
clearConditions
[
GameManager
.
nCase
].
IsDone
(
1
);
MapManager
.
inst
.
currentMap
.
clearConditions
[
GameManager
.
nCase
].
IsDone
(
1
);
floor
.
objOnFloor
=
null
;
floor
.
objOnFloor
=
null
;
Destroy
(
gameObject
);
MapManager
.
inst
.
currentMap
.
RemoveObject
(
Position
);
}
}
}
}
...
...
Assets/Scripts/Map/Map.cs
View file @
99b0af01
...
@@ -268,6 +268,7 @@ public class Map : MonoBehaviour
...
@@ -268,6 +268,7 @@ public class Map : MonoBehaviour
}
}
Destroy
(
objectGrid
[
pos
].
GetObject
());
Destroy
(
objectGrid
[
pos
].
GetObject
());
objectGrid
.
Remove
(
pos
);
objectGrid
.
Remove
(
pos
);
floorGrid
[
pos
].
objOnFloor
=
null
;
StartCoroutine
(
MapManager
.
inst
.
Rebaker
());
StartCoroutine
(
MapManager
.
inst
.
Rebaker
());
}
}
else
else
...
...
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