2 Commits

Author	SHA1	Message	Date
SweetJJuya	6c80f6bfee	임시	2025-02-18 15:56:30 +09:00
SweetJJuya	ff7dfe28fa	Merge branch 'ntg' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject ... # Conflicts: # Assets/02.Scripts/BlueWater/Sail/ShipMove.cs # Assets/02.Scripts/BlueWater/Sail/ShipMove.cs.meta # 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	2025-02-10 14:51:17 +09:00