Commit Graph

10 Commits

Author SHA1 Message Date
81f7b58938 숙소 가구추가
레스토랑씬 라이트 수정
2025-02-27 04:13:09 +09:00
NTG_Lenovo
44f282a718 Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg
# Conflicts:
#	Assets/03.Images/DDD/Props/Environments/Jungle.meta
#	Assets/03.Images/DDD/Props/Environments/Jungle/JungleBG.png
#	Assets/03.Images/DDD/Props/Environments/Jungle/JungleBG.png.meta
#	Assets/03.Images/DDD/Props/Environments/Jungle/JungleBG2.png
#	Assets/03.Images/DDD/Props/Environments/Jungle/JungleBG2.png.meta
#	Assets/03.Images/DDD/Props/Environments/Jungle/JungleTile.png
#	Assets/03.Images/DDD/Props/Environments/Jungle/JungleTile.png.meta
#	Assets/03.Images/DDD/Props/Environments/Jungle/JungleTile2.png
#	Assets/03.Images/DDD/Props/Environments/Jungle/JungleTile2.png.meta
#	Assets/03.Images/DDD/Props/Environments/Jungle/TableWoodFront.png
#	Assets/03.Images/DDD/Props/Environments/Jungle/TableWoodFront.png.meta
#	Assets/03.Images/DDD/Props/Environments/Jungle/TableWoodUp.png
#	Assets/03.Images/DDD/Props/Environments/Jungle/TableWoodUp.png.meta
#	Assets/03.Images/DDD/Props/Environments/Jungle/Tile 1.png
#	Assets/03.Images/DDD/Props/Environments/Jungle/Tile 1.png.meta
#	Assets/03.Images/DDD/Props/Environments/Jungle/tree.png
#	Assets/03.Images/DDD/Props/Environments/Jungle/tree.png.meta
#	Assets/05.Prefabs/DDD/Props/Furnitures/Prefabricated/HomeTableWood.prefab
#	Assets/05.Prefabs/DDD/Props/Furnitures/Prefabricated/HomeTableWood.prefab.meta
#	Assets/08.Spines/07.Animations/DDD/Props/Fryer.meta
#	Assets/08.Spines/07.Animations/DDD/Props/Fryer/Enable.anim
#	Assets/08.Spines/07.Animations/DDD/Props/Fryer/Enable.anim.meta
#	Assets/08.Spines/07.Animations/DDD/Props/Fryer/EnableLoop.anim
#	Assets/08.Spines/07.Animations/DDD/Props/Fryer/EnableLoop.anim.meta
#	Assets/08.Spines/07.Animations/DDD/Props/Fryer/Fryer.controller
#	Assets/08.Spines/07.Animations/DDD/Props/Fryer/Fryer.controller.meta
#	Assets/08.Spines/07.Animations/DDD/Props/Fryer/Idle.anim
#	Assets/08.Spines/07.Animations/DDD/Props/Fryer/Idle.anim.meta
2025-02-24 20:57:04 +09:00
NTG_Lenovo
88987df67d 타이쿤 업데이트 2025-02-24 20:55:35 +09:00
970527a0ee Merge branch 'lmg' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject 2025-02-24 15:41:33 +09:00
SweetJJuya
9cad61b812 항해씬 중간제작 2025-02-24 15:37:43 +09:00
Nam Tae Gun
72b3db3d3e 맵 업데이트 2025-02-24 11:55:22 +09:00
1d42c94723 타이쿤씬 업데이트 2025-02-21 03:38:07 +09:00
NTG_Lenovo
8171828657 타이쿤 최신화 2025-02-18 18:10:19 +09:00
Nam Tae Gun
62f936092d 타이쿤 업데이트 2025-02-18 06:47:56 +09:00
Nam Tae Gun
07d3763889 타이쿤씬 재정비 중 2025-02-10 11:13:46 +09:00