Explorar o código

提交部分被冲突掉的场景修改

wartheking hai 8 meses
pai
achega
cb88c344af

BIN=BIN
Content/Main.umap


BIN=BIN
Content/VFX/MapBorderCollection/Blueprints/TriggerBoxLevel2.uasset


BIN=BIN
Saved/AutoScreenshot.png


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 5 - 7
Saved/Config/WindowsEditor/EditorPerProjectUserSettings.ini


+ 12 - 0
Saved/Config/WindowsEditor/Engine.ini

@@ -66,6 +66,15 @@ Paths=D:/UEProject/SteelFactory/Plugins/UAssetBrowser/Content
 Paths=../../../../../UEProject/SteelFactory/Plugins/FlowField2D/Content
 Paths=D:/UEProject/SteelFactory/Plugins/FlowField2D/Content
 Paths=../../../../../UEProject/SteelFactory/Plugins/HttpHelper/Content
+Paths=../../../Engine/Plugins/Media/PixelCapture/Content
+Paths=../../../Engine/Plugins/Media/PixelStreaming/Content
+Paths=../../../../../Unreal Projects/SteelFactory/Plugins/HeatMapPlugin/Content
+Paths=../../../../../Unreal Projects/SteelFactory/Plugins/FileHelperPlugin/Content
+Paths=../../../../../Unreal Projects/SteelFactory/Plugins/HttpHelper/Content
+Paths=../../../../../Unreal Projects/SteelFactory/Plugins/WebView/Content
+Paths=../../../../../Unreal Projects/SteelFactory/Plugins/DBTween/Content
+Paths=../../../../../Unreal Projects/SteelFactory/Plugins/FlowField2D/Content
+Paths=../../../../../Unreal Projects/SteelFactory/Plugins/UAssetBrowser/Content
 
 [/Script/UnrealEd.UnrealEdEngine]
 TemplateMapInfos=(ThumbnailTexture=None,Thumbnail="/Engine/Maps/Templates/Thumbnails/OpenWorld.OpenWorld",Map="/Engine/Maps/Templates/OpenWorld",DisplayName="Open World",Category="OpenWorld")
@@ -96,3 +105,6 @@ TunnelMulticastEndpoint=
 [/Script/UnrealEd.EditorEngine]
 FlipNormalMapGreenChannel=False
 
+[Audio]
+UnfocusedVolumeMultiplier=1
+

BIN=BIN
Saved/Config/WorldState/1557959905.json


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 239 - 813
Saved/Logs/SteelFactory.log


BIN=BIN
Saved/SourceControl/UncontrolledChangelists.json


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio