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

Assets/Res/Config/DropConfig.json

@@ -41,6 +41,790 @@
         1006
       ],
       "dropType": 3
+    },
+    {
+      "ID": 1201,
+      "dropGroupID": [
+        1201
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1202,
+      "dropGroupID": [
+        1202
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1203,
+      "dropGroupID": [
+        1203
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1204,
+      "dropGroupID": [
+        1204
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1205,
+      "dropGroupID": [
+        1205
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1206,
+      "dropGroupID": [
+        1206
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1207,
+      "dropGroupID": [
+        1207
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1208,
+      "dropGroupID": [
+        1208
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1209,
+      "dropGroupID": [
+        1209
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1301,
+      "dropGroupID": [
+        1301
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1302,
+      "dropGroupID": [
+        1302
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1303,
+      "dropGroupID": [
+        1303
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1304,
+      "dropGroupID": [
+        1304
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1401,
+      "dropGroupID": [
+        1401
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1402,
+      "dropGroupID": [
+        1402
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1403,
+      "dropGroupID": [
+        1403
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1404,
+      "dropGroupID": [
+        1404
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1501,
+      "dropGroupID": [
+        1501
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1502,
+      "dropGroupID": [
+        1502
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 1601,
+      "dropGroupID": [
+        1601
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 10001,
+      "dropGroupID": [
+        10001
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 10002,
+      "dropGroupID": [
+        10002
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 10003,
+      "dropGroupID": [
+        10003
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 10004,
+      "dropGroupID": [
+        10004
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 10005,
+      "dropGroupID": [
+        10005
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 10006,
+      "dropGroupID": [
+        10006
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 10007,
+      "dropGroupID": [
+        10007
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 10008,
+      "dropGroupID": [
+        10008
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 10009,
+      "dropGroupID": [
+        10009
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 10010,
+      "dropGroupID": [
+        10010
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 10011,
+      "dropGroupID": [
+        10011
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 11001,
+      "dropGroupID": [
+        11001
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 11002,
+      "dropGroupID": [
+        11002
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 11003,
+      "dropGroupID": [
+        11003
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 11004,
+      "dropGroupID": [
+        11004
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 11005,
+      "dropGroupID": [
+        11005
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 11006,
+      "dropGroupID": [
+        11006
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 11007,
+      "dropGroupID": [
+        11007
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 11008,
+      "dropGroupID": [
+        11008
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 11009,
+      "dropGroupID": [
+        11009
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 11010,
+      "dropGroupID": [
+        11010
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 11011,
+      "dropGroupID": [
+        11011
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12001,
+      "dropGroupID": [
+        12001
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12002,
+      "dropGroupID": [
+        12002
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12003,
+      "dropGroupID": [
+        12003
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12004,
+      "dropGroupID": [
+        12004
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12005,
+      "dropGroupID": [
+        12005
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12006,
+      "dropGroupID": [
+        12006
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12007,
+      "dropGroupID": [
+        12007
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12008,
+      "dropGroupID": [
+        12008
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12009,
+      "dropGroupID": [
+        12009
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12010,
+      "dropGroupID": [
+        12010
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12011,
+      "dropGroupID": [
+        12011
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12012,
+      "dropGroupID": [
+        12012
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12013,
+      "dropGroupID": [
+        12013
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12014,
+      "dropGroupID": [
+        12014
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12015,
+      "dropGroupID": [
+        12015
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12016,
+      "dropGroupID": [
+        12016
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12017,
+      "dropGroupID": [
+        12017
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12018,
+      "dropGroupID": [
+        12018
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12019,
+      "dropGroupID": [
+        12019
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12020,
+      "dropGroupID": [
+        12020
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12021,
+      "dropGroupID": [
+        12021
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12022,
+      "dropGroupID": [
+        12022
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12023,
+      "dropGroupID": [
+        12023
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12024,
+      "dropGroupID": [
+        12024
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12025,
+      "dropGroupID": [
+        12025
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12501,
+      "dropGroupID": [
+        12501
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12502,
+      "dropGroupID": [
+        12502
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12503,
+      "dropGroupID": [
+        12503
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12504,
+      "dropGroupID": [
+        12504
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12505,
+      "dropGroupID": [
+        12505
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12506,
+      "dropGroupID": [
+        12506
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12507,
+      "dropGroupID": [
+        12507
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12508,
+      "dropGroupID": [
+        12508
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12509,
+      "dropGroupID": [
+        12509
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 12510,
+      "dropGroupID": [
+        12510
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13001,
+      "dropGroupID": [
+        13001
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13002,
+      "dropGroupID": [
+        13002
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13003,
+      "dropGroupID": [
+        13003
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13004,
+      "dropGroupID": [
+        13004
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13005,
+      "dropGroupID": [
+        13005
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13006,
+      "dropGroupID": [
+        13006
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13007,
+      "dropGroupID": [
+        13007
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13008,
+      "dropGroupID": [
+        13008
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13009,
+      "dropGroupID": [
+        13009
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13010,
+      "dropGroupID": [
+        13010
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13011,
+      "dropGroupID": [
+        13011
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13012,
+      "dropGroupID": [
+        13012
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13013,
+      "dropGroupID": [
+        13013
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13014,
+      "dropGroupID": [
+        13014
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13015,
+      "dropGroupID": [
+        13015
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13016,
+      "dropGroupID": [
+        13016
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13017,
+      "dropGroupID": [
+        13017
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13018,
+      "dropGroupID": [
+        13018
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13019,
+      "dropGroupID": [
+        13019
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13020,
+      "dropGroupID": [
+        13020
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13021,
+      "dropGroupID": [
+        13021
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13022,
+      "dropGroupID": [
+        13022
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13023,
+      "dropGroupID": [
+        13023
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13024,
+      "dropGroupID": [
+        13024
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13025,
+      "dropGroupID": [
+        13025
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13501,
+      "dropGroupID": [
+        13501
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13502,
+      "dropGroupID": [
+        13502
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13503,
+      "dropGroupID": [
+        13503
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13504,
+      "dropGroupID": [
+        13504
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13505,
+      "dropGroupID": [
+        13505
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13506,
+      "dropGroupID": [
+        13506
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13507,
+      "dropGroupID": [
+        13507
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13508,
+      "dropGroupID": [
+        13508
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13509,
+      "dropGroupID": [
+        13509
+      ],
+      "dropType": 3
+    },
+    {
+      "ID": 13510,
+      "dropGroupID": [
+        13510
+      ],
+      "dropType": 3
     }
   ]
 }

Assets/Res/Config/ItemConfig.json

@@ -2296,6 +2296,64 @@
       "sort": null,
       "itemDesc_1": null
     },
+    {
+      "ID": 12509,
+      "itemName": 1808,
+      "itemDesc": 1858,
+      "icon": "icon_item_12509",
+      "itemTag": 13,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13507,
+        2007
+      ],
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 12510,
+      "itemName": 1809,
+      "itemDesc": 1859,
+      "icon": "icon_item_12510",
+      "itemTag": 13,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13508,
+        2008
+      ],
+      "sort": null,
+      "itemDesc_1": null
+    },
     {
       "ID": 13001,
       "itemName": 1600,
@@ -3120,6 +3178,56 @@
       "associateID": null,
       "sort": null,
       "itemDesc_1": null
+    },
+    {
+      "ID": 13509,
+      "itemName": 1633,
+      "itemDesc": 1733,
+      "icon": "icon_item_13509",
+      "itemTag": 14,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13510,
+      "itemName": 1634,
+      "itemDesc": 1734,
+      "icon": "icon_item_13510",
+      "itemTag": 14,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -6530,11 +6530,11 @@
     },
     {
       "ID": 1633,
-      "txt": "功法碎片名称占位----------------"
+      "txt": "青莲净体诀碎片"
     },
     {
       "ID": 1634,
-      "txt": "功法碎片名称占位----------------"
+      "txt": "碧霄回春术碎片"
     },
     {
       "ID": 1635,
@@ -6930,11 +6930,11 @@
     },
     {
       "ID": 1733,
-      "txt": "用于功法--的升星"
+      "txt": "用于功法-青莲净体诀-的升星"
     },
     {
       "ID": 1734,
-      "txt": "用于功法--的升星"
+      "txt": "用于功法-碧霄回春术-的升星"
     },
     {
       "ID": 1735,
@@ -7230,11 +7230,11 @@
     },
     {
       "ID": 1808,
-      "txt": "被动功法名称------占位"
+      "txt": "青莲净体诀"
     },
     {
       "ID": 1809,
-      "txt": "被动功法名称------占位"
+      "txt": "碧霄回春术"
     },
     {
       "ID": 1810,
@@ -7430,11 +7430,11 @@
     },
     {
       "ID": 1858,
-      "txt": "使用后获得被动功法-"
+      "txt": "使用后获得被动功法-青莲净体诀"
     },
     {
       "ID": 1859,
-      "txt": "使用后获得被动功法-"
+      "txt": "使用后获得被动功法-碧霄回春术"
     },
     {
       "ID": 1860,
@@ -7970,67 +7970,67 @@
     },
     {
       "ID": 1993,
-      "txt": "双修之旅·小"
+      "txt": "赠送修为"
     },
     {
       "ID": 1994,
-      "txt": "双修之旅·中"
+      "txt": "赠送修为"
     },
     {
       "ID": 1995,
-      "txt": "双修之旅·大"
+      "txt": "赠送修为"
     },
     {
       "ID": 1996,
-      "txt": "双修之旅·极"
+      "txt": "赠送修为"
     },
     {
       "ID": 1997,
-      "txt": "商贾之道·小"
+      "txt": "赠送铜钱"
     },
     {
       "ID": 1998,
-      "txt": "商贾之道·中"
+      "txt": "赠送铜钱"
     },
     {
       "ID": 1999,
-      "txt": "商贾之道·大"
+      "txt": "赠送铜钱"
     },
     {
       "ID": 2000,
-      "txt": "商贾之道·极"
+      "txt": "赠送铜钱"
     },
     {
       "ID": 2001,
-      "txt": "席地论法·小"
+      "txt": "赠送灵气"
     },
     {
       "ID": 2002,
-      "txt": "席地论法·中"
+      "txt": "赠送灵气"
     },
     {
       "ID": 2003,
-      "txt": "席地论法·大"
+      "txt": "赠送灵气"
     },
     {
       "ID": 2004,
-      "txt": "席地论法·极"
+      "txt": "赠送灵气"
     },
     {
       "ID": 2005,
-      "txt": "坎山寻宝·小"
+      "txt": "赠送灵韵"
     },
     {
       "ID": 2006,
-      "txt": "坎山寻宝·中"
+      "txt": "赠送灵韵"
     },
     {
       "ID": 2007,
-      "txt": "坎山寻宝·大"
+      "txt": "赠送灵韵"
     },
     {
       "ID": 2008,
-      "txt": "坎山寻宝·极"
+      "txt": "赠送灵韵"
     },
     {
       "ID": 2009,
@@ -8250,19 +8250,19 @@
     },
     {
       "ID": 2063,
-      "txt": "慷概之心·小"
+      "txt": "赠送概率"
     },
     {
       "ID": 2064,
-      "txt": "慷概之心·中"
+      "txt": "赠送概率"
     },
     {
       "ID": 2065,
-      "txt": "慷概之心·大"
+      "txt": "赠送概率"
     },
     {
       "ID": 2066,
-      "txt": "慷概之心·极"
+      "txt": "赠送概率"
     },
     {
       "ID": 2067,