Merge branch 'feature/bj' into develop_合作分支

# Conflicts:
#	ChivaTechFramework/Assets/StreamingAssets/Config/Audios/220kV主变-主变解体大修(回装)/116.mp3.meta
#	ChivaTechFramework/Assets/StreamingAssets/Config/Audios/220kV主变-主变解体大修/116.mp3.meta

ChivaTechFramework/Assets/Scenes/云南/自由模式/主变冷却散热系统大修(油流继电器)_Free.unity

@@ -184170,6 +184170,7 @@ GameObject:
   m_Component:
   - component: {fileID: 318734187}
   - component: {fileID: 318734188}
+  - component: {fileID: 318734189}
   m_Layer: 0
   m_Name: "\u65B0\u6CB9\u6D41\u7EE7\u7535\u5668\u53C2\u6570\u786E\u5B9A\r"
   m_TagString: Untagged
@@ -184215,6 +184216,21 @@ MonoBehaviour:
   useTool: 0
   choseToolNames: []
   useToolIndependentAni: 0
+--- !u!114 &318734189
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 318734186}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 98febcfcdd1b2954989010e8b02e54ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  freeProcessType: 1
+  markName: 
+  assembleObjInfos: []
 --- !u!1 &318862937
 GameObject:
   m_ObjectHideFlags: 0
@@ -647985,6 +648001,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1092437846}
   - component: {fileID: 1092437847}
+  - component: {fileID: 1092437848}
   m_Layer: 0
   m_Name: "\u5916\u89C2\u68C0\u67E5\r"
   m_TagString: Untagged
@@ -648030,6 +648047,21 @@ MonoBehaviour:
   useTool: 0
   choseToolNames: []
   useToolIndependentAni: 0
+--- !u!114 &1092437848
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1092437845}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 98febcfcdd1b2954989010e8b02e54ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  freeProcessType: 1
+  markName: 
+  assembleObjInfos: []
 --- !u!1 &1092448731
 GameObject:
   m_ObjectHideFlags: 0
@@ -765393,6 +765425,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1295216708}
   - component: {fileID: 1295216709}
+  - component: {fileID: 1295216710}
   m_Layer: 0
   m_Name: "\u5185\u90E8\u68C0\u67E5\r"
   m_TagString: Untagged
@@ -765438,6 +765471,21 @@ MonoBehaviour:
   useTool: 0
   choseToolNames: []
   useToolIndependentAni: 0
+--- !u!114 &1295216710
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1295216707}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 98febcfcdd1b2954989010e8b02e54ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  freeProcessType: 1
+  markName: 
+  assembleObjInfos: []
 --- !u!1 &1295364863
 GameObject:
   m_ObjectHideFlags: 0
@@ -869360,7 +869408,7 @@ MonoBehaviour:
   aniName: "\u786E\u8BA4\u68C0\u4FEE\u65B9\u6848\r"
   currentStepID: 1
   selection:
-  - {fileID: 587873893}
+  - {fileID: 318734186}
 --- !u!1 &1475596766
 GameObject:
   m_ObjectHideFlags: 0