GemBattle.git - Gitblit

宝石塔防

chenxin

2020-12-04 988e7226f6799263fed8e8e2afe04288f357df29

refs
author	chenxin <chenxin6991@163.com>
	Friday, December 4, 2020 17:43 +0800
committer	chenxin <chenxin6991@163.com>
	Friday, December 4, 2020 17:43 +0800
commit	988e7226f6799263fed8e8e2afe04288f357df29
tree	48de668ebbc306a5ab6d572aa4031e5d978f3695 tree \| zip \| gz
parent	81be72a35f9e7b247f6c5f79931ed910986ce274 view \| diff 52aa4f486f772f9aaf52eb6e7729eed8bbc298aa view \| diff

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

8 files modified

	Assets/Prefabs/UI/Final/FinalPanelItemNew.prefab	1 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Resources/UI/Final/FinalPanel.prefab	357 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/Guide/TestButton.cs	43 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs	2 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/UI/FinalPanel/FinalHttp.cs	71 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/UI/FinalPanel/FinalPanel.cs	119 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Scripts/UI/FinalPanel/FinalPanelItem.cs	28 ●●●●● diff \| view \| raw \| blame \| history
	Assets/Tools/EnhancedScroller v2/Plugins/EnhancedScroller.cs	3 ●●●●● diff \| view \| raw \| blame \| history