Commit Graph

370 Commits

Author SHA1 Message Date
SweetJJuya
2190cd1230 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg 2024-12-27 05:27:08 +09:00
SweetJJuya
21385cb31b Merge branch 'ntg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into HEAD
# Conflicts:
#	Assets/StreamingAssets/google-services-desktop.json.meta
2024-12-27 05:22:50 +09:00
SweetJJuya
53546c572c Merge branch 'refs/heads/lmg' into HEAD
# Conflicts:
#	Assets/01.Scenes/99.Tycoon_LMG.unity
#	Assets/StreamingAssets/google-services-desktop.json.meta
2024-12-27 05:19:37 +09:00
SweetJJuya
98aa9be66f 0.3.5.25 2024-12-27 05:14:15 +09:00
f4996d6987 카드 데이터 테이블 (자동 충전 Max3으로 수정) 2024-12-26 17:25:19 +09:00
Nam Tae Gun
1faa4e36b7 0.3.5.23 2024-12-20 14:11:56 +09:00
NTG_Lenovo
8bb511eecf Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-12-19 23:29:31 +09:00
NTG_Lenovo
78de51a3f7 0.3.5.22 2024-12-19 23:27:01 +09:00
a54b2895bd 카드 노멀, 레어, 숍 테이블에 DoubleServing 확률 0으로 추가 및 수정 2024-12-19 19:55:07 +09:00
SweetJJuya
ebb5e6c127 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg
# Conflicts:
#	Assets/StreamingAssets/google-services-desktop.json.meta
2024-12-19 19:21:44 +09:00
SweetJJuya
9369389f4c 0.3.5.21 2024-12-19 19:20:44 +09:00
Nam Tae Gun
e4a06b8475 0.3.5.20 2024-12-19 01:00:39 +09:00
NTG_Lenovo
f040a91cda 0.3.5.19 2024-12-17 22:50:27 +09:00
NTG_Lenovo
ec93fe81ed 0.3.5.18 2024-12-17 21:54:30 +09:00
NTG_Lenovo
956ae93ae6 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-12-17 20:26:14 +09:00
NTG_Lenovo
9637668049 0.3.5.17 2024-12-17 20:25:53 +09:00
NTG_Lenovo
67eb2b542a Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-12-17 19:50:21 +09:00
SweetJJuya
1befc6d157 0.3.5.16 2024-12-17 19:44:39 +09:00
1b1228263d LevelDataTable 에서 RewardBox (0: 안나옴, 1: 일반 보물 상자, 2: 에픽 보물상자) 숫자 수정, 50레벨 이후 난이도 수정 2024-12-17 16:50:53 +09:00
NTG_Lenovo
bd8bed0cad 메뉴 튜토리얼 완성 2024-12-17 16:42:47 +09:00
632f91f317 Level Data Table 수정 (난이도 변경) 2024-12-17 14:48:19 +09:00
NTG_Lenovo
1672cf03b6 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-12-16 21:06:57 +09:00
NTG_Lenovo
89ee6c87ba 튜토리얼 작업 중 2024-12-16 21:06:42 +09:00
SweetJJuya
4a54f11319 0.3.5.15 2024-12-16 20:25:27 +09:00
72a616e43c 레벨 난이도 수정 2024-12-12 19:23:16 +09:00
Nam Tae Gun
dd191f1259 0.3.5.14 2024-12-12 15:30:38 +09:00
Nam Tae Gun
9ce7e946b7 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-12-12 13:37:15 +09:00
SweetJJuya
50523c903a Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg 2024-12-10 18:56:57 +09:00
SweetJJuya
3185ba9027 0.3.5.13 2024-12-10 18:56:18 +09:00
NTG_Lenovo
00289190b7 0.3.5.12 2024-12-10 15:49:15 +09:00
Nam Tae Gun
8e7b32d0f0 0.3.5.11 2024-12-06 22:20:10 +09:00
NTG_Lenovo
49321522f6 매뉴얼 북 수정 중 2024-12-05 19:30:41 +09:00
NTG_Lenovo
becad95097 0.3.5.10 2024-12-03 21:30:09 +09:00
NTG_Lenovo
c109087040 0.3.5.9 2024-12-03 18:38:19 +09:00
NTG_Lenovo
a131e6cc67 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-12-03 17:03:09 +09:00
NTG_Lenovo
8d012763bb 0.3.5.8 2024-12-03 17:02:15 +09:00
SweetJJuya
4c469494a9 0.3.5.7 2024-12-03 16:54:12 +09:00
NTG_Lenovo
2c0fcd5e48 0.3.5.6 2024-12-03 15:08:15 +09:00
NTG_Lenovo
5c2ab045d7 0.3.5.5 2024-12-02 20:43:08 +09:00
NTG_Lenovo
d615b18620 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-12-02 20:42:03 +09:00
SweetJJuya
45de8c07b2 0.3.5.4 2024-12-02 20:40:40 +09:00
SweetJJuya
4d6a7eb32e Temp_Save 2024-12-02 20:28:46 +09:00
5c47e922cd 카드 데이터 버프 카드 횟수 변경, 설명 10% 변경 (Excel, Json, SO) 2024-12-02 18:01:37 +09:00
Nam Tae Gun
7848033d4e 0.3.5.3 2024-12-02 10:48:44 +09:00
Nam Tae Gun
139675f9dd 0.3.5.2 2024-12-01 02:07:45 +09:00
Nam Tae Gun
a228267f88 0.3.5.1 2024-12-01 00:00:24 +09:00
Nam Tae Gun
6ce65a4f13 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-11-30 20:54:51 +09:00
Nam Tae Gun
9d4c461d07 0.3.5.0 2024-11-30 20:53:38 +09:00
koko
5dff241d32 Merge remote-tracking branch 'origin/develop' into develop 2024-11-30 03:25:58 +09:00
koko
ebe5d1cf5f 획득 골드 수량 감소 (Json,Excel,SO) 2024-11-30 03:20:22 +09:00
Nam Tae Gun
b5dc9b0f91 0.3.4.24 2024-11-29 17:34:20 +09:00
Nam Tae Gun
579b9d187a Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-11-29 08:21:52 +09:00
Nam Tae Gun
fdf698f0b9 0.3.4.23 2024-11-29 08:20:42 +09:00
Nam Tae Gun
9a70355b61 0.3.4.22 2024-11-29 08:07:50 +09:00
koko
2cdf7a5de6 레벨 난이도 수정 (Json, Excel, Json) 2024-11-28 21:57:23 +09:00
SweetJJuya
802f961044 0.3.4.21 2024-11-26 21:24:01 +09:00
NTG_Lenovo
c0f227e54b Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-11-26 17:22:46 +09:00
NTG_Lenovo
f82559342e 0.3.4.19 2024-11-26 17:22:26 +09:00
SweetJJuya
39ff17b22c 0.3.4.18 2024-11-26 17:18:41 +09:00
NTG_Lenovo
3e986edc1a 0.3.4.17 2024-11-25 21:36:48 +09:00
NTG_Lenovo
900d7c5825 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-11-25 21:35:39 +09:00
4125052444 난이도 조절 (Json, Excel, Json) 2024-11-25 20:54:45 +09:00
b0635728ee 난이도 조절 (DB,Excel, Json) 2024-11-25 19:39:31 +09:00
ee1ba43d61 골드 획득량 조절 (DB,Excel, Json) 2024-11-25 17:59:15 +09:00
NTG_Lenovo
f69eb0c9f3 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-11-25 15:52:19 +09:00
Nam Tae Gun
e969065f7b 0.3.4.16(2) 2024-11-25 10:40:15 +09:00
koko
10df68c073 상점 가격 변경, 골드 획득량 증가, 오물 확률 감소 2024-11-22 23:06:33 +09:00
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
SweetJJuya
d38a40cde4 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg
# Conflicts:
#	Assets/04.Materials/Ink.mat
2024-11-19 22:34:20 +09:00
SweetJJuya
826bc20b0c 0.3.4.11 2024-11-19 22:33:54 +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
SweetJJuya
bda714eb94 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg
# Conflicts:
#	Assets/04.Materials/Ink.mat
2024-11-19 16:58:37 +09:00
SweetJJuya
9c064a2f01 0.3.4.9 2024-11-19 16:58:11 +09:00
NTG_Lenovo
63472acde1 0.3.4.10 업데이트 2024-11-19 16:57:05 +09:00
NTG_Lenovo
e3bd934991 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-11-19 15:58:29 +09:00
SweetJJuya
ecd28edebe 0.3.4.9 2024-11-19 15:57:50 +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
9ef51bd5e4 0.3.4.6 업데이트 2024-11-18 19:07:19 +09:00
Nam Tae Gun
00be1f84dd 0.3.4.5 빌드 테스트 버전 2024-11-18 13:08:32 +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
959c3f31b4 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-11-16 03:14:06 +09:00
SweetJJuya
30276c6ff4 0.3.4.0(2) 2024-11-15 22:12:39 +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
SweetJJuya
7d45253810 0.3.3.21 2024-11-12 18:33:07 +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
0af5d8e69f 0.3.3.18 업데이트 2024-11-12 15:58:33 +09:00
NTG_Lenovo
cf861878fc 0.3.3.17(2) 업데이트 2024-11-12 15:24:44 +09:00