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
ede88ee9
Commit
ede88ee9
authored
May 24, 2019
by
18손재민
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
IObject에 init(Floor floor) 추가함
parent
255c8a17
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
100 additions
and
1076 deletions
+100
-1076
jackson.prefab
Assets/Prefabs/MapObjects/jackson.prefab
+3
-1
camera.prefab
Assets/Prefabs/Objects/camera.prefab
+16
-0
ModelScene.unity
Assets/Scenes/ModelScene.unity
+70
-1073
Vector2IntExtensions.cs
Assets/Scripts/Extensions/Vector2IntExtensions.cs
+3
-1
IObject.cs
Assets/Scripts/Interactors/Interfaces/IObject.cs
+1
-0
Mannequin.cs
Assets/Scripts/Interactors/Mannequin.cs
+7
-1
No files found.
Assets/Prefabs/MapObjects/jackson.prefab
View file @
ede88ee9
...
...
@@ -1362,7 +1362,7 @@ Animator:
m_Controller
:
{
fileID
:
9100000
,
guid
:
eaf238dc35bc3074fa2fffcbcbbe58df
,
type
:
2
}
m_CullingMode
:
1
m_UpdateMode
:
0
m_ApplyRootMotion
:
0
m_ApplyRootMotion
:
1
m_LinearVelocityBlending
:
0
m_WarningMessage
:
m_HasTransformHierarchy
:
1
...
...
@@ -1585,6 +1585,7 @@ SkinnedMeshRenderer:
m_ProbeAnchor
:
{
fileID
:
0
}
m_LightProbeVolumeOverride
:
{
fileID
:
0
}
m_ScaleInLightmap
:
1
m_ReceiveGI
:
1
m_PreserveUVs
:
0
m_IgnoreNormalsForChartDetection
:
0
m_ImportantGI
:
0
...
...
@@ -2310,6 +2311,7 @@ SkinnedMeshRenderer:
m_ProbeAnchor
:
{
fileID
:
0
}
m_LightProbeVolumeOverride
:
{
fileID
:
0
}
m_ScaleInLightmap
:
1
m_ReceiveGI
:
1
m_PreserveUVs
:
0
m_IgnoreNormalsForChartDetection
:
0
m_ImportantGI
:
0
...
...
Assets/Prefabs/Objects/camera.prefab
View file @
ede88ee9
...
...
@@ -65,6 +65,7 @@ MeshRenderer:
m_ProbeAnchor
:
{
fileID
:
0
}
m_LightProbeVolumeOverride
:
{
fileID
:
0
}
m_ScaleInLightmap
:
1
m_ReceiveGI
:
1
m_PreserveUVs
:
0
m_IgnoreNormalsForChartDetection
:
0
m_ImportantGI
:
0
...
...
@@ -87,6 +88,7 @@ GameObject:
m_Component
:
-
component
:
{
fileID
:
6001025753464593565
}
-
component
:
{
fileID
:
439939669
}
-
component
:
{
fileID
:
896145114
}
m_Layer
:
0
m_Name
:
camera
m_TagString
:
Untagged
...
...
@@ -129,6 +131,19 @@ Animator:
m_HasTransformHierarchy
:
1
m_AllowConstantClipSamplingOptimization
:
1
m_KeepAnimatorControllerStateOnDisable
:
0
---
!u!114
&896145114
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6001025753464815805
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
00412ad71b8f0e14c9a23118682ee6f9
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
floor
:
{
fileID
:
0
}
---
!u!1
&6001025753464815807
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -195,6 +210,7 @@ MeshRenderer:
m_ProbeAnchor
:
{
fileID
:
0
}
m_LightProbeVolumeOverride
:
{
fileID
:
0
}
m_ScaleInLightmap
:
1
m_ReceiveGI
:
1
m_PreserveUVs
:
0
m_IgnoreNormalsForChartDetection
:
0
m_ImportantGI
:
0
...
...
Assets/Scenes/ModelScene.unity
View file @
ede88ee9
This diff is collapsed.
Click to expand it.
Assets/Scripts/Extensions/Vector2IntExtensions.cs
View file @
ede88ee9
...
...
@@ -6,7 +6,9 @@ public static class Vector2IntExtensions
{
public
static
bool
IsInSquareArea
(
this
Vector2Int
a
,
Vector2Int
b
,
int
size
)
{
return
Mathf
.
Abs
(
a
.
x
-
b
.
x
)
<=
size
&&
Mathf
.
Abs
(
a
.
y
-
b
.
y
)
<=
size
;
bool
xdiff
=
Mathf
.
Abs
(
a
.
x
-
b
.
x
)
<=
size
;
bool
ydiff
=
Mathf
.
Abs
(
a
.
y
-
b
.
y
)
<=
size
;
return
(
xdiff
&&
!
ydiff
)
||
(!
xdiff
&&
ydiff
);
}
public
static
int
ManhattanDistance
(
this
Vector2Int
a
,
Vector2Int
b
)
...
...
Assets/Scripts/Interactors/Interfaces/IObject.cs
View file @
ede88ee9
...
...
@@ -12,6 +12,7 @@ public enum ObjType
public
interface
IObject
{
void
Init
(
Floor
floor
);
GameObject
GetObject
();
Vector2Int
GetPos
();
ObjType
GetType
();
...
...
Assets/Scripts/Interactors/Mannequin.cs
View file @
ede88ee9
...
...
@@ -7,6 +7,7 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor
[
SerializeField
]
private
Mesh
[]
mannequinMesh
=
new
Mesh
[
2
];
private
Color
_color
;
[
SerializeField
]
private
Floor
floor
;
public
Color
Color
{
get
{
...
...
@@ -44,7 +45,12 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor
}
}
public
void
Init
(
bool
isWhite
)
public
void
Init
(
Floor
floor
)
{
this
.
floor
=
floor
;
}
public
void
SetColor
(
bool
isWhite
)
{
Color
=
isWhite
?
Color
.
white
:
Color
.
black
;
}
...
...
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