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

Assets/Res/Config/ItemConfig.json

@@ -1273,7 +1273,7 @@
       "itemDesc": 272,
       "icon": "icon_item_1301",
       "itemTag": 4,
-      "quality": 4,
+      "quality": 2,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -1307,7 +1307,7 @@
       "itemDesc": 273,
       "icon": "icon_item_1302",
       "itemTag": 4,
-      "quality": 4,
+      "quality": 2,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -1341,7 +1341,7 @@
       "itemDesc": 274,
       "icon": "icon_item_1303",
       "itemTag": 4,
-      "quality": 4,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -1375,7 +1375,7 @@
       "itemDesc": 275,
       "icon": "icon_item_1304",
       "itemTag": 4,
-      "quality": 5,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -1409,7 +1409,7 @@
       "itemDesc": 10117,
       "icon": "icon_item_1305",
       "itemTag": 4,
-      "quality": 5,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -1443,7 +1443,7 @@
       "itemDesc": 10118,
       "icon": "icon_item_1306",
       "itemTag": 4,
-      "quality": 5,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -1477,7 +1477,7 @@
       "itemDesc": 10119,
       "icon": "icon_item_1307",
       "itemTag": 4,
-      "quality": 6,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -1511,7 +1511,7 @@
       "itemDesc": 10120,
       "icon": "icon_item_1308",
       "itemTag": 4,
-      "quality": 6,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -1545,6 +1545,584 @@
       "itemDesc": 10121,
       "icon": "icon_item_1309",
       "itemTag": 4,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        5,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1310,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1310",
+      "itemTag": 4,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        45,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1311,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1311",
+      "itemTag": 4,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        40,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1312,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1312",
+      "itemTag": 4,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        35,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1313,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1313",
+      "itemTag": 4,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        30,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1314,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1314",
+      "itemTag": 4,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        25,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1315,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1315",
+      "itemTag": 4,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        20,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1316,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1316",
+      "itemTag": 4,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        15,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1317,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1317",
+      "itemTag": 4,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        10,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1318,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1318",
+      "itemTag": 4,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        5,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1319,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1319",
+      "itemTag": 4,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        40,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1320,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1320",
+      "itemTag": 4,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        35,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1321,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1321",
+      "itemTag": 4,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        30,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1322,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1322",
+      "itemTag": 4,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        25,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1323,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1323",
+      "itemTag": 4,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        20,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1324,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1324",
+      "itemTag": 4,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        15,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1325,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1325",
+      "itemTag": 4,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        10,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1326,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1326",
+      "itemTag": 4,
       "quality": 6,
       "stack": 0,
       "isSell": false,