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

chenxin

2020-12-11 f4b2230e6456f4e5c05e8535834a693a55fce0a2

 Assets/Scripts/Enum/EndlessBuffEffectType.cs

@@ -39,5 +39,14 @@

        // 减少木属性强化子弹的蓄力时间
        DecreaseWoodChargeTime,

        // 增加水精灵冰冻小怪的概率，水精灵普通攻击和技能都有概率造成冰冻，小怪被冰冻后不能移动
        FrostProbabilityAdd,

        // 增加水精灵冰冻伤害，小怪被冰冻后有额外伤害
        FrostDamageAdd,

        // 增加水精灵冰冻时间
        FrostTimeAdd,
    }
}