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

liuzhiwei

2020-12-04 df178fec76b6f6fed0326ff9f07bef2206dd75f9

 Assets/Scripts/Enum/EndlessBossActionState.cs

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

        // 死亡
        Death
        Death,

        // 技能动作
        Skill
    }
}