Commit Graph

417 Commits

Author SHA1 Message Date
Nam Tae Gun
57bd6f451b 0.4.1.0 2025-01-06 17:37:19 +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
Nam Tae Gun
0df469c26e 0.4.0.4(2) 2025-01-03 16:20:04 +09:00
SweetJJuya
bbb2d5a650 0.4.0.4 2025-01-03 11:44:54 +09:00
Nam Tae Gun
76193ed596 0.4.0.2 2025-01-02 20:24: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
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
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
78de51a3f7 0.3.5.22 2024-12-19 23:27:01 +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
1d8fafd6ba 0.3.5.20(2) 2024-12-19 01:17:54 +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
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
NTG_Lenovo
bd8bed0cad 메뉴 튜토리얼 완성 2024-12-17 16:42:47 +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
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
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
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
9d4c461d07 0.3.5.0 2024-11-30 20:53:38 +09:00
Nam Tae Gun
9a70355b61 0.3.4.22 2024-11-29 08:07:50 +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
3e986edc1a 0.3.4.17 2024-11-25 21:36:48 +09:00
Nam Tae Gun
e969065f7b 0.3.4.16(2) 2024-11-25 10:40:15 +09:00
NTG_Lenovo
afb747cc79 0.3.4.16 2024-11-21 20:05:59 +09:00
SweetJJuya
a90dc55ab5 0.3.4.14 2024-11-19 23:19: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
3a0c28d3e3 0.3.4.4 2024-11-18 12:51:28 +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
6298020485 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-11-16 03:14:30 +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
5b886f8b9d 홀 예시 씬 T45 2024-11-16 02:29:19 +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
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
e11c1db205 0.3.3.16(2) 2024-11-11 18:54:28 +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
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
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
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
NTG_Lenovo
7148065e2f 0.3.3.0 업데이트 2024-10-31 21:18:34 +09:00
NTG_Lenovo
77df4bd899 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-10-31 21:17:55 +09:00
SweetJJuya
e549e19ab7 0.3.2.20 2024-10-31 21:17:10 +09:00
402118db93 홀 4차02 2024-10-31 19:58:14 +09:00
7a7c4dd846 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into develop 2024-10-31 14:50:31 +09:00
1ec3377e7a 홀 4차01 2024-10-31 14:50:06 +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
853c595078 0.3.2.18 2024-10-31 14:28:45 +09:00
NTG_Lenovo
2696026118 0.3.2.17(2) 2024-10-29 21:17:17 +09:00
NTG_Lenovo
726063fcf6 0.3.2.17 버전 업데이트 2024-10-29 21:17:00 +09:00
SweetJJuya
3cb6c7b52b 0.3.2.16 2024-10-29 20:45:46 +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
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
NTG_Lenovo
4b2eb0c117 0.3.2.11 업데이트 2024-10-28 20:42:22 +09:00
1de6e70778 홀 3차07 2024-10-28 20:06:08 +09:00
NTG_Lenovo
3db4870837 0.3.2.10 업데이트2 (병합) 2024-10-28 18:27:48 +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
SweetJJuya
5fb234e991 0.3.2.7 2024-10-28 13:24:04 +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
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
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