SweetJJuya
|
bcc63bc8b4
|
Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into lmg
|
2025-03-01 14:52:27 +09:00 |
|
SweetJJuya
|
2812c7240c
|
구름제거+물고기크기조정
|
2025-03-01 14:50:02 +09:00 |
|
Nam Tae Gun
|
2046a2eec1
|
날씨 시스템
|
2025-03-01 08:29:51 +09:00 |
|
Nam Tae Gun
|
38cf9437df
|
Merge branch 'lmg' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg
|
2025-03-01 07:40:27 +09:00 |
|
SweetJJuya
|
1a6f2d93a7
|
Merge remote-tracking branch 'origin/lmg' into lmg
# Conflicts:
# Assets/01.Scenes/Old/03994.Sail.unity
|
2025-03-01 00:44:48 +09:00 |
|
SweetJJuya
|
f498b709a1
|
스카이박스수정
|
2025-03-01 00:44:25 +09:00 |
|
|
|
4c2d32a7f2
|
해상씬 깊이 표현 추가
|
2025-02-28 23:30:10 +09:00 |
|
Nam Tae Gun
|
7043237252
|
Merge branch 'lmg' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg
|
2025-02-28 18:05:27 +09:00 |
|
Nam Tae Gun
|
60fe3b8b98
|
대화Ui 변경
|
2025-02-28 18:04:26 +09:00 |
|
SweetJJuya
|
e1a43b9c55
|
이미지머테리얼투명+카메라테스트
|
2025-02-28 15:19:50 +09:00 |
|
|
|
7206cd0c1c
|
03994 해상씬 업데이트
|
2025-02-28 14:52:30 +09:00 |
|
Nam Tae Gun
|
d6746ffee4
|
타이쿤 1차 완성
|
2025-02-28 00:38:55 +09:00 |
|
Nam Tae Gun
|
6192f2d525
|
Merge branch 'lmg' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg
|
2025-02-27 23:59:33 +09:00 |
|
|
|
ad4c5e314f
|
회사
|
2025-02-27 19:49:21 +09:00 |
|
NTG_Lenovo
|
9b31d0f720
|
대화 맵 애니메이션 수정
|
2025-02-27 19:35:20 +09:00 |
|
SweetJJuya
|
3b8022bc57
|
배 뒷면, 씬 이미지 추가
|
2025-02-27 19:04:06 +09:00 |
|
SweetJJuya
|
cc4d146fd4
|
임시 수정3
|
2025-02-27 17:23:22 +09:00 |
|
SweetJJuya
|
be52294ace
|
임시 수정1
|
2025-02-27 17:22:29 +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
|
e9fcb22a92
|
대화 추가2
|
2025-02-27 14:29:55 +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 |
|
|
|
81f7b58938
|
숙소 가구추가
레스토랑씬 라이트 수정
|
2025-02-27 04:13:09 +09:00 |
|
|
|
f03eab3132
|
복도 업데이트
|
2025-02-26 03:32:22 +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
|
0948762b36
|
Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject
|
2025-02-24 20:20:22 +09:00 |
|
|
|
0059c7de8c
|
복도 업데이트
|
2025-02-24 20:12:19 +09:00 |
|
|
|
b479cbf9a0
|
숙소씬 업데이트
|
2025-02-24 19:15:28 +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 |
|
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
|
86e24f9790
|
Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg
|
2025-02-23 17:10:08 +09:00 |
|
|
|
ac45ab3b82
|
타이쿤씬 업데이트
|
2025-02-23 17:09:42 +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 |
|
NTG_Lenovo
|
f02195615d
|
메뉴판 Ui 수정
|
2025-02-18 18:35:13 +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 |
|
