Nam Tae Gun 66ee152be1 Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg ... # Conflicts: # Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta # Assets/Icons - Picto Total Pack/PNG/Style2_CasualGame(320)/Before(v1.0)/Before_(v1.0).unitypackage.meta # Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta # Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta # Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta # Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta # Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta # Packages/com.distantlands.cozy.core/Content/Integration/Import for BiRP.unitypackage.meta # Packages/com.distantlands.cozy.core/Content/Integration/Import for HDRP.unitypackage.meta # Packages/com.distantlands.cozy.core/Content/Integration/Import for URP.unitypackage.meta		2024-06-13 15:55:09 +09:00
..
02.Combat	PostProcessingManager 추가	2024-06-10 03:19:32 +09:00
00.CombatTitle.unity	CombatPlayer Die애니메이션 추가	2024-06-09 22:36:38 +09:00
00.CombatTitle.unity.meta	CombatPlayer Die애니메이션 추가	2024-06-09 22:36:38 +09:00
01.Tycoon.unity	Halo 이펙트 테스트	2024-06-11 04:54:51 +09:00
01.Tycoon.unity.meta	#4 애니메이션 도중에 게임오브젝트가 파괴되면 생기는 오류 수정	2024-06-06 17:06:54 +09:00
02.Combat.meta	Initial commit	2024-06-04 03:26:03 +09:00
02.Combat.unity	Halo 이펙트 테스트	2024-06-11 04:54:51 +09:00
02.Combat.unity.meta	Initial commit	2024-06-04 03:26:03 +09:00
99.Combat.unity	정글맵 수정	2024-06-11 16:32:59 +09:00
99.Combat.unity.meta	정글맵 수정	2024-06-11 16:32:59 +09:00