3e60516ddc
# Conflicts: # Assets/LRC/Prefab/TowerCrane/TowerCrane.prefab # Assets/SampleSceneAssets/Particles/ButterFlies.vfx # Assets/SampleSceneAssets/Particles/FallingLeaves.vfx # Assets/SampleSceneAssets/Particles/FloatingDust.vfx # Assets/Samples.meta # Assets/Samples/High Definition RP.meta # Assets/Samples/High Definition RP/13.1.9.meta # Assets/Samples/High Definition RP/13.1.9/Additional Post-processing Data.meta # Assets/Samples/High Definition RP/13.1.9/Lens Flare Samples.meta # Assets/Samples/High Definition RP/13.1.9/Lens Flare Samples/LensFlarePresets.meta # Assets/Samples/High Definition RP/13.1.9/Lens Flare Samples/LensFlarePresets/Polycount.asset.meta # Assets/Samples/High Definition RP/13.1.9/Lens Flare Samples/LensFlarePresets/Smartphone_Smudged.asset.meta # Assets/Samples/High Definition RP/13.1.9/Lens Flare Samples/Textures.meta # Assets/Samples/High Definition RP/13.1.9/Lens Flare Samples/Textures/Shimmer.png.meta # Assets/Samples/High Definition RP/13.1.9/Lens Flare Samples/Textures/Shimmer2.png.meta # Assets/Samples/High Definition RP/13.1.9/Local Volumetric 3D Texture Samples.meta # Assets/Samples/High Definition RP/13.1.9/Material Samples.meta # Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro.meta # Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta # Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Fonts/LiberationSans.ttf.meta # Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Resources.meta # Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Resources/Fonts and Materials.meta # Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Resources/Fonts and Materials/LiberationSans SDF.asset.meta # Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta # Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta # Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Resources/Shaders/TMPro.cginc.meta # Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc.meta # Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Resources/Shaders/TMPro_Surface.cginc.meta # Assets/Samples/High Definition RP/13.1.9/Material Samples/TextMesh Pro/Resources/TMP Settings.asset.meta # Assets/Samples/High Definition RP/13.1.9/Particle System Shader Samples.meta # Assets/Samples/High Definition RP/13.1.9/Procedural Sky.meta # Assets/Scenes/PrefabEditingScene.unity # Assets/Scenes/PrefabEditingSceneOld.unity # Assets/Scenes/PrefabEditingSceneOld.unity.meta # Assets/Scenes/PrefabScene.unity # Assets/Scenes/SampleScene.unity # Assets/Scenes/Volume.meta # Assets/Scenes/Volume/VolumeGlobal Z.asset # Assets/ZMS/Script/3D/CameraUSE/CameraPointWinding.cs # Assets/ZMS/Script/3D/Configuration/Configuration.cs # Assets/ZMS/Script/3D/Configuration/ConstructConf.cs # Assets/ZMS/Script/3D/Configuration/SiteConfigura.cs
13 lines
281 B
Plaintext
13 lines
281 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<< HEAD
|
|
guid: d35fdd2fef1c0074bbf2267d828075c4
|
|
=======
|
|
guid: 4601c6baa84ce6c4386b4f94d3ac2689
|
|
>>>>>>> 093cb4a204f089ea559287728c114cc6b1e1d34d
|
|
folderAsset: yes
|
|
DefaultImporter:
|
|
externalObjects: {}
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|