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

# Conflicts:
#	ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/220kV断路器-LW25型灭弧、导电和绝缘部分解体大修_old.unity.meta
#	ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV断路器-LW35型手动电动分合闸检查/15.mp3.meta

ChivaTechFramework/Assets/GameAssets/03.Models/10.10kV开关柜-KYN28型/工器具.meta

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

ChivaTechFramework/Assets/GameAssets/03.Models/10.10kV开关柜-KYN28型/工器具/尖嘴钳&链条钳&摇把&二次插头.meta

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

ChivaTechFramework/Assets/GameAssets/03.Models/10.10kV开关柜-KYN28型/工器具/推车.meta

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

ChivaTechFramework/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