Merge branch 'feature/cjy' into develop

# Conflicts:
#	35kVPSADS_Platform/Assets/03.Models/220kV主变检修.meta
#	35kVPSADS_Platform/Assets/03.Models/220kV变压器.meta
#	35kVPSADS_Platform/Assets/03.Models/35kV_主变压器.fbm.meta
#	35kVPSADS_Platform/Assets/03.Models/变压器更改.fbm.meta
#	35kVPSADS_Platform/Assets/03.Models/工器具/工具/游标卡尺.meta
#	35kVPSADS_Platform/Assets/03.Models/工器具/工具/电缆接头制作工具包.meta
#	35kVPSADS_Platform/Assets/03.Models/工器具/工具/电阻测量仪.meta

35kVPSADS_Platform/ProjectSettings/ProjectSettings.asset

@@ -17,7 +17,7 @@ PlayerSettings:
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
-  m_ShowUnitySplashScreen: 0
+  m_ShowUnitySplashScreen: 1
   m_ShowUnitySplashLogo: 1
   m_SplashScreenOverlayOpacity: 1
   m_SplashScreenAnimation: 1