GemBattle.git - Gitblit

宝石塔防

chenxin

2020-12-11 f4b2230e6456f4e5c05e8535834a693a55fce0a2

refs
author	chenxin <chenxin6991@163.com>
	Friday, December 11, 2020 17:13 +0800
committer	chenxin <chenxin6991@163.com>
	Friday, December 11, 2020 17:13 +0800
commit	f4b2230e6456f4e5c05e8535834a693a55fce0a2
tree	137c98eb0894a30566b851bc9c01a9db11d9794b tree \| zip \| gz
parent	080100a11100ac8ee44f0742d0a55b12d5db8485 view \| diff 4e6cdeab033a3edc6c481742445904af8a8a4178 view \| diff

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

8 files modified

	Assets/Animations/Endless/Tower/Fire/Normal.controller	64 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Animations/Endless/Tower/Fire/NormalStand.anim	56 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Animations/Endless/Tower/Water/Normal.controller	62 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Animations/Endless/Tower/Water/NormalStand.anim	49 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Prefabs/UI/Endless/Energy.prefab	16 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Guide/GuidePanelNew.cs	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Economy/LootDrop.cs	20 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs	2 ●●●●● diff \| view \| raw \| blame \| history