Merge remote-tracking branch 'origin/interact'

Assets/Prefabs/Objects/Mannequin/default_mannequin.prefab

@@ -893,6 +893,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
@@ -1323,6 +1324,7 @@ GameObject:
   m_Component:
   - component: {fileID: 33432975985760517}
   - component: {fileID: 8051139420697939838}
+  - component: {fileID: 8336647915299263558}
   m_Layer: 0
   m_Name: default_mannequin
   m_TagString: Untagged
@@ -1339,7 +1341,7 @@ Transform:
   m_GameObject: {fileID: 33432975985984805}
   m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956}
   m_LocalPosition: {x: -0.029588563, y: 0.110000014, z: 2.009}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
   m_Children:
   - {fileID: 33432975985760597}
   - {fileID: 33432975985760621}
@@ -1359,9 +1361,26 @@ MonoBehaviour:
   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
+  renderers:
+  - {fileID: 33432975991195757}
+  - {fileID: 33432975991195759}
+  mannequinMaterial:
+  - {fileID: 2100000, guid: 36f9d35b500106b42b6a47c516bf7b38, type: 2}
+  - {fileID: 2100000, guid: af605edc8af008346a3f42f355847da6, type: 2}
+  floor: {fileID: 0}
+--- !u!65 &8336647915299263558
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 33432975985984805}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.81, y: 1.6, z: 0.3}
+  m_Center: {x: 0, y: 0.8, z: 0}
 --- !u!1 &33432975985984807
 GameObject:
   m_ObjectHideFlags: 0
@@ -1480,6 +1499,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/Mannequin/mannequin (1).prefab

@@ -955,6 +955,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
@@ -1229,6 +1230,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2817243128983195582}
   - component: {fileID: 7901650875037068864}
+  - component: {fileID: 4444892167944922722}
   m_Layer: 0
   m_Name: mannequin (1)
   m_TagString: Untagged
@@ -1245,7 +1247,7 @@ Transform:
   m_GameObject: {fileID: 2817243128983163806}
   m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956}
   m_LocalPosition: {x: 0, y: 0.11, z: 4}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
   m_Children:
   - {fileID: 2817243128983195630}
   - {fileID: 2817243128983195606}
@@ -1265,9 +1267,26 @@ MonoBehaviour:
   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
+  renderers:
+  - {fileID: 2817243128969502422}
+  - {fileID: 2817243128969502420}
+  mannequinMaterial:
+  - {fileID: 2100000, guid: 36f9d35b500106b42b6a47c516bf7b38, type: 2}
+  - {fileID: 2100000, guid: af605edc8af008346a3f42f355847da6, type: 2}
+  floor: {fileID: 0}
+--- !u!65 &4444892167944922722
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2817243128983163806}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.81, y: 1.6, z: 0.3}
+  m_Center: {x: 0, y: 0.8, z: 0}
 --- !u!1 &2817243128983163808
 GameObject:
   m_ObjectHideFlags: 0
@@ -1667,6 +1686,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/Mannequin/mannequin (2).prefab

@@ -809,6 +809,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
@@ -1083,6 +1084,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4555134343763943550}
   - component: {fileID: 1053313960500733773}
+  - component: {fileID: 2925762978337305251}
   m_Layer: 0
   m_Name: mannequin (2)
   m_TagString: Untagged
@@ -1099,7 +1101,7 @@ Transform:
   m_GameObject: {fileID: 4555134343764048990}
   m_LocalRotation: {x: 0, y: 0.5283346, z: 0, w: 0.8490363}
   m_LocalPosition: {x: -0.16, y: 0.110000014, z: 5.06}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
   m_Children:
   - {fileID: 4555134343763943470}
   - {fileID: 4555134343763943446}
@@ -1119,9 +1121,26 @@ MonoBehaviour:
   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
+  renderers:
+  - {fileID: 4555134343775547670}
+  - {fileID: 4555134343775547668}
+  mannequinMaterial:
+  - {fileID: 2100000, guid: 36f9d35b500106b42b6a47c516bf7b38, type: 2}
+  - {fileID: 2100000, guid: af605edc8af008346a3f42f355847da6, type: 2}
+  floor: {fileID: 0}
+--- !u!65 &2925762978337305251
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4555134343764048990}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.81, y: 1.6, z: 0.3}
+  m_Center: {x: 0, y: 0.8, z: 0}
 --- !u!1 &4555134343764048992
 GameObject:
   m_ObjectHideFlags: 0
@@ -1521,6 +1540,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/Mannequin/mannequin (3).prefab

@@ -1245,6 +1245,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
@@ -1874,6 +1875,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
@@ -2024,6 +2026,7 @@ GameObject:
   m_Component:
   - component: {fileID: 6840018466224560459}
   - component: {fileID: 6862997482539891855}
+  - component: {fileID: 2423524975426210005}
   m_Layer: 0
   m_Name: mannequin (3)
   m_TagString: Untagged
@@ -2040,7 +2043,7 @@ Transform:
   m_GameObject: {fileID: 6840018466224391531}
   m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956}
   m_LocalPosition: {x: -0.029588563, y: 0.110000014, z: 6.009}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
   m_Children:
   - {fileID: 6840018466224560411}
   - {fileID: 6840018466224560419}
@@ -2060,9 +2063,26 @@ MonoBehaviour:
   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
+  renderers:
+  - {fileID: 6840018466229602339}
+  - {fileID: 6840018466229602337}
+  mannequinMaterial:
+  - {fileID: 2100000, guid: 36f9d35b500106b42b6a47c516bf7b38, type: 2}
+  - {fileID: 2100000, guid: af605edc8af008346a3f42f355847da6, type: 2}
+  floor: {fileID: 0}
+--- !u!65 &2423524975426210005
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6840018466224391531}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.81, y: 1.6, z: 0.3}
+  m_Center: {x: 0, y: 0.8, z: 0}
 --- !u!1 &6840018466224391533
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/Objects/Mannequin/mannequin (4).prefab

@@ -89,6 +89,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
@@ -718,6 +719,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
@@ -868,6 +870,7 @@ GameObject:
   m_Component:
   - component: {fileID: 6169104080419485322}
   - component: {fileID: 5018897370588914429}
+  - component: {fileID: 8508261491693406977}
   m_Layer: 0
   m_Name: mannequin (4)
   m_TagString: Untagged
@@ -884,7 +887,7 @@ Transform:
   m_GameObject: {fileID: 6169104080419908266}
   m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956}
   m_LocalPosition: {x: -0.029588563, y: 0.110000014, z: 7.009}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
   m_Children:
   - {fileID: 6169104080419485402}
   - {fileID: 6169104080419485410}
@@ -904,9 +907,26 @@ MonoBehaviour:
   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
+  renderers:
+  - {fileID: 6169104080406308834}
+  - {fileID: 6169104080406308832}
+  mannequinMaterial:
+  - {fileID: 2100000, guid: 36f9d35b500106b42b6a47c516bf7b38, type: 2}
+  - {fileID: 2100000, guid: af605edc8af008346a3f42f355847da6, type: 2}
+  floor: {fileID: 0}
+--- !u!65 &8508261491693406977
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6169104080419908266}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.81, y: 1.6, z: 0.3}
+  m_Center: {x: 0, y: 0.8, z: 0}
 --- !u!1 &6169104080419908268
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/Objects/Mannequin/mannequin (5).prefab

@@ -653,6 +653,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
@@ -741,6 +742,7 @@ GameObject:
   m_Component:
   - component: {fileID: 87051754405658857}
   - component: {fileID: 2798309523397132260}
+  - component: {fileID: 4743889867940665203}
   m_Layer: 0
   m_Name: mannequin (5)
   m_TagString: Untagged
@@ -757,7 +759,7 @@ Transform:
   m_GameObject: {fileID: 87051754405567689}
   m_LocalRotation: {x: 0, y: 0.18129157, z: 0, w: 0.9834294}
   m_LocalPosition: {x: 0.01, y: 0.110000014, z: 7.86}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
   m_Children:
   - {fileID: 87051754405658809}
   - {fileID: 87051754405658753}
@@ -777,9 +779,26 @@ MonoBehaviour:
   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
+  renderers:
+  - {fileID: 87051754410840449}
+  - {fileID: 87051754410840451}
+  mannequinMaterial:
+  - {fileID: 2100000, guid: 36f9d35b500106b42b6a47c516bf7b38, type: 2}
+  - {fileID: 2100000, guid: af605edc8af008346a3f42f355847da6, type: 2}
+  floor: {fileID: 0}
+--- !u!65 &4743889867940665203
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 87051754405567689}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.81, y: 1.6, z: 0.3}
+  m_Center: {x: 0, y: 0.8, z: 0}
 --- !u!1 &87051754405567691
 GameObject:
   m_ObjectHideFlags: 0
@@ -1177,6 +1196,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/Scenes/ModelScene.meta

+fileFormatVersion: 2
+guid: ae6df86ab9243f74f8c5e9aab2cbca92
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Interactors/Mannequin.cs

@@ -4,10 +4,10 @@ using UnityEngine;
 
 public class Mannequin : MonoBehaviour, IObject, IBulletInteractor
 {
-	[SerializeField]
-	private Mesh[] mannequinMesh = new Mesh[2];
-	private Color _color;
+    [SerializeField] private SkinnedMeshRenderer[] renderers = new SkinnedMeshRenderer[2];
+    [SerializeField] private Material[] mannequinMaterial = new Material[2];
     [SerializeField] private Floor floor;
+    private Color _color;
     public Color Color {
         get
         {
@@ -17,14 +17,20 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor
         {
 			if (value == Color.black)
 			{
-				GetComponent<MeshFilter>().mesh = mannequinMesh[0];
+                foreach (var renderer in renderers)
+                {
+                    renderer.material = mannequinMaterial[0];
+                }
 				//Change mesh to black mannequin
 			}
 			else if (value == Color.white)
 			{
-				GetComponent<MeshFilter>().mesh = mannequinMesh[1];
-				//Change mesh to white mannequin
-			}
+                foreach (var renderer in renderers)
+                {
+                    renderer.material = mannequinMaterial[1];
+                }
+                //Change mesh to white mannequin
+            }
 			else
 			{
 				Debug.LogWarning("Invalid color input");
@@ -37,7 +43,7 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor
     {
         if (bullet is TruthBullet)
         {
-           Color = Color.white;
+            Color = Color.white;
         }
         if (bullet is FakeBullet)
         {
@@ -55,6 +61,7 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor
         Color = isWhite ? Color.white : Color.black;
     }
 
+    #region IObject Override
     public GameObject GetObject()
     {
         return gameObject;
@@ -69,4 +76,5 @@ public class Mannequin : MonoBehaviour, IObject, IBulletInteractor
     {
         return ObjType.Mannequin;
     }
+    #endregion
 }