Commit Graph

345 Commits

Author SHA1 Message Date
SweetJJuya
9cad61b812 항해씬 중간제작 2025-02-24 15:37:43 +09:00
SweetJJuya
c4dc3500c3 Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject
# Conflicts:
#	Assets/08.Spines/07.Animations/DDD.meta
#	Assets/08.Spines/07.Animations/DDD/Props.meta
#	Assets/08.Spines/07.Animations/DDD/Props/Pot.meta
#	Assets/08.Spines/07.Animations/DDD/Props/Pot/Enable.anim
#	Assets/08.Spines/07.Animations/DDD/Props/Pot/Enable.anim.meta
#	Assets/08.Spines/07.Animations/DDD/Props/Pot/Idle.anim
#	Assets/08.Spines/07.Animations/DDD/Props/Pot/Idle.anim.meta
#	Assets/08.Spines/07.Animations/DDD/Props/Pot/Pot.controller
#	Assets/08.Spines/07.Animations/DDD/Props/Pot/Pot.controller.meta
2025-02-18 15:57:56 +09:00
SweetJJuya
6c80f6bfee 임시 2025-02-18 15:56:30 +09:00
Nam Tae Gun
62f936092d 타이쿤 업데이트 2025-02-18 06:47:56 +09:00
NTG_Lenovo
0cbb82f370 메뉴판Ui 작업중2 2025-02-14 16:22:20 +09:00
Nam Tae Gun
7f6e467688 메뉴판Ui 2025-02-14 12:17:41 +09:00
SweetJJuya
76a57b33e0 임시 2025-02-12 16:33:04 +09:00
SweetJJuya
ff7dfe28fa Merge branch 'ntg' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject
# Conflicts:
#	Assets/02.Scripts/BlueWater/Sail/ShipMove.cs
#	Assets/02.Scripts/BlueWater/Sail/ShipMove.cs.meta
#	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 14:51:17 +09:00
Nam Tae Gun
07d3763889 타이쿤씬 재정비 중 2025-02-10 11:13:46 +09:00
SweetJJuya
275a4d9a5c 항해 Fix 2025-02-07 22:15:29 +09:00
NTG_Lenovo
d35ec28809 프로젝트DDD 스크립트 분할 2025-02-03 19:03:41 +09:00
NTG_Lenovo
3617a607a0 0.1.0.4 2025-01-21 17:58:43 +09:00
NTG_Lenovo
ff5ae9ebd4 0.1.0.2 2025-01-16 18:32:09 +09:00
NTG_Lenovo
ae6eca5a31 0.1.0.1 2025-01-16 17:39:25 +09:00
NTG_Lenovo
95a5922df4 패키지 업그레이드 2025-01-13 16:46:04 +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
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
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
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
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