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

chenxin

2020-12-02 54181477c210344b037d88f17dbe2cddc5cbc930

Assets/Scripts/Guide/ImageTowerPos2.cs does not exist in tree 3efa6d1937ecadd790967580831e6068ce7aea55