chenxin
2020-10-31 ab06c43e60fbfaf6699a639766dbed01d35e7f47
refs
author chenxin <chenxin6991@163.com>
Saturday, October 31, 2020 18:11 +0800
committer chenxin <chenxin6991@163.com>
Saturday, October 31, 2020 18:11 +0800
commitab06c43e60fbfaf6699a639766dbed01d35e7f47
tree 6c4a43b04c64ee317790f65dc916f8d991aa719f tree | zip | gz
parent 482e8b47271bfcff1e5c7464cdbea848dfb4ccd9 view | diff
c5acee6ee51a8007a717c39d498dee4fc2092f6c view | diff
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
27 files modified
82 ■■■■ changed files
Assets/Data/Agents/woodMonster.asset 2 ●●● diff | view | raw | blame | history
Assets/Materials/Guide/RectGuidance.mat 2 ●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/fire.mat 2 ●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/fire1.mat 2 ●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/fire2.mat 2 ●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/fire3.mat 2 ●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/fire4.mat 2 ●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/water.mat 2 ●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/water1.mat 2 ●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/water2.mat 2 ●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/water3.mat 2 ●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/water4.mat 2 ●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/wood.mat 2 ●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/wood1.mat 2 ●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/wood2.mat 2 ●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/wood3.mat 2 ●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/Materials/wood4.mat 2 ●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Wood/matAttack_Oppo.mat 6 ●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Wood/matAttack_Self.mat 6 ●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Wood/matDie_Oppo.mat 6 ●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Wood/matDie_Self.mat 6 ●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Wood/matGetHit_Oppo.mat 4 ●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Wood/matGetHit_Self.mat 4 ●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Wood/matMove_Oppo.mat 6 ●●●● diff | view | raw | blame | history
Assets/Materials/PVPTD/MonsterMat/NewMat/Wood/matMove_Self.mat 4 ●●●● diff | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless.unity 2 ●●● diff | view | raw | blame | history
Assets/Scripts/TowerDefense/Towers/Tower.cs 4 ●●●● diff | view | raw | blame | history