87f5eb6ed5
# Conflicts: # Assets/01_Scenes/Festival_Chapter5/Lightmap-0_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-0_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-0_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-10_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-10_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-10_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-11_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-11_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-11_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-12_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-12_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-12_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-13_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-13_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-13_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-14_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-14_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-14_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-15_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-15_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-15_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-16_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-16_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-16_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-1_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-1_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-1_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-2_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-2_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-2_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-3_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-3_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-3_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-4_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-4_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-4_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-5_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-5_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-5_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-6_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-6_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-6_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-7_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-7_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-7_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-8_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-8_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-8_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-9_comp_dir.png.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-9_comp_light.exr.meta # Assets/01_Scenes/Festival_Chapter5/Lightmap-9_comp_shadowmask.png.meta # Assets/01_Scenes/Festival_Chapter5/ReflectionProbe-0.exr.meta # Assets/01_Scenes/Hischool_Chapter4/Festival_Test Baking Set.asset.meta
13 lines
291 B
Plaintext
13 lines
291 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<< HEAD
|
|
guid: a8c1175d9dd2ba043adc1bc21fbdbca2
|
|
=======
|
|
guid: e9e78b91c05cab0489dbab9e03d63030
|
|
>>>>>>> 3558b85ce3191974e6667a9cdf637b53a374c388
|
|
NativeFormatImporter:
|
|
externalObjects: {}
|
|
mainObjectFileID: 0
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|