liuzhiwei
2020-12-09 b01151f932f8faa041a8facfb03059147170f40c
refs
author liuzhiwei <liuzhiwei@qq.com>
Wednesday, December 9, 2020 10:16 +0800
committer liuzhiwei <liuzhiwei@qq.com>
Wednesday, December 9, 2020 10:16 +0800
commitb01151f932f8faa041a8facfb03059147170f40c
tree c5b2bd3d7404dbc19bc902e1111e57f6d164101c tree | zip | gz
parent efccb9862a1ce9c3e4ccf21ed8b5e559f743333f view | diff
9626aad068e38196108ad9597e7dd8555f4a4ca3 view | diff
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
60 files added
40 files modified
3137 ■■■■■ changed files
Assets/Animations/Endless/Boss/1/Boss_1.controller 4 ●●●● diff | view | raw | blame | history
Assets/Animations/Endless/Boss/1/Boss_Standing.anim 26 ●●●●● diff | view | raw | blame | history
Assets/Animations/Endless/Boss/2/Boss_2.controller 4 ●●●● diff | view | raw | blame | history
Assets/Animations/Endless/Boss/2/Boss_Standing.anim 41 ●●●● diff | view | raw | blame | history
Assets/Animations/Endless/Boss/3/Boss_Standing.anim 20 ●●●●● diff | view | raw | blame | history
Assets/Materials/PVE/Materials/PVEBg.mat 2 ●●● diff | view | raw | blame | history
Assets/Materials/PVE/PVEBg3.png diff | view | raw | blame | history
Assets/Materials/PVE/PVEBg3.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/Resources/Music/UI按键.mp3 diff | view | raw | blame | history
Assets/Resources/Music/UI按键.mp3.meta 2 ●●● diff | view | raw | blame | history
Assets/Resources/Music/不可点击_错误.wav diff | view | raw | blame | history
Assets/Resources/Music/不可点击_错误.wav.meta 2 ●●● diff | view | raw | blame | history
Assets/Resources/Music/冰淇淋技能.wav diff | view | raw | blame | history
Assets/Resources/Music/冰淇淋技能.wav.meta 22 ●●●●● diff | view | raw | blame | history
Assets/Resources/Music/合成.wav diff | view | raw | blame | history
Assets/Resources/Music/合成.wav.meta 22 ●●●●● diff | view | raw | blame | history
Assets/Resources/Music/气泡.mp3 diff | view | raw | blame | history
Assets/Resources/Music/气泡.mp3.meta 22 ●●●●● diff | view | raw | blame | history
Assets/Resources/Music/火焰喷射.mp3 diff | view | raw | blame | history
Assets/Resources/Music/火焰喷射.mp3.meta 22 ●●●●● diff | view | raw | blame | history
Assets/Resources/Music/玉米狙击子弹.wav diff | view | raw | blame | history
Assets/Resources/Music/玉米狙击子弹.wav.meta 22 ●●●●● diff | view | raw | blame | history
Assets/Resources/Music/结算分数.wav diff | view | raw | blame | history
Assets/Resources/Music/结算分数.wav.meta 22 ●●●●● diff | view | raw | blame | history
Assets/Scripts/Music/AudioSourceManager.cs 94 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs 14 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs 2 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Tower.cs 4 ●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBuffPreview.cs 3 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/FreezeBreath.cs 2 ●●●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs 1 ●●●● diff | view | raw | blame | history
Assets/Scripts/UI/FinalPanel/FinalPanel.cs 9 ●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/01.png diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/02.png diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/03.png diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/04.png diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/05.png diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/06.png diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/07.png diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/08.png diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/09.png diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/09.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/10.png diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/10.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/11.png diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/11.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/12.png diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/12.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/13.png diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/13.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/14.png diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/14.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/15.png diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/15.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/16.png diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/16.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/NewStanding.anim 53 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/1/z1/NewStanding.anim.meta 8 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/01.png diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/02.png diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/03.png diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/04.png diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/05.png diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/06.png diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/07.png diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/08.png diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/09.png diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/09.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/10.png diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/10.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/11.png diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/11.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/12.png diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/12.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/13.png diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/13.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/14.png diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/14.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/15.png diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/15.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/16.png diff | view | raw | blame | history
Assets/UI/Endless/boss/2/z1/16.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/3/z1/01.png diff | view | raw | blame | history
Assets/UI/Endless/boss/3/z1/02.png diff | view | raw | blame | history
Assets/UI/Endless/boss/3/z1/03.png diff | view | raw | blame | history
Assets/UI/Endless/boss/3/z1/04.png diff | view | raw | blame | history
Assets/UI/Endless/boss/3/z1/05.png diff | view | raw | blame | history
Assets/UI/Endless/boss/3/z1/06.png diff | view | raw | blame | history
Assets/UI/Endless/boss/3/z1/07.png diff | view | raw | blame | history
Assets/UI/Endless/boss/3/z1/07.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/3/z1/08.png diff | view | raw | blame | history
Assets/UI/Endless/boss/3/z1/08.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/3/z1/09.png diff | view | raw | blame | history
Assets/UI/Endless/boss/3/z1/09.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/3/z1/10.png diff | view | raw | blame | history
Assets/UI/Endless/boss/3/z1/10.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/3/z1/11.png diff | view | raw | blame | history
Assets/UI/Endless/boss/3/z1/11.png.meta 118 ●●●●● diff | view | raw | blame | history
Assets/UI/Endless/boss/3/z1/12.png diff | view | raw | blame | history
Assets/UI/Endless/boss/3/z1/12.png.meta 118 ●●●●● diff | view | raw | blame | history