Commit Graph

643 Commits

Author SHA1 Message Date
Nam Tae Gun
699adb2415 Bill Ui 수정 2024-10-10 11:37:44 +09:00
NTG_Lenovo
5787b83b30 빌지 Ui 작업 중 2024-10-08 22:44:20 +09:00
SweetJJuya
0f8f398c99 0.3.0.10 2024-10-08 15:45:46 +09:00
NTG_Lenovo
b000128df3 Merge branch 'lmg' of http://175.209.66.186/capersunity/newbluewater into ntg 2024-10-08 15:14:16 +09:00
NTG_Lenovo
330567c868 0.3.0.9 업데이트 2024-10-08 15:13:52 +09:00
SweetJJuya
82a22c8ea5 0.3.0.8 2024-10-08 15:12:27 +09:00
9155cb3002 홀조명세팅 2024-10-07 17:45:00 +09:00
NTG_Lenovo
411f1079b0 0.3.0.7 업데이트 2024-10-07 15:43:01 +09:00
Nam Tae Gun
4764097f6a 0.3.0.6 업데이트 2024-10-07 08:41:09 +09:00
Nam Tae Gun
aa425699c1 Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into ntg 2024-10-06 19:27:50 +09:00
Nam Tae Gun
ccab946896 Merge branch 'lmg' of http://gitlab.capers.co.kr/capersunity/newbluewater into ntg
# Conflicts:
#	Assets/11.BehaviorTree/Customer.asset
2024-10-06 19:27:26 +09:00
SweetJJuya
5a5a784f98 0.3.0.5 2024-10-03 19:59:07 +09:00
fdc09ac22d 홀 3차05 2024-10-03 17:34:12 +09:00
SweetJJuya
b08abbc6b3 0.3.0.4 2024-10-03 16:55:56 +09:00
700c773d57 홀 3차04 2024-10-03 02:29:49 +09:00
NTG_Lenovo
b601a284ff ai 플로우 수정 중 2024-09-30 21:05:19 +09:00
4ae778acb0 홀 3차03 2024-09-30 20:31:06 +09:00
NTG_Lenovo
c9eb09e0fb 스파인 캐릭터 수정 및 타이쿤 스테이지 로직 수정 중 2024-09-30 18:41:55 +09:00
Nam Tae Gun
2856d83f25 칵테일 제조 Ui 변경 2024-09-30 11:11:09 +09:00
NTG_Lenovo
9d7723d0ee Liquid Ui 수정 중 2024-09-26 20:50:39 +09:00
8c959e2016 홀 3차02 2024-09-26 01:25:53 +09:00
NTG_Lenovo
45b2dca96f 누락요소 추가 2024-09-24 19:36:06 +09:00
NTG_Lenovo
9af080fda2 Ver 0.3.0.2 업데이트 2024-09-24 19:35:49 +09:00
NTG_Lenovo
9bee0a9b74 Merge branch 'lmg' of http://175.209.66.186/capersunity/newbluewater into ntg 2024-09-24 19:31:54 +09:00
SweetJJuya
a4ec830929 0.3.0.1 2024-09-24 19:09:17 +09:00
f50a8bee87 홀 3차01 2024-09-23 20:35:38 +09:00
NTG_Lenovo
f9ac16f30f Ver 3.0.0.0 업데이트 2024-09-23 19:18:47 +09:00
Nam Tae Gun
a4637e74ba 타이쿤 기능 붙이는 중 2024-09-23 11:00:21 +09:00
Nam Tae Gun
b325dc5304 Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into ntg
# Conflicts:
#	Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs
2024-09-23 00:55:52 +09:00
SweetJJuya
b08c8ef39f 카드효과 추가 2024-09-23 00:49:43 +09:00
Nam Tae Gun
a69152b060 Merge branch 'lmg' of http://gitlab.capers.co.kr/capersunity/newbluewater into ntg
# Conflicts:
#	Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs
2024-09-22 23:52:16 +09:00
NTG_Lenovo
7bc9f8e922 타이쿤 맵 수정 중 2024-09-12 19:03:21 +09:00
SweetJJuya
9ae0556534 Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into lmg 2024-09-12 16:56:52 +09:00
NTG_Lenovo
98b22b3677 통합 EventManager 생성 2024-09-12 16:53:16 +09:00
SweetJJuya
9169603d09 Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into lmg
# Conflicts:
#	Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs
2024-09-12 16:40:03 +09:00
SweetJJuya
8bb0f299c3 카드 효과 추가 2024-09-12 16:38:16 +09:00
NTG_Lenovo
b5638a435a 데이터 구조 방식 변경 2024-09-12 16:36:24 +09:00
SweetJJuya
a105013227 json 수정 2024-09-12 13:30:48 +09:00
SweetJJuya
c5b90896a4 Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into lmg 2024-09-12 13:25:57 +09:00
SweetJJuya
463ad93200 Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into lmg
# Conflicts:
#	Assets/02.Scripts/Editor/JsonHelperEditor.cs
2024-09-12 13:25:17 +09:00
SweetJJuya
6b5d4da610 2024_09_10 2024-09-12 13:17:34 +09:00
NTG_Lenovo
8cd0005329 Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg 2024-09-12 13:09:16 +09:00
419390a998 홀 2차02 2024-09-11 17:36:18 +09:00
NTG_Lenovo
bf9c6f1491 플레이어 체력 연동 중 2024-09-10 19:52:32 +09:00
NTG_Lenovo
a5b460bfe0 술 제조 작업 중2 2024-09-10 19:25:05 +09:00
NTG_Lenovo
9be98366fa 술 제조 작업 중 2024-09-10 16:26:29 +09:00
NTG_Lenovo
4ddf944b31 Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg
# Conflicts:
#	Assets/02.Scripts/Editor/JsonHelperEditor.cs
#	Assets/02.Scripts/Ui/Tycoon/DrinkIngredientUi.cs
2024-09-10 16:25:23 +09:00
NTG_Lenovo
a5767065c6 렌더 텍스처 수정 중 2024-09-09 21:27:15 +09:00
62ff30cdb0 Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into develop 2024-09-09 20:02:00 +09:00
f33992c9ee 홀 2차01 2024-09-09 20:01:47 +09:00