GemBattle.git - Gitblit

宝石塔防

liuzhiwei

2020-12-08 ae487b742c792c43b81cce6f060b881e5609d160

refs
author	liuzhiwei <liuzhiwei@qq.com>
	Tuesday, December 8, 2020 11:48 +0800
committer	liuzhiwei <liuzhiwei@qq.com>
	Tuesday, December 8, 2020 11:48 +0800
commit	ae487b742c792c43b81cce6f060b881e5609d160
tree	49df2381fb17dfe76445654402aa46a35ae8c09a tree \| zip \| gz
parent	fc0f8dc7c70bf8e83d61e85f7f7885ba2754714a view \| diff 4b4e9e166f633705191f349e3c7cbb4fc280c132 view \| diff

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

9 files modified

	Assets/Prefabs/UI/PlacementTileMobile.prefab	4 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Final/FinalPanel.prefab	28 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Guide/GuidePanelNew.cs	14 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/Towers/Tower.cs	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs	9 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs	22 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/UI/FinalPanel/FinalPanel.cs	16 ●●●●● diff \| view \| raw \| blame \| history
	Assets/StreamingAssets/Table/elf_upgrade.json	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/StreamingAssets/Table/endless_buff.json	2 ●●●●● diff \| view \| raw \| blame \| history