# Conflicts:
#	Assets/Scenes/PlayScene.unity
#	Assets/Scripts/Characters/Enemy/EnemyAir.cs
#	Assets/Scripts/Characters/Enemy/EnemyGround.cs

# Conflicts:
#	Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-3.prefab
#	Assets/Scripts/Characters/Enemy/Enemy.cs

# Conflicts:
#	Assets/Scripts/Characters/Enemy/Enemy.cs

# Conflicts:
#	Assets/Prefabs/Rooms/NormalRoom/Room 1.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 12.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 13.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 14.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 20.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 9.prefab
#	Assets/Prefabs/TetrisMap/Tetrimino/Room Tutorial.prefab

이동이랑 죽음 애니메이션도 만들었음

일단 모든 방에 적은 있다

# Conflicts:
#	ProjectSettings/TagManager.asset

룸1 문생성 정보 잘못 되있던거 수정함.

# Conflicts:
#	Assets/Scripts/Characters/Enemy/Enemy.cs

큰거미 작은거미 스프라이트가 따로 없어서 걍 나중에 넣으련다.