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 |
|
SweetJJuya
|
b81f9d567e
|
Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into lmg
|
2024-09-09 18:51:35 +09:00 |
|
SweetJJuya
|
0a3addea9a
|
카드 추가
|
2024-09-09 18:50:37 +09:00 |
|
NTG_Lenovo
|
288e6a7897
|
Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg
|
2024-09-09 13:16:10 +09:00 |
|
|
|
678e97eac2
|
Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into develop
|
2024-09-05 19:08:06 +09:00 |
|
|
|
d0358629a3
|
홀 수정04
|
2024-09-05 19:07:49 +09:00 |
|
NTG_Lenovo
|
319a005027
|
Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg
# Conflicts:
# Assets/01.Scenes/01.Tycoon.unity
|
2024-09-05 18:47:34 +09:00 |
|
SweetJJuya
|
0a635bce74
|
Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into lmg
|
2024-09-05 18:41:14 +09:00 |
|
SweetJJuya
|
7ce2094032
|
VCA 추가
|
2024-09-05 18:39:51 +09:00 |
|
SweetJJuya
|
2a56a257df
|
항해씬 임시 동결
|
2024-09-05 18:33:06 +09:00 |
|
NTG_Lenovo
|
8246b3bc7d
|
Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg
|
2024-09-05 14:49:40 +09:00 |
|
|
|
2dc619b8df
|
홀 수정03
|
2024-09-05 01:12:34 +09:00 |
|
NTG_Lenovo
|
4bac95ec9b
|
Bar Ui 작업 중2
|
2024-09-03 21:04:25 +09:00 |
|
|
|
9129c7bf70
|
홀 수정02
|
2024-09-03 03:20:51 +09:00 |
|
NTG_Lenovo
|
340408a8d4
|
Bar Ui 작업 중
|
2024-09-02 22:45:46 +09:00 |
|
SweetJJuya
|
5ba54aceb9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-09-02 14:07:10 +09:00 |
|
SweetJJuya
|
60e4e3f5d4
|
최신화
|
2024-09-02 14:06:21 +09:00 |
|
NTG_Lenovo
|
a43bf4c613
|
DB 최신화
|
2024-09-02 14:03:17 +09:00 |
|
|
|
068ec3e140
|
홀 수정01
|
2024-08-31 21:20:03 +09:00 |
|
NTG_Lenovo
|
1d9fb1c5a9
|
씬 저장
|
2024-08-29 18:54:48 +09:00 |
|
NTG_Lenovo
|
718274154f
|
양조장 분리, Drink 시스템 보완
|
2024-08-29 18:51:32 +09:00 |
|
NTG_Lenovo
|
94742936ff
|
Drink, Cocktail 시스템 및 Ui 작업 중
|
2024-08-27 21:23:41 +09:00 |
|
NTG_Lenovo
|
6591e1a66f
|
Idx 자료형 변경 int -> string
|
2024-08-22 19:39:15 +09:00 |
|
