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

Assets/Res/Config/ItemConfig.json

@@ -999,7 +999,7 @@
       "stack_1": 0,
       "associateID": 8,
       "associateVlaue": [
-        100
+        300
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -1027,7 +1027,7 @@
       "stack_1": 0,
       "associateID": 8,
       "associateVlaue": [
-        100
+        1000
       ],
       "sort": 0,
       "itemDesc2": 0

Assets/Res/Config/LanguageChineseConfig.json

@@ -990,7 +990,7 @@
     },
     {
       "ID": 248,
-      "txt": "金锭"
+      "txt": "仙缘宝券"
     },
     {
       "ID": 249,
@@ -1074,15 +1074,15 @@
     },
     {
       "ID": 269,
-      "txt": "葬沙骨"
+      "txt": "金阳果"
     },
     {
       "ID": 270,
-      "txt": "凤凰果"
+      "txt": "九窍芝"
     },
     {
       "ID": 271,
-      "txt": "九彩铃兰"
+      "txt": "玄冥髓"
     },
     {
       "ID": 272,
@@ -1102,19 +1102,19 @@
     },
     {
       "ID": 276,
-      "txt": "修为丹1"
+      "txt": "增元丹"
     },
     {
       "ID": 277,
-      "txt": "修为丹2"
+      "txt": "增元丹"
     },
     {
       "ID": 278,
-      "txt": "修为丹3"
+      "txt": "增元丹"
     },
     {
       "ID": 279,
-      "txt": "修为丹4"
+      "txt": "增元丹"
     },
     {
       "ID": 280,
@@ -12946,15 +12946,15 @@
     },
     {
       "ID": 3237,
-      "txt": "神识丹-小"
+      "txt": "清识还元丹"
     },
     {
       "ID": 3238,
-      "txt": "神识丹"
+      "txt": "清识还元丹"
     },
     {
       "ID": 3239,
-      "txt": "神识丹-大"
+      "txt": "清识还元丹"
     },
     {
       "ID": 3240,
@@ -12962,11 +12962,11 @@
     },
     {
       "ID": 3241,
-      "txt": "使用后恢复100点神识。"
+      "txt": "使用后恢复300点神识。"
     },
     {
       "ID": 3242,
-      "txt": "使用后恢复100点神识。"
+      "txt": "使用后恢复1000点神识。"
     },
     {
       "ID": 3243,
@@ -37430,19 +37430,19 @@
     },
     {
       "ID": 10098,
-      "txt": "免双倍广告卡"
+      "txt": "倍源净尘符"
     },
     {
       "ID": 10099,
-      "txt": "免所有广告卡"
+      "txt": "全域无尘玉牌"
     },
     {
       "ID": 10100,
-      "txt": "免双倍广告卡碎片"
+      "txt": "倍源净尘符碎片"
     },
     {
       "ID": 10101,
-      "txt": "免所有广告卡碎片"
+      "txt": "全域无尘玉牌碎片"
     },
     {
       "ID": 10102,
@@ -37486,23 +37486,23 @@
     },
     {
       "ID": 10112,
-      "txt": "妖血石"
+      "txt": "九焰莲"
     },
     {
       "ID": 10113,
-      "txt": "红玉珊瑚"
+      "txt": "混沌合晶"
     },
     {
       "ID": 10114,
-      "txt": "真武玄甲"
+      "txt": "鸿蒙紫华"
     },
     {
       "ID": 10115,
-      "txt": "天府玉莲"
+      "txt": "开天古藤"
     },
     {
       "ID": 10116,
-      "txt": "太乙真金"
+      "txt": "九天露华"
     },
     {
       "ID": 10117,