Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg
# Conflicts: # Assets/AllIn1VfxToolkit/Demo & Assets/Textures Demo/DemoTextures.meta # Assets/AllIn1VfxToolkit/Demo & Assets/Textures Demo/DemoTextures/LightingData.asset # Assets/AllIn1VfxToolkit/Demo & Assets/Textures Demo/DemoTextures/LightingData.asset.meta # Assets/AllIn1VfxToolkit/Demo & Assets/Textures Demo/DemoTextures/ReflectionProbe-0.exr.meta
This commit is contained in:
commit
7f02053158
26975
Assets/01.Scenes/Old/03.Sail2.unity
Normal file
26975
Assets/01.Scenes/Old/03.Sail2.unity
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/01.Scenes/Old/03.Sail2.unity.meta
Normal file
7
Assets/01.Scenes/Old/03.Sail2.unity.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: dd4fd403ba43a4e4080abe1c0fd810cf
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user