From 7f76d83eda60e05a25e1803340412f5e9111df25 Mon Sep 17 00:00:00 2001
From: chenxiangxue <910695411@qq.com>
Date: Mon, 2 Sep 2024 18:29:10 +0800
Subject: [PATCH 1/3] a

---
 Assets/Scripts/CXX/Tools/Tool_TestPen.cs                        | 1 +
 Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs
index e73893f..f4b0aaa 100644
--- a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs
@@ -76,6 +76,7 @@ public class Tool_TestPen : Tool_Base
                 if (!isMoving)
                 {
                     isFlicker = false;
+                    screem.materials[0].color = Color.white;
                     base.ReBackHead();
                 }
             }
diff --git a/Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml b/Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml
index 059c463..1796356 100644
--- a/Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml
+++ b/Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml
@@ -24,7 +24,7 @@
           </Step>
 
           <Step id="" subProcessName="正确着装" isPrecondition="FALSE" precondition="" tipTitle="" tips="请前往工具间，选取工作服、绝缘鞋、安全帽、手套，到梳妆镜面前进行换装">
-              <operation id="" subProcessStepName="前往工具间" isPrecondition="" precondition="Office" triggerID="工具间按钮" tipTitle="" score=""></operation>
+              <operation id="" subProcessStepName="前往工具间" isPrecondition="" precondition="Office" triggerID="工具间按钮" tipTitle="前往工具间" score=""></operation>
               <operation id="" subProcessStepName="选择着装" isPrecondition="" precondition="ToolRoom" triggerID="国网安全帽,工作服,绝缘手套,绝缘靴" tipTitle="请点击正确的着装" score=""></operation>
               <operation id="" subProcessStepName="正确着装" isPrecondition="" precondition="ToolRoom" triggerID="镜子,国网安全帽,工作服,绝缘手套,绝缘靴" tipTitle="请走到镜子面前，点击镜子" score=""></operation>
           </Step>

From 42648d474e673207f7c052caf6999470fcd629ef Mon Sep 17 00:00:00 2001
From: chenxiangxue <910695411@qq.com>
Date: Mon, 2 Sep 2024 18:30:58 +0800
Subject: [PATCH 2/3] aa

---
 Assets/Scenes/05_LiveScene.unity | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Assets/Scenes/05_LiveScene.unity b/Assets/Scenes/05_LiveScene.unity
index 8af8759..04e9cb2 100644
--- a/Assets/Scenes/05_LiveScene.unity
+++ b/Assets/Scenes/05_LiveScene.unity
@@ -3070,8 +3070,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 950850337}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.14606, y: -0.15198, z: 0.40478}
-  m_LocalScale: {x: 0.10437811, y: 0.029909056, z: 0.0563622}
+  m_LocalPosition: {x: 0.14606, y: -0.15198, z: 0.40884}
+  m_LocalScale: {x: 0.10437811, y: 0.029909056, z: 0.04823308}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 543450652271447145}

From 17edf664b7fb2f635174b76186f1462522dac672 Mon Sep 17 00:00:00 2001
From: chenxiangxue <910695411@qq.com>
Date: Mon, 2 Sep 2024 19:10:22 +0800
Subject: [PATCH 3/3] =?UTF-8?q?npc=E5=AF=B9=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scripts/CXX/StepState/1002/StepState_1002.cs   | 14 ++++++++++++--
 .../Project/UI/UI_Panel/UI_CustomSessionPanel.cs   |  1 +
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
index 41f2233..a3db284 100644
--- a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
+++ b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
@@ -139,18 +139,28 @@ public class StepState_1002 : StepState
             SiteManager.instance.measuringCabinet.Init();
 
             //��ԭnpc�Ի�
-            GameObject.FindObjectsOfType<NPCController>().ToList().ForEach(a => { a.speackIndex = 0; });
+            GameObject.FindObjectsOfType<NPCController>().ToList().ForEach(a => 
+            {
+                a.speackIndex = 0; 
+                a.spriteRenderer.gameObject.SetActive(true);
+            });
         }
         else if (num == 8)
         {
             //��ǰ��
+            GameObject.FindObjectsOfType<NPCController>().ToList().Find(a => a.triggerName == "NPC�ͻ�").spriteRenderer.gameObject.SetActive(false);
         }
         else if (num == 9) 
         {
             //���߼��
 
             //��ԭnpc������
-            GameObject.FindObjectsOfType<NPCController>().ToList().Find(a => a.triggerName == "NPC������").speackIndex = 1;
+            GameObject.FindObjectsOfType<NPCController>().ToList().ForEach(a =>
+            {
+                if(a.triggerName == "NPC������")
+                    a.speackIndex = 1;
+                a.spriteRenderer.gameObject.SetActive(false);
+            });
         }
         else if(num == 10)
         {
diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_CustomSessionPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_CustomSessionPanel.cs
index 689cf6e..8c68006 100644
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_CustomSessionPanel.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_CustomSessionPanel.cs
@@ -18,6 +18,7 @@ public class UI_CustomSessionPanel : BasePanel
     {
         this.triggerID = triggerID;
         callBack += _callBack;
+        GetControl<TextMeshProUGUI>("ClientText_DialogBox").DOKill();
         GetControl<TextMeshProUGUI>("ClientText_DialogBox").text = "";
         //UItext = GetControl<TextMeshProUGUI>("ClientText_DialogBox");
         StartTypewriterEffect(clientTalk);