iwnc2020/CapersProject
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
407 Commits 7 Branches 0 Tags 3.9 GiB
8b51e55deb
Commit Graph

265 Commits

Author SHA1 Message Date
SweetJJuya
439595f03c 0.3.3.15 2024-11-11 18:50:41 +09:00
NTG_Lenovo
517e0324e8 0.3.3.14 업데이트 2024-11-11 16:29:53 +09:00
NTG_Lenovo
3e78113bd5 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 
# Conflicts:
#	Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs
 2024-11-11 16:25:25 +09:00
SweetJJuya
c2b3b589e4 0.3.3.13 2024-11-11 16:23:21 +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
NTG_Lenovo
778f3645cc Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-11-05 21:27:53 +09:00
NTG_Lenovo
396d0d67d8 0.3.3.5 업데이트 2024-11-05 21:27:46 +09:00
SweetJJuya
1dd6f3c4a0 0.3.3.4 2024-11-05 21:27:14 +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
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
SweetJJuya
e549e19ab7 0.3.2.20 2024-10-31 21:17:10 +09:00
capers
204453c5a7 칵테일 DB, 카드 DB 수정 2024-10-31 21:03:55 +09:00
NTG_Lenovo
b6182e8d0a 0.3.2.19 업데이트 2024-10-31 14:41:13 +09:00
NTG_Lenovo
72281e727c Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-10-31 14:29:08 +09:00
SweetJJuya
d4d2580abd 0.3.2.18 2024-10-31 14:28:29 +09:00
NTG_Lenovo
726063fcf6 0.3.2.17 버전 업데이트 2024-10-29 21:17:00 +09:00
SweetJJuya
d50f24b8e0 0.3.2.16 2024-10-29 20:38:36 +09:00
SweetJJuya
8945c191f3 0.3.2.15 2024-10-29 19:43:07 +09:00
SweetJJuya
f2fed8df8f 0.3.2.15 2024-10-29 15:52:17 +09:00
SweetJJuya
19a78c1200 Merge branch 'ntg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg 
# Conflicts:
#	Assets/02.Scripts/Ui/Tycoon/Manual.cs
#	Assets/02.Scripts/Ui/Tycoon/ManualBook.cs
 2024-10-29 15:49:54 +09:00
SweetJJuya
4dd40c4c1d 0.3.2.15 2024-10-29 15:46:50 +09:00
NTG_Lenovo
1dcd03e018 0.3.2.14 업데이트 2024-10-29 15:45:18 +09:00
capers
723c2598ac 책상 쓰레기 확률 증가 2024-10-29 14:24:56 +09:00
capers
6374e23a46 Merge remote-tracking branch 'origin/develop' into develop 2024-10-28 21:20:08 +09:00
capers
3161695f08 난이도 변경 (excel, json, so 수정) 2024-10-28 21:19:38 +09:00
NTG_Lenovo
fa924e2e06 0.3.2.13 업데이트 2024-10-28 21:11:31 +09:00
NTG_Lenovo
11c4e11a14 0.3.2.12 업데이트 2024-10-28 21:02:31 +09:00
NTG_Lenovo
4b2eb0c117 0.3.2.11 업데이트 2024-10-28 20:42:22 +09:00
capers
8e69d88137 카드 데이타 테이블 리버트, 칵테일 데이터 다시 재업로드 2024-10-28 20:33:57 +09:00
capers
56ba83c239 칵테일 오차율 변경 (Excel, json, SO) 2024-10-28 20:29:09 +09:00
capers
5cd6a03e7e 난이도 수정, 리스폰 속도 감소. 
(excel, json, so 수정)
 2024-10-28 20:08:42 +09:00
NTG_Lenovo
3db4870837 0.3.2.10 업데이트2 (병합) 2024-10-28 18:27:48 +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
NTG_Lenovo
1cf7b9a48f 0.3.2.8 누락된 업데이트 추가 2024-10-28 14:09:06 +09:00
NTG_Lenovo
3b66a33d2f 0.3.2.8 업데이트 2024-10-28 13:52:11 +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
SweetJJuya
5fb234e991 0.3.2.7 2024-10-28 13:24:04 +09:00
NTG_Lenovo
18909909fe 0.3.2.6 업데이트 2024-10-28 13:09:10 +09:00
Nam Tae Gun
87f6ddf1ea 0.3.2.5 버전 업데이트 2024-10-27 18:44:22 +09:00
NTG_Lenovo
b54b4a8b43 0.3.2.4 업데이트 2024-10-24 17:05:32 +09:00
capers
9ca698b56f 토 확률, 책상 더러워 확률 증가 (SO 수정) 2024-10-24 16:57:34 +09:00
capers
8013366e64 손님 대기 시간 수정, EXP 수정, 등장 속도 수정 
(엑셀, json, SO 모두 수정)
 2024-10-24 16:57:08 +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
17a5a96b53 CocktailIngredient 데이터 직렬화 2024-10-24 14:03:18 +09:00
Nam Tae Gun
99a8e9b653 0.3.2.2 업데이트 2024-10-23 14:26:56 +09:00
NTG_Lenovo
9b82a39ff1 0.3.2.1 누락 요소 추가3 2024-10-22 21:51:22 +09:00
NTG_Lenovo
17d2abc545 0.3.2.1 누락 요소 추가2 2024-10-22 21:47:02 +09:00
NTG_Lenovo
05e75346b6 0.3.2.1 누락요소 추가 2024-10-22 21:44:27 +09:00
NTG_Lenovo
10a7c01066 0.3.2.1 버전 업데이트 2024-10-22 21:41:31 +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
517285cbc3 0.3.2.0 테스트용 버전 업데이트 2024-10-21 16:58:20 +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
Nam Tae Gun
555b2507a8 0.3.1.4 업데이트 2024-10-21 02:21:39 +09:00
Nam Tae Gun
c1f07f81bd 테스트용 푸쉬 2024-10-17 14:19:42 +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
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
b34dfa2ddb 0.3.1.2 업데이트 2024-10-10 18:32:18 +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
18f78706d0 Merge branch 'lmg' of http://175.209.66.186/capersunity/newbluewater into ntg 2024-10-10 14:42:17 +09:00
SweetJJuya
ce32862586 0.3.0.11 2024-10-10 14:41:47 +09:00
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
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
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
b08abbc6b3 0.3.0.4 2024-10-03 16:55:56 +09:00
NTG_Lenovo
b601a284ff ai 플로우 수정 중 2024-09-30 21:05:19 +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
NTG_Lenovo
9af080fda2 Ver 0.3.0.2 업데이트 2024-09-24 19:35:49 +09:00
SweetJJuya
a4ec830929 0.3.0.1 2024-09-24 19:09:17 +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
SweetJJuya
b08c8ef39f 카드효과 추가 2024-09-23 00:49:43 +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