|
|
0ec6aa5d52
|
숙소씬 업데이트
|
2025-02-24 01:48:01 +09:00 |
|
Nam Tae Gun
|
86e24f9790
|
Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg
|
2025-02-23 17:10:08 +09:00 |
|
|
|
ac45ab3b82
|
타이쿤씬 업데이트
|
2025-02-23 17:09:42 +09:00 |
|
Nam Tae Gun
|
8821037091
|
Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg
|
2025-02-23 17:01:09 +09:00 |
|
|
|
74ba8d3f3f
|
타이쿤씬 업데이트
|
2025-02-23 16:33:53 +09:00 |
|
NTG_Lenovo
|
146c4b6ffa
|
타이쿤 수정
|
2025-02-21 15:31:50 +09:00 |
|
|
|
1d42c94723
|
타이쿤씬 업데이트
|
2025-02-21 03:38:07 +09:00 |
|
NTG_Lenovo
|
f02195615d
|
메뉴판 Ui 수정
|
2025-02-18 18:35:13 +09:00 |
|
NTG_Lenovo
|
8171828657
|
타이쿤 최신화
|
2025-02-18 18:10:19 +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 |
|
Nam Tae Gun
|
bf08756a77
|
Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg
|
2025-02-17 02:19:45 +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
|
e4fe8e78b4
|
Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject
|
2025-02-12 16:33:48 +09:00 |
|
SweetJJuya
|
76a57b33e0
|
임시
|
2025-02-12 16:33:04 +09:00 |
|
|
|
1fc769b98d
|
숙소씬 추가
|
2025-02-12 16:15:41 +09:00 |
|
|
|
da056f2d4c
|
타이쿤씬+그리드
|
2025-02-10 19:44:21 +09:00 |
|
NTG_Lenovo
|
2a94200205
|
씬 재수정
|
2025-02-10 18:50:41 +09:00 |
|
NTG_Lenovo
|
dc7b6c9909
|
그리드 추가
|
2025-02-10 17:08:58 +09:00 |
|
SweetJJuya
|
6efc00934c
|
04.TycoonTest 그리드 추가
|
2025-02-10 16:50:43 +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 |
|
SweetJJuya
|
11bc3b60ca
|
임시
|
2025-02-10 14:47:48 +09:00 |
|
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 |
|
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 |
|
