Merge remote-tracking branch 'origin/develop_合作分支' into develop_合作分支

# Conflicts:
#	ChivaTechFramework/Assets/StreamingAssets/Config/Audios/220kV隔离开关-GW4A型传动机构和转动部件大修/157.mp3.meta

ChivaTechFramework/Assets/Scenes/云南/220kV主变-调压机构吊出及检修.unity

@@ -9157,7 +9157,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 22
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &41248178
 Transform:
   m_ObjectHideFlags: 0
@@ -16738,7 +16738,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 22
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &69799718
 Transform:
   m_ObjectHideFlags: 0
@@ -175327,7 +175327,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 22
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &770268716
 Transform:
   m_ObjectHideFlags: 0
@@ -290639,7 +290639,7 @@ MonoBehaviour:
   aniName: "\u786E\u8BA4\u68C0\u4FEE\u65B9\u6848\r"
   currentStepID: 1
   selection:
-  - {fileID: 2080456764}
+  - {fileID: 1358949938}
 --- !u!1 &1280359150
 GameObject:
   m_ObjectHideFlags: 0
@@ -308869,7 +308869,7 @@ PrefabInstance:
     - target: {fileID: 919132149155446097, guid: 4fd8362f20fd6d94dbeb92e784ce6909,
         type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4fd8362f20fd6d94dbeb92e784ce6909, type: 3}
@@ -308879,6 +308879,12 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1358949936}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1358949938 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4fd8362f20fd6d94dbeb92e784ce6909,
+    type: 3}
+  m_PrefabInstance: {fileID: 1358949936}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1359172465
 GameObject:
   m_ObjectHideFlags: 0
@@ -396929,7 +396935,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 22
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1728366615
 Transform:
   m_ObjectHideFlags: 0
@@ -401050,7 +401056,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 22
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1746994629
 Transform:
   m_ObjectHideFlags: 0
@@ -454738,7 +454744,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 22
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1831884516
 Transform:
   m_ObjectHideFlags: 0