NTG_Lenovo
|
44f282a718
|
Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg
# Conflicts:
# Assets/03.Images/DDD/Props/Environments/Jungle.meta
# Assets/03.Images/DDD/Props/Environments/Jungle/JungleBG.png
# Assets/03.Images/DDD/Props/Environments/Jungle/JungleBG.png.meta
# Assets/03.Images/DDD/Props/Environments/Jungle/JungleBG2.png
# Assets/03.Images/DDD/Props/Environments/Jungle/JungleBG2.png.meta
# Assets/03.Images/DDD/Props/Environments/Jungle/JungleTile.png
# Assets/03.Images/DDD/Props/Environments/Jungle/JungleTile.png.meta
# Assets/03.Images/DDD/Props/Environments/Jungle/JungleTile2.png
# Assets/03.Images/DDD/Props/Environments/Jungle/JungleTile2.png.meta
# Assets/03.Images/DDD/Props/Environments/Jungle/TableWoodFront.png
# Assets/03.Images/DDD/Props/Environments/Jungle/TableWoodFront.png.meta
# Assets/03.Images/DDD/Props/Environments/Jungle/TableWoodUp.png
# Assets/03.Images/DDD/Props/Environments/Jungle/TableWoodUp.png.meta
# Assets/03.Images/DDD/Props/Environments/Jungle/Tile 1.png
# Assets/03.Images/DDD/Props/Environments/Jungle/Tile 1.png.meta
# Assets/03.Images/DDD/Props/Environments/Jungle/tree.png
# Assets/03.Images/DDD/Props/Environments/Jungle/tree.png.meta
# Assets/05.Prefabs/DDD/Props/Furnitures/Prefabricated/HomeTableWood.prefab
# Assets/05.Prefabs/DDD/Props/Furnitures/Prefabricated/HomeTableWood.prefab.meta
# Assets/08.Spines/07.Animations/DDD/Props/Fryer.meta
# Assets/08.Spines/07.Animations/DDD/Props/Fryer/Enable.anim
# Assets/08.Spines/07.Animations/DDD/Props/Fryer/Enable.anim.meta
# Assets/08.Spines/07.Animations/DDD/Props/Fryer/EnableLoop.anim
# Assets/08.Spines/07.Animations/DDD/Props/Fryer/EnableLoop.anim.meta
# Assets/08.Spines/07.Animations/DDD/Props/Fryer/Fryer.controller
# Assets/08.Spines/07.Animations/DDD/Props/Fryer/Fryer.controller.meta
# Assets/08.Spines/07.Animations/DDD/Props/Fryer/Idle.anim
# Assets/08.Spines/07.Animations/DDD/Props/Fryer/Idle.anim.meta
|
2025-02-24 20:57:04 +09:00 |
|
NTG_Lenovo
|
88987df67d
|
타이쿤 업데이트
|
2025-02-24 20:55:35 +09:00 |
|
|
|
0059c7de8c
|
복도 업데이트
|
2025-02-24 20:12:19 +09:00 |
|
|
|
b479cbf9a0
|
숙소씬 업데이트
|
2025-02-24 19:15:28 +09:00 |
|
|
|
970527a0ee
|
Merge branch 'lmg' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject
|
2025-02-24 15:41:33 +09:00 |
|
SweetJJuya
|
9cad61b812
|
항해씬 중간제작
|
2025-02-24 15:37:43 +09:00 |
|
Nam Tae Gun
|
72b3db3d3e
|
맵 업데이트
|
2025-02-24 11:55:22 +09:00 |
|
Nam Tae Gun
|
d9cd461e83
|
Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg
|
2025-02-24 08:56:59 +09:00 |
|
|
|
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 |
|
