解决冲突

chenxin

2020-10-31 a1f0653ec48d7787e0d57cabef0600b2a07355eb

 Assets/Scripts/Event/EventType.cs

@@ -47,6 +47,8 @@
        PlayAppearEffect,
        //新手引导合成特效
        GuidePlayUpgradeEffect,
        // 无尽模式boss召唤结束
        EndlessBossSummonEnd,
    }

}