Commit Graph

8 Commits

Author SHA1 Message Date
SweetJJuya
c4dc3500c3 Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject
# Conflicts:
#	Assets/08.Spines/07.Animations/DDD.meta
#	Assets/08.Spines/07.Animations/DDD/Props.meta
#	Assets/08.Spines/07.Animations/DDD/Props/Pot.meta
#	Assets/08.Spines/07.Animations/DDD/Props/Pot/Enable.anim
#	Assets/08.Spines/07.Animations/DDD/Props/Pot/Enable.anim.meta
#	Assets/08.Spines/07.Animations/DDD/Props/Pot/Idle.anim
#	Assets/08.Spines/07.Animations/DDD/Props/Pot/Idle.anim.meta
#	Assets/08.Spines/07.Animations/DDD/Props/Pot/Pot.controller
#	Assets/08.Spines/07.Animations/DDD/Props/Pot/Pot.controller.meta
2025-02-18 15:57:56 +09:00
SweetJJuya
6c80f6bfee 임시 2025-02-18 15:56:30 +09:00
Nam Tae Gun
62f936092d 타이쿤 업데이트 2025-02-18 06:47:56 +09:00
Nam Tae Gun
7f6e467688 메뉴판Ui 2025-02-14 12:17:41 +09:00
SweetJJuya
76a57b33e0 임시 2025-02-12 16:33:04 +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
Nam Tae Gun
07d3763889 타이쿤씬 재정비 중 2025-02-10 11:13:46 +09:00
NTG_Lenovo
d35ec28809 프로젝트DDD 스크립트 분할 2025-02-03 19:03:41 +09:00