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
..
New Folder	숙소씬 업데이트	2025-02-24 01:48:01 +09:00
0399.Sail.unity	숙소씬 업데이트	2025-02-24 19:15:28 +09:00
0399.Sail.unity.meta	숙소씬 업데이트	2025-02-24 19:15:28 +09:00
0599.DialogueTest2.unity	복도 업데이트	2025-02-24 20:12:19 +09:00
0599.DialogueTest2.unity.meta	숙소씬 업데이트	2025-02-24 01:48:01 +09:00
04992.TycoonTest.unity	맵 업데이트	2025-02-24 11:55:22 +09:00
04992.TycoonTest.unity.meta	타이쿤씬 업데이트	2025-02-21 03:38:07 +09:00
New Folder.meta	타이쿤씬+그리드	2025-02-10 19:44:21 +09:00