Merge branch 'feature/LQD' into develop

# Conflicts:
#	35kVPSADS_Platform/Assets/GameAssets/03.Models.meta
#	35kVPSADS_Platform/Assets/GameAssets/03.Models/GongJu_Tex.meta
#	35kVPSADS_Platform/Assets/GameAssets/03.Models/工器具.meta
#	35kVPSADS_Platform/Assets/GameAssets/03.Models/工器具/GongJu_Tex.meta
#	35kVPSADS_Platform/Assets/GameAssets/03.Models/工器具/Materials.meta
#	35kVPSADS_Platform/Assets/Scenes/35kV变压器直阻超标处理.unity.meta
#	35kVPSADS_Platform/Assets/StreamingAssets/Config/Audios.meta
#	35kVPSADS_Platform/Assets/StreamingAssets/Config/流程配置.meta
#	35kVPSADS_Platform/Assets/_TerrainAutoUpgrade/layer_Default_Floor3d3aba195e4d26ee.terrainlayer.meta

35kVPSADS_Platform/ProjectSettings/ProjectSettings.asset

@@ -86,7 +86,7 @@ PlayerSettings:
   bakeCollisionMeshes: 0
   forceSingleInstance: 0
   useFlipModelSwapchain: 1
-  resizableWindow: 0
+  resizableWindow: 1
   useMacAppStoreValidation: 0
   macAppStoreCategory: public.app-category.games
   gpuSkinning: 1
@@ -97,7 +97,7 @@ PlayerSettings:
   xboxEnableFitness: 0
   visibleInBackground: 1
   allowFullscreenSwitch: 1
-  fullscreenMode: 1
+  fullscreenMode: 3
   xboxSpeechDB: 0
   xboxEnableHeadOrientation: 0
   xboxEnableGuest: 0