Commit Graph

628 Commits

Author SHA1 Message Date
Nam Tae Gun
07d3763889 타이쿤씬 재정비 중 2025-02-10 11:13:46 +09:00
Nam Tae Gun
7f02053158 Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg
# Conflicts:
#	Assets/AllIn1VfxToolkit/Demo & Assets/Textures Demo/DemoTextures.meta
#	Assets/AllIn1VfxToolkit/Demo & Assets/Textures Demo/DemoTextures/LightingData.asset
#	Assets/AllIn1VfxToolkit/Demo & Assets/Textures Demo/DemoTextures/LightingData.asset.meta
#	Assets/AllIn1VfxToolkit/Demo & Assets/Textures Demo/DemoTextures/ReflectionProbe-0.exr.meta
2025-02-10 06:09:38 +09:00
46c3bb61b4 타이쿤씬 수정5 2025-02-10 04:37:44 +09:00
Nam Tae Gun
ac52737cc6 merge2 2025-02-10 01:20:45 +09:00
Nam Tae Gun
3704cd90f6 merge 2025-02-10 01:16:10 +09:00
SweetJJuya
ccd84249a3 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject 2025-02-07 22:18:59 +09:00
SweetJJuya
275a4d9a5c 항해 Fix 2025-02-07 22:15:29 +09:00
f1e1ac0be6 타이쿤씬 수정4 2025-02-04 21:42:21 +09:00
NTG_Lenovo
d35ec28809 프로젝트DDD 스크립트 분할 2025-02-03 19:03:41 +09:00
2cf3d81235 타이쿤씬 수정중3 2025-02-03 18:11:42 +09:00
NTG_Lenovo
77cda57935 Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg 2025-01-21 17:59:16 +09:00
NTG_Lenovo
3617a607a0 0.1.0.4 2025-01-21 17:58:43 +09:00
6c4985df3f 타이쿤씬 수정중2 2025-01-20 19:42:31 +09:00
NTG_Lenovo
d5a8cb468f 마법진 테스트 중 2025-01-20 19:13:06 +09:00
NTG_Lenovo
98d07d4886 0.1.0.3(2) 2025-01-20 16:36:33 +09:00
NTG_Lenovo
da18e0cc15 0.1.0.3 2025-01-20 16:32:19 +09:00
3790861a5d Merge remote-tracking branch 'origin/main' 2025-01-16 20:07:16 +09:00
5799f28fdf 타이쿤씬 수정중 2025-01-16 20:04:13 +09:00
NTG_Lenovo
ff5ae9ebd4 0.1.0.2 2025-01-16 18:32:09 +09:00
SweetJJuya
d4d816cd14 First 2025-01-16 17:49:49 +09:00
NTG_Lenovo
ae6eca5a31 0.1.0.1 2025-01-16 17:39:25 +09:00
NTG_Lenovo
f7d2309146 대화 시스템 테스트 2025-01-15 17:39:57 +09:00
NTG_Lenovo
e8ef2ce723 대화 시스템 테스트 중 2025-01-13 20:41:50 +09:00
NTG_Lenovo
95a5922df4 패키지 업그레이드 2025-01-13 16:46:04 +09:00
NTG_Lenovo
4a65eabca7 렌더 텍스처 테스트2 2025-01-09 19:15:02 +09:00
NTG_Lenovo
63c1913820 렌더 텍스처 테스트 2025-01-07 20:03:44 +09:00
NTG_Lenovo
ba43932f3d Capers Project 0.1.0.0 2025-01-07 16:17:27 +09:00
Nam Tae Gun
57bd6f451b 0.4.1.0 2025-01-06 17:37:19 +09:00
Nam Tae Gun
f2db2ad110 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2025-01-06 17:13:27 +09:00
SweetJJuya
c7e25c15d6 0.4.0.8 2025-01-06 17:02:09 +09:00
SweetJJuya
f8771168cc 0.4.0.7 2025-01-06 15:23:22 +09:00
koko
2f9031bac1 사운드 교체 (나무 때리기) 2025-01-05 02:18:31 +09:00
koko
a74b953c32 사운드 교체 (곰팡이, 나무 때리기) 2025-01-04 02:42:21 +09:00
Nam Tae Gun
a9bb44fe99 0.4.0.6 2025-01-03 17:24:57 +09:00
Nam Tae Gun
e8f30ab80d 0.4.0.5 2025-01-03 16:26:36 +09:00
Nam Tae Gun
0df469c26e 0.4.0.4(2) 2025-01-03 16:20:04 +09:00
Nam Tae Gun
5a86a6b609 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg
# Conflicts:
#	Assets/StreamingAssets/google-services-desktop.json.meta
2025-01-03 16:18:15 +09:00
Nam Tae Gun
f9595ec0ef merge 2025-01-03 16:17:23 +09:00
SweetJJuya
bbb2d5a650 0.4.0.4 2025-01-03 11:44:54 +09:00
Nam Tae Gun
a6dc25b915 0.4.0.3 2025-01-02 20:28:45 +09:00
Nam Tae Gun
01fad1f338 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg
# Conflicts:
#	Assets/StreamingAssets/google-services-desktop.json.meta
2025-01-02 20:27:56 +09:00
Nam Tae Gun
76193ed596 0.4.0.2 2025-01-02 20:24:45 +09:00
SweetJJuya
02a761c3b4 0.4.0.2 2025-01-02 19:57:45 +09:00
Nam Tae Gun
3b09252818 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg
# Conflicts:
#	Assets/01.Scenes/01.Tycoon 1.unity.meta
2025-01-02 19:57:38 +09:00
SweetJJuya
28b8b6dfb0 0.4.0.1 2025-01-02 19:44:51 +09:00
NTG_Lenovo
c560d7115f 텍스트 애니메이션 패키지 추가 2025-01-02 18:56:03 +09:00
NTG_Lenovo
9114e03bf5 4.0.0.1 2025-01-02 18:33:05 +09:00
Nam Tae Gun
e8e3b0461a 업데이트중 2025-01-02 12:40:16 +09:00
koko
59d132730e 사운드 파일 교체 및 추가 2024-12-31 16:30:03 +09:00
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
3475d40edc 0.3.5.25 2024-12-27 05:25:49 +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
616fff8580 0.4.0.0 2024-12-21 02:56:34 +09:00
Nam Tae Gun
fc2df15a55 0.3.5.24 2024-12-20 18:05:45 +09:00
f645e36371 타이틀 수정 2024-12-20 16:48:07 +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
177800e0fe 홀비주얼 수정1219-2 2024-12-19 02:29:42 +09:00
Nam Tae Gun
46e2029267 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-12-19 01:18:56 +09:00
Nam Tae Gun
1d8fafd6ba 0.3.5.20(2) 2024-12-19 01:17:54 +09:00
koko
60c52cc483 Merge remote-tracking branch 'origin/develop' into develop 2024-12-19 01:03:34 +09:00
koko
09663a9487 BGM 볼륨 조절 2024-12-19 01:03:04 +09:00
Nam Tae Gun
bff1e2ce58 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-12-19 01:00:55 +09:00
Nam Tae Gun
e4a06b8475 0.3.5.20 2024-12-19 01:00:39 +09:00
0d8596ee67 홀비주얼 수정 1219 2024-12-19 00:58:24 +09:00
NTG_Lenovo
af2ccaaeb9 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-12-17 22:50:46 +09:00
NTG_Lenovo
f040a91cda 0.3.5.19 2024-12-17 22:50:27 +09:00
74631ab062 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into develop 2024-12-17 22:37:42 +09:00
7139a230f4 홀비주얼 수정3 2024-12-17 22:29:25 +09:00
NTG_Lenovo
27bf5a8427 0.3.5.18(2) 2024-12-17 22:00:00 +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
8df303afa1 카드 시스템 변경 2024-12-16 21:08:29 +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
afea36ff5b 홀비주얼 수정2 2024-12-16 20:35:07 +09:00
SweetJJuya
4a54f11319 0.3.5.15 2024-12-16 20:25:27 +09:00
4cb7137cfe 홀비주얼 수정 2024-12-16 03:42:12 +09:00
koko
9941b879a2 사운드 교체 및 사운드 파일 추가 2024-12-14 20:46:27 +09:00
72a616e43c 레벨 난이도 수정 2024-12-12 19:23:16 +09:00
Nam Tae Gun
5d9b0f79f9 0.3.5.14(2) 2024-12-12 15:33:15 +09:00
Nam Tae Gun
844f1b4885 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-12-12 15:31:38 +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
8915de1940 타이틀 수정 2024-12-10 20:00:59 +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
96c185998e 0.3.5.5(2) 2024-12-02 20:45:24 +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
a5df423c6a 0.3.5.2(2) 2024-12-01 02:11:05 +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
Nam Tae Gun
8b51e55deb Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-11-28 13:05:19 +09:00
SweetJJuya
802f961044 0.3.4.21 2024-11-26 21:24:01 +09:00
NTG_Lenovo
62a17ed600 결과창 작업중 2024-11-26 20:46:32 +09:00
NTG_Lenovo
d54be2d253 0.3.4.20(3) 2024-11-26 17:44:40 +09:00
NTG_Lenovo
4a9de67a11 0.3.4.20 2024-11-26 17:41:51 +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
b8423eda5e 0.3.4.17(2) 2024-11-25 21:37:35 +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