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

ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/10kV真空断路器-VS1型分合闸弹簧更换.unity

@@ -2128,7 +2128,7 @@ MonoBehaviour:
   aniName: "01\u786E\u8BA4\u68C0\u4FEE\u5185\u5BB9\r"
   currentStepID: 1
   selection:
-  - {fileID: 4859385029275675404}
+  - {fileID: 472400006700951630}
 --- !u!1 &193007662
 GameObject:
   m_ObjectHideFlags: 0
@@ -5768,6 +5768,75 @@ Transform:
   m_Father: {fileID: 1404030378}
   m_RootOrder: 41
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &912556477
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: e999593b83469664894691eb71b542e0,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e999593b83469664894691eb71b542e0,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e999593b83469664894691eb71b542e0,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.863
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e999593b83469664894691eb71b542e0,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 2.27
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e999593b83469664894691eb71b542e0,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e999593b83469664894691eb71b542e0,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e999593b83469664894691eb71b542e0,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e999593b83469664894691eb71b542e0,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e999593b83469664894691eb71b542e0,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e999593b83469664894691eb71b542e0,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: e999593b83469664894691eb71b542e0,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: e999593b83469664894691eb71b542e0,
+        type: 3}
+      propertyPath: m_Name
+      value: "\u7279\u6027\u5206\u6790\u4EEA"
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e999593b83469664894691eb71b542e0, type: 3}
 --- !u!1 &915988650
 GameObject:
   m_ObjectHideFlags: 0
@@ -71539,7 +71608,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: b48009b1c3e08a24aa5b43a9c1fe5cba, type: 2}
+  - {fileID: 2100000, guid: c344d08ed4f3df7439636c3ab9ce816e, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0