Commit 48608137 authored by 18신대성's avatar 18신대성

마네킹 코드 매트리얼 변경으로 수정 및 프리팹에 적용

parent ad065302
...@@ -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
......
...@@ -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
......
...@@ -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
......
...@@ -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
......
...@@ -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
......
...@@ -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
......
...@@ -187,6 +187,12 @@ Transform: ...@@ -187,6 +187,12 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 94169129} m_PrefabInstance: {fileID: 94169129}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!4 &199568323 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 87051754405658857, guid: 2a2831d520acdd3408d8a04673423e2a,
type: 3}
m_PrefabInstance: {fileID: 87051754525010730}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &256562464 --- !u!1001 &256562464
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1249,13 +1255,19 @@ Transform: ...@@ -1249,13 +1255,19 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 500885053} m_GameObject: {fileID: 500885053}
m_LocalRotation: {x: -0.10745974, y: 0.8100995, z: -0.1569739, w: -0.5545724} m_LocalRotation: {x: 0.07476249, y: -0.8940248, z: 0.16299322, w: 0.41056472}
m_LocalPosition: {x: 2.0030305, y: 1.7786024, z: 0.9883809} m_LocalPosition: {x: 2.6246982, y: 1.8163223, z: 8.443985}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 5 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &683214547 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4555134343763943550, guid: 72682f7503996bc4e988ed5ba93fb688,
type: 3}
m_PrefabInstance: {fileID: 4555134343365945005}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &683734117 --- !u!1001 &683734117
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1368,7 +1380,7 @@ Transform: ...@@ -1368,7 +1380,7 @@ Transform:
- {fileID: 94169130} - {fileID: 94169130}
- {fileID: 296040902} - {fileID: 296040902}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 6 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &740991604 --- !u!1001 &740991604
PrefabInstance: PrefabInstance:
...@@ -1595,6 +1607,12 @@ Transform: ...@@ -1595,6 +1607,12 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 834316237} m_PrefabInstance: {fileID: 834316237}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!4 &1188039621 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6840018466224560459, guid: d7070c786deaa3a4082f9339da091b46,
type: 3}
m_PrefabInstance: {fileID: 6840018467404206734}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1292286962 stripped --- !u!1 &1292286962 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 100056, guid: 21bb8ae9866c4304198832331df496dc, m_CorrespondingSourceObject: {fileID: 100056, guid: 21bb8ae9866c4304198832331df496dc,
...@@ -1613,6 +1631,18 @@ MonoBehaviour: ...@@ -1613,6 +1631,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 474dfdafc60acfb488eec1ee8cd53e62, type: 3} m_Script: {fileID: 11500000, guid: 474dfdafc60acfb488eec1ee8cd53e62, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!4 &1336118980 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6169104080419485322, guid: 420a4f921e52a4141b80a3eefcd511e6,
type: 3}
m_PrefabInstance: {fileID: 6169104079087958094}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1363588588 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2817243128983195582, guid: 4a442e968e3ddd3468104f4179c3b880,
type: 3}
m_PrefabInstance: {fileID: 2817243130337868370}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1379039819 --- !u!1001 &1379039819
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1688,6 +1718,42 @@ Transform: ...@@ -1688,6 +1718,42 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 1379039819} m_PrefabInstance: {fileID: 1379039819}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &1467985598
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1467985599}
m_Layer: 0
m_Name: mannequins
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1467985599
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1467985598}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1713985292}
- {fileID: 1363588588}
- {fileID: 683214547}
- {fileID: 1188039621}
- {fileID: 1336118980}
- {fileID: 199568323}
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1599301987 --- !u!1 &1599301987
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1757,6 +1823,12 @@ Transform: ...@@ -1757,6 +1823,12 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 61.532, y: -75.43201, z: 12.869} m_LocalEulerAnglesHint: {x: 61.532, y: -75.43201, z: 12.869}
--- !u!4 &1713985292 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 33432975985760517, guid: ec20e06c4a993924791d02d7a4c9375c,
type: 3}
m_PrefabInstance: {fileID: 33432975546977801}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1915692017 --- !u!1001 &1915692017
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1837,7 +1909,7 @@ PrefabInstance: ...@@ -1837,7 +1909,7 @@ PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 1467985599}
m_Modifications: m_Modifications:
- target: {fileID: 33432975985984805, guid: ec20e06c4a993924791d02d7a4c9375c, - target: {fileID: 33432975985984805, guid: ec20e06c4a993924791d02d7a4c9375c,
type: 3} type: 3}
...@@ -1862,7 +1934,7 @@ PrefabInstance: ...@@ -1862,7 +1934,7 @@ PrefabInstance:
- target: {fileID: 33432975985760517, guid: ec20e06c4a993924791d02d7a4c9375c, - target: {fileID: 33432975985760517, guid: ec20e06c4a993924791d02d7a4c9375c,
type: 3} type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 33432975985760517, guid: ec20e06c4a993924791d02d7a4c9375c, - target: {fileID: 33432975985760517, guid: ec20e06c4a993924791d02d7a4c9375c,
type: 3} type: 3}
...@@ -1872,7 +1944,7 @@ PrefabInstance: ...@@ -1872,7 +1944,7 @@ PrefabInstance:
- target: {fileID: 33432975985760517, guid: ec20e06c4a993924791d02d7a4c9375c, - target: {fileID: 33432975985760517, guid: ec20e06c4a993924791d02d7a4c9375c,
type: 3} type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 33432975985760517, guid: ec20e06c4a993924791d02d7a4c9375c, - target: {fileID: 33432975985760517, guid: ec20e06c4a993924791d02d7a4c9375c,
type: 3} type: 3}
...@@ -1882,7 +1954,7 @@ PrefabInstance: ...@@ -1882,7 +1954,7 @@ PrefabInstance:
- target: {fileID: 33432975985760517, guid: ec20e06c4a993924791d02d7a4c9375c, - target: {fileID: 33432975985760517, guid: ec20e06c4a993924791d02d7a4c9375c,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 33432975985760517, guid: ec20e06c4a993924791d02d7a4c9375c, - target: {fileID: 33432975985760517, guid: ec20e06c4a993924791d02d7a4c9375c,
type: 3} type: 3}
...@@ -1906,7 +1978,7 @@ PrefabInstance: ...@@ -1906,7 +1978,7 @@ PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 1467985599}
m_Modifications: m_Modifications:
- target: {fileID: 87051754405567689, guid: 2a2831d520acdd3408d8a04673423e2a, - target: {fileID: 87051754405567689, guid: 2a2831d520acdd3408d8a04673423e2a,
type: 3} type: 3}
...@@ -1951,7 +2023,7 @@ PrefabInstance: ...@@ -1951,7 +2023,7 @@ PrefabInstance:
- target: {fileID: 87051754405658857, guid: 2a2831d520acdd3408d8a04673423e2a, - target: {fileID: 87051754405658857, guid: 2a2831d520acdd3408d8a04673423e2a,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 11 value: 5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 87051754405658857, guid: 2a2831d520acdd3408d8a04673423e2a, - target: {fileID: 87051754405658857, guid: 2a2831d520acdd3408d8a04673423e2a,
type: 3} type: 3}
...@@ -2044,7 +2116,7 @@ PrefabInstance: ...@@ -2044,7 +2116,7 @@ PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 1467985599}
m_Modifications: m_Modifications:
- target: {fileID: 2817243128983163806, guid: 4a442e968e3ddd3468104f4179c3b880, - target: {fileID: 2817243128983163806, guid: 4a442e968e3ddd3468104f4179c3b880,
type: 3} type: 3}
...@@ -2069,7 +2141,7 @@ PrefabInstance: ...@@ -2069,7 +2141,7 @@ PrefabInstance:
- target: {fileID: 2817243128983195582, guid: 4a442e968e3ddd3468104f4179c3b880, - target: {fileID: 2817243128983195582, guid: 4a442e968e3ddd3468104f4179c3b880,
type: 3} type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2817243128983195582, guid: 4a442e968e3ddd3468104f4179c3b880, - target: {fileID: 2817243128983195582, guid: 4a442e968e3ddd3468104f4179c3b880,
type: 3} type: 3}
...@@ -2079,7 +2151,7 @@ PrefabInstance: ...@@ -2079,7 +2151,7 @@ PrefabInstance:
- target: {fileID: 2817243128983195582, guid: 4a442e968e3ddd3468104f4179c3b880, - target: {fileID: 2817243128983195582, guid: 4a442e968e3ddd3468104f4179c3b880,
type: 3} type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2817243128983195582, guid: 4a442e968e3ddd3468104f4179c3b880, - target: {fileID: 2817243128983195582, guid: 4a442e968e3ddd3468104f4179c3b880,
type: 3} type: 3}
...@@ -2089,7 +2161,7 @@ PrefabInstance: ...@@ -2089,7 +2161,7 @@ PrefabInstance:
- target: {fileID: 2817243128983195582, guid: 4a442e968e3ddd3468104f4179c3b880, - target: {fileID: 2817243128983195582, guid: 4a442e968e3ddd3468104f4179c3b880,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 7 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2817243128983195582, guid: 4a442e968e3ddd3468104f4179c3b880, - target: {fileID: 2817243128983195582, guid: 4a442e968e3ddd3468104f4179c3b880,
type: 3} type: 3}
...@@ -2113,7 +2185,7 @@ PrefabInstance: ...@@ -2113,7 +2185,7 @@ PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 1467985599}
m_Modifications: m_Modifications:
- target: {fileID: 4555134343764048990, guid: 72682f7503996bc4e988ed5ba93fb688, - target: {fileID: 4555134343764048990, guid: 72682f7503996bc4e988ed5ba93fb688,
type: 3} type: 3}
...@@ -2158,7 +2230,7 @@ PrefabInstance: ...@@ -2158,7 +2230,7 @@ PrefabInstance:
- target: {fileID: 4555134343763943550, guid: 72682f7503996bc4e988ed5ba93fb688, - target: {fileID: 4555134343763943550, guid: 72682f7503996bc4e988ed5ba93fb688,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 8 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4555134343763943550, guid: 72682f7503996bc4e988ed5ba93fb688, - target: {fileID: 4555134343763943550, guid: 72682f7503996bc4e988ed5ba93fb688,
type: 3} type: 3}
...@@ -2227,7 +2299,7 @@ PrefabInstance: ...@@ -2227,7 +2299,7 @@ PrefabInstance:
- target: {fileID: 6001025753464593565, guid: df6f1d8b9377ec346af4255abe290fbb, - target: {fileID: 6001025753464593565, guid: df6f1d8b9377ec346af4255abe290fbb,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 2 value: 5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6001025753464593565, guid: df6f1d8b9377ec346af4255abe290fbb, - target: {fileID: 6001025753464593565, guid: df6f1d8b9377ec346af4255abe290fbb,
type: 3} type: 3}
...@@ -2251,7 +2323,7 @@ PrefabInstance: ...@@ -2251,7 +2323,7 @@ PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 1467985599}
m_Modifications: m_Modifications:
- target: {fileID: 6169104080419908266, guid: 420a4f921e52a4141b80a3eefcd511e6, - target: {fileID: 6169104080419908266, guid: 420a4f921e52a4141b80a3eefcd511e6,
type: 3} type: 3}
...@@ -2276,7 +2348,7 @@ PrefabInstance: ...@@ -2276,7 +2348,7 @@ PrefabInstance:
- target: {fileID: 6169104080419485322, guid: 420a4f921e52a4141b80a3eefcd511e6, - target: {fileID: 6169104080419485322, guid: 420a4f921e52a4141b80a3eefcd511e6,
type: 3} type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6169104080419485322, guid: 420a4f921e52a4141b80a3eefcd511e6, - target: {fileID: 6169104080419485322, guid: 420a4f921e52a4141b80a3eefcd511e6,
type: 3} type: 3}
...@@ -2286,7 +2358,7 @@ PrefabInstance: ...@@ -2286,7 +2358,7 @@ PrefabInstance:
- target: {fileID: 6169104080419485322, guid: 420a4f921e52a4141b80a3eefcd511e6, - target: {fileID: 6169104080419485322, guid: 420a4f921e52a4141b80a3eefcd511e6,
type: 3} type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6169104080419485322, guid: 420a4f921e52a4141b80a3eefcd511e6, - target: {fileID: 6169104080419485322, guid: 420a4f921e52a4141b80a3eefcd511e6,
type: 3} type: 3}
...@@ -2296,7 +2368,7 @@ PrefabInstance: ...@@ -2296,7 +2368,7 @@ PrefabInstance:
- target: {fileID: 6169104080419485322, guid: 420a4f921e52a4141b80a3eefcd511e6, - target: {fileID: 6169104080419485322, guid: 420a4f921e52a4141b80a3eefcd511e6,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 10 value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6169104080419485322, guid: 420a4f921e52a4141b80a3eefcd511e6, - target: {fileID: 6169104080419485322, guid: 420a4f921e52a4141b80a3eefcd511e6,
type: 3} type: 3}
...@@ -2320,7 +2392,7 @@ PrefabInstance: ...@@ -2320,7 +2392,7 @@ PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 1467985599}
m_Modifications: m_Modifications:
- target: {fileID: 6840018466224391531, guid: d7070c786deaa3a4082f9339da091b46, - target: {fileID: 6840018466224391531, guid: d7070c786deaa3a4082f9339da091b46,
type: 3} type: 3}
...@@ -2345,7 +2417,7 @@ PrefabInstance: ...@@ -2345,7 +2417,7 @@ PrefabInstance:
- target: {fileID: 6840018466224560459, guid: d7070c786deaa3a4082f9339da091b46, - target: {fileID: 6840018466224560459, guid: d7070c786deaa3a4082f9339da091b46,
type: 3} type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6840018466224560459, guid: d7070c786deaa3a4082f9339da091b46, - target: {fileID: 6840018466224560459, guid: d7070c786deaa3a4082f9339da091b46,
type: 3} type: 3}
...@@ -2355,7 +2427,7 @@ PrefabInstance: ...@@ -2355,7 +2427,7 @@ PrefabInstance:
- target: {fileID: 6840018466224560459, guid: d7070c786deaa3a4082f9339da091b46, - target: {fileID: 6840018466224560459, guid: d7070c786deaa3a4082f9339da091b46,
type: 3} type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6840018466224560459, guid: d7070c786deaa3a4082f9339da091b46, - target: {fileID: 6840018466224560459, guid: d7070c786deaa3a4082f9339da091b46,
type: 3} type: 3}
...@@ -2365,7 +2437,7 @@ PrefabInstance: ...@@ -2365,7 +2437,7 @@ PrefabInstance:
- target: {fileID: 6840018466224560459, guid: d7070c786deaa3a4082f9339da091b46, - target: {fileID: 6840018466224560459, guid: d7070c786deaa3a4082f9339da091b46,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 9 value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6840018466224560459, guid: d7070c786deaa3a4082f9339da091b46, - target: {fileID: 6840018466224560459, guid: d7070c786deaa3a4082f9339da091b46,
type: 3} type: 3}
......
...@@ -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;
GetComponent<MeshRenderer>().material.color = value;
} private void Start()
{
_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;
} }
} }
...@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment