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

chenxin

2020-10-27 43b531f76be6e12c775a1135f6895e8fdc389a59

 Assets/Scripts/TowerDefense/Towers/Tower.cs

@@ -135,6 +135,7 @@
        public int uiProOffset
        {
            get { return this.progressOffset; } 
            set { this.progressOffset = value; }
        }