Merge branch 'feature/cjy' into develop

35kVPSADS_Platform/Assets/Scenes/35kV隔离开关更换支撑瓷管.unity

@@ -11790,21 +11790,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 92cc81563794f39488ffbda29b250acb, type: 3}
---- !u!4 &235772224
+--- !u!4 &235772224 stripped
 Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 92cc81563794f39488ffbda29b250acb,
+    type: 3}
   m_PrefabInstance: {fileID: 235772223}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 673020727}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 1518964614}
-  m_Father: {fileID: 1045532402}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &237740131
 GameObject:
   m_ObjectHideFlags: 0
@@ -18909,7 +18900,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &358393123
 Transform:
   m_ObjectHideFlags: 0
@@ -36338,7 +36329,8 @@ MonoBehaviour:
   m_CurrentAniData: {fileID: 1595745430}
   aniName: "01\u73B0\u573A\u52D8\u5BDF\r"
   currentStepID: 1
-  selection: []
+  selection:
+  - {fileID: 963194225}
 --- !u!1 &669934085
 GameObject:
   m_ObjectHideFlags: 0
@@ -36532,22 +36524,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 672921831}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &673020727
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 235772223}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 235772224}
-  m_Layer: 0
-  m_Name: "35kV_\u53D8\u538B\u5668 (Missing Prefab)"
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &674006667
 GameObject:
   m_ObjectHideFlags: 0
@@ -83835,36 +83811,6 @@ MonoBehaviour:
   finished: 0
   preprocess: {fileID: 0}
   processBase: {fileID: 1518833636}
---- !u!1 &1518964613
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 235772223}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1518964614}
-  m_Layer: 0
-  m_Name: Missing Prefab (Dummy)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1518964614
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 235772223}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1518964613}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 235772224}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1520738049
 GameObject:
   m_ObjectHideFlags: 0
@@ -111264,7 +111210,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &2028653760
 Transform:
   m_ObjectHideFlags: 0

35kVPSADS_Platform/Assets/Art.meta → 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV隔离开关瓷瓶更换解体检修/100.mp3.meta

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: f0b270424b686614ebc184d7703aaf0d
-folderAsset: yes
+guid: f9be7ccfbd45ade4a97e3112922dc117
 DefaultImporter:
   externalObjects: {}
   userData: 

35kVPSADS_Platform/Assets/StreamingAssets/AssetBundles.meta → 35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios/35kV隔离开关瓷瓶更换解体检修/101.mp3.meta

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: 4e66abcb6b46deb488423f4d834abf96
-folderAsset: yes
+guid: 2e2a3b76c9e2b9948a064b2c4d4d8d48
 DefaultImporter:
   externalObjects: {}
   userData: 

35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1037/接地导体.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a46ed46674ec65d4d96a08ad6674992a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1037/电缆接头.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 57a5a5cc2801c1f469aeb198662a38de
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1037/绝缘护套.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c455ed229d1d6e442afe188778f95a13
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1038/主电缆.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ecc4800821d875347b9b58a336706b9c
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1038/分支电缆.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 15645ed7fb24a4e4987d2afb08949c24
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1038/接地导体.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ef5fe989eaec23d4ea984176c4e36bab
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1038/绝缘护套.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8fac1703f490e604ab2314989b1bfad0
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1041/低压出线柜.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cd72a968f66cf0f4f9a14efc36b0d482
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1041/低压进出线柜.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: db82d93afdb45734a9a4ac3ff6c9a9bc
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1041/出线间隔.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 358bd91858e434b43a9c0618ea1aa25e
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1041/变压器本体.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8e0ff773d57c7554c8abd25ea5285f39
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1041/进线间隔.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8711b8e7a5edc43429d8fa729a0ce792
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: