Commit Graph

25 Commits

Author SHA1 Message Date
Nam Tae Gun
d6746ffee4 타이쿤 1차 완성 2025-02-28 00:38:55 +09:00
NTG_Lenovo
44f2a34ee0 싱글톤 수정 2025-02-27 16:23:07 +09:00
NTG_Lenovo
0532892e7b Merge branch 'lmg' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg 2025-02-27 16:21:43 +09:00
NTG_Lenovo
3e30a5ac03 레스토랑 수정 및 호감도 맵 추가 2025-02-27 16:21:34 +09:00
SweetJJuya
5e33d25c4d 임시 2025-02-27 15:31:16 +09:00
NTG_Lenovo
57f65859f0 대화 추가 2025-02-27 14:29:11 +09:00
SweetJJuya
3ad7edb46a Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject
# Conflicts:
#	Assets/01.Scenes/Old/0599.DialogueTest2.unity
#	Assets/Toon Water URP/Curved Toon Water Material 1.mat
2025-02-27 13:28:04 +09:00
SweetJJuya
45dfcb153f 2025_02_27임시용 2025-02-27 13:27:27 +09:00
NTG_Lenovo
9c6702d382 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg 2025-02-24 20:58:39 +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
SweetJJuya
d2f1307079 빛 추가 2025-02-24 17:18:50 +09:00
970527a0ee Merge branch 'lmg' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject 2025-02-24 15:41:33 +09:00
SweetJJuya
75a30f2337 Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject 2025-02-24 15:40:18 +09:00
SweetJJuya
9cad61b812 항해씬 중간제작 2025-02-24 15:37:43 +09:00
Nam Tae Gun
72b3db3d3e 맵 업데이트 2025-02-24 11:55:22 +09:00
NTG_Lenovo
8171828657 타이쿤 최신화 2025-02-18 18:10:19 +09:00
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