Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology

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\u5370"
+      value: "\u7535\u80FD\u8868\u5C01\u53701"
       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\u5370"
+      value: "\u7535\u80FD\u8868\u5C01\u53702"
       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\u87BA\u4E1D"
+      value: "\u7535\u80FD\u8868\u76D6\u5B50\u56FA\u5B9A\u87BA\u4E1D1"
       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\u87BA\u4E1D"
+      value: "\u7535\u80FD\u8868\u76D6\u5B50\u56FA\u5B9A\u87BA\u4E1D2"
       objectReference: {fileID: 0}
     - target: {fileID: 2576541080794005323, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
       propertyPath: hasElectricity
@@ -6519,6 +6519,10 @@ 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,6 +14,7 @@ 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

@@ -39,24 +39,28 @@ public class Device_CabinetDoor : Device_Base
         //关门
         transform.DOLocalRotate(new Vector3(0, 0, 0), 3).OnComplete(() =>
           {
-            //关锁
-            transform.Find("计量柜锁2/计量柜锁3").DOLocalRotate(new Vector3(0, 0, 0), 1).OnComplete(() =>
-              {
-                  isOpen = false;
-              });
+              //关锁
+              transform.Find("计量柜锁2/计量柜锁3").DOLocalRotate(new Vector3(0, 0, 0), 1).OnComplete(() =>
+                {
+                    isOpen = false;
+                });
           });
     }
-
-    private void OnMouseDown()
+    protected override void OnMDown()
     {
-        if (LiveSceneManager.Instance.currentTool.name == "验电笔") return;
-        if (isOpen)
+        if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.name == "验电笔") return;
+        if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
         {
-            Close();
-        }
-        else
-        {
-            Open();
+            base.OnMDown();
+            if (isOpen)
+            {
+                Close();
+            }
+            else
+            {
+                Open();
+            }
         }
     }
+
 }

Assets/Scripts/CXX/Tools/Tool_TestPen.cs

@@ -31,7 +31,7 @@ public class Tool_TestPen : Tool_Base
                     return;
                 }
 
-                //柜门
+                //螺丝
                 Tool_Base tb = hit.transform.GetComponent<Tool_Base>();
                 if (tb != null)
                 {
@@ -66,6 +66,7 @@ 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);
@@ -74,10 +75,12 @@ 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;
@@ -89,24 +92,24 @@ public class Tool_TestPen : Tool_Base
         }
     }
 
-    /// <summary>
-    /// 执行验电操作
-    /// </summary>
-    /// <param name="tool_base">被验电设备</param>
-    public void Test(Tool_Base tool_base)
-    {
-        if (tool_base.toolType == ToolType.螺丝)
+        /// <summary>
+        /// 执行验电操作
+        /// </summary>
+        /// <param name="tool_base">被验电设备</param>
+        public void Test(Tool_Base tool_base)
         {
-            var tmp = ((Tool_Screw)tool_base);
-            //位置移动
-            transform.position = tmp.installPos.position;
-            transform.localEulerAngles = tmp.installPos.localEulerAngles;
-            Debug.Log("螺丝 已验电");
-            isFlicker = tmp.hasElectricity;
+            if (tool_base.toolType == ToolType.螺丝)
+            {
+                var tmp = ((Tool_Screw)tool_base);
+                //位置移动
+                transform.position = tmp.installPos.position;
+                transform.localEulerAngles = tmp.installPos.localEulerAngles;
+                Debug.Log("螺丝 已验电");
+                isFlicker = tmp.hasElectricity;
+            }
+
+            screem.materials[0].color = isFlicker ? Color.red : Color.white;
         }
 
-        screem.materials[0].color = isFlicker ? Color.red : Color.white;
+
     }
-
-
-}

Assets/Scripts/CXX/Tools/Tool_WireStripper.cs

@@ -27,7 +27,7 @@ public class Tool_WireStripper : Tool_Base
     /// <returns></returns>
     IEnumerator PlayAnimi(Device_Seal device_Seal)
     {
-        SkinnedMeshRenderer renderer= GetComponentInChildren<SkinnedMeshRenderer>();
+        SkinnedMeshRenderer renderer = GetComponentInChildren<SkinnedMeshRenderer>();
         float vlaue = 0;
         //´ò¿ª
         while (renderer.GetBlendShapeWeight(0) < 100)
@@ -59,7 +59,10 @@ public class Tool_WireStripper : Tool_Base
                 Device_Seal ds = hit.transform.GetComponent<Device_Seal>();
                 if (ds != null)
                 {
-                    CutOpen(ds);
+                    if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(ds.triggerName, true) == 0)
+                    {
+                        CutOpen(ds);
+                    }
                 }
             }
         }

Assets/Scripts/Project/Manager/LiveSceneManager.cs

@@ -30,6 +30,7 @@ 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

@@ -125,7 +125,7 @@ public class ProcessManager : BaseManager<ProcessManager>
             if (spStepID <= d_Scheme.CurrentProcess.CurrentSubProcess.subProcessStepes[spStepcount - 1].id)
             {
                 HandoverSubProcessStep(spStepID);
-               
+
                 Debug.Log("进入下一步子流程步骤");
                 return true;
             }
@@ -137,7 +137,7 @@ public class ProcessManager : BaseManager<ProcessManager>
                 {
                     HandoverSubProcess(spID, 0);
                     GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId);
-                   
+
                     Debug.Log("进入下一步子流程");
                     return true;
                 }
@@ -150,7 +150,7 @@ public class ProcessManager : BaseManager<ProcessManager>
                         HandoverProcess(pID, 0, 0);
                         GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcessStep, d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId);
                         GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId);
-                       
+
                         Debug.Log("进入下一步流程");
                         return true;
                     }
@@ -166,10 +166,7 @@ public class ProcessManager : BaseManager<ProcessManager>
         else
         {
             Debug.Log("按照流程走");
-            GameManager.UIMgr.ShowPanel<UI_MiddleTipPanel>(E_UI_Layer.Mid, (panel) =>
-            {
-                panel.Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}");
-            });
+            StepErrorTips();
             return false;
         }
 
@@ -204,10 +201,7 @@ public class ProcessManager : BaseManager<ProcessManager>
                 }
                 else
                 {
-                    GameManager.UIMgr.ShowPanel<UI_MiddleTipPanel>(E_UI_Layer.System, (p) =>
-                    {
-                        p.Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}");
-                    });
+                    StepErrorTips();
                     return 1;
                 }
             }
@@ -218,12 +212,24 @@ 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.SceneName()}");
+                p.Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}");
             });
-            return -1;
         }
     }
 

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

@@ -6,19 +6,11 @@ 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)
-        {
-            onSpeackOver = false;
-        }
-        else
-        {
-            onSpeackOver = true;
-        }
-        if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, onSpeackOver) == 0)
+        
+        if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, false ) == 0)
         {
             GameManager.UIMgr.ShowPanel<UI_CustomSessionPanel>(E_UI_Layer.Mid, (panel) =>
             {

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

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