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

liuzhiwei

2020-12-08 ae487b742c792c43b81cce6f060b881e5609d160

 Assets/Scripts/TowerDefense/Towers/Tower.cs

@@ -88,7 +88,7 @@
        /// <summary>
        /// The current level of the tower
        /// </summary>
        public int currentLevel { get; protected set; }
        public int currentLevel { get; set; }

        protected bool m_bInAttackMode = false;