修改提示问题，修改收回工具逻辑，修改继承重载问题，修改流程triggerID实时更新的问题

2024-08-29 00:38:45 +08:00 · 2024-08-29 00:38:45 +08:00 · f796755ef4
parent 60acc714d6
commit f796755ef4
28 changed files with 183 additions and 136 deletions
--- a/Assets/ArtRes/Excel/Config.xlsx
+++ b/Assets/ArtRes/Excel/Config.xlsx
--- a/Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold
+++ b/Assets/ArtRes/Fonts/AlimamaShuHeiTi-Bold
--- a/Assets/ArtRes/Fonts/SourceHanSansCN-Regular
+++ b/Assets/ArtRes/Fonts/SourceHanSansCN-Regular
--- a/Assets/Scenes/05_LiveScene.unity
+++ b/Assets/Scenes/05_LiveScene.unity
@ -5156,6 +5156,7 @@ MonoBehaviour:
  currentTool: {fileID: 0}
  spawnToolPos: {fileID: 1927580343}
  tMDTips: {fileID: 1180096483}
+  triggerName: "\u6536\u56DE\u5DE5\u5177"
 --- !u!4 &2109812127
 Transform:
  m_ObjectHideFlags: 0
--- a/Assets/Scripts/CXX/Devices/Device_Base.cs
+++ b/Assets/Scripts/CXX/Devices/Device_Base.cs
@ -12,14 +12,21 @@ public class Device_Base : PermanentTriggerBase
    /// <summary>
    /// trigger´¥·¢ÊÂ¼þ
    /// </summary>
-    public Func<string,bool,int> triggerAction;
+    public Func<string, bool, int> triggerAction;

    private Vector3 head_LocalPos;
    private Vector3 head_LocalEulerAnglesl;

+    protected override void OnAwake()
+    {
+        if (GameManager.RunModelMgr.SceneType == E_SceneType.Site)
+        {
+            base.OnAwake();
+        }
+    }
    protected override void OnStart()
    {
-        if ( GameManager.RunModelMgr.SceneType == E_SceneType.Site)
+        if (GameManager.RunModelMgr.SceneType == E_SceneType.Site)
        {
            base.OnStart();
            AddTriggerAction(GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID);
@ -28,7 +35,7 @@ public class Device_Base : PermanentTriggerBase

    protected override void OnMEnter()
    {
-        if ( GameManager.RunModelMgr.SceneType == E_SceneType.Site && GameManager.RunModelMgr.ModeType != E_ModeType.Study)
+        if (GameManager.RunModelMgr.SceneType == E_SceneType.Site && GameManager.RunModelMgr.ModeType != E_ModeType.Study)
        {
            base.OnMEnter();
            _highlight.SetHighlighted(true);
--- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs
+++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs
@ -28,8 +28,9 @@ public class Device_Cover : Device_Base
    [Tooltip("ÓÒ¸Ç×Ó·âÓ¡")]
    public Device_Seal cover_seal_Right;

-    private void OnMouseDown()
+    protected override void OnMDown()
    {
+        base.OnMDown();
        if ((triggerAction == null ? 0 : triggerAction.Invoke(triggerName, false)) == 0)
        {
            isCheckOK = true;
@ -59,7 +60,7 @@ public class Device_Cover : Device_Base
        Transform parent = cover_screw_Left.transform.parent;
        cover_screw_Left.transform.parent = transform;
        cover_screw_Right.transform.parent = transform;
-        transform.DOLocalMove(new Vector3(transform.localPosition.x,-0.1388763f, -0.2485413f), 2).OnComplete(() =>
+        transform.DOLocalMove(new Vector3(transform.localPosition.x, -0.1388763f, -0.2485413f), 2).OnComplete(() =>
         {
             cover_screw_Left.transform.parent = parent;
             cover_screw_Right.transform.parent = parent;
@ -78,7 +79,7 @@ public class Device_Cover : Device_Base
        Transform parent = cover_screw_Left.transform.parent;
        cover_screw_Left.transform.parent = transform;
        cover_screw_Right.transform.parent = transform;
-        transform.DOLocalMove(new Vector3(transform.localPosition.x,0.01112366f, -0.09854126f), 2).OnComplete(() =>
+        transform.DOLocalMove(new Vector3(transform.localPosition.x, 0.01112366f, -0.09854126f), 2).OnComplete(() =>
         {
             cover_screw_Left.transform.parent = parent;
             cover_screw_Right.transform.parent = parent;
--- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Switch.cs
+++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Switch.cs
@ -21,8 +21,9 @@ public class Device_Switch : Device_Base
        this.actionBack = actionBack;
    }

-    private void OnMouseDown()
+    protected override void OnMDown()
    {
+        base.OnMDown();
        if ((triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true)) == 0)
        {
            if (isOpen)
--- a/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs
+++ b/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs
@ -4,8 +4,9 @@ using UnityEngine;

 public class Device_Sundries : Device_Base
 {
-    private void OnMouseDown()
+    protected override void OnMDown()
    {
+        base.OnMDown();
        Debug.Log("清理柜子杂物");
        gameObject.SetActive(false); 
    }
--- a/Assets/Scripts/CXX/StepState/StepState.cs
+++ b/Assets/Scripts/CXX/StepState/StepState.cs
@ -80,7 +80,7 @@ public abstract class StepState : MonoBehaviour
                GameManager.UIMgr.HidePanel<UI_LoadingPanel>();
                GameManager.RunModelMgr.SceneType = jumpSence;
                GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, jumpSence);
-                GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
+                //GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);

                doStepState.Invoke(true);
            });
--- a/Assets/Scripts/CXX/Tools/Tool_Base.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_Base.cs
@ -23,9 +23,16 @@ public class Tool_Base : PermanentTriggerBase
    private Vector3 head_LocalPos;
    private Vector3 head_LocalEulerAnglesl;

+    protected override void OnAwake()
+    {
+        if (GameManager.RunModelMgr.SceneType == E_SceneType.Site)
+        {
+            base.OnAwake();
+        }
+    }
    protected override void OnStart()
    {
-        if ( GameManager.RunModelMgr.SceneType == E_SceneType.Site)
+        if (GameManager.RunModelMgr.SceneType == E_SceneType.Site)
        {
            base.OnStart();
            AddTriggerAction(GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID);
@ -59,10 +66,10 @@ public class Tool_Base : PermanentTriggerBase
    /// </summary>
    /// <param name="head_LocalPos"></param>
    /// <param name="head_LocalEulerAnglesl"></param>
-    public void SetHeadPosAndEulerang(Vector3 head_LocalPos,Vector3 head_LocalEulerAnglesl)
+    public void SetHeadPosAndEulerang(Vector3 head_LocalPos, Vector3 head_LocalEulerAnglesl)
    {
        this.head_LocalPos = head_LocalPos;
-        this.head_LocalEulerAnglesl= head_LocalEulerAnglesl;
+        this.head_LocalEulerAnglesl = head_LocalEulerAnglesl;
    }

    /// <summary>
@ -70,7 +77,7 @@ public class Tool_Base : PermanentTriggerBase
    /// </summary>
    public void ReBackHead()
    {
-        transform.parent=Camera.main.transform;
+        transform.parent = Camera.main.transform;
        transform.DOLocalRotate(head_LocalEulerAnglesl, 0.5f);
        transform.DOLocalMove(head_LocalPos, 1).OnComplete(() =>
        {
--- a/Assets/Scripts/CXX/Tools/Tool_Line.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_Line.cs
@ -32,11 +32,11 @@ public class Tool_Line: Tool_Base

    private Action<bool> actionBack;

-    protected override void OnAwake()
-    {
-        base.OnAwake();
-        id = gameObject.name;
-    }
+    //protected override void OnAwake()
+    //{
+    //    base.OnAwake();
+    //    id = gameObject.name;
+    //}

    public void AddAction(Action<bool> actionBack)
    {
--- a/Assets/Scripts/CXX/Tools/Tool_Screw.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_Screw.cs
@ -44,11 +44,11 @@ public class Tool_Screw : Tool_Base
    private Action<bool> installAction;


-    protected override void OnAwake()
-    {
-        base.OnAwake();
-        id = gameObject.name;
-    }
+    //protected override void OnAwake()
+    //{
+    //    base.OnAwake();
+    //    id = gameObject.name;
+    //}

    public void AddAction(Action<bool> action)
    {
--- a/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs
@ -52,6 +52,7 @@ public class Tool_WireStripper : Tool_Base
        //¼ô¶Ï
        device_Seal.Cut();
        isCuning = false;
+        //int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
        ReBackHead();
    }

@ -67,7 +68,7 @@ public class Tool_WireStripper : Tool_Base
                Device_Seal ds = hit.transform.GetComponent<Device_Seal>();
                if (ds != null)
                {
-                    if ((triggerAction == null ? 0 : triggerAction.Invoke(ds.triggerName, true)) == 0)
+                    if ((triggerAction == null ? 0 : triggerAction.Invoke(ds.triggerName, true))== 0)
                    {
                        CutOpen(ds);
                    }
--- a/Assets/Scripts/Project/DataClass/ProcessData/D_SubProcess.cs
+++ b/Assets/Scripts/Project/DataClass/ProcessData/D_SubProcess.cs
@ -109,6 +109,7 @@ public class D_SubProcess : I_Enter, I_Exit
        CurrentSubProcessStep = GetSubProcessStep(stepId);
        CurrentSubProcessStep.Enter();
        UnityEngine.Debug.Log("切换子流程步骤到:" + stepId);
+        UnityEngine.Debug.Log("切换子流程步骤TriggerID到:" + ProcessManager.Instance.subProcessStepTriggerID);
    }

    /// <summary>
--- a/Assets/Scripts/Project/DataClass/ProcessData/D_SubProcessStep.cs
+++ b/Assets/Scripts/Project/DataClass/ProcessData/D_SubProcessStep.cs
@ -23,7 +23,7 @@ public class D_SubProcessStep : I_Enter, I_Exit
    public void Init()
    {
        GetTriggerID();
-        ProcessManager.Instance.subProcessStepTriggerID = triggersName[0];
+        //ProcessManager.Instance.subProcessStepTriggerID = triggersName[0];
    }

    /// <summary>
@ -45,6 +45,7 @@ public class D_SubProcessStep : I_Enter, I_Exit
        {
            triggersName.Add(triggerID.Replace("\r\n", "").Replace("\n", "").Replace("\r", ""));
        }
+        ProcessManager.Instance.subProcessStepTriggerID = triggersName[0];
    }

    public string SceneName()
--- a/Assets/Scripts/Project/Manager/LiveSceneManager.cs
+++ b/Assets/Scripts/Project/Manager/LiveSceneManager.cs
@ -10,6 +10,7 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
    public GameObject currentTool;
    public Transform spawnToolPos;
    public Transform tMDTips;
+    public string triggerName;

    protected override void Awake()
    {
@ -41,21 +42,29 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
            });
            tMDTips.gameObject.SetActive(false);
            currentTool.transform.localEulerAngles = new Vector3(90, 0, 0);
+            currentTool = null;
        }
        if (currentTool.name.Equals("ÈýÏàËÄÏßµçÄÜ±í"))
        {
            tMDTips.gameObject.SetActive(false);
            currentTool.transform.localEulerAngles = new Vector3(-90, 0, -180);
+            currentTool = null;
        }
    }

    private void Update()
    {
        if (Input.GetKeyDown(KeyCode.Escape))
+        {
+            if (currentTool != null)
+            {
+                if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
                {
                    Debug.Log("Escape");
                    tMDTips.gameObject.SetActive(false);
                    Destroy(currentTool);
                }
            }
+        }
+    }
 }
--- a/Assets/Scripts/Project/Manager/OfficeManager.cs
+++ b/Assets/Scripts/Project/Manager/OfficeManager.cs
@ -20,10 +20,13 @@ 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)
+        {
            GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcess, SwitchSubProcess);
-
+        }
    }

    private void SwitchSubProcess(int subProcess)
@ -43,6 +46,8 @@ public class OfficeManager : SingletonMono<OfficeManager>


    private void OfficeTimeLineOver()
+    {
+        if (!GameManager.UIMgr.GetPanel<UI_MaskPanel>())
        {
            GameManager.UIMgr.ShowPanel<UI_MaskPanel>(E_UI_Layer.System, (panel) =>
            {
@ -50,6 +55,7 @@ public class OfficeManager : SingletonMono<OfficeManager>
                GameManager.EventMgr.EventTrigger(Enum_EventType.HideMask);
            });
        }
+    }
    private void InitializationUI()
    {
        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
@ -58,6 +64,8 @@ public class OfficeManager : SingletonMono<OfficeManager>
            {
                panel.Init(GameManager.ProcessMgr.subProcessId);
            });
+            GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
+            GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, GameManager.ProcessMgr.subProcessId);
        }

        GameManager.UIMgr.ShowPanel<UI_MenuBar>(E_UI_Layer.Mid, (panel) =>
@ -65,8 +73,6 @@ public class OfficeManager : SingletonMono<OfficeManager>
            panel.Init();
            GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
        });
-        GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
-        GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, GameManager.ProcessMgr.subProcessId);
    }


--- a/Assets/Scripts/Project/Manager/ProcessManager.cs
+++ b/Assets/Scripts/Project/Manager/ProcessManager.cs
@ -179,6 +179,7 @@ public class ProcessManager : BaseManager<ProcessManager>
    /// <returns></returns>
    public int IsRightSubProcessStepsTriggerID(string triggerID, bool isRemove)
    {
+        if (GameManager.RunModelMgr.ModeType != E_ModeType.Study) return 0;
        if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.precondition == GameManager.RunModelMgr.SceneType.ToString())
        {
            if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count > 0)
@ -190,7 +191,7 @@ public class ProcessManager : BaseManager<ProcessManager>
                        d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.RemoveAt(0);
                    if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count == 0)
                    {
-                        CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId);
+                        CheckSubProcessSteps(subProcessStepId);
                    }
                    if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count != 0)
                    {
--- a/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs
+++ b/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs
@ -31,7 +31,6 @@ public class PermanentTriggerBase : MonoBehaviour
    }
    private void SwitchSubProcessStepTriggerID(string arg0)
    {
-        if (_highlight == null) return;
        if (triggerName == arg0)
        {
            _highlight.SetHighlighted(true);
--- a/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs
+++ b/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs
@ -52,6 +52,7 @@ public class UI_SubProcessItem : BaseItem
                //ÖØÖÃÎïÌå
                StepStateControl.instance.InvokeInitStepState(GameManager.Instance.systemId, GameManager.ProcessMgr.d_Scheme.id, subProcessID);
                GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, subProcessID);
+                Debug.LogError(ProcessManager.Instance.subProcessStepTriggerID);
                GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
                break;
        }
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_LowTensionWorkTicketPanel.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_LowTensionWorkTicketPanel.cs
@ -16,7 +16,11 @@ public class UI_LowTensionWorkTicketPanel : BasePanel
    {
        base.ShowMe();
        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
+        {
            GetControl<Button>("closeBtn").interactable = false;
+            GetControl<Button>("BackBtn").gameObject.SetActive(false);
+
+        }
    }


--- a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs
@ -57,32 +57,27 @@ public class UI_MenuBar : BasePanel
        if (triggerID == workOrderName)
        {
            GameManager.UIMgr.imageTips.ShowTips(workOrderBtn.GetComponent<RectTransform>());
-            Debug.Log("묏鱗데瓊刻");
+           
        }
        else if (triggerID == disassemblyAssemblyWorkOrderName)
        {
            GameManager.UIMgr.imageTips.ShowTips(disassemblyAssemblyWorkOrderBtn.GetComponent<RectTransform>());
-            Debug.Log("뀔陋묏데瓊刻");
        }
        else if (triggerID == toolKitName)
        {
            GameManager.UIMgr.imageTips.ShowTips(toolKitBtn.GetComponent<RectTransform>());
-            Debug.Log("교관객큐瓊刻");
        }
        else if (triggerID == siteName)
        {
            GameManager.UIMgr.imageTips.ShowTips(siteBtn.GetComponent<RectTransform>());
-            Debug.Log("君끝객큐瓊刻");
        }
        else if (triggerID == officeName)
        {
            GameManager.UIMgr.imageTips.ShowTips(officeBtn.GetComponent<RectTransform>());
-            Debug.Log("곗무杆객큐瓊刻");
        }
        else if (triggerID == toolRoomName)
        {
            GameManager.UIMgr.imageTips.ShowTips(toolRoomBtn.GetComponent<RectTransform>());
-            Debug.Log("묏야쇌객큐瓊刻");
        }
        else
        {
--- a/Assets/Scripts/Wwz/OfficeScene/Responser.cs
+++ b/Assets/Scripts/Wwz/OfficeScene/Responser.cs
@ -1,19 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class Responser : MonoBehaviour
-{
-
-    void Start()
-    {
-        GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
-    }
-
-    private void SwitchSubProcessStepTriggerID(string arg0)
-    {
-        Debug.Log($"MenuClick ===== {arg0}");
-    }
-
-}
--- a/Assets/Scripts/Wwz/OfficeScene/Responser.cs.meta
+++ b/Assets/Scripts/Wwz/OfficeScene/Responser.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 5acc47c41ca61b344ba11e38989c2ac8
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/Wwz/OfficeScene/TerminalEquipment.cs
+++ b/Assets/Scripts/Wwz/OfficeScene/TerminalEquipment.cs
@ -1,21 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 终端设备手机
-/// </summary>
-public class TerminalEquipment : MonoBehaviour
-{
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}
--- a/Assets/Scripts/Wwz/OfficeScene/TerminalEquipment.cs.meta
+++ b/Assets/Scripts/Wwz/OfficeScene/TerminalEquipment.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 4b802178c7fb12e4e833bd98290a0ee3
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/StreamingAssets/BinaryData/TB_Scheme.binary
+++ b/Assets/StreamingAssets/BinaryData/TB_Scheme.binary
--- a/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary
+++ b/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary