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
48608137
Commit
48608137
authored
Mar 24, 2019
by
18신대성
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
마네킹 코드 매트리얼 변경으로 수정 및 프리팹에 적용
parent
ad065302
Changes
9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
226 additions
and
54 deletions
+226
-54
default_mannequin.prefab
Assets/Prefabs/Mannequin/default_mannequin.prefab
+10
-14
mannequin (1).prefab
Assets/Prefabs/Mannequin/mannequin (1).prefab
+16
-0
mannequin (2).prefab
Assets/Prefabs/Mannequin/mannequin (2).prefab
+17
-1
mannequin (3).prefab
Assets/Prefabs/Mannequin/mannequin (3).prefab
+16
-0
mannequin (4).prefab
Assets/Prefabs/Mannequin/mannequin (4).prefab
+16
-0
mannequin (5).prefab
Assets/Prefabs/Mannequin/mannequin (5).prefab
+17
-1
ModelScene.unity
Assets/Scenes/ModelScene.unity
+97
-25
Mannequin.cs
Assets/Scripts/Interactors/Mannequin.cs
+34
-12
Mannequin.cs.meta
Assets/Scripts/Interactors/Mannequin.cs.meta
+3
-1
No files found.
Assets/Prefabs/Mannequin/default_mannequin.prefab
View file @
48608137
...
@@ -1322,7 +1322,7 @@ GameObject:
...
@@ -1322,7 +1322,7 @@ GameObject:
serializedVersion
:
6
serializedVersion
:
6
m_Component
:
m_Component
:
-
component
:
{
fileID
:
33432975985760517
}
-
component
:
{
fileID
:
33432975985760517
}
-
component
:
{
fileID
:
33432975995352749
}
-
component
:
{
fileID
:
8051139420697939838
}
m_Layer
:
0
m_Layer
:
0
m_Name
:
default_mannequin
m_Name
:
default_mannequin
m_TagString
:
Untagged
m_TagString
:
Untagged
...
@@ -1347,25 +1347,21 @@ Transform:
...
@@ -1347,25 +1347,21 @@ Transform:
m_Father
:
{
fileID
:
0
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
45
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
45
,
z
:
0
}
---
!u!95
&33432975995352749
---
!u!114
&8051139420697939838
Animator
:
MonoBehaviour
:
serializedVersion
:
3
m_ObjectHideFlags
:
0
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
33432975985984805
}
m_GameObject
:
{
fileID
:
33432975985984805
}
m_Enabled
:
1
m_Enabled
:
1
m_Avatar
:
{
fileID
:
9000000
,
guid
:
875e50677f7b5bf4d9767bed93659d15
,
type
:
3
}
m_EditorHideFlags
:
0
m_Controller
:
{
fileID
:
0
}
m_Script
:
{
fileID
:
11500000
,
guid
:
5f15a625122ee354090202ddf9cb0299
,
type
:
3
}
m_CullingMode
:
1
m_Name
:
m_UpdateMode
:
0
m_EditorClassIdentifier
:
m_ApplyRootMotion
:
0
white
:
{
fileID
:
2100000
,
guid
:
af605edc8af008346a3f42f355847da6
,
type
:
2
}
m_LinearVelocityBlending
:
0
black
:
{
fileID
:
2100000
,
guid
:
36f9d35b500106b42b6a47c516bf7b38
,
type
:
2
}
m_WarningMessage
:
isWhite
:
0
m_HasTransformHierarchy
:
1
m_AllowConstantClipSamplingOptimization
:
1
m_KeepAnimatorControllerStateOnDisable
:
0
---
!u!1
&33432975985984807
---
!u!1
&33432975985984807
GameObject
:
GameObject
:
m_ObjectHideFlags
:
0
m_ObjectHideFlags
:
0
...
...
Assets/Prefabs/Mannequin/mannequin (1).prefab
View file @
48608137
...
@@ -1228,6 +1228,7 @@ GameObject:
...
@@ -1228,6 +1228,7 @@ GameObject:
serializedVersion
:
6
serializedVersion
:
6
m_Component
:
m_Component
:
-
component
:
{
fileID
:
2817243128983195582
}
-
component
:
{
fileID
:
2817243128983195582
}
-
component
:
{
fileID
:
7901650875037068864
}
m_Layer
:
0
m_Layer
:
0
m_Name
:
mannequin (1)
m_Name
:
mannequin (1)
m_TagString
:
Untagged
m_TagString
:
Untagged
...
@@ -1252,6 +1253,21 @@ Transform:
...
@@ -1252,6 +1253,21 @@ Transform:
m_Father
:
{
fileID
:
0
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
45
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
45
,
z
:
0
}
---
!u!114
&7901650875037068864
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2817243128983163806
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
5f15a625122ee354090202ddf9cb0299
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
white
:
{
fileID
:
2100000
,
guid
:
af605edc8af008346a3f42f355847da6
,
type
:
2
}
black
:
{
fileID
:
2100000
,
guid
:
36f9d35b500106b42b6a47c516bf7b38
,
type
:
2
}
isWhite
:
0
---
!u!1
&2817243128983163808
---
!u!1
&2817243128983163808
GameObject
:
GameObject
:
m_ObjectHideFlags
:
0
m_ObjectHideFlags
:
0
...
...
Assets/Prefabs/Mannequin/mannequin (2).prefab
View file @
48608137
...
@@ -1082,6 +1082,7 @@ GameObject:
...
@@ -1082,6 +1082,7 @@ GameObject:
serializedVersion
:
6
serializedVersion
:
6
m_Component
:
m_Component
:
-
component
:
{
fileID
:
4555134343763943550
}
-
component
:
{
fileID
:
4555134343763943550
}
-
component
:
{
fileID
:
1053313960500733773
}
m_Layer
:
0
m_Layer
:
0
m_Name
:
mannequin (2)
m_Name
:
mannequin (2)
m_TagString
:
Untagged
m_TagString
:
Untagged
...
@@ -1096,7 +1097,7 @@ Transform:
...
@@ -1096,7 +1097,7 @@ Transform:
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
4555134343764048990
}
m_GameObject
:
{
fileID
:
4555134343764048990
}
m_LocalRotation
:
{
x
:
-0
,
y
:
0.5283366
,
z
:
-0
,
w
:
0.849035
}
m_LocalRotation
:
{
x
:
0
,
y
:
0.5283346
,
z
:
0
,
w
:
0.8490363
}
m_LocalPosition
:
{
x
:
-0.16
,
y
:
0.110000014
,
z
:
5.06
}
m_LocalPosition
:
{
x
:
-0.16
,
y
:
0.110000014
,
z
:
5.06
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
m_Children
:
...
@@ -1106,6 +1107,21 @@ Transform:
...
@@ -1106,6 +1107,21 @@ Transform:
m_Father
:
{
fileID
:
0
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
63.786003
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
63.786003
,
z
:
0
}
---
!u!114
&1053313960500733773
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
4555134343764048990
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
5f15a625122ee354090202ddf9cb0299
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
white
:
{
fileID
:
2100000
,
guid
:
af605edc8af008346a3f42f355847da6
,
type
:
2
}
black
:
{
fileID
:
2100000
,
guid
:
36f9d35b500106b42b6a47c516bf7b38
,
type
:
2
}
isWhite
:
0
---
!u!1
&4555134343764048992
---
!u!1
&4555134343764048992
GameObject
:
GameObject
:
m_ObjectHideFlags
:
0
m_ObjectHideFlags
:
0
...
...
Assets/Prefabs/Mannequin/mannequin (3).prefab
View file @
48608137
...
@@ -2023,6 +2023,7 @@ GameObject:
...
@@ -2023,6 +2023,7 @@ GameObject:
serializedVersion
:
6
serializedVersion
:
6
m_Component
:
m_Component
:
-
component
:
{
fileID
:
6840018466224560459
}
-
component
:
{
fileID
:
6840018466224560459
}
-
component
:
{
fileID
:
6862997482539891855
}
m_Layer
:
0
m_Layer
:
0
m_Name
:
mannequin (3)
m_Name
:
mannequin (3)
m_TagString
:
Untagged
m_TagString
:
Untagged
...
@@ -2047,6 +2048,21 @@ Transform:
...
@@ -2047,6 +2048,21 @@ Transform:
m_Father
:
{
fileID
:
0
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
45
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
45
,
z
:
0
}
---
!u!114
&6862997482539891855
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6840018466224391531
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
5f15a625122ee354090202ddf9cb0299
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
white
:
{
fileID
:
2100000
,
guid
:
af605edc8af008346a3f42f355847da6
,
type
:
2
}
black
:
{
fileID
:
2100000
,
guid
:
36f9d35b500106b42b6a47c516bf7b38
,
type
:
2
}
isWhite
:
0
---
!u!1
&6840018466224391533
---
!u!1
&6840018466224391533
GameObject
:
GameObject
:
m_ObjectHideFlags
:
0
m_ObjectHideFlags
:
0
...
...
Assets/Prefabs/Mannequin/mannequin (4).prefab
View file @
48608137
...
@@ -867,6 +867,7 @@ GameObject:
...
@@ -867,6 +867,7 @@ GameObject:
serializedVersion
:
6
serializedVersion
:
6
m_Component
:
m_Component
:
-
component
:
{
fileID
:
6169104080419485322
}
-
component
:
{
fileID
:
6169104080419485322
}
-
component
:
{
fileID
:
5018897370588914429
}
m_Layer
:
0
m_Layer
:
0
m_Name
:
mannequin (4)
m_Name
:
mannequin (4)
m_TagString
:
Untagged
m_TagString
:
Untagged
...
@@ -891,6 +892,21 @@ Transform:
...
@@ -891,6 +892,21 @@ Transform:
m_Father
:
{
fileID
:
0
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
45
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
45
,
z
:
0
}
---
!u!114
&5018897370588914429
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6169104080419908266
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
5f15a625122ee354090202ddf9cb0299
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
white
:
{
fileID
:
2100000
,
guid
:
af605edc8af008346a3f42f355847da6
,
type
:
2
}
black
:
{
fileID
:
2100000
,
guid
:
36f9d35b500106b42b6a47c516bf7b38
,
type
:
2
}
isWhite
:
0
---
!u!1
&6169104080419908268
---
!u!1
&6169104080419908268
GameObject
:
GameObject
:
m_ObjectHideFlags
:
0
m_ObjectHideFlags
:
0
...
...
Assets/Prefabs/Mannequin/mannequin (5).prefab
View file @
48608137
...
@@ -740,6 +740,7 @@ GameObject:
...
@@ -740,6 +740,7 @@ GameObject:
serializedVersion
:
6
serializedVersion
:
6
m_Component
:
m_Component
:
-
component
:
{
fileID
:
87051754405658857
}
-
component
:
{
fileID
:
87051754405658857
}
-
component
:
{
fileID
:
2798309523397132260
}
m_Layer
:
0
m_Layer
:
0
m_Name
:
mannequin (5)
m_Name
:
mannequin (5)
m_TagString
:
Untagged
m_TagString
:
Untagged
...
@@ -754,7 +755,7 @@ Transform:
...
@@ -754,7 +755,7 @@ Transform:
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
87051754405567689
}
m_GameObject
:
{
fileID
:
87051754405567689
}
m_LocalRotation
:
{
x
:
-0
,
y
:
0.18128827
,
z
:
-0
,
w
:
0.98343
}
m_LocalRotation
:
{
x
:
0
,
y
:
0.18129157
,
z
:
0
,
w
:
0.9834294
}
m_LocalPosition
:
{
x
:
0.01
,
y
:
0.110000014
,
z
:
7.86
}
m_LocalPosition
:
{
x
:
0.01
,
y
:
0.110000014
,
z
:
7.86
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
m_Children
:
...
@@ -764,6 +765,21 @@ Transform:
...
@@ -764,6 +765,21 @@ Transform:
m_Father
:
{
fileID
:
0
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
20.890001
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
20.890001
,
z
:
0
}
---
!u!114
&2798309523397132260
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
87051754405567689
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
5f15a625122ee354090202ddf9cb0299
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
white
:
{
fileID
:
2100000
,
guid
:
af605edc8af008346a3f42f355847da6
,
type
:
2
}
black
:
{
fileID
:
2100000
,
guid
:
36f9d35b500106b42b6a47c516bf7b38
,
type
:
2
}
isWhite
:
0
---
!u!1
&87051754405567691
---
!u!1
&87051754405567691
GameObject
:
GameObject
:
m_ObjectHideFlags
:
0
m_ObjectHideFlags
:
0
...
...
Assets/Scenes/ModelScene.unity
View file @
48608137
This diff is collapsed.
Click to expand it.
Assets/Scripts/Interactors/Mannequin.cs
View file @
48608137
...
@@ -4,31 +4,53 @@ using UnityEngine;
...
@@ -4,31 +4,53 @@ using UnityEngine;
public
class
Mannequin
:
MonoBehaviour
,
IInteractor
public
class
Mannequin
:
MonoBehaviour
,
IInteractor
{
{
public
Color
Color
{
// 일단은 이렇게 해두긴 하는데 나중에 마네킹 매니저같은게 생기면 거기에 두고 쓰는게 편할듯
get
public
Material
white
;
{
public
Material
black
;
return
GetComponent
<
MeshRenderer
>().
material
.
color
;
}
public
bool
isWhite
;
private
set
private
SkinnedMeshRenderer
[]
_mats
;
private
void
Start
()
{
{
GetComponent
<
MeshRenderer
>().
material
.
color
=
value
;
_mats
=
GetComponentsInChildren
<
SkinnedMeshRenderer
>();
}
}
}
//public Color Color {
// get
// {
// return GetComponent<MeshRenderer>().material.color;
// }
// private set
// {
// GetComponent<MeshRenderer>().material.color = value;
// }
//}
public
void
Interact
(
Bullet
bullet
)
public
void
Interact
(
Bullet
bullet
)
{
{
if
(
bullet
is
TruthBullet
)
if
(
bullet
is
TruthBullet
)
{
{
GetComponent
<
MeshRenderer
>().
material
.
color
=
Color
.
white
;
//GetComponent<MeshRenderer>().material.color = Color.white;
isWhite
=
true
;
foreach
(
var
mat
in
_mats
)
mat
.
material
=
white
;
}
}
if
(
bullet
is
FakeBullet
)
if
(
bullet
is
FakeBullet
)
{
{
GetComponent
<
MeshRenderer
>().
material
.
color
=
Color
.
black
;
//GetComponent<MeshRenderer>().material.color = Color.black;
isWhite
=
false
;
foreach
(
var
mat
in
_mats
)
mat
.
material
=
black
;
}
}
}
}
public
void
Init
(
bool
isWhite
)
public
void
Init
(
bool
isWhite
)
{
{
Color
=
isWhite
?
Color
.
white
:
Color
.
black
;
//Color = isWhite ? Color.white : Color.black;
this
.
isWhite
=
isWhite
;
foreach
(
var
mat
in
_mats
)
mat
.
material
=
isWhite
?
white
:
black
;
}
}
}
}
Assets/Scripts/Interactors/Mannequin.cs.meta
View file @
48608137
...
@@ -3,7 +3,9 @@ guid: 5f15a625122ee354090202ddf9cb0299
...
@@ -3,7 +3,9 @@ guid: 5f15a625122ee354090202ddf9cb0299
MonoImporter:
MonoImporter:
externalObjects: {}
externalObjects: {}
serializedVersion: 2
serializedVersion: 2
defaultReferences: []
defaultReferences:
- white: {fileID: 2100000, guid: af605edc8af008346a3f42f355847da6, type: 2}
- black: {fileID: 2100000, guid: 36f9d35b500106b42b6a47c516bf7b38, type: 2}
executionOrder: 0
executionOrder: 0
icon: {instanceID: 0}
icon: {instanceID: 0}
userData:
userData:
...
...
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