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
1c531be9
Commit
1c531be9
authored
May 24, 2019
by
18손재민
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mannequin 고침
parent
63bc07c4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
17 deletions
+18
-17
Data.meta
Assets/Data.meta
+8
-0
jackson.prefab
Assets/Prefabs/MapObjects/jackson.prefab
+1
-1
SampleScene.unity
Assets/Scenes/SampleScene.unity
+1
-1
Mannequin.cs
Assets/Scripts/Interactors/Mannequin.cs
+7
-2
Map.cs
Assets/Scripts/Map/Map.cs
+1
-13
No files found.
Assets/Data.meta
0 → 100644
View file @
1c531be9
fileFormatVersion: 2
guid: 4731b0a3d859f2d4ab6e84178c528304
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/MapObjects/jackson.prefab
View file @
1c531be9
...
...
@@ -1432,7 +1432,7 @@ MonoBehaviour:
m_Name
:
m_EditorClassIdentifier
:
head
:
{
fileID
:
3233955354714130270
}
shootingArm
:
{
fileID
:
0
}
shootingArm
:
{
fileID
:
494213313239917623
}
---
!u!1
&494213313239918029
GameObject
:
m_ObjectHideFlags
:
0
...
...
Assets/Scenes/SampleScene.unity
View file @
1c531be9
...
...
@@ -324,7 +324,7 @@ Camera:
y
:
0
width
:
1
height
:
1
near clip plane
:
0.
3
near clip plane
:
0.
01
far clip plane
:
1000
field of view
:
40
orthographic
:
0
...
...
Assets/Scripts/Interactors/Mannequin.cs
View file @
1c531be9
...
...
@@ -44,8 +44,13 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor
Color
=
Color
.
black
;
}
}
public
void
Init
(
bool
isWhite
)
public
void
Init
(
Floor
floor
)
{
this
.
floor
=
floor
;
}
public
void
SetColor
(
bool
isWhite
)
{
Color
=
isWhite
?
Color
.
white
:
Color
.
black
;
}
...
...
Assets/Scripts/Map/Map.cs
View file @
1c531be9
...
...
@@ -177,19 +177,7 @@ public class Map : MonoBehaviour
if
(!
objectGrid
.
ContainsKey
(
pos
))
{
objectGrid
.
Add
(
pos
,
Instantiate
(
MapManager
.
inst
.
objects
[(
int
)
objType
-
1
],
new
Vector3
(
pos
.
x
,
0
,
pos
.
y
),
Quaternion
.
identity
,
objects
.
transform
).
GetComponent
<
IObject
>());
switch
(
objType
)
{
case
ObjType
.
Briefcase
:
objectGrid
[
pos
].
GetObject
().
GetComponent
<
Briefcase
>().
Init
(
GetFloorAtPos
(
pos
));
return
;
case
ObjType
.
Camera
:
objectGrid
[
pos
].
GetObject
().
GetComponent
<
CameraTurret
>().
Init
(
GetFloorAtPos
(
pos
));
return
;
//Need to make mannequin init
/*case ObjType.Mannequin:
objectGrid[pos].GetObject().GetComponent<Mannequin>().Init(GetFloorAtPos(pos));
return;*/
}
objectGrid
[
pos
].
Init
(
GetFloorAtPos
(
pos
));
StartCoroutine
(
MapManager
.
inst
.
Rebaker
());
}
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