Merge branch 'prefab' into tetris

# Conflicts: # Assets/Prefabs/Rooms/NormalRoom/Room 4(FR).prefab # Assets/Prefabs/Rooms/NormalRoom/Room 4.prefab

Merge branch 'prefab' into tetris
# Conflicts: # Assets/Prefabs/Rooms/NormalRoom/Room 4(FR).prefab # Assets/Prefabs/Rooms/NormalRoom/Room 4.prefab
4109d650 · 18손재민 · 3c490b9a · 96592d88 · 4109d650 · 4109d650
Commit 4109d650 authored Jan 26, 2019 by 18손재민
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 2172 additions and 1743 deletions

Room 4(FR).prefab Assets/Prefabs/Rooms/NormalRoom/Room 4(FR).prefab +1493 -1307

Room 4.prefab Assets/Prefabs/Rooms/NormalRoom/Room 4.prefab +679 -436

No files found.
--- a/Assets/Prefabs/Rooms/NormalRoom/Room 4(FR).prefab
+++ b/Assets/Prefabs/Rooms/NormalRoom/Room 4(FR).prefab
--- a/Assets/Prefabs/Rooms/NormalRoom/Room 4.prefab
+++ b/Assets/Prefabs/Rooms/NormalRoom/Room 4.prefab