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

weixudong

2020-11-19 69e0fea6c92fd4e153d45e5f26ef89baecf0405a

 Assets/Scripts/ActionGameFramework/Health/Damager.cs

@@ -57,12 +57,6 @@
        public SerializableIAlignmentProvider alignment;

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

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