Assets/Scenes/05_LiveScene.unity

@@ -6373,7 +6373,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2576541079831587447, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: triggerName
-      value: "\u7535\u80FD\u8868\u5C01\u53701"
+      value: "\u7535\u80FD\u8868\u5C01\u5370"
       objectReference: {fileID: 0}
     - target: {fileID: 2576541079831587450, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: triggerID
@@ -6381,7 +6381,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2576541079831587450, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: triggerName
-      value: "\u7535\u80FD\u8868\u5C01\u53702"
+      value: "\u7535\u80FD\u8868\u5C01\u5370"
       objectReference: {fileID: 0}
     - target: {fileID: 2576541080106509928, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
@@ -6417,7 +6417,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2576541080563400544, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: triggerName
-      value: "\u7535\u80FD\u8868\u76D6\u5B50\u56FA\u5B9A\u87BA\u4E1D1"
+      value: "\u7535\u80FD\u8868\u87BA\u4E1D"
       objectReference: {fileID: 0}
     - target: {fileID: 2576541080563400545, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
@@ -6433,7 +6433,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2576541080772862035, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: triggerName
-      value: "\u7535\u80FD\u8868\u76D6\u5B50\u56FA\u5B9A\u87BA\u4E1D2"
+      value: "\u7535\u80FD\u8868\u87BA\u4E1D"
       objectReference: {fileID: 0}
     - target: {fileID: 2576541080794005323, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
@@ -6519,10 +6519,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6044607018453959887, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
-      propertyPath: m_Name
-      value: "\u7535\u80FD\u8868\u76D6\u5B50"
-      objectReference: {fileID: 0}
     - target: {fileID: 6044607018453959887, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: m_IsActive
       value: 1

Assets/Scripts/CXX/Devices/Device_Base.cs

@@ -14,7 +14,6 @@ public class Device_Base : PermanentTriggerBase
         if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
         {
             base.OnStart();
-            Debug.Log("Device_Base PermanentTriggerBase");
         }
     }
 

Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs

@@ -46,12 +46,10 @@ public class Device_CabinetDoor : Device_Base
               });
           });
     }
-    protected override void OnMDown()
+
+    private void OnMouseDown()
     {
-        if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.name == "Ñéµç±Ê") return;
+        if (LiveSceneManager.Instance.currentTool.name == "Ñéµç±Ê") return;
-        if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
-        {
-            base.OnMDown();
         if (isOpen)
         {
             Close();
@@ -62,5 +60,3 @@ public class Device_CabinetDoor : Device_Base
         }
     }
 }
-
-}

Assets/Scripts/CXX/Tools/Tool_TestPen.cs

@@ -31,7 +31,7 @@ public class Tool_TestPen : Tool_Base
                     return;
                 }
 
-                //ÂÝË¿
+                //ｹ<EFBFBD>ﾅ
                 Tool_Base tb = hit.transform.GetComponent<Tool_Base>();
                 if (tb != null)
                 {
@@ -66,7 +66,6 @@ public class Tool_TestPen : Tool_Base
     {
         if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(device_base.triggerName, true) == 0)
         {
-            Debug.Log("Test(Device_Base device_base)");
             if (device_base.deviceType == DeviceType.计量柜_插座)
             {
                 var tmp = ((Device_Socket)device_base);
@@ -75,12 +74,10 @@ public class Tool_TestPen : Tool_Base
                 transform.eulerAngles = tmp.testPosAndRot.eulerAngles;
                 Debug.Log("计量柜_插座 已验电");
                 isFlicker = tmp.hasElectricity;
-
             }
             else if (device_base.deviceType == DeviceType.计量柜_柜门)
             {
                 var tmp = ((Device_CabinetDoor)device_base);
-
                 //位置移动
                 transform.position = tmp.testPosAndRot.position;
                 transform.localEulerAngles = tmp.testPosAndRot.localEulerAngles;

Assets/Scripts/CXX/Tools/Tool_WireStripper.cs

@@ -58,8 +58,6 @@ public class Tool_WireStripper : Tool_Base
                 //·âÓ¡
                 Device_Seal ds = hit.transform.GetComponent<Device_Seal>();
                 if (ds != null)
-                {
-                    if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(ds.triggerName, true) == 0)
                 {
                     CutOpen(ds);
                 }
@@ -67,4 +65,3 @@ public class Tool_WireStripper : Tool_Base
         }
     }
 }
-}

Assets/Scripts/Project/Manager/LiveSceneManager.cs

@@ -30,7 +30,6 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
                 p.Init("", "您好，我是xx供电公司员工，这是我的工作证。现在我们要对贵户更换电能计量表", (intTemp) => { Destroy(currentTool); });
             });
             tMDTips.gameObject.SetActive(false);
-            currentTool.transform.localEulerAngles = new Vector3(90, 0, 0);
         }
     }
 

Assets/Scripts/Project/Manager/ProcessManager.cs

@@ -166,7 +166,10 @@ public class ProcessManager : BaseManager<ProcessManager>
         else
         {
             Debug.Log("按照流程走");
-            StepErrorTips();
+            GameManager.UIMgr.ShowPanel<UI_MiddleTipPanel>(E_UI_Layer.Mid, (panel) =>
+            {
+                panel.Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}");
+            });
             return false;
         }
 
@@ -201,7 +204,10 @@ public class ProcessManager : BaseManager<ProcessManager>
                 }
                 else
                 {
-                    StepErrorTips();
+                    GameManager.UIMgr.ShowPanel<UI_MiddleTipPanel>(E_UI_Layer.System, (p) =>
+                    {
+                        p.Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}");
+                    });
                     return 1;
                 }
             }
@@ -212,24 +218,12 @@ public class ProcessManager : BaseManager<ProcessManager>
             }
         }
         else
-        {
-            StepErrorTips();
-            return -1;
-        }
-    }
-
-    private void StepErrorTips()
-    {
-        if (GameManager.UIMgr.GetPanel<UI_MiddleTipPanel>())
-        {
-            GameManager.UIMgr.GetPanel<UI_MiddleTipPanel>().Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}");
-        }
-        else
         {
             GameManager.UIMgr.ShowPanel<UI_MiddleTipPanel>(E_UI_Layer.System, (p) =>
             {
-                p.Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}");
+                p.Init($"错误,请前往{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.SceneName()}");
             });
+            return -1;
         }
     }
 

Assets/Scripts/Project/Objects/Other/NPCController.cs

@@ -6,11 +6,19 @@ public class NPCController : PermanentTriggerBase
 {
     public List<string> npcSpeack;
     public int speackIndex = 0;
+    private  bool onSpeackOver;
     protected override void OnMDown()
     {
         base.OnMDown();
-        
+        if(npcSpeack.Count > 1)
-        if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, false ) == 0)
+        {
+            onSpeackOver = false;
+        }
+        else
+        {
+            onSpeackOver = true;
+        }
+        if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, onSpeackOver) == 0)
         {
             GameManager.UIMgr.ShowPanel<UI_CustomSessionPanel>(E_UI_Layer.Mid, (panel) =>
             {

Assets/Scripts/Project/UI/UI_Panel/UI_MiddleTipPanel.cs

@@ -23,13 +23,11 @@ public class UI_MiddleTipPanel : BasePanel
     /// </summary>
     private void Hide()
     {
-        StopCoroutine(HideAsync());
         StartCoroutine(HideAsync());
     }
-   
     private IEnumerator HideAsync()
     {
         yield return new WaitForSeconds(disappear);
-       GameManager.UIMgr.HidePanel<UI_MiddleTipPanel>();
+        UIManager.Instance.HidePanel<UI_MiddleTipPanel>();
     }
 }