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

liuzhiwei

2020-11-06 f44ad64eff5c66b711e2b8d28c44c85a92cbc393

 Assets/Scripts/Enum/EndlessBossActionState.cs

@@ -14,6 +14,9 @@
        Summon,

        // 死亡
        Death
        Death,

        // 技能动作
        Skill
    }
}