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

# Conflicts:
#	ChivaTechFramework/Assets/GameAssets/03.Models/09.10kV开关柜-KYN28型/配电室_10kV_开关柜改动.fbm.meta

ChivaTechFramework/Assets/GameAssets/StreamingAssets/AssetBundles.meta

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

ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/10kV开关柜-KYN28型接地回路检修.unity

@@ -187539,7 +187539,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 246924928620097130}
   m_LocalRotation: {x: 0.7071068, y: 1.5095603e-14, z: 0.00000012363448, w: 0.7071067}
-  m_LocalPosition: {x: -0.00000061035155, y: -0.00019561767, z: 0.0000012207031}
+  m_LocalPosition: {x: 0, y: -0.0227, z: -0.0068}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 5131669081098248432}
@@ -217631,7 +217631,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6344096586742456997}
   m_LocalRotation: {x: 0.7071068, y: 1.5095603e-14, z: 0.00000012363448, w: 0.7071067}
-  m_LocalPosition: {x: -0, y: 0.02529602, z: 0}
+  m_LocalPosition: {x: 0, y: 0.0028, z: -0.0068}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 5131669081098248432}
@@ -248648,7 +248648,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &4594849606234125519
 GameObject:
   m_ObjectHideFlags: 0