TigerProject/Assets/Scripts/Item/Item.cs

using System;
using UnityEngine;

public class Item
{

}
Merge branch 'main' of http://59.19.179.48:3300/qoralstmd6825/TigerProject # Conflicts: # Assets/Scripts/EntityData/TestEntity.asset # Assets/Scripts/Monster/GroundEnemyMovement.cs # Assets/Scripts/Player/Player.cs # Assets/Scripts/Player/PlayerController.cs 2026-01-27 12:17:01 +00:00			`using System;`
발판 추적시스템 수정 2026-01-27 12:06:26 +00:00			`using UnityEngine;`

Merge branch 'main' of http://59.19.179.48:3300/qoralstmd6825/TigerProject # Conflicts: # Assets/Scripts/EntityData/TestEntity.asset # Assets/Scripts/Monster/GroundEnemyMovement.cs # Assets/Scripts/Player/Player.cs # Assets/Scripts/Player/PlayerController.cs 2026-01-27 12:17:01 +00:00			`public class Item`
발판 추적시스템 수정 2026-01-27 12:06:26 +00:00			`{`

Merge branch 'main' of http://59.19.179.48:3300/qoralstmd6825/TigerProject # Conflicts: # Assets/Scripts/EntityData/TestEntity.asset # Assets/Scripts/Monster/GroundEnemyMovement.cs # Assets/Scripts/Player/Player.cs # Assets/Scripts/Player/PlayerController.cs 2026-01-27 12:17:01 +00:00			`}`