Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master

weixudong

2020-12-09 17c6e8b6f2aee4ed9a15c886f54a73f0cb61b125

 Assets/Scripts/ActionGameFramework/Health/Damager.cs

@@ -19,9 +19,14 @@
        public float damage;

        /// <summary>
        /// 用于最后一颗子弹的多倍攻击
        /// 强化子弹的多倍攻击
        /// </summary>
        public float damageMulti = 1.0f;

        /// <summary>
        /// 是否是增强的子弹
        /// </summary>
        public bool IsEnhancedBullet { get; set; }

        /// <summary>
        /// TEST CODE TO TOWER_NAME
@@ -56,11 +61,7 @@
        /// </summary>
        public SerializableIAlignmentProvider alignment;

        /// <summary>
        /// 塔的属性id
        /// </summary>
        /// <value></value>
        public int TowerAttributeId { get; set; }
        public Tower TowerPtr;

        /// <summary>
        /// Gets the alignment of the damager
@@ -117,12 +118,11 @@
        /// </summary>
        public float finalDamage
        {
            
            
            get {
            get
            {
                float fd = damage * damageMulti;
                damageMulti = 1.0f;
                return fd + inSceneUpGradeDamage; 
                return fd + inSceneUpGradeDamage;
            }
        }