Merge commit '998ebc0dc00c103b365e36797c1a1ac4a6a2afa5' into master

chenxin

2020-11-19 fdfb88a9ee3652e716e603f759d3be5dcc0bd3bd

 Assets/Scripts/Event/EventType.cs

@@ -85,6 +85,8 @@
        WaveLineFinish,
        // 播放水精灵充能满特效
        EndlessPlayFreezeBreathEffect,
        // 木属性精灵暴击子弹数量改变
        EndlessCritBulletNumChange,
    }

}