Assets/Scenes/PlayScene.unity · dd04ff2a905d240fd7b7db72d7bb37154cfc776c · Oenos / tetra-tower

Merge branch 'tetris' into enemy 고블린 스프라이트 크기와 콜라이더 크기 수정, 고블린 생성 버튼 복구할것 · dd04ff2a

18류지석 authored Feb 01, 2019

# Conflicts:
#	Assets/Prefabs/Characters/Player.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Start.prefab
#	Assets/Prefabs/TetrisMap/TestTools.prefab
#	Assets/Scenes/PlayScene.unity

dd04ff2a

PlayScene.unity 49.5 KB

Replace PlayScene.unity