version finale

Assets/Materials/LiamShirtless.mat

@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: LiamShirtless
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 0
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 0.5
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.40392157, g: 0.22745098, b: 0, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Scenes/FirstAid/FirstAid.unity

@@ -13292,6 +13292,7 @@ MonoBehaviour:
   audioHelpClip: {fileID: 8300000, guid: 200b1b8a4f80f5c4faeb829cc37000cc, type: 3}
   flickeringObjects:
   - {fileID: 2082122310}
+  mouthTrigger: {fileID: 76815177}
 --- !u!328 &362540462
 VideoPlayer:
   m_ObjectHideFlags: 0
@@ -14384,6 +14385,7 @@ MonoBehaviour:
   tie: {fileID: 2069307290}
   isTieRemoved: 0
   shirt: {fileID: 1283581261}
+  shirtlessMaterial: {fileID: 2100000, guid: a11cff4610b1cd6489693189f7adb6bd, type: 2}
   shirtCollider: {fileID: 1283581263}
   isShirtRemoved: 0
   isElectrodeLeftPlaced: 0
@@ -20181,6 +20183,7 @@ MonoBehaviour:
   audioHelpClip: {fileID: 8300000, guid: 33dbae55509d3b642b53f9b84e25828b, type: 3}
   flickeringObjects:
   - {fileID: 1283581260}
+  shirtTrigger: {fileID: 1283581262}
 --- !u!4 &998868360
 Transform:
   m_ObjectHideFlags: 0
@@ -23944,6 +23947,8 @@ MonoBehaviour:
   flickeringObjects:
   - {fileID: 2082122312}
   - {fileID: 2082122311}
+  chinTrigger: {fileID: 1465397366}
+  foreheadTrigger: {fileID: 502945273}
 --- !u!1 &1420395217
 GameObject:
   m_ObjectHideFlags: 0
@@ -25448,7 +25453,7 @@ Mesh:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-  m_Name: pb_Mesh17618
+  m_Name: pb_Mesh17608
   serializedVersion: 8
   m_SubMeshes:
   - serializedVersion: 2

Assets/Scripts/Colleague/LiamInteraction.cs

@@ -23,6 +23,7 @@ public class LiamInteraction : MonoBehaviour {
 
     [Header("Shirt")]
     public SkinnedMeshRenderer shirt;
+    public Material shirtlessMaterial;
     public Collider shirtCollider;
     public bool isShirtRemoved = false;
 
@@ -65,7 +66,7 @@ public void RemoveTie()
 
     public void RemovedShirt()
     {
-        shirt.material.color = Color.black;
+        shirt.material = shirtlessMaterial;
         shirtCollider.gameObject.SetActive(false);
         isShirtRemoved = true;
     }

Assets/Scripts/FirstAids/Steps/FirstAid_Step10.cs

@@ -4,13 +4,31 @@
 
 public class FirstAid_Step10 : BasicStep
 {
-    public override void Enter(){}
-    public override void Exit(){}
+    public GameObject chinTrigger;
+    public GameObject foreheadTrigger;
 
-	void Update(){
+    public void Start()
+    {
+        chinTrigger.SetActive(false);
+        foreheadTrigger.SetActive(false);
+    }
+
+    void Update(){
 		if (this.IsActivated && LiamInteraction.instance.chin.isHolding && LiamInteraction.instance.forehead.isHolding)
         {
 			this.Complete ();
 		}
 	}
+    public override void Enter()
+    {
+        chinTrigger.SetActive(true);
+        foreheadTrigger.SetActive(true);
+    }
+
+    public override void Exit()
+    {
+        chinTrigger.SetActive(false);
+        foreheadTrigger.SetActive(false);
+    }
+
 }

Assets/Scripts/FirstAids/Steps/FirstAid_Step12.cs

@@ -4,6 +4,12 @@
 
 public class FirstAid_Step12 : BasicStep
 {
+    public GameObject mouthTrigger;
+
+    public void Start()
+    {
+        mouthTrigger.SetActive(false);
+    }
 
     void Update()
     {
@@ -16,12 +22,12 @@ void Update()
     // Start after the activation of the step
     public override void Enter()
     {
-
+        mouthTrigger.SetActive(true);
     }
 
     // Start before the completion of the step
     public override void Exit()
     {
-
+        mouthTrigger.SetActive(false);
     }
 }

Assets/Scripts/FirstAids/Steps/FirstAid_Step20.cs

@@ -4,15 +4,29 @@
 
 public class FirstAid_Step20 : BasicStep
 {
+    public GameObject shirtTrigger;
 
-    public override void Enter(){}
-    public override void Exit(){}
+    public void Start()
+    {
+        shirtTrigger.SetActive(false);
+    }
 
-
-	void Update(){
+    void Update(){
 		if(this.IsActivated && LiamInteraction.instance.isShirtRemoved)
         {
 			this.Complete ();
 		}
 	}
+
+    // Start after the activation of the step
+    public override void Enter()
+    {
+        shirtTrigger.SetActive(true);
+    }
+
+    // Start before the completion of the step
+    public override void Exit()
+    {
+        shirtTrigger.SetActive(false);
+    }
 }