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

liuzhiwei

2020-12-15 e1a9ed955b247e4cc4615e8700b0ea34d7683224

 Assets/Scripts/Enum/EndlessBossSkillType.cs

@@ -9,9 +9,6 @@
    {
        None,

        // 魔法护盾
        ShieldWall,

        // 泡泡炸弹
        BubbleBomb,

@@ -20,5 +17,8 @@

        // 禁锢泡泡
        BondageBubble,

        // 魔法护盾
        ShieldWall,
    }
}