宝石塔防
parent: 9a0707 | patch | commitdiff
chenxin
2020-11-12 8eb1ccdd018282a0f31bc31ea0a9f5a45fd9d498
refs
author chenxin <chenxin6991@163.com>
Thursday, November 12, 2020 11:43 +0800
committer chenxin <chenxin6991@163.com>
Thursday, November 12, 2020 11:43 +0800
commit8eb1ccdd018282a0f31bc31ea0a9f5a45fd9d498
tree 0993d87bc4ea347800d3cf3326bc305e8a93e658 tree | zip | gz
parent 9a07073abba13afa28b85a2e0a59575bc6b7e417 view | diff
278c5a9068bbe31be577d3d239f2a10867b46dd6 view | diff 
Merge commit '278c5a9068bbe31be577d3d239f2a10867b46dd6' into master

# Conflicts:
#	Assets/Scripts/TowerDefense/UI/HUD/PlacementTile.cs
6 files renamed
6 files added
13 files modified
2290 ■■■■■ changed files
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/a_00.png.meta 32 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/a_01.png.meta 32 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/b_00.png.meta 32 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/b_01.png.meta 32 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/sw_00.png.meta 32 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/sw_01.png.meta 32 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/z_00.png.meta 32 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Water/z_01.png.meta 32 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/BuffPreview.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/BuffPreview/BuffPreview.prefab 981 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/BuffPreview/BuffPreview.prefab.meta 7 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Endless/BuffPreviewIcon.meta 8 ●●●●● diff | view | raw | blame | history
Assets/Resources/UI/Endless/BuffPreviewIcon/buff_1.png diff | view | raw | blame | history
Assets/Resources/UI/Endless/BuffPreviewIcon/buff_1.png.meta diff | view | raw | blame | history
Assets/Resources/UI/Endless/BuffPreviewIcon/buff_2.png diff | view | raw | blame | history
Assets/Resources/UI/Endless/BuffPreviewIcon/buff_2.png.meta diff | view | raw | blame | history
Assets/Resources/UI/Endless/BuffPreviewIcon/buff_3.png diff | view | raw | blame | history
Assets/Resources/UI/Endless/BuffPreviewIcon/buff_3.png.meta diff | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless.unity 910 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Event/EventType.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessBuffManager.cs 6 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs 1 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBuffPreview.cs 95 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBuffPreview.cs.meta 11 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs 5 ●●●●● diff | view | raw | blame | history