From 7cddb5ecc3346d9ab202b0e7ae5b5f500630aeb7 Mon Sep 17 00:00:00 2001
From: liuyu <272912176@qq.com>
Date: Fri, 13 Sep 2024 15:24:58 +0800
Subject: [PATCH] =?UTF-8?q?13=E6=97=A5=E4=B8=8B=E5=8D=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assets/Scenes/Start.unity                 |  16 +
 .../Scripts/FaultRecords/FaultRecordUI.cs     |   2 +-
 .../Assets/Scripts/HQB/ScoreCheckPoint.cs     |  30 ++
 .../Scripts/HQB/ScoreCheckPoint.cs.meta       |  11 +
 .../Assets/Scripts/HQB/WorkorderComponent.cs  |  44 +++
 .../Scripts/HQB/WorkorderComponent.cs.meta    |  11 +
 .../Assets/Scripts/IndicatorArrowComponent.cs |   5 +-
 .../ProcessMode/AnimationProcessManager.cs    |  52 ++-
 .../Assets/Scripts/ProcessMode/ProcessMode.cs |   8 +-
 .../DataConfig/SceneStepData - HQB副本.json   | 358 ++++++++++++++++++
 .../SceneStepData - HQB副本.json.meta         |   7 +
 .../DataConfig/SceneStepData.json             | 151 ++------
 .../Assets/ToolManager.cs                     |   1 +
 .../Assets/taoruiqi/Script/ToolsManager.cs    |  11 +-
 14 files changed, 581 insertions(+), 126 deletions(-)
 create mode 100644 SXElectricityInformationAcquisition/Assets/Scripts/HQB/ScoreCheckPoint.cs
 create mode 100644 SXElectricityInformationAcquisition/Assets/Scripts/HQB/ScoreCheckPoint.cs.meta
 create mode 100644 SXElectricityInformationAcquisition/Assets/Scripts/HQB/WorkorderComponent.cs
 create mode 100644 SXElectricityInformationAcquisition/Assets/Scripts/HQB/WorkorderComponent.cs.meta
 create mode 100644 SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData - HQB副本.json
 create mode 100644 SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData - HQB副本.json.meta

diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity b/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity
index 3e725612..d8a99e43 100644
--- a/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity
+++ b/SXElectricityInformationAcquisition/Assets/Scenes/Start.unity
@@ -11049,6 +11049,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   toolsPackMenuBtOnClick: {fileID: 10415334}
+  catchedTools: []
 --- !u!1 &1047742104
 GameObject:
   m_ObjectHideFlags: 0
@@ -23594,6 +23595,7 @@ GameObject:
   - component: {fileID: 2020880424}
   - component: {fileID: 2020880426}
   - component: {fileID: 2020880425}
+  - component: {fileID: 2020880427}
   m_Layer: 5
   m_Name: "\u5DE5\u4F5C\u5355UI"
   m_TagString: Untagged
@@ -23659,6 +23661,20 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2020880423}
   m_CullTransparentMesh: 1
+--- !u!114 &2020880427
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2020880423}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0b07dc75a0e6bb64ea4dadfd5dab85f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  filledOrder: 0
+  weighRoot: {fileID: 1364082822}
 --- !u!1 &2039310410
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/FaultRecords/FaultRecordUI.cs b/SXElectricityInformationAcquisition/Assets/Scripts/FaultRecords/FaultRecordUI.cs
index 4f52dcaa..fb972b67 100644
--- a/SXElectricityInformationAcquisition/Assets/Scripts/FaultRecords/FaultRecordUI.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/FaultRecords/FaultRecordUI.cs
@@ -88,7 +88,7 @@ namespace DefaultNamespace.FaultRecords
             {
                 GameObject item = Instantiate(recordItemPrefab, recordListContent);
                 item.transform.Find("Content").GetComponent<TMP_Text>().text = record.value.content ;
-                item.transform.Find("Index").GetComponent<TMP_Text>().text = record.index.ToString() ;
+                item.transform.Find("Index").GetComponent<TMP_Text>().text = (record.index + 1).ToString();//LY
                 int index = record.index;
                 item.GetComponentInChildren<Button>().onClick.AddListener(() => OnDeleteButtonClicked(index));
             }
diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/HQB/ScoreCheckPoint.cs b/SXElectricityInformationAcquisition/Assets/Scripts/HQB/ScoreCheckPoint.cs
new file mode 100644
index 00000000..c4fb8aca
--- /dev/null
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/HQB/ScoreCheckPoint.cs
@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// �ڷ��������Է�����������
+/// </summary>
+public class ScoreCheckPoint : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
+
+/// <summary>
+/// ���������
+/// </summary>
+public enum CheckPoint
+{ 
+    Start,
+    FirstInLive
+}
diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/HQB/ScoreCheckPoint.cs.meta b/SXElectricityInformationAcquisition/Assets/Scripts/HQB/ScoreCheckPoint.cs.meta
new file mode 100644
index 00000000..498469b2
--- /dev/null
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/HQB/ScoreCheckPoint.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 27ee1913a53c2314fa75efdf5f70df79
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/HQB/WorkorderComponent.cs b/SXElectricityInformationAcquisition/Assets/Scripts/HQB/WorkorderComponent.cs
new file mode 100644
index 00000000..3dec72c3
--- /dev/null
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/HQB/WorkorderComponent.cs
@@ -0,0 +1,44 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class WorkorderComponent : MonoBehaviour
+{
+    static public WorkorderComponent instance;
+    [HideInInspector]
+    public bool filledOrder = false;
+    public Transform weighRoot;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        for (int i = 0; i < weighRoot.childCount; i++)
+        {
+            if (weighRoot.gameObject.name.Contains("Toggle"))
+            {
+                weighRoot.GetComponent<Toggle>().onValueChanged.AddListener(OrderChanged);
+            }
+            else if (weighRoot.gameObject.name.Contains("InputField"))
+            {
+                weighRoot.GetComponent<InputField>().onValueChanged.AddListener(OrderChanged);
+            }
+        }
+    }
+
+    public void OrderChanged(bool b)
+    { 
+        filledOrder = true;
+    }
+
+    public void OrderChanged(string s)
+    {
+        filledOrder = true;
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/HQB/WorkorderComponent.cs.meta b/SXElectricityInformationAcquisition/Assets/Scripts/HQB/WorkorderComponent.cs.meta
new file mode 100644
index 00000000..c8ba4e9c
--- /dev/null
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/HQB/WorkorderComponent.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0b07dc75a0e6bb64ea4dadfd5dab85f6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/IndicatorArrowComponent.cs b/SXElectricityInformationAcquisition/Assets/Scripts/IndicatorArrowComponent.cs
index fcf83660..53daf791 100644
--- a/SXElectricityInformationAcquisition/Assets/Scripts/IndicatorArrowComponent.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/IndicatorArrowComponent.cs
@@ -31,7 +31,10 @@ public class IndicatorArrowComponent : MonoBehaviour
 
         teachingModePrompt.SetActive(true);
         MotionEngine.GetModule<AnimationProcessManager>().OnTeachingPromptsObjects += TeachingPromptsObjects;
-        MotionEngine.GetModule<AnimationProcessManager>().OnStepProcessDescriptionMessage += OnSendMessagePrompt;
+        if (MotionEngine.GetModule<DataConfigManager>().GetProcessMode() == ProcessMode.Teaching)//LY除了教学模式都弹出提示
+        {
+            MotionEngine.GetModule<AnimationProcessManager>().OnStepProcessDescriptionMessage += OnSendMessagePrompt;
+        }
     }
 
     /// <summary>
diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs
index ae6ba4c8..2a6c12eb 100644
--- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs
@@ -276,7 +276,7 @@ namespace DefaultNamespace.ProcessMode
 
             if (_currentActionIndex >= step.Actions.Count)
             {
-                Debug.Log("所有动作完成！");
+                Debug.Log("所有动作完成！=>" + step.StepDescription);
                 step.IsCompleted = true;
                 if (_currentMode == ProcessMode.Practice)
                 {
@@ -535,6 +535,7 @@ namespace DefaultNamespace.ProcessMode
         public int CalculateTotalScore()
         {
             float totalScore = 0;
+            if (!_processes.ContainsKey(_currentMode.ToString())) return -1;
             foreach (var step in _processes[_currentMode.ToString()].Steps)
             {
                 SubmitScoreStep sub = new SubmitScoreStep();
@@ -586,6 +587,7 @@ namespace DefaultNamespace.ProcessMode
 
         public void OnUpdate()
         {
+            Debug.Log("==>当前得分：" + CalculateTotalScore());
         }
 
         public void OnDestroy()
@@ -716,5 +718,53 @@ namespace DefaultNamespace.ProcessMode
             // _submitScoreSteps = new List<SubmitScoreStep>() { new SubmitScoreStep() { score = 10, stepName = "asd", testPoint = "大苏打实打实打算" } };
             return _submitScoreSteps;
         }
+
+        /// <summary>
+        /// HQB 在考试模式下对分数进行修正，结算点：
+        /// </summary>
+        public int AdjustedTotalScore()
+        { 
+        
+        }
+
+        //public void AdjustScoreInPractice(CheckPoint checkPoint)
+        //{
+        //    if (!_processes.ContainsKey(_currentMode.ToString())) return;
+        //    switch (checkPoint)
+        //    {
+        //        case CheckPoint.FirstInLive://第一次从工具间到现场
+        //            foreach (var step in _processes[_currentMode.ToString()].Steps)
+        //            {
+        //                switch (step.StepDescription)
+        //                {
+        //                    case "填写工作票":
+        //                        if (!step.IsCompleted)
+        //                        {
+        //                            foreach (var item in _incorrectClicksPerStep)//检查_incorrectClicksPerStep
+        //                            {
+        //                                foreach (var item1 in item.Value)
+        //                                {
+        //                                    if (item1.Contains("工作单") && WorkorderComponent.instance.filledOrder)
+        //                                    {
+        //                                        step.IsCompleted = true;
+        //                                        step.Score = 10;
+        //                                    }
+        //                                }
+        //                            }
+        //                        }
+        //                        step.IsCompleted = WorkorderComponent.instance.filledOrder;
+        //                        break;
+        //                    case "领取工器具及仪器设备":
+        //                        if (!step.IsCompleted)
+        //                        {
+
+        //                        }
+        //                        break;
+        //                }
+        //            }
+        //            _incorrectClicksPerStep.Clear();
+        //            break;
+        //    }
+        //}
     }
 }
\ No newline at end of file
diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/ProcessMode.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/ProcessMode.cs
index b16df286..976db7c8 100644
--- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/ProcessMode.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/ProcessMode.cs
@@ -8,19 +8,19 @@ namespace DefaultNamespace.ProcessMode
         /// <summary>
         /// 教学模式
         /// </summary>
-        Teaching, 
+        Teaching = 2, 
         /// <summary>
         /// 培训模式
         /// </summary>
-        Training, 
+        Training = 3, 
         /// <summary>
         /// 练习模式
         /// </summary>
-        Practice,  
+        Practice = 0,  
         /// <summary>
         ///  考核模式
         /// </summary>
-        Assessment 
+        Assessment = 1
     }
 
 }
\ No newline at end of file
diff --git a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData - HQB副本.json b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData - HQB副本.json
new file mode 100644
index 00000000..1aaa2c7a
--- /dev/null
+++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData - HQB副本.json	
@@ -0,0 +1,358 @@
+{
+  "steps": [
+    {
+      "stepDescription": "填写工作票",
+      "score": 10,
+      "actions": [
+        {
+          "description": "选择",
+          "score": 0,
+          "isUI": false,
+          "isSequential": true,
+          "targetObjects": [
+            "工作单"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "领取工器具及仪器设备",
+      "score": 20,
+      "actions": [
+        {
+          "description": "领取",
+          "score": 30,
+          "isUI": false,
+          "isSequential": false,
+          "targetObjects": [
+            "螺丝刀",
+            "剥线钳",
+            "绝缘胶带",
+            "验电笔",
+            "盒装封印",
+            "安全帽",
+            "纱布手套",
+            "工作服",
+            "l型集中器",
+            "梯子",
+            "工作证"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "佩戴装备检视",
+      "score": 5,
+      "actions": [
+        {
+          "description": "佩戴装备前往",
+          "score": 0,
+          "isUI": false,
+          "isSequential": false,
+          "targetObjects": [
+            "梳妆镜"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "前往现场",
+      "score": 5,
+      "actions": [
+        {
+          "description": "点击按钮 ",
+          "score": 0,
+          "isUI": true,
+          "isSequential": false,
+          "targetObjects": [
+            "前往现场"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "前往现场",
+      "score": 5,
+      "actions": [
+        {
+          "description": "前往",
+          "score": 0,
+          "isUI": false,
+          "isSequential": true,
+          "targetObjects": [
+            "客户"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "验电",
+      "score": 10,
+      "actions": [
+        {
+          "description": "验电笔验电",
+          "score": 0,
+          "isUI": false,
+          "isSequential": true,
+          "targetObjects": [
+            "插座",
+            "箱体",
+            "插座"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "柜门封印",
+      "score": 3.11,
+      "actions": [
+        {
+          "description": "剥线钳打开",
+          "score": 0,
+          "isUI": false,
+          "isSequential": true,
+          "targetObjects": [
+            "柜门_封印"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "更换集中器",
+      "score": 3.11,
+      "actions": [
+        {
+          "description": "剥线钳更换",
+          "score": 0,
+          "isUI": false,
+          "isSequential": false,
+          "targetObjects": [
+            "接线盒_封印R",
+            "接线盒_封印L"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "更换集中器",
+      "score": 3.11,
+      "actions": [
+        {
+          "description": "螺丝刀扭开",
+          "score": 0,
+          "isUI": false,
+          "isSequential": false,
+          "targetObjects": [
+            "盖_固定螺丝_Rup",
+            "固定螺丝_Ldown"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "更换集中器",
+      "score": 3.11,
+      "actions": [
+        {
+          "description": "滑动",
+          "score": 0,
+          "isUI": false,
+          "isSequential": true,
+          "targetObjects": [
+            "接线盒纵向滑块004",
+            "接线盒横向上滑块003",
+            "接线盒纵向滑块003",
+            "接线盒横向上滑块001",
+            "接线盒纵向滑块002",
+            "接线盒横向上滑块002",
+            "接线盒纵向滑块001"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "更换集中器",
+      "score": 3.11,
+      "actions": [
+        {
+          "description": "螺丝刀扭开",
+          "score": 0,
+          "isUI": false,
+          "isSequential": false,
+          "targetObjects": [
+            "集中器_封印R",
+            "集中器_封印_L",
+            "壳固定螺丝_R",
+            "壳固定螺丝_L"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "更换集中器",
+      "score": 3.11,
+      "actions": [
+        {
+          "description": "螺丝刀扭开",
+          "score": 0,
+          "isUI": false,
+          "isSequential": false,
+          "targetObjects": [
+            "JZQ_螺丝001",
+            "JZQ_螺丝0011",
+            "JZQ_螺丝002",
+            "JZQ_螺丝0022",
+            "JZQ_螺丝003",
+            "JZQ_螺丝0033",
+            "JZQ_螺丝004",
+            "JZQ_螺丝0044",
+            "JZQ_螺丝006",
+            "JZQ_螺丝005"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "更换集中器",
+      "score": 3.11,
+      "actions": [
+        {
+          "description": "绝缘胶带绑",
+          "score": 0,
+          "isUI": false,
+          "isSequential": true,
+          "targetObjects": [
+            "pCylinder170"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "更换集中器",
+      "score": 3.11,
+      "actions": [
+        {
+          "description": "螺丝刀扭开",
+          "score": 0,
+          "isUI": false,
+          "isSequential": false,
+          "targetObjects": [
+            "固定螺丝_Rdown",
+            "集电器固定螺丝_Ldown"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "更换集中器",
+      "score": 3.11,
+      "actions": [
+        {
+          "description": "更换",
+          "score": 0,
+          "isUI": false,
+          "isSequential": false,
+          "targetObjects": [
+            "新的集中器碰撞"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "更换集中器",
+      "score": 3.12,
+      "actions": [
+        {
+          "description": "螺丝刀上",
+          "score": 0,
+          "isUI": false,
+          "isSequential": false,
+          "targetObjects": [
+            "JZQ_螺丝1",
+            "JZQ_螺丝2",
+            "JZQ_螺丝3",
+            "JZQ_螺丝4",
+            "JZQ_螺丝6",
+            "JZQ_螺丝7"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "临时用电",
+      "score": 5,
+      "actions": [
+        {
+          "description": "打开",
+          "score": 0,
+          "isUI": true,
+          "isSequential": false,
+          "targetObjects": [
+            "临时用电"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "加装封印",
+      "score": 1.4,
+      "actions": [
+        {
+          "description": "加装封印",
+          "score": 0,
+          "isUI": false,
+          "isSequential": false,
+          "targetObjects": [
+            "盖_透明外壳"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "加装封印",
+      "score": 1.4,
+      "actions": [
+        {
+          "description": "加装封印",
+          "score": 0,
+          "isUI": false,
+          "isSequential": false,
+          "targetObjects": [
+            "透明盖子封印碰撞R",
+            "透明盖子封印碰撞L"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "加装封印",
+      "score": 1.4,
+      "actions": [
+        {
+          "description": "加装封印",
+          "score": 0,
+          "isUI": false,
+          "isSequential": false,
+          "targetObjects": [
+            "变电箱_门"
+          ]
+        }
+      ]
+    },
+    {
+      "stepDescription": "加装封印",
+      "score": 1.4,
+      "actions": [
+        {
+          "description": "加装封印",
+          "score": 0,
+          "isUI": false,
+          "isSequential": false,
+          "targetObjects": [
+            "柜门卡栓"
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData - HQB副本.json.meta b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData - HQB副本.json.meta
new file mode 100644
index 00000000..78d9d0eb
--- /dev/null
+++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData - HQB副本.json.meta	
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cd83545d54cd3f04aa44bfedfbb566ea
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json
index 1aaa2c7a..19e6c1ac 100644
--- a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json
+++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json
@@ -6,7 +6,7 @@
       "actions": [
         {
           "description": "选择",
-          "score": 0,
+          "score": 10,
           "isUI": false,
           "isSequential": true,
           "targetObjects": [
@@ -21,7 +21,7 @@
       "actions": [
         {
           "description": "领取",
-          "score": 30,
+          "score": 20,
           "isUI": false,
           "isSequential": false,
           "targetObjects": [
@@ -46,7 +46,7 @@
       "actions": [
         {
           "description": "佩戴装备前往",
-          "score": 0,
+          "score": 5,
           "isUI": false,
           "isSequential": false,
           "targetObjects": [
@@ -57,26 +57,11 @@
     },
     {
       "stepDescription": "前往现场",
-      "score": 5,
+      "score": 10,
       "actions": [
         {
-          "description": "点击按钮 ",
-          "score": 0,
-          "isUI": true,
-          "isSequential": false,
-          "targetObjects": [
-            "前往现场"
-          ]
-        }
-      ]
-    },
-    {
-      "stepDescription": "前往现场",
-      "score": 5,
-      "actions": [
-        {
-          "description": "前往",
-          "score": 0,
+          "description": "前往现场后需要与客户沟通",
+          "score": 10,
           "isUI": false,
           "isSequential": true,
           "targetObjects": [
@@ -91,7 +76,7 @@
       "actions": [
         {
           "description": "验电笔验电",
-          "score": 0,
+          "score": 10,
           "isUI": false,
           "isSequential": true,
           "targetObjects": [
@@ -104,7 +89,7 @@
     },
     {
       "stepDescription": "柜门封印",
-      "score": 3.11,
+      "score": 0,
       "actions": [
         {
           "description": "剥线钳打开",
@@ -119,46 +104,18 @@
     },
     {
       "stepDescription": "更换集中器",
-      "score": 3.11,
+      "score": 4,
       "actions": [
         {
-          "description": "剥线钳更换",
-          "score": 0,
+          "description": "打开接线盒，调整拨片",
+          "score": 4,
           "isUI": false,
           "isSequential": false,
           "targetObjects": [
             "接线盒_封印R",
-            "接线盒_封印L"
-          ]
-        }
-      ]
-    },
-    {
-      "stepDescription": "更换集中器",
-      "score": 3.11,
-      "actions": [
-        {
-          "description": "螺丝刀扭开",
-          "score": 0,
-          "isUI": false,
-          "isSequential": false,
-          "targetObjects": [
+            "接线盒_封印L",
             "盖_固定螺丝_Rup",
-            "固定螺丝_Ldown"
-          ]
-        }
-      ]
-    },
-    {
-      "stepDescription": "更换集中器",
-      "score": 3.11,
-      "actions": [
-        {
-          "description": "滑动",
-          "score": 0,
-          "isUI": false,
-          "isSequential": true,
-          "targetObjects": [
+            "固定螺丝_Ldown",
             "接线盒纵向滑块004",
             "接线盒横向上滑块003",
             "接线盒纵向滑块003",
@@ -172,11 +129,11 @@
     },
     {
       "stepDescription": "更换集中器",
-      "score": 3.11,
+      "score": 4,
       "actions": [
         {
-          "description": "螺丝刀扭开",
-          "score": 0,
+          "description": "打开集中器盒子",
+          "score": 4,
           "isUI": false,
           "isSequential": false,
           "targetObjects": [
@@ -190,11 +147,11 @@
     },
     {
       "stepDescription": "更换集中器",
-      "score": 3.11,
+      "score": 4,
       "actions": [
         {
           "description": "螺丝刀扭开",
-          "score": 0,
+          "score": 4,
           "isUI": false,
           "isSequential": false,
           "targetObjects": [
@@ -214,11 +171,11 @@
     },
     {
       "stepDescription": "更换集中器",
-      "score": 3.11,
+      "score": 4,
       "actions": [
         {
           "description": "绝缘胶带绑",
-          "score": 0,
+          "score": 4,
           "isUI": false,
           "isSequential": true,
           "targetObjects": [
@@ -229,11 +186,11 @@
     },
     {
       "stepDescription": "更换集中器",
-      "score": 3.11,
+      "score": 4,
       "actions": [
         {
           "description": "螺丝刀扭开",
-          "score": 0,
+          "score": 4,
           "isUI": false,
           "isSequential": false,
           "targetObjects": [
@@ -245,11 +202,11 @@
     },
     {
       "stepDescription": "更换集中器",
-      "score": 3.11,
+      "score": 4,
       "actions": [
         {
           "description": "更换",
-          "score": 0,
+          "score": 4,
           "isUI": false,
           "isSequential": false,
           "targetObjects": [
@@ -260,11 +217,11 @@
     },
     {
       "stepDescription": "更换集中器",
-      "score": 3.12,
+      "score": 4,
       "actions": [
         {
           "description": "螺丝刀上",
-          "score": 0,
+          "score": 4,
           "isUI": false,
           "isSequential": false,
           "targetObjects": [
@@ -280,11 +237,11 @@
     },
     {
       "stepDescription": "临时用电",
-      "score": 5,
+      "score": 10,
       "actions": [
         {
           "description": "打开",
-          "score": 0,
+          "score": 10,
           "isUI": true,
           "isSequential": false,
           "targetObjects": [
@@ -295,60 +252,18 @@
     },
     {
       "stepDescription": "加装封印",
-      "score": 1.4,
+      "score": 7,
       "actions": [
         {
           "description": "加装封印",
-          "score": 0,
-          "isUI": false,
-          "isSequential": false,
-          "targetObjects": [
-            "盖_透明外壳"
-          ]
-        }
-      ]
-    },
-    {
-      "stepDescription": "加装封印",
-      "score": 1.4,
-      "actions": [
-        {
-          "description": "加装封印",
-          "score": 0,
+          "score": 7,
           "isUI": false,
           "isSequential": false,
           "targetObjects": [
+            "盖_透明外壳",
             "透明盖子封印碰撞R",
-            "透明盖子封印碰撞L"
-          ]
-        }
-      ]
-    },
-    {
-      "stepDescription": "加装封印",
-      "score": 1.4,
-      "actions": [
-        {
-          "description": "加装封印",
-          "score": 0,
-          "isUI": false,
-          "isSequential": false,
-          "targetObjects": [
-            "变电箱_门"
-          ]
-        }
-      ]
-    },
-    {
-      "stepDescription": "加装封印",
-      "score": 1.4,
-      "actions": [
-        {
-          "description": "加装封印",
-          "score": 0,
-          "isUI": false,
-          "isSequential": false,
-          "targetObjects": [
+            "透明盖子封印碰撞L",
+            "变电箱_门",
             "柜门卡栓"
           ]
         }
diff --git a/SXElectricityInformationAcquisition/Assets/ToolManager.cs b/SXElectricityInformationAcquisition/Assets/ToolManager.cs
index 4e2118fb..8f07cfde 100644
--- a/SXElectricityInformationAcquisition/Assets/ToolManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/ToolManager.cs
@@ -201,6 +201,7 @@ public class ToolManager : MonoBehaviour
                     Tool[2].gameObject.SetActive(true);
                     TooslManager.instance.currentTool = Tool[2];
                     RetractBtn[0].gameObject.SetActive(true);
+                    Tool[2].transform.localScale = new Vector3(0.001f, 0.001f, 0.001f);//LY
                 }
             
                 if (message == "��˿��")
diff --git a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs
index 3514c6a1..c3b4836a 100644
--- a/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ToolsManager.cs
@@ -72,7 +72,16 @@ public class TooslManager : MonoBehaviour
             tool.toolObject.transform.SetParent(PlayercameraTrans.transform);
             tool.toolObject.transform.localPosition = tool.originalPosition;
             tool.toolObject.transform.localRotation = tool.originalRotation;
-            tool.toolObject.SetActive(false);
+            if (tool.toolObject.transform.name == "����ǯ")
+            {
+                tool.toolObject.transform.localScale = new Vector3(0.000001f, 0.000001f, 0.000001f);//LY
+                tool.returnButton.gameObject.SetActive(false);
+                TooslManager.instance.currentTool = null;
+            }
+            else
+            {
+                tool.toolObject.SetActive(false);
+            }
             Debug.Log("�ڶ���λ�ã�" + tool.originalPosition);
         }
         UIManager.instance.toolsPackMenuBtOnClick.selfBtn.interactable = true ;//HQB��������֮�󹤾߰��ʹ򲻿���