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} 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().ToList().ForEach(a => { a.speackIndex = 0; }); + GameObject.FindObjectsOfType().ToList().ForEach(a => + { + a.speackIndex = 0; + a.spriteRenderer.gameObject.SetActive(true); + }); } else if (num == 8) { //班前会 + GameObject.FindObjectsOfType().ToList().Find(a => a.triggerName == "NPC客户").spriteRenderer.gameObject.SetActive(false); } else if (num == 9) { //接线检查 //还原npc负责人 - GameObject.FindObjectsOfType().ToList().Find(a => a.triggerName == "NPC负责人").speackIndex = 1; + GameObject.FindObjectsOfType().ToList().ForEach(a => + { + if(a.triggerName == "NPC负责人") + a.speackIndex = 1; + a.spriteRenderer.gameObject.SetActive(false); + }); } else if(num == 10) { 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/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("ClientText_DialogBox").DOKill(); GetControl("ClientText_DialogBox").text = ""; //UItext = GetControl("ClientText_DialogBox"); StartTypewriterEffect(clientTalk);