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

Assets/Res/Config/EventConfig.json

@@ -214,9 +214,6 @@
       "placeID": 0,
       "SmallPlacesId": 0,
       "XiantuID": 0,
-      "EventConditionId": [
-        3
-      ],
       "EventName": 4007,
       "Description": 4082
     },

Assets/Res/Config/LanguageChineseConfig.json

@@ -13066,7 +13066,7 @@
     },
     {
       "ID": 4007,
-      "txt": "[资源]渡劫丹"
+      "txt": "[资源]灵血草"
     },
     {
       "ID": 4008,
@@ -13102,7 +13102,7 @@
     },
     {
       "ID": 4016,
-      "txt": "[资源]渡劫丹"
+      "txt": "[资源]灵血草"
     },
     {
       "ID": 4017,
@@ -14254,7 +14254,7 @@
     },
     {
       "ID": 4304,
-      "txt": "[资源]良品渡劫丹"
+      "txt": "[资源]玄玉髓"
     },
     {
       "ID": 4305,
@@ -14290,7 +14290,7 @@
     },
     {
       "ID": 4313,
-      "txt": "[资源]上品渡劫丹"
+      "txt": "[资源]赤阳砂"
     },
     {
       "ID": 4314,
@@ -14326,7 +14326,7 @@
     },
     {
       "ID": 4322,
-      "txt": "[资源]极品渡劫丹"
+      "txt": "[资源]火灵果"
     },
     {
       "ID": 4323,