~wxd/GemBattle.git

chenxin

2020-10-27 43b531f76be6e12c775a1135f6895e8fdc389a59

refs
author	chenxin <chenxin6991@163.com>
	Tuesday, October 27, 2020 17:39 +0800
committer	chenxin <chenxin6991@163.com>
	Tuesday, October 27, 2020 17:39 +0800
commit	43b531f76be6e12c775a1135f6895e8fdc389a59
tree	1c0160d014de5c0e6e6ef3b9c914baec7101c6b6 tree \| zip \| gz
parent	38136a34de9aa36bf15ec7471abd56e2cba6c26f view \| diff 79e652bedf62f0842f59a2323f139f2e90efe819 view \| diff

Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

5 files modified

	Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs	3 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Towers/Tower.cs	78 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/BulletUICtl.cs	20 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EnergyUICtl.cs	28 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/HUD/GameUI.cs	29 ●●●●● diff \| view \| raw \| blame \| history