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
..
BehaviorTree	타이쿤 업데이트	2025-02-24 20:55:35 +09:00
Character	타이쿤씬 재정비 중	2025-02-10 11:13:46 +09:00
Prop	타이쿤 업데이트	2025-02-24 20:55:35 +09:00
ScriptableObject	맵 업데이트	2025-02-24 11:55:22 +09:00
Ui	Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg	2025-02-24 20:57:04 +09:00
BehaviorTree.meta	타이쿤 업데이트	2025-02-18 06:47:56 +09:00
Character.meta	타이쿤씬 재정비 중	2025-02-10 11:13:46 +09:00
Prop.meta	타이쿤 업데이트	2025-02-18 06:47:56 +09:00
ScriptableObject.meta	프로젝트DDD 스크립트 분할	2025-02-03 19:03:41 +09:00
Ui.meta	타이쿤씬 재정비 중	2025-02-10 11:13:46 +09:00