Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Scripts/GameLogic/Combat/Skill/S2007.cs

@@ -23,7 +23,7 @@ namespace GameLogic.Combat.Skill
         {
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.StartInjured, StartInjured);
-            Finish();
+            // Finish();
         }
 
         protected override void ProActiveSkill()
@@ -47,6 +47,11 @@ namespace GameLogic.Combat.Skill
 
         private void Finish()
         {
+            if (CombatHeroEntity == null)
+            {
+                return;
+            }
+
             CombatHeroEntity.CurrCombatHeroInfo.addAttSpeed_bl -= _addSpeed;
             _addSpeed = 0;
             _isUpdate = false;