Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology

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

@@ -7,10 +7,13 @@ public class Device_Sundries : Device_Base
     protected override void OnMDown()
     {
         base.OnMDown();
-        Debug.Log("清理柜子杂物");
+        if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
-        gameObject.SetActive(false);
+        {
-        triggerAction.Invoke(triggerName, false);
+            Debug.Log("清理柜子杂物");
-        base.CallScoreAction();
+            gameObject.SetActive(false);
-            
+            triggerAction.Invoke(triggerName, false);
+            base.CallScoreAction();
+        }
+
     }
 }

Assets/Scripts/Project/Manager/OfficeManager.cs

@@ -8,10 +8,11 @@ using UnityEngine;
 /// </summary>
 public class OfficeManager : SingletonMono<OfficeManager>
 {
-    public int currentProcessID;
+    //public int currentProcessID;
-    public int currentSubProcessID;
+    //public int currentSubProcessID;
-    public int currentSubProcessStepID;
+    //public int currentSubProcessStepID;
-    public int currentSubProcessStepTriggerID;
+    //public int currentSubProcessStepTriggerID;
+
 
 
     /// <summary>
@@ -20,7 +21,6 @@ public class OfficeManager : SingletonMono<OfficeManager>
     public MobileController mobileController;
     void Start()
     {
-
         GameManager.EventMgr.AddEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver);
         GameManager.EventMgr.AddEventListener(Enum_EventType.InitializationUI, InitializationUI);
         if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)

Assets/Scripts/Project/Manager/ProcessManager.cs

@@ -150,12 +150,12 @@ public class ProcessManager : BaseManager<ProcessManager>
                         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("进入下一步流程");
+                        Debug.Log($"<color=red>进入下一步流程</color>");
                         return true;
                     }
                     else
                     {
-                        //Debug.Log("完成所有");
+                        Debug.Log($"<color=red>完成所有</color>");
                         return false;
                     }
 
@@ -164,7 +164,7 @@ public class ProcessManager : BaseManager<ProcessManager>
         }
         else
         {
-            //Debug.Log("按照流程走");
+            Debug.Log($"<color=red>按照流程走</color>");
             StepErrorTips();
             return false;
         }

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

@@ -10,7 +10,7 @@ public class UI_PlayerSessionPanel : BasePanel
 {
     private string triggerID;
     public Action<string> callBack;
-    private float typingSpeed = 0.05f; 
+    private float typingSpeed = 0.05f;
     /// <summary>
     /// 初始化,state 0 激活另一个操作
     /// </summary>
@@ -18,7 +18,7 @@ public class UI_PlayerSessionPanel : BasePanel
     {
         this.triggerID = triggerID;
         callBack += _callBack;
-        //GetControl<TextMeshProUGUI>("PlayerText_DialogBox").text = clientTalk /*"好的"*/;
+        GetControl<TextMeshProUGUI>("PlayerText_DialogBox").text = "";
         //UItext = GetControl<TextMeshProUGUI>("PlayerText_DialogBox");
         StartTypewriterEffect(clientTalk);
     }