Commit Graph

94 Commits

Author SHA1 Message Date
SweetJJuya
4dd40c4c1d 0.3.2.15 2024-10-29 15:46:50 +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
619ce13f38 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg 2024-10-21 17:00:37 +09:00
SweetJJuya
c60d6e6286 0.3.1.6 2024-10-21 17:00:11 +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
NTG_Lenovo
fa5d184120 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-10-21 15:03:43 +09:00
SweetJJuya
3c7e2ba313 0.3.1.5 업데이트 2024-10-21 14:47:20 +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
07c0e21a57 Initial commit 2024-10-14 20:13:08 +09:00
SweetJJuya
c33e3c095f Merge branch 'ntg' of http://gitlab.capers.co.kr/capersunity/newbluewater into lmg 2024-10-10 18:34:25 +09:00
NTG_Lenovo
5e6aced848 Merge branch 'lmg' of http://175.209.66.186/capersunity/newbluewater into ntg 2024-10-10 18:34:23 +09:00
SweetJJuya
108c038858 0.3.1.3 2024-10-10 18:33:50 +09:00
NTG_Lenovo
dd3a023793 0.3.1.1 업데이트 2024-10-10 17:42:20 +09:00
NTG_Lenovo
5787b83b30 빌지 Ui 작업 중 2024-10-08 22:44:20 +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
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
700c773d57 홀 3차04 2024-10-03 02:29:49 +09:00
NTG_Lenovo
c9eb09e0fb 스파인 캐릭터 수정 및 타이쿤 스테이지 로직 수정 중 2024-09-30 18:41:55 +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
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
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
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
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
0a3addea9a 카드 추가 2024-09-09 18:50:37 +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
340408a8d4 Bar Ui 작업 중 2024-09-02 22:45:46 +09:00
NTG_Lenovo
6591e1a66f Idx 자료형 변경 int -> string 2024-08-22 19:39:15 +09:00
NTG_Lenovo
a5c698521b 타이쿤씬 액체 따르기 테스트 추가 2024-08-13 19:13:09 +09:00