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

# Conflicts:
#	SXElectricityInformationAcquisition/Assembly-CSharp.csproj

SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity

@@ -31065,8 +31065,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1516723168}
-  - component: {fileID: 1516723167}
   - component: {fileID: 1516723169}
+  - component: {fileID: 1516723170}
   m_Layer: 0
   m_Name: GameObject
   m_TagString: Untagged
@@ -31074,18 +31074,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!114 &1516723167
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1516723166}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 51f73ee94f284a86b677a6bc74544094, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!4 &1516723168
 Transform:
   m_ObjectHideFlags: 0
@@ -31114,6 +31102,18 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   toolsPackScene: 1
+--- !u!114 &1516723170
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1516723166}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 51f73ee94f284a86b677a6bc74544094, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1521115505
 GameObject:
   m_ObjectHideFlags: 0