Merge branch 'main' of http://10.30.3.219:3000/MengJunBo/ChangChunM1

# Conflicts: # Content/Widget/LayingExploration/WBP_LayingExplorDesk.uasset
2024-04-10 19:25:04 +08:00 · 2024-04-10 19:25:04 +08:00 · 7709eea38a
parent bf58c87ec5 f4302e9e90
commit 7709eea38a
26 changed files with 2 additions and 2 deletions
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@ -43,8 +43,8 @@ AppliedDefaultGraphicsPerformance=Maximum
 [/Script/Engine.RendererSettings]
 r.GenerateMeshDistanceFields=True
-r.DynamicGlobalIlluminationMethod=1
+r.DynamicGlobalIlluminationMethod=0
-r.ReflectionMethod=1
+r.ReflectionMethod=0
 r.Shadow.Virtual.Enable=1
 r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True
 r.DefaultFeature.AutoExposure=False
--- a/Content/AM_vol4/Materials/MI_AM_vol4_leaf_12.uasset
+++ b/Content/AM_vol4/Materials/MI_AM_vol4_leaf_12.uasset
--- a/Content/AM_vol4/Meshes/SM_AM_vol4_tree_12_0.uasset
+++ b/Content/AM_vol4/Meshes/SM_AM_vol4_tree_12_0.uasset
--- a/Content/Audio/Btn.uasset
+++ b/Content/Audio/Btn.uasset
--- a/Content/BP/BP_DynamicMatControl.uasset
+++ b/Content/BP/BP_DynamicMatControl.uasset
--- a/Content/BP/Interface_ToolControl.uasset
+++ b/Content/BP/Interface_ToolControl.uasset
--- a/Content/BP/ScenarioContext_Actors.uasset
+++ b/Content/BP/ScenarioContext_Actors.uasset
--- a/Content/BP/Tools/BP_ToolBase.uasset
+++ b/Content/BP/Tools/BP_ToolBase.uasset
--- a/Content/BP/Tools/BP_Tool_ChuTou.uasset
+++ b/Content/BP/Tools/BP_Tool_ChuTou.uasset
--- a/Content/BP/Tools/BP_Tool_MaoShua.uasset
+++ b/Content/BP/Tools/BP_Tool_MaoShua.uasset
--- a/Content/BP/Tools/BP_Tool_ShouChan.uasset
+++ b/Content/BP/Tools/BP_Tool_ShouChan.uasset
--- a/Content/BP/Tools/BP_Tool_TanChan.uasset
+++ b/Content/BP/Tools/BP_Tool_TanChan.uasset
--- a/Content/BP/Tools/BP_Tool_TieQiao.uasset
+++ b/Content/BP/Tools/BP_Tool_TieQiao.uasset
--- a/Content/BP/ToolsDataRequired.uasset
+++ b/Content/BP/ToolsDataRequired.uasset
--- a/Content/BP/UIPawn.uasset
+++ b/Content/BP/UIPawn.uasset
--- a/Content/PN_FoliageCollection/Materials/grassMaterials/grassMaterials/lowGrass_02_02_Mat1_2.uasset
+++ b/Content/PN_FoliageCollection/Materials/grassMaterials/grassMaterials/lowGrass_02_02_Mat1_2.uasset
--- a/Content/Widget/ArchaeologicalClearance/WBP_ClearanceDesk.uasset
+++ b/Content/Widget/ArchaeologicalClearance/WBP_ClearanceDesk.uasset
--- a/Content/Widget/ArchaeologicalExcavation/WBP_ExcavationDesk.uasset
+++ b/Content/Widget/ArchaeologicalExcavation/WBP_ExcavationDesk.uasset
--- a/Content/Widget/ArchaeologicalExcavation/WBP_ExcavationFront.uasset
+++ b/Content/Widget/ArchaeologicalExcavation/WBP_ExcavationFront.uasset
--- a/Content/Widget/ArchaeologicalExploration/WBP_ExplorDesk.uasset
+++ b/Content/Widget/ArchaeologicalExploration/WBP_ExplorDesk.uasset
--- a/Content/Widget/LayingExploration/WBP_LayingExplorDesk.uasset
+++ b/Content/Widget/LayingExploration/WBP_LayingExplorDesk.uasset
--- a/Content/Widget/LayingExploration/WBP_LayingExplorFront.uasset
+++ b/Content/Widget/LayingExploration/WBP_LayingExplorFront.uasset
--- a/Content/Widget/Uti/ArchaeologyTips.uasset
+++ b/Content/Widget/Uti/ArchaeologyTips.uasset
--- a/Content/Widget/Uti/ToolbarElement.uasset
+++ b/Content/Widget/Uti/ToolbarElement.uasset
--- a/Content/map/test.umap
+++ b/Content/map/test.umap
--- a/Content/map/wzl1.umap
+++ b/Content/map/wzl1.umap