Commit Graph

262 Commits

Author SHA1 Message Date
NTG_Lenovo
afb747cc79 0.3.4.16 2024-11-21 20:05:59 +09:00
NTG_Lenovo
d4dd36a59e 0.3.4.15 2024-11-19 23:38:45 +09:00
SweetJJuya
a90dc55ab5 0.3.4.14 2024-11-19 23:19:54 +09:00
SweetJJuya
0b3cb03a9d 0.3.4.13 2024-11-19 22:48:41 +09:00
NTG_Lenovo
86a0e22151 0.3.4.12 2024-11-19 22:32:43 +09:00
SweetJJuya
273df8d6ed 0.3.4.11 2024-11-19 21:53:00 +09:00
NTG_Lenovo
63472acde1 0.3.4.10 업데이트 2024-11-19 16:57:05 +09:00
NTG_Lenovo
0c68cfe87a 0.3.4.8 업데이트 2024-11-19 15:03:43 +09:00
Nam Tae Gun
4c46b87a95 0.3.4.7 2024-11-19 10:12:01 +09:00
Nam Tae Gun
3a0c28d3e3 0.3.4.4 2024-11-18 12:51:28 +09:00
Nam Tae Gun
fc0b648b04 0.3.4.3 업데이트 2024-11-18 00:36:08 +09:00
Nam Tae Gun
4d9362fc20 0.3.4.2 업데이트 2024-11-17 23:21:16 +09:00
Nam Tae Gun
d9110b34df 0.3.4.1 업데이트 2024-11-17 13:29:57 +09:00
Nam Tae Gun
859333272b 0.3.4.0(2) 2024-11-15 16:41:17 +09:00
Nam Tae Gun
57b21c004f 0.3.4.0 2024-11-15 16:28:13 +09:00
NTG_Lenovo
c905337c94 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-11-12 21:07:37 +09:00
NTG_Lenovo
2d78b0d2a0 0.3.3.23 업데이트 2024-11-12 21:07:23 +09:00
SweetJJuya
e35844537f 0.3.3.22 2024-11-12 20:25:00 +09:00
NTG_Lenovo
3b6420352c 0.3.3.20 2024-11-12 18:15:42 +09:00
NTG_Lenovo
2117b3004f Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-11-12 17:07:28 +09:00
NTG_Lenovo
92abe1a1b6 0.3.3.19 2024-11-12 17:07:17 +09:00
NTG_Lenovo
10605c71be 0.3.3.17 업데이트 2024-11-11 21:23:27 +09:00
SweetJJuya
4e64449e02 0.3.3.16 2024-11-11 20:11:10 +09:00
NTG_Lenovo
d093750e27 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-11-11 18:51:22 +09:00
NTG_Lenovo
ffb6fbc26a 0.3.3.16 2024-11-11 18:51:12 +09:00
SweetJJuya
439595f03c 0.3.3.15 2024-11-11 18:50:41 +09:00
NTG_Lenovo
d01a2ba262 0.3.3.12 업데이트 2024-11-11 16:06:33 +09:00
NTG_Lenovo
5143cb3bff 0.3.3.11 업데이트 2024-11-11 15:09:32 +09:00
Nam Tae Gun
a116f24499 0.3.3.10 업데이트 2024-11-11 11:02:24 +09:00
NTG_Lenovo
88d38d95a2 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-11-07 21:21:08 +09:00
NTG_Lenovo
cffcaa531b 0.3.3.9 업데이트 2024-11-07 21:20:24 +09:00
SweetJJuya
c2616e30d7 0.3.3.8 2024-11-07 21:02:00 +09:00
NTG_Lenovo
ecc036a98d 0.3.3.7 업데이트 2024-11-07 18:13:54 +09:00
NTG_Lenovo
61c4fd1094 0.3.3.6 업데이트 2024-11-07 15:13:57 +09:00
ad7b10ce44 홀 구조 수정시안 2024-11-06 18:45:29 +09:00
NTG_Lenovo
07cdaa296a 0.3.3.5(2) 2024-11-05 21:31:03 +09:00
NTG_Lenovo
396d0d67d8 0.3.3.5 업데이트 2024-11-05 21:27:46 +09:00
NTG_Lenovo
10bf2d0638 0.3.3.3 업데이트 2024-11-05 17:26:26 +09:00
NTG_Lenovo
c5887fcbec 0.3.3.2 업데이트 2024-11-04 21:22:07 +09:00
Nam Tae Gun
aae5bef8f0 0.3.3.1 업데이트 2024-10-31 22:25:31 +09:00
NTG_Lenovo
5a3c2a1ac4 0.3.3.0(2) 업데이트 2024-10-31 21:20:00 +09:00
NTG_Lenovo
b593824caa Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-10-31 21:18:48 +09:00
NTG_Lenovo
7148065e2f 0.3.3.0 업데이트 2024-10-31 21:18:34 +09:00
402118db93 홀 4차02 2024-10-31 19:58:14 +09:00
1ec3377e7a 홀 4차01 2024-10-31 14:50:06 +09:00
NTG_Lenovo
726063fcf6 0.3.2.17 버전 업데이트 2024-10-29 21:17:00 +09:00
NTG_Lenovo
1dcd03e018 0.3.2.14 업데이트 2024-10-29 15:45:18 +09:00
1de6e70778 홀 3차07 2024-10-28 20:06:08 +09:00
NTG_Lenovo
30423a4755 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-10-28 18:10:54 +09:00
NTG_Lenovo
0f6fb12605 0.3.2.10 업데이트 2024-10-28 18:10:34 +09:00
SweetJJuya
c58074df41 0.3.2.9 2024-10-28 18:09:18 +09:00
SweetJJuya
da35977888 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg
# Conflicts:
#	Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs
2024-10-28 13:24:39 +09:00
Nam Tae Gun
87f6ddf1ea 0.3.2.5 버전 업데이트 2024-10-27 18:44:22 +09:00
SweetJJuya
c3bdefa642 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg
# Conflicts:
#	Assets/02.Scripts/Item/Cocktail/CocktailData.cs
2024-10-24 14:05:51 +09:00
SweetJJuya
a85c91211e 0.3.2.3 2024-10-24 14:04:40 +09:00
NTG_Lenovo
10a7c01066 0.3.2.1 버전 업데이트 2024-10-22 21:41:31 +09:00
NTG_Lenovo
d4486a2f06 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-10-21 16:53:54 +09:00
080a67502b 홀 3차06 2024-10-21 04:29:39 +09:00
Nam Tae Gun
555b2507a8 0.3.1.4 업데이트 2024-10-21 02:21:39 +09:00
7b8322cc34 Gitea connect 2024-10-18 18:22:54 +09:00
Nam Tae Gun
31ea50c10a Init commit 2024-10-16 03:01:16 +09:00
Nam Tae Gun
07c0e21a57 Initial commit 2024-10-14 20:13:08 +09:00
Nam Tae Gun
ece403f3f1 Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into ntg
# Conflicts:
#	Assets/01.Scenes/99.Tycoon43.unity
2024-10-10 23:27:35 +09:00
56c17a8486 홀 3차06 2024-10-10 19:32:02 +09:00
NTG_Lenovo
dd3a023793 0.3.1.1 업데이트 2024-10-10 17:42:20 +09:00
NTG_Lenovo
37612b8dbe 0.3.1.0 업데이트 2024-10-10 14:44:37 +09:00
NTG_Lenovo
5283f75745 Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg 2024-10-10 12:59:03 +09:00
NTG_Lenovo
5787b83b30 빌지 Ui 작업 중 2024-10-08 22:44:20 +09:00
NTG_Lenovo
330567c868 0.3.0.9 업데이트 2024-10-08 15:13:52 +09:00
9155cb3002 홀조명세팅 2024-10-07 17:45:00 +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
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
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
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
8bb0f299c3 카드 효과 추가 2024-09-12 16:38:16 +09:00
NTG_Lenovo
b5638a435a 데이터 구조 방식 변경 2024-09-12 16:36:24 +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
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