Commit Graph

1 Commits (02c9585cd95dcda170a96bc0b191ca3553f46a64)

Author SHA1 Message Date
ChenZiang 6764085db0 【策划】主线5-4配置及临时后处理
# Conflicts:
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMain_Maps00_Plain_8_a_0_0_0.png
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMain_Maps00_Plain_8_a_0_0_0.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMain_Maps00_Plain_8_a_0_0_1.png
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMain_Maps00_Plain_8_a_0_0_1.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMain_Maps00_Plain_8_a_0_0_2.png
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMain_Maps00_Plain_8_a_0_0_2.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMain_Maps00_Plain_8_a_0_0_3.png
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMain_Maps00_Plain_8_a_0_0_3.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMain_Maps00_Plain_8_a_0_0_4.png
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMain_Maps00_Plain_8_a_0_0_4.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMain_Maps00_Plain_8_a_0_1_2.png
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMain_Maps00_Plain_8_a_0_1_2.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMain_Maps00_Plain_8_a_0_1_3.png
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMain_Maps00_Plain_8_a_0_1_3.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMain_Maps00_Plain_8_a_0_1_4.png
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMain_Maps00_Plain_8_a_0_1_4.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMask_Maps00_Plain_8_a_0_0_0.png
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMask_Maps00_Plain_8_a_0_0_0.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMask_Maps00_Plain_8_a_0_0_1.png
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMask_Maps00_Plain_8_a_0_0_1.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMask_Maps00_Plain_8_a_0_0_2.png
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMask_Maps00_Plain_8_a_0_0_2.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMask_Maps00_Plain_8_a_0_0_3.png
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMask_Maps00_Plain_8_a_0_0_3.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMask_Maps00_Plain_8_a_0_0_4.png
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMask_Maps00_Plain_8_a_0_0_4.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMask_Maps00_Plain_8_a_0_1_2.png
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMask_Maps00_Plain_8_a_0_1_2.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMask_Maps00_Plain_8_a_0_1_3.png
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMask_Maps00_Plain_8_a_0_1_3.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMask_Maps00_Plain_8_a_0_1_4.png
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/CombinedMask_Maps00_Plain_8_a_0_1_4.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_0_0.asset.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_0_0.mat
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_0_0.mat.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_0_1.asset.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_0_1.mat
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_0_1.mat.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_0_2.asset.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_0_2.mat
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_0_2.mat.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_0_3.asset.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_0_3.mat
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_0_3.mat.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_0_4.asset.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_0_4.mat
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_0_4.mat.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_1_2.asset.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_1_2.mat
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_1_2.mat.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_1_3.asset.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_1_3.mat
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_1_3.mat.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_1_4.asset.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_1_4.mat
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Combined_Maps00_Plain_8_a_0_1_4.mat.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Maps00_Plain_8_a_0.9.mat
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Maps00_Plain_8_a_0.9.mat.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Maps00_Plain_8_a_0.9.png.meta
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Maps00_Plain_8_a_0.9_PostProcess.unity
#	ProjectNLD/Assets/Art_Out/AutoGen/PostProcessScenes/Maps00_Plain_8_a_0/Maps00_Plain_8_a_0.9_PostProcess.unity.meta
2025-12-29 16:57:56 +08:00