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

# Conflicts:
#	Excel2Json/Excel/Language.xlsx   resolved by origin/master(远端) version

Assets/Res/Config/ItemConfig.json

@@ -377,7 +377,7 @@
       "itemDesc": 259,
       "icon": "icon_dujiedan",
       "itemTag": 3,
-      "quality": 3,
+      "quality": 2,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -412,7 +412,7 @@
       "itemDesc": 260,
       "icon": "icon_dujiedan",
       "itemTag": 3,
-      "quality": 4,
+      "quality": 2,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -447,7 +447,7 @@
       "itemDesc": 261,
       "icon": "icon_dujiedan",
       "itemTag": 3,
-      "quality": 5,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -481,6 +481,764 @@
       "itemDesc": 262,
       "icon": "icon_dujiedan",
       "itemTag": 3,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        40,
+        80
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1205,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5,
+        7
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        10,
+        10
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1206,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5,
+        7
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        15,
+        25
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1207,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        25,
+        50
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1208,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        40,
+        80
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1209,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5,
+        7
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        10,
+        10
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1210,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5,
+        7
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        15,
+        25
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1211,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        25,
+        50
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1212,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        40,
+        80
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1213,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5,
+        7
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        10,
+        10
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1214,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5,
+        7
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        15,
+        25
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1215,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        25,
+        50
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1216,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        40,
+        80
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1217,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5,
+        7
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        10,
+        10
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1218,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5,
+        7
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        15,
+        25
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1219,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        25,
+        50
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1220,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        40,
+        80
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1221,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        25,
+        50
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1222,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        40,
+        80
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1223,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5,
+        7
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        10,
+        10
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1224,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5,
+        7
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        15,
+        25
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1225,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        25,
+        50
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1226,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
       "quality": 6,
       "stack": 0,
       "isSell": false,