Commit Graph

184 Commits

Author SHA1 Message Date
Nam Tae Gun
60fe3b8b98 대화Ui 변경 2025-02-28 18:04:26 +09:00
Nam Tae Gun
d6746ffee4 타이쿤 1차 완성 2025-02-28 00:38:55 +09:00
NTG_Lenovo
9b31d0f720 대화 맵 애니메이션 수정 2025-02-27 19:35:20 +09:00
NTG_Lenovo
3e30a5ac03 레스토랑 수정 및 호감도 맵 추가 2025-02-27 16:21:34 +09:00
NTG_Lenovo
57f65859f0 대화 추가 2025-02-27 14:29:11 +09:00
81f7b58938 숙소 가구추가
레스토랑씬 라이트 수정
2025-02-27 04:13:09 +09:00
f03eab3132 복도 업데이트 2025-02-26 03:32:22 +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
b479cbf9a0 숙소씬 업데이트 2025-02-24 19:15:28 +09:00
Nam Tae Gun
72b3db3d3e 맵 업데이트 2025-02-24 11:55:22 +09:00
Nam Tae Gun
d9cd461e83 Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg 2025-02-24 08:56:59 +09:00
0ec6aa5d52 숙소씬 업데이트 2025-02-24 01:48:01 +09:00
Nam Tae Gun
8821037091 Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg 2025-02-23 17:01:09 +09:00
74ba8d3f3f 타이쿤씬 업데이트 2025-02-23 16:33:53 +09:00
NTG_Lenovo
146c4b6ffa 타이쿤 수정 2025-02-21 15:31:50 +09:00
1d42c94723 타이쿤씬 업데이트 2025-02-21 03:38:07 +09:00
Nam Tae Gun
62f936092d 타이쿤 업데이트 2025-02-18 06:47:56 +09:00
NTG_Lenovo
0cbb82f370 메뉴판Ui 작업중2 2025-02-14 16:22:20 +09:00
Nam Tae Gun
7f6e467688 메뉴판Ui 2025-02-14 12:17:41 +09:00
f1e1ac0be6 타이쿤씬 수정4 2025-02-04 21:42:21 +09:00
2cf3d81235 타이쿤씬 수정중3 2025-02-03 18:11:42 +09:00
NTG_Lenovo
3617a607a0 0.1.0.4 2025-01-21 17:58:43 +09:00
NTG_Lenovo
d5a8cb468f 마법진 테스트 중 2025-01-20 19:13:06 +09:00
NTG_Lenovo
ae6eca5a31 0.1.0.1 2025-01-16 17:39:25 +09:00
NTG_Lenovo
63c1913820 렌더 텍스처 테스트 2025-01-07 20:03:44 +09:00
NTG_Lenovo
ba43932f3d Capers Project 0.1.0.0 2025-01-07 16:17:27 +09:00
Nam Tae Gun
3b09252818 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg
# Conflicts:
#	Assets/01.Scenes/01.Tycoon 1.unity.meta
2025-01-02 19:57:38 +09:00
NTG_Lenovo
9114e03bf5 4.0.0.1 2025-01-02 18:33:05 +09:00
SweetJJuya
21385cb31b Merge branch 'ntg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into HEAD
# Conflicts:
#	Assets/StreamingAssets/google-services-desktop.json.meta
2024-12-27 05:22:50 +09:00
SweetJJuya
53546c572c Merge branch 'refs/heads/lmg' into HEAD
# Conflicts:
#	Assets/01.Scenes/99.Tycoon_LMG.unity
#	Assets/StreamingAssets/google-services-desktop.json.meta
2024-12-27 05:19:37 +09:00
SweetJJuya
98aa9be66f 0.3.5.25 2024-12-27 05:14:15 +09:00
Nam Tae Gun
616fff8580 0.4.0.0 2024-12-21 02:56:34 +09:00
NTG_Lenovo
78de51a3f7 0.3.5.22 2024-12-19 23:27:01 +09:00
SweetJJuya
ebb5e6c127 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg
# Conflicts:
#	Assets/StreamingAssets/google-services-desktop.json.meta
2024-12-19 19:21:44 +09:00
SweetJJuya
9369389f4c 0.3.5.21 2024-12-19 19:20:44 +09:00
177800e0fe 홀비주얼 수정1219-2 2024-12-19 02:29:42 +09:00
Nam Tae Gun
bff1e2ce58 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-12-19 01:00:55 +09:00
Nam Tae Gun
e4a06b8475 0.3.5.20 2024-12-19 01:00:39 +09:00
0d8596ee67 홀비주얼 수정 1219 2024-12-19 00:58:24 +09:00
74631ab062 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into develop 2024-12-17 22:37:42 +09:00
7139a230f4 홀비주얼 수정3 2024-12-17 22:29:25 +09:00
NTG_Lenovo
89ee6c87ba 튜토리얼 작업 중 2024-12-16 21:06:42 +09:00
afea36ff5b 홀비주얼 수정2 2024-12-16 20:35:07 +09:00
Nam Tae Gun
9ce7e946b7 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-12-12 13:37:15 +09:00
SweetJJuya
3185ba9027 0.3.5.13 2024-12-10 18:56:18 +09:00
NTG_Lenovo
00289190b7 0.3.5.12 2024-12-10 15:49:15 +09:00
Nam Tae Gun
8e7b32d0f0 0.3.5.11 2024-12-06 22:20:10 +09:00
NTG_Lenovo
49321522f6 매뉴얼 북 수정 중 2024-12-05 19:30:41 +09:00
NTG_Lenovo
becad95097 0.3.5.10 2024-12-03 21:30:09 +09:00