GemBattle.git - Gitblit

宝石塔防

chenxin

2020-12-11 80e661fd703af3f305efadf02f31c014b9f79d90

refs
author	chenxin <chenxin6991@163.com>
	Friday, December 11, 2020 17:45 +0800
committer	chenxin <chenxin6991@163.com>
	Friday, December 11, 2020 17:45 +0800
commit	80e661fd703af3f305efadf02f31c014b9f79d90
tree	ea21a58df8e3eb90cc97e4e3c12d258c26826ff9 tree \| zip \| gz
parent	c1ef6cbe7088df7eb236272db0621d5f51c02e5f view \| diff 74cc09511f7ffcbec25d9ce276f4be974875c05b view \| diff

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

# Conflicts:
#	Assets/Prefabs/UI/Endless/BottomCanvas.prefab

2 files added

3 files modified

	Assets/Prefabs/UI/Endless/BottomCanvas.prefab	1829 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs	1 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/HUD/BuffFly.cs	106 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/HUD/BuffFly.cs.meta	11 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs	16 ●●●●● diff \| view \| raw \| blame \| history