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

Assets/Res/Config/EventConfig.json

@@ -103,7 +103,7 @@
         1030
       ],
       "EventTriggerType": 1,
-      "EventTag": 1,
+      "EventTag": 3,
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
@@ -131,7 +131,7 @@
         1040
       ],
       "EventTriggerType": 1,
-      "EventTag": 1,
+      "EventTag": 3,
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
@@ -156,7 +156,7 @@
         1050
       ],
       "EventTriggerType": 1,
-      "EventTag": 1,
+      "EventTag": 3,
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
@@ -181,7 +181,7 @@
         1060
       ],
       "EventTriggerType": 1,
-      "EventTag": 1,
+      "EventTag": 3,
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
@@ -902,7 +902,11 @@
         1001813,
         1001814,
         1001815,
-        1001816
+        1001816,
+        1001817,
+        1001818,
+        1001819,
+        1001820
       ],
       "EventTriggerType": 4,
       "EventTag": 1,

Assets/Res/Config/EventLinkConfig.json

@@ -1183,7 +1183,7 @@
       "EventConditionMessage": null,
       "NPCID": 102,
       "LanID": [
-        2115
+        3033
       ],
       "DialogueType": null,
       "EventID": 10004,

Assets/Res/Config/LanguageChineseConfig.json

@@ -2790,7 +2790,7 @@
     },
     {
       "ID": 698,
-      "txt": "玄黄道"
+      "txt": "玄黄道 "
     },
     {
       "ID": 699,
@@ -2802,7 +2802,7 @@
     },
     {
       "ID": 701,
-      "txt": "每次使用功法时在当前位置留下一道属性印记，下一个放上来的功法如果和以前功法相生则功法效果提升{0}%，每次使用功法时都会治疗对应相生属性的{1}伤势。（均衡性功法搭配，转盘改变，变为金、水、木、火、土）"
+      "txt": "每次使用功法时在当前位置留下一道属性印记，下一个放上来的功法如果和以前功法相生则功法效果提升{0}%，每次使用功法时都会治疗对应相生属性的{1}伤势。（均衡性功法搭配，转盘改变，变为金、水、木、火、土）\n"
     },
     {
       "ID": 702,
@@ -8458,7 +8458,7 @@
     },
     {
       "ID": 2115,
-      "txt": "击败结界兽怎么想过去，就去吧.."
+      "txt": "击败结界兽"
     },
     {
       "ID": 2116,
@@ -12127,6 +12127,10 @@
     {
       "ID": 3032,
       "txt": "毒专精：毒照成的伤害+{0}%，且蔓延速度加快{1}%"
+    },
+    {
+      "ID": 3033,
+      "txt": "怎么想过去，就去吧.."
     }
   ]
 }