Merge branch 'tetris'
# Conflicts: # Assets/Data/dropData_exam.csv # Assets/Prefabs/Characters/Enemy/Goblin.prefab # Assets/Prefabs/Characters/Player.prefab # Assets/Scripts/Characters/Enemy/Enemy.cs # Assets/Scripts/Characters/Enemy/EnemyAir.cs # Assets/Scripts/Characters/Enemy/EnemyGround.cs # Assets/Scripts/EnemyManager.cs
Showing
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
Assets/Scripts/Normal.anim
0 → 100644
Assets/Sprites/Portal.meta
0 → 100644
4.38 KB
4.67 KB
4.68 KB
4.57 KB
4.55 KB
4.51 KB
4.45 KB
4.35 KB
4.44 KB
4.57 KB
4.78 KB
4.7 KB
4.7 KB
4.62 KB
4.61 KB
4.6 KB
610 Bytes
1.34 KB
2.58 KB
3.47 KB
4.35 KB
2 KB
522 Bytes
12.6 KB
15.9 KB
27.2 KB
3.58 KB
4.1 KB
722 Bytes
858 Bytes
2.78 KB
3.12 KB
2.89 KB
2.52 KB
932 Bytes
2.79 KB
4.11 KB
3.75 KB
3.06 KB
3.78 KB
3.14 KB
File moved
File moved
File moved
File moved
Assets/Sprites/UI.meta
0 → 100644
Assets/Sprites/UI/alert.png
0 → 100644
433 Bytes
File moved
File moved
File moved
Assets/Sprites/UI/sans.png
0 → 100644
655 Bytes
Assets/Sprites/pressbody.png
0 → 100644
5.47 KB
Assets/Sprites/presshead.png
0 → 100644
4.84 KB
2.68 KB