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

Assets/Res/Config/EventLinkConfig.json

@@ -14807,14 +14807,17 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 106,
-      "LanID": [
-        6073
-      ],
+      "NPCID": 100,
       "DialogueType": 0,
       "EventID": 6043,
       "step": 1,
-      "optionType": 0,
+      "optionType": 1,
+      "optionPara1": [
+        604302
+      ],
+      "optionPara2": [
+        6073
+      ],
       "ResultType": 1,
       "ResultOptions": [
         604302

Assets/Res/Config/LanguageChineseConfig.json

@@ -38366,11 +38366,11 @@
     },
     {
       "ID": 10332,
-      "txt": "({0}后，恢复1点神识)"
+      "txt": "每{0}恢复1点神识"
     },
     {
       "ID": 10333,
-      "txt": "({0}后，恢复全部神识)"
+      "txt": "{0}后恢复全部神识"
     },
     {
       "ID": 10334,

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

@@ -588,6 +588,12 @@ namespace GameLogic.Combat.Skill
                 return;
             }
 
+            ShowBaiscEntity th=   targetEntity.This<CombatHeroHitPoint>().combatHeroEntity;
+            if (th == null || th.CurrCombatHeroInfo == null)
+            {
+                return;
+            }
+
             if (_triggerCallBack.ContainsKey(groupName))
             {
                 _triggerCallBack[groupName]?.Invoke(groupName,