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] =?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);