Merge branch 'SXElectricityInformationAcquisition' of http://gitea.umayle.com/huangjiayu/ShanxiKnowledgeBase into SXElectricityInformationAcquisition

# Conflicts:
#	SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity

SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/StepData.json

@@ -13,6 +13,13 @@
             "变电箱_门",
             "插座"
           ]
+        },{
+          "description": "我i开采。",
+          "score": 0,
+          "isSequential": true,
+          "targetObjects": [
+            "插座"
+          ]
         }
       ]
     },
@@ -29,122 +36,6 @@
           ]
         }
       ]
-    },
-    {
-      "stepDescription": "步骤 3 描述",
-      "score": 0,
-      "actions": [
-        {
-          "description": "用螺丝刀打开接线盒",
-          "score": 0,
-          "isSequential": false,
-          "targetObjects": [
-            "接线盒_封印R",
-            "接线盒_封印L",
-            "固定螺丝_Ldown",
-            "盖_固定螺丝_Rup"
-          ]
-        }
-      ]
-    },
-    {
-      "stepDescription": "步骤 5 描述",
-      "score": 0,
-      "actions": [
-        {
-          "description": "用螺丝刀打开接线盒，将拨片调整至断电状态（带电作业调整横向滑块，断电作业调整竖向滑块，系统默认断电作业），开始作业；",
-          "score": 0,
-          "isSequential": false,
-          "targetObjects": [
-            "接线盒纵向滑块001",
-            "接线盒纵向滑块002",
-            "接线盒纵向滑块003",
-            "接线盒纵向滑块004"
-          ]
-        }
-      ]
-    },
-    {
-      "stepDescription": "步骤 6 描述",
-      "score": 0,
-      "actions": [
-        {
-          "description": "打开集中器封印，去除螺丝;",
-          "score": 0,
-          "isSequential": false,
-          "targetObjects": [
-            "集中器_封印R",
-            "集中器_封印_L",
-            "壳固定螺丝_R",
-            "壳固定螺丝_L"
-          ]
-        }
-      ]
-    },
-    {
-      "stepDescription": "步骤 4 描述",
-      "score": 0,
-      "actions": [
-        {
-          "description": "将集中器连接线的螺丝全部拧开，拧开两个固定该线的螺丝后，线消失。;",
-          "score": 0,
-          "isSequential": true,
-          "targetObjects": [
-            "变电箱_门",
-            "插座"
-          ]
-        },{
-          "description": "将集中器连接线的螺丝全部拧开，拧开两个固定该线的螺丝后，线消失。;",
-          "score": 0,
-          "isSequential": false,
-          "targetObjects": [
-            "变电箱_门",
-            "插座"
-          ]
-        }
-      ]
-    },
-    {
-      "stepDescription": "步骤 4 描述",
-      "score": 0,
-      "actions": [
-        {
-          "description": "将集中器连接线的螺丝全部拧开，拧开两个固定该线的螺丝后，线消失。;",
-          "score": 0,
-          "isSequential": false,
-          "targetObjects": [
-            "JZQ_螺丝005",
-            "JZQ_螺丝006",
-            "JZQ_螺丝009",
-            "JZQ_螺丝010",
-            "JZQ_螺丝015",
-            "JZQ_螺丝016",
-            "JZQ_螺丝021",
-            "JZQ_螺丝022",
-            "JZQ_螺丝023",
-            "JZQ_螺丝024",
-            "JZQ_螺丝041",
-            "JZQ_螺丝042"
-          ]
-        }
-      ]
-    },
-    {
-      "stepDescription": "步骤 6 描述",
-      "score": 0,
-      "actions": [
-        {
-          "description": "打开集中器封印，去除螺丝;",
-          "score": 0,
-          "isSequential": false,
-          "targetObjects": [
-            "集中器_封印R",
-            "集中器_封印_L",
-            "壳固定螺丝_R",
-            "壳固定螺丝_L"
-          ]
-        }
-      ]
     }
   ]
 }