Merge branch 'LifeStone' into tetris 해냈다해냈어
# Conflicts: # Assets/Prefabs/Characters/Player.prefab # Assets/Scenes/PlayScene.unity # Assets/Scripts/Characters/PlayerController.cs
Showing
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
1.26 KB
1.19 KB
141 Bytes
1.33 KB
1.19 KB