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
..
Buildable	항해씬 중간제작	2025-02-24 15:37:43 +09:00
Prefabricated	Merge branch 'main' of http://gitea.capers.co.kr:3000/iwnc2020/CapersProject into ntg	2025-02-24 20:57:04 +09:00
BaseInteractionFurniture.prefab	타이쿤 업데이트	2025-02-18 06:47:56 +09:00
BaseInteractionFurniture.prefab.meta	타이쿤 업데이트	2025-02-18 06:47:56 +09:00
Bell.prefab	타이쿤 업데이트	2025-02-24 20:55:35 +09:00
Bell.prefab.meta	타이쿤 업데이트	2025-02-18 06:47:56 +09:00
Buildable.meta	항해씬 중간제작	2025-02-24 15:37:43 +09:00
CustomerTable.prefab	타이쿤 업데이트	2025-02-18 06:47:56 +09:00
CustomerTable.prefab.meta	타이쿤 업데이트	2025-02-18 06:47:56 +09:00
Cutter.prefab	맵 업데이트	2025-02-24 11:55:22 +09:00
Cutter.prefab.meta	맵 업데이트	2025-02-24 11:55:22 +09:00
Fryer.prefab	맵 업데이트	2025-02-24 11:55:22 +09:00
Fryer.prefab.meta	타이쿤 수정	2025-02-21 15:31:50 +09:00
MenuBoard.prefab	타이쿤 업데이트	2025-02-18 06:47:56 +09:00
MenuBoard.prefab.meta	타이쿤 업데이트	2025-02-18 06:47:56 +09:00
Plater.prefab	맵 업데이트	2025-02-24 11:55:22 +09:00
Plater.prefab.meta	맵 업데이트	2025-02-24 11:55:22 +09:00
Pot.prefab	맵 업데이트	2025-02-24 11:55:22 +09:00
Pot.prefab.meta	타이쿤 업데이트	2025-02-18 06:47:56 +09:00
Prefabricated.meta	타이쿤 업데이트	2025-02-18 06:47:56 +09:00
TycoonSwitch.prefab	타이쿤 업데이트	2025-02-18 06:47:56 +09:00
TycoonSwitch.prefab.meta	타이쿤 업데이트	2025-02-18 06:47:56 +09:00