diff --git a/shared/resource/jsons/dic_goods.json b/shared/resource/jsons/dic_goods.json
index ec506d1eb..ee4ac1bb7 100644
--- a/shared/resource/jsons/dic_goods.json
+++ b/shared/resource/jsons/dic_goods.json
@@ -9,7 +9,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&11001|21|117|77",
+        "getWays": "137&11001|148&11001|77|149|117|21|116|6",
         "useWays": "31&",
         "value": 100,
         "condition": 0,
@@ -27,7 +27,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "77&",
+        "getWays": "137&11002|148&11002|77|149|117|21|116|6",
         "useWays": "31&",
         "value": 500,
         "condition": 0,
@@ -45,7 +45,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "77&",
+        "getWays": "137&11003|148&11003|77|149|117|21|116|6",
         "useWays": "31&",
         "value": 2000,
         "condition": 0,
@@ -63,7 +63,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "77&",
+        "getWays": "137&11004|148&11004|77|149|117|21|116|6",
         "useWays": "31&",
         "value": 10000,
         "condition": 0,
@@ -81,7 +81,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&11011|84|86|98",
+        "getWays": "137&11011|148&11011|149|117|21|68|6",
         "useWays": "34&",
         "value": 5,
         "condition": 0,
@@ -99,7 +99,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&11012|84|86|98",
+        "getWays": "137&11012|148&11012|149|117|21|68|6",
         "useWays": "34&",
         "value": 10,
         "condition": 0,
@@ -117,7 +117,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&11013|84|86|98",
+        "getWays": "137&11013|148&11013|149|117|21|68|6",
         "useWays": "34&",
         "value": 15,
         "condition": 0,
@@ -135,7 +135,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&11014|84|86|98",
+        "getWays": "137&11014|148&11014|149|117|21|68|6",
         "useWays": "34&",
         "value": 20,
         "condition": 0,
@@ -153,7 +153,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "&",
+        "getWays": "84|6                                                                ",
         "useWays": "5&",
         "value": 5,
         "condition": 0,
@@ -2403,7 +2403,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "84|86|87|80|98",
+        "getWays": "84|86|87|116",
         "useWays": "32&",
         "value": 0,
         "condition": 0,
@@ -2421,7 +2421,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17002",
+        "getWays": "137&17002|148&17002",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2439,7 +2439,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17003",
+        "getWays": "137&17003|148&17003",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2457,7 +2457,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17004",
+        "getWays": "137&17004|148&17004",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2475,7 +2475,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17005",
+        "getWays": "137&17005|148&17005",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2493,7 +2493,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17006",
+        "getWays": "137&17006|148&17006",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2511,7 +2511,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17007",
+        "getWays": "137&17007|148&17007",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2529,7 +2529,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17008",
+        "getWays": "137&17008|148&17008",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2547,7 +2547,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17009",
+        "getWays": "137&17009|148&17009",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2565,7 +2565,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17010",
+        "getWays": "137&17010|148&17010",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2583,7 +2583,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17011",
+        "getWays": "137&17011|148&17011",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2601,7 +2601,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17012",
+        "getWays": "137&17012|148&17012",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2619,7 +2619,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17013",
+        "getWays": "137&17013|148&17013",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2637,7 +2637,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17014",
+        "getWays": "137&17014|148&17014",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2655,7 +2655,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17015",
+        "getWays": "137&17015|148&17015",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2673,7 +2673,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17016",
+        "getWays": "137&17016|148&17016",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2691,7 +2691,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17017",
+        "getWays": "137&17017|148&17017",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2709,7 +2709,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17018",
+        "getWays": "137&17018|148&17018",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2727,7 +2727,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17019",
+        "getWays": "137&17019|148&17019",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2745,7 +2745,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17020",
+        "getWays": "137&17020|148&17020",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2763,7 +2763,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17021",
+        "getWays": "137&17021|148&17021",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2781,7 +2781,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17022",
+        "getWays": "137&17022|148&17022",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2799,7 +2799,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17023",
+        "getWays": "137&17023|148&17023",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2817,7 +2817,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17024",
+        "getWays": "137&17024|148&17024",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2835,7 +2835,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17025",
+        "getWays": "137&17025|148&17025",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2853,7 +2853,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17026",
+        "getWays": "137&17026|148&17026",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2871,7 +2871,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17027",
+        "getWays": "137&17027|148&17027",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2889,7 +2889,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17028",
+        "getWays": "137&17028|148&17028",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2907,7 +2907,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17029",
+        "getWays": "137&17029|148&17029",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2925,7 +2925,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17030",
+        "getWays": "137&17030|148&17030",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2943,7 +2943,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17031",
+        "getWays": "137&17031|148&17031",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2961,7 +2961,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17032",
+        "getWays": "137&17032|148&17032",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2979,7 +2979,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17033",
+        "getWays": "137&17033|148&17033",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2997,7 +2997,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17034",
+        "getWays": "137&17034|148&17034",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -3015,7 +3015,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17035",
+        "getWays": "137&17035|148&17035",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -3033,7 +3033,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17036",
+        "getWays": "137&17036|148&17036",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -3051,7 +3051,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17037",
+        "getWays": "137&17037|148&17037",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -3069,7 +3069,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17038",
+        "getWays": "137&17038|148&17038",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -3087,7 +3087,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17039",
+        "getWays": "137&17039|148&17039",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -3105,7 +3105,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17040",
+        "getWays": "137&17040|148&17040",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -3123,7 +3123,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17041",
+        "getWays": "137&17041|148&17041",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -3141,7 +3141,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "80|86|84|98",
+        "getWays": "84|87|86|6|116",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -3177,7 +3177,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "84|90|81",
+        "getWays": "84|89|81|149|117|81|6",
         "useWays": "38&",
         "value": 0,
         "condition": 0,
@@ -3321,7 +3321,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "85|68",
+        "getWays": "78|85|149|117|68|21|6",
         "useWays": "53&",
         "value": 0,
         "condition": 0,
@@ -3339,7 +3339,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "84|85|68|64",
+        "getWays": "84|85|81|68|6",
         "useWays": "53&",
         "value": 0,
         "condition": 0,
@@ -3357,7 +3357,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "84|90|81",
+        "getWays": "83|90|67|85|117|21",
         "useWays": "36&",
         "value": 0,
         "condition": 0,
@@ -3375,7 +3375,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "84|90|81",
+        "getWays": "84|89|90|81",
         "useWays": "36&",
         "value": 0,
         "condition": 0,
@@ -3403,7 +3403,7 @@
     },
     {
         "good_id": 17057,
-        "name": "天命石",
+        "name": "淬炼石",
         "quality": 5,
         "image_id": "bailianzao",
         "itid": 38,
@@ -3411,13 +3411,13 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "84&",
+        "getWays": "84|89|77|6",
         "useWays": "45&",
         "value": 0,
         "condition": 0,
         "timelimit": 0,
         "gift": 0,
-        "info": "天命石，用于天晶淬炼，提高成功概率"
+        "info": "用于天晶淬炼"
     },
     {
         "good_id": 21001,
@@ -3429,7 +3429,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 1,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3447,7 +3447,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 2,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3465,7 +3465,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 3,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3483,7 +3483,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 4,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3501,7 +3501,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 5,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3519,7 +3519,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 7,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3537,7 +3537,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 8,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3555,7 +3555,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 10,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3573,7 +3573,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 11,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3591,7 +3591,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 12,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3609,7 +3609,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 13,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3627,7 +3627,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 14,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3645,7 +3645,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 16,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3663,7 +3663,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 17,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3681,7 +3681,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 18,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3699,7 +3699,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 19,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3717,7 +3717,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 20,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3735,7 +3735,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 21,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3753,7 +3753,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 22,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3771,7 +3771,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 24,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3789,7 +3789,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 25,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3807,7 +3807,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 26,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3825,7 +3825,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 27,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3843,7 +3843,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 28,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3861,7 +3861,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 30,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3879,7 +3879,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 31,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3897,7 +3897,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 32,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3915,7 +3915,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 33,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3933,7 +3933,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 34,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3951,7 +3951,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 35,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3969,7 +3969,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 36,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -3987,7 +3987,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 37,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4005,7 +4005,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 38,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4023,7 +4023,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 40,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4041,7 +4041,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 41,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4059,7 +4059,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 44,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4077,7 +4077,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 45,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4095,7 +4095,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 46,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4113,7 +4113,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 47,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4131,7 +4131,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 49,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4149,7 +4149,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 50,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4167,7 +4167,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 51,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4185,7 +4185,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 52,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4203,7 +4203,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 53,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4221,7 +4221,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 54,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4239,7 +4239,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 55,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4257,7 +4257,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 56,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4275,7 +4275,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 57,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4293,7 +4293,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 59,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4311,7 +4311,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 62,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4329,7 +4329,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 63,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4347,7 +4347,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 64,
-        "getWays": "114|13|50|6|86|87",
+        "getWays": "13|50|84|87|86|64|6|148",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4401,7 +4401,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "1&0",
+        "getWays": "&",
         "useWays": "13&",
         "value": 0,
         "condition": 0,
@@ -4455,7 +4455,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "105|106",
+        "getWays": "&",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4473,7 +4473,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107",
+        "getWays": "83|89|6",
         "useWays": "82&33001",
         "value": 0,
         "condition": 0,
@@ -4491,7 +4491,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&0&2&0",
+        "getWays": "83|89|6",
         "useWays": "82&33002",
         "value": 0,
         "condition": 0,
@@ -4509,7 +4509,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&0&3&0",
+        "getWays": "83|89|6",
         "useWays": "82&33003",
         "value": 0,
         "condition": 0,
@@ -4527,7 +4527,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&0&4&0",
+        "getWays": "83|89|6",
         "useWays": "82&33004",
         "value": 0,
         "condition": 0,
@@ -4545,7 +4545,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107",
+        "getWays": "83|89|6",
         "useWays": "82&33005",
         "value": 0,
         "condition": 0,
@@ -4563,7 +4563,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&0&2&1",
+        "getWays": "83|89|6",
         "useWays": "82&33006",
         "value": 0,
         "condition": 0,
@@ -4581,7 +4581,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&0&3&1",
+        "getWays": "83|89|6",
         "useWays": "82&33007",
         "value": 0,
         "condition": 0,
@@ -4599,7 +4599,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&0&4&1",
+        "getWays": "83|89|6",
         "useWays": "82&33008",
         "value": 0,
         "condition": 0,
@@ -4617,7 +4617,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107",
+        "getWays": "83|89|6",
         "useWays": "82&33009",
         "value": 0,
         "condition": 0,
@@ -4635,7 +4635,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&0&2&2",
+        "getWays": "83|89|6",
         "useWays": "82&33010",
         "value": 0,
         "condition": 0,
@@ -4653,7 +4653,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&0&3&2",
+        "getWays": "83|89|6",
         "useWays": "82&33011",
         "value": 0,
         "condition": 0,
@@ -4671,7 +4671,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&0&4&2",
+        "getWays": "83|89|6",
         "useWays": "82&33012",
         "value": 0,
         "condition": 0,
@@ -4689,7 +4689,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107",
+        "getWays": "83|89|6",
         "useWays": "82&33013",
         "value": 0,
         "condition": 0,
@@ -4707,7 +4707,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&0&2&3",
+        "getWays": "83|89|6",
         "useWays": "82&33014",
         "value": 0,
         "condition": 0,
@@ -4725,7 +4725,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&0&3&3",
+        "getWays": "83|89|6",
         "useWays": "82&33015",
         "value": 0,
         "condition": 0,
@@ -4743,7 +4743,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&0&4&3",
+        "getWays": "83|89|6",
         "useWays": "82&33016",
         "value": 0,
         "condition": 0,
@@ -4761,7 +4761,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107",
+        "getWays": "83|89|6",
         "useWays": "82&33017",
         "value": 0,
         "condition": 0,
@@ -4779,7 +4779,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&0&2&4",
+        "getWays": "83|89|6",
         "useWays": "82&33018",
         "value": 0,
         "condition": 0,
@@ -4797,7 +4797,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&0&3&4",
+        "getWays": "83|89|6",
         "useWays": "82&33019",
         "value": 0,
         "condition": 0,
@@ -4815,7 +4815,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&0&4&4",
+        "getWays": "83|89|6",
         "useWays": "82&33020",
         "value": 0,
         "condition": 0,
@@ -4833,7 +4833,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107",
+        "getWays": "83|89|6",
         "useWays": "82&33021",
         "value": 0,
         "condition": 0,
@@ -4851,7 +4851,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&0&2&5",
+        "getWays": "83|89|6",
         "useWays": "82&33022",
         "value": 0,
         "condition": 0,
@@ -4869,7 +4869,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&0&3&5",
+        "getWays": "83|89|6",
         "useWays": "82&33023",
         "value": 0,
         "condition": 0,
@@ -4887,7 +4887,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&0&4&5",
+        "getWays": "83|89|6",
         "useWays": "82&33024",
         "value": 0,
         "condition": 0,
@@ -4905,7 +4905,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107",
+        "getWays": "83|89|6",
         "useWays": "82&33025",
         "value": 0,
         "condition": 0,
@@ -4923,7 +4923,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&1&2&0",
+        "getWays": "83|89|6",
         "useWays": "82&33026",
         "value": 0,
         "condition": 0,
@@ -4941,7 +4941,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&1&3&0",
+        "getWays": "83|89|6",
         "useWays": "82&33027",
         "value": 0,
         "condition": 0,
@@ -4959,7 +4959,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&1&4&0",
+        "getWays": "83|89|6",
         "useWays": "82&33028",
         "value": 0,
         "condition": 0,
@@ -4977,7 +4977,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107",
+        "getWays": "83|89|6",
         "useWays": "82&33029",
         "value": 0,
         "condition": 0,
@@ -4995,7 +4995,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&1&2&1",
+        "getWays": "83|89|6",
         "useWays": "82&33030",
         "value": 0,
         "condition": 0,
@@ -5013,7 +5013,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&1&3&1",
+        "getWays": "83|89|6",
         "useWays": "82&33031",
         "value": 0,
         "condition": 0,
@@ -5031,7 +5031,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&1&4&1",
+        "getWays": "83|89|6",
         "useWays": "82&33032",
         "value": 0,
         "condition": 0,
@@ -5049,7 +5049,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107",
+        "getWays": "83|89|6",
         "useWays": "82&33033",
         "value": 0,
         "condition": 0,
@@ -5067,7 +5067,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&1&2&2",
+        "getWays": "83|89|6",
         "useWays": "82&33034",
         "value": 0,
         "condition": 0,
@@ -5085,7 +5085,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&1&3&2",
+        "getWays": "83|89|6",
         "useWays": "82&33035",
         "value": 0,
         "condition": 0,
@@ -5103,7 +5103,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "90|107|120&1&4&2",
+        "getWays": "83|89|6",
         "useWays": "82&33036",
         "value": 0,
         "condition": 0,
@@ -7119,7 +7119,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&20",
         "hid": 0,
-        "getWays": "89&",
+        "getWays": "83|90|67|68|64|85|6",
         "useWays": "140&",
         "value": 0,
         "condition": 0,
@@ -7137,7 +7137,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&60",
         "hid": 0,
-        "getWays": "89&",
+        "getWays": "83|90|67|68|64|85|6",
         "useWays": "140&",
         "value": 0,
         "condition": 0,
@@ -7155,7 +7155,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&180",
         "hid": 0,
-        "getWays": "89&",
+        "getWays": "83|90|67|68|64|85|6",
         "useWays": "140&",
         "value": 0,
         "condition": 0,
@@ -7173,7 +7173,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&540",
         "hid": 0,
-        "getWays": "89&",
+        "getWays": "83|90|67|68|64|85|6",
         "useWays": "140&",
         "value": 0,
         "condition": 0,
@@ -7191,7 +7191,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&1800",
         "hid": 0,
-        "getWays": "89&",
+        "getWays": "83|90|67|68|64|85|6",
         "useWays": "140&",
         "value": 0,
         "condition": 0,
@@ -7209,7 +7209,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&100",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60001",
         "value": 0,
         "condition": 0,
@@ -7227,7 +7227,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&200",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60002",
         "value": 0,
         "condition": 0,
@@ -7245,7 +7245,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&300",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60003",
         "value": 0,
         "condition": 0,
@@ -7263,7 +7263,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&400",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60004",
         "value": 0,
         "condition": 0,
@@ -7281,7 +7281,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&500",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60005",
         "value": 0,
         "condition": 0,
@@ -7299,7 +7299,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&600",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60006",
         "value": 0,
         "condition": 0,
@@ -7317,7 +7317,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&700",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60007",
         "value": 0,
         "condition": 0,
@@ -7335,7 +7335,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&800",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60008",
         "value": 0,
         "condition": 0,
@@ -7353,7 +7353,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&900",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60009",
         "value": 0,
         "condition": 0,
@@ -7371,7 +7371,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&100",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60011",
         "value": 0,
         "condition": 0,
@@ -7389,7 +7389,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&200",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60012",
         "value": 0,
         "condition": 0,
@@ -7407,7 +7407,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&300",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60013",
         "value": 0,
         "condition": 0,
@@ -7425,7 +7425,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&400",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60014",
         "value": 0,
         "condition": 0,
@@ -7443,7 +7443,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&500",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60015",
         "value": 0,
         "condition": 0,
@@ -7461,7 +7461,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&600",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60016",
         "value": 0,
         "condition": 0,
@@ -7479,7 +7479,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&700",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60017",
         "value": 0,
         "condition": 0,
@@ -7497,7 +7497,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&800",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60018",
         "value": 0,
         "condition": 0,
@@ -7515,7 +7515,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&900",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60019",
         "value": 0,
         "condition": 0,
@@ -7533,7 +7533,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&100",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60021",
         "value": 0,
         "condition": 0,
@@ -7551,7 +7551,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&200",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60022",
         "value": 0,
         "condition": 0,
@@ -7569,7 +7569,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&300",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60023",
         "value": 0,
         "condition": 0,
@@ -7587,7 +7587,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&400",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60024",
         "value": 0,
         "condition": 0,
@@ -7605,7 +7605,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&500",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60025",
         "value": 0,
         "condition": 0,
@@ -7623,7 +7623,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&600",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60026",
         "value": 0,
         "condition": 0,
@@ -7641,7 +7641,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&700",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60027",
         "value": 0,
         "condition": 0,
@@ -7659,7 +7659,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&800",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60028",
         "value": 0,
         "condition": 0,
@@ -7677,7 +7677,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&900",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60029",
         "value": 0,
         "condition": 0,
@@ -7695,7 +7695,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&100",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60031",
         "value": 0,
         "condition": 0,
@@ -7713,7 +7713,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&200",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60032",
         "value": 0,
         "condition": 0,
@@ -7731,7 +7731,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&300",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60033",
         "value": 0,
         "condition": 0,
@@ -7749,7 +7749,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&400",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60034",
         "value": 0,
         "condition": 0,
@@ -7767,7 +7767,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&500",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60035",
         "value": 0,
         "condition": 0,
@@ -7785,7 +7785,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&600",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60036",
         "value": 0,
         "condition": 0,
@@ -7803,7 +7803,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&700",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60037",
         "value": 0,
         "condition": 0,
@@ -7821,7 +7821,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&800",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60038",
         "value": 0,
         "condition": 0,
@@ -7839,7 +7839,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&900",
         "hid": 0,
-        "getWays": "81|90|145",
+        "getWays": "83|90|85|6|21|81",
         "useWays": "126&60039",
         "value": 0,
         "condition": 0,
@@ -8027,6 +8027,294 @@
         "gift": 17,
         "info": "将魂全选礼包，请勿投放"
     },
+    {
+        "good_id": 71011,
+        "name": "自选ssr*80",
+        "quality": 1,
+        "image_id": "zhongjibaoxiang",
+        "itid": 24,
+        "goodType": 1,
+        "redPoint": 1,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 0,
+        "condition": 0,
+        "timelimit": 0,
+        "gift": 23,
+        "info": "自选ssr*80"
+    },
+    {
+        "good_id": 71012,
+        "name": "自选ssr*120",
+        "quality": 1,
+        "image_id": "zhongjibaoxiang",
+        "itid": 24,
+        "goodType": 1,
+        "redPoint": 1,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 0,
+        "condition": 0,
+        "timelimit": 0,
+        "gift": 24,
+        "info": "自选ssr*120"
+    },
+    {
+        "good_id": 71013,
+        "name": "自选ssr*240",
+        "quality": 1,
+        "image_id": "zhongjibaoxiang",
+        "itid": 24,
+        "goodType": 1,
+        "redPoint": 1,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 0,
+        "condition": 0,
+        "timelimit": 0,
+        "gift": 25,
+        "info": "自选ssr*240"
+    },
+    {
+        "good_id": 71014,
+        "name": "充值限定-每周精品3选1礼包 198元",
+        "quality": 1,
+        "image_id": "zhongjibaoxiang",
+        "itid": 24,
+        "goodType": 1,
+        "redPoint": 1,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 95,
+        "condition": 0,
+        "timelimit": 0,
+        "gift": 26,
+        "info": "充值限定-每周精品3选1礼包 198元"
+    },
+    {
+        "good_id": 71015,
+        "name": "充值限定-每日经验书礼包",
+        "quality": 1,
+        "image_id": "zhongjibaoxiang",
+        "itid": 24,
+        "goodType": 1,
+        "redPoint": 1,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 50,
+        "condition": 0,
+        "timelimit": 0,
+        "gift": 4,
+        "info": "充值限定-每日经验书礼包"
+    },
+    {
+        "good_id": 71016,
+        "name": "充值限定-每周好感度礼包 68元",
+        "quality": 1,
+        "image_id": "zhongjibaoxiang",
+        "itid": 24,
+        "goodType": 1,
+        "redPoint": 1,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 65,
+        "condition": 0,
+        "timelimit": 0,
+        "gift": 4,
+        "info": "充值限定-每周好感度礼包 68元"
+    },
+    {
+        "good_id": 71017,
+        "name": "充值限定-每周皮肤礼包 98元",
+        "quality": 1,
+        "image_id": "zhongjibaoxiang",
+        "itid": 24,
+        "goodType": 1,
+        "redPoint": 1,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 80,
+        "condition": 0,
+        "timelimit": 0,
+        "gift": 4,
+        "info": "充值限定-每周皮肤礼包 98元"
+    },
+    {
+        "good_id": 71018,
+        "name": "充值限定-每周觉醒礼包 328元",
+        "quality": 1,
+        "image_id": "zhongjibaoxiang",
+        "itid": 24,
+        "goodType": 1,
+        "redPoint": 1,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 110,
+        "condition": 0,
+        "timelimit": 0,
+        "gift": 4,
+        "info": "充值限定-每周觉醒礼包 328元"
+    },
+    {
+        "good_id": 71019,
+        "name": "萌新限购-点将令*5 6元",
+        "quality": 1,
+        "image_id": "zhongjibaoxiang",
+        "itid": 24,
+        "goodType": 1,
+        "redPoint": 1,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 125,
+        "condition": 0,
+        "timelimit": 0,
+        "gift": 4,
+        "info": "萌新限购-点将令*5 6元"
+    },
+    {
+        "good_id": 71020,
+        "name": "萌新限购-点将令*10 12元",
+        "quality": 1,
+        "image_id": "zhongjibaoxiang",
+        "itid": 24,
+        "goodType": 1,
+        "redPoint": 1,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 140,
+        "condition": 0,
+        "timelimit": 0,
+        "gift": 4,
+        "info": "萌新限购-点将令*10 12元"
+    },
+    {
+        "good_id": 71021,
+        "name": "萌新限购-经验书礼包 30元",
+        "quality": 1,
+        "image_id": "zhongjibaoxiang",
+        "itid": 24,
+        "goodType": 1,
+        "redPoint": 1,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 155,
+        "condition": 0,
+        "timelimit": 0,
+        "gift": 4,
+        "info": "萌新限购-经验书礼包 30元"
+    },
+    {
+        "good_id": 71022,
+        "name": "萌新限购-装备精炼礼包 68元",
+        "quality": 1,
+        "image_id": "zhongjibaoxiang",
+        "itid": 24,
+        "goodType": 1,
+        "redPoint": 1,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 170,
+        "condition": 0,
+        "timelimit": 0,
+        "gift": 4,
+        "info": "萌新限购-装备精炼礼包 68元"
+    },
+    {
+        "good_id": 71023,
+        "name": "萌新限购-地玉礼包 98元",
+        "quality": 1,
+        "image_id": "zhongjibaoxiang",
+        "itid": 24,
+        "goodType": 1,
+        "redPoint": 1,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 185,
+        "condition": 0,
+        "timelimit": 0,
+        "gift": 4,
+        "info": "萌新限购-地玉礼包 98元"
+    },
+    {
+        "good_id": 71024,
+        "name": "萌新限购-超值自选武将礼包 198元",
+        "quality": 3,
+        "image_id": "zhongjibaoxiang",
+        "itid": 24,
+        "goodType": 1,
+        "redPoint": 1,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 200,
+        "condition": 0,
+        "timelimit": 0,
+        "gift": 4,
+        "info": "萌新限购-超值自选武将礼包 198元"
+    },
+    {
+        "good_id": 71025,
+        "name": "萌新限购-超值自选武将礼包 328元",
+        "quality": 4,
+        "image_id": "zhongjibaoxiang",
+        "itid": 24,
+        "goodType": 1,
+        "redPoint": 1,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 215,
+        "condition": 0,
+        "timelimit": 0,
+        "gift": 4,
+        "info": "萌新限购-超值自选武将礼包 328元"
+    },
+    {
+        "good_id": 71026,
+        "name": "萌新限购-超值自选武将礼包 648元",
+        "quality": 5,
+        "image_id": "zhongjibaoxiang",
+        "itid": 24,
+        "goodType": 1,
+        "redPoint": 1,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "&",
+        "useWays": "&",
+        "value": 230,
+        "condition": 0,
+        "timelimit": 0,
+        "gift": 4,
+        "info": "萌新限购-超值自选武将礼包 648元"
+    },
     {
         "good_id": 72001,
         "name": "烧肉",
@@ -8055,7 +8343,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "1&0",
+        "getWays": "&",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -8073,7 +8361,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "1&0",
+        "getWays": "&",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -8091,7 +8379,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "1&0",
+        "getWays": "115|114|21",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -8109,7 +8397,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&100",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33001",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8127,7 +8415,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&200",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33002",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8145,7 +8433,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&300",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33003",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8163,7 +8451,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&400",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33004",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8181,7 +8469,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&500",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33005",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8199,7 +8487,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&600",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33006",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8217,7 +8505,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&700",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33007",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8235,7 +8523,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&800",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33008",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8253,7 +8541,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&900",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33009",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8271,7 +8559,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&100",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33010",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8289,7 +8577,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&200",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33011",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8307,7 +8595,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&300",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33012",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8325,7 +8613,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&400",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33013",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8343,7 +8631,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&500",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33014",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8361,7 +8649,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&600",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33015",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8379,7 +8667,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&700",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33016",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8397,7 +8685,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&800",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33017",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8415,7 +8703,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&900",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33018",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8433,7 +8721,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&100",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33019",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8451,7 +8739,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&200",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33020",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8469,7 +8757,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&300",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33021",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8487,7 +8775,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&400",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33022",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8505,7 +8793,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&500",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33023",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8523,7 +8811,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&600",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33024",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8541,7 +8829,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&700",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33025",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8559,7 +8847,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&800",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33026",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8577,7 +8865,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&900",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33027",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8595,7 +8883,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&100",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33028",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8613,7 +8901,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&200",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33029",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8631,7 +8919,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&300",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33030",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8649,7 +8937,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&400",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33031",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8667,7 +8955,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&500",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33032",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8685,7 +8973,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&600",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33033",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8703,7 +8991,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&700",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33034",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8721,7 +9009,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&800",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33035",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8739,7 +9027,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&900",
         "hid": 0,
-        "getWays": "89|82",
+        "getWays": "82&33036",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
diff --git a/shared/resource/jsons/dic_zyz_equipSuit.json b/shared/resource/jsons/dic_zyz_equipSuit.json
index 59e873737..24e7fc407 100644
--- a/shared/resource/jsons/dic_zyz_equipSuit.json
+++ b/shared/resource/jsons/dic_zyz_equipSuit.json
@@ -3,42 +3,42 @@
         "id": 1,
         "jobClass": 1,
         "equips": "1&2&3&4",
-        "effect": "3&1&10|6&2&10|9&4&10|12&5&10"
+        "effect": "3&1&40|6&2&40|9&4&40|12&5&40"
     },
     {
         "id": 2,
         "jobClass": 2,
         "equips": "5&6&7&8",
-        "effect": "3&1&10|6&2&10|9&4&10|12&5&10"
+        "effect": "3&1&40|6&2&40|9&4&40|12&5&40"
     },
     {
         "id": 3,
         "jobClass": 3,
         "equips": "9&10&11&12",
-        "effect": "3&1&10|6&2&10|9&4&10|12&5&10"
+        "effect": "3&1&40|6&2&40|9&4&40|12&5&40"
     },
     {
         "id": 4,
         "jobClass": 4,
         "equips": "13&14&15&16",
-        "effect": "3&1&10|6&2&10|9&4&10|12&5&10"
+        "effect": "3&1&40|6&2&40|9&4&40|12&5&40"
     },
     {
         "id": 5,
         "jobClass": 5,
         "equips": "17&18&19&20",
-        "effect": "3&1&10|6&2&10|9&4&10|12&5&10"
+        "effect": "3&1&40|6&2&40|9&4&40|12&5&40"
     },
     {
         "id": 6,
         "jobClass": 6,
         "equips": "21&22&23&24",
-        "effect": "3&1&10|6&2&10|9&4&10|12&5&10"
+        "effect": "3&1&40|6&2&40|9&4&40|12&5&40"
     },
     {
         "id": 7,
         "jobClass": 7,
         "equips": "25&26&27&28",
-        "effect": "3&1&10|6&2&10|9&4&10|12&5&10"
+        "effect": "3&1&40|6&2&40|9&4&40|12&5&40"
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/jsons/dic_zyz_giftPackage.json b/shared/resource/jsons/dic_zyz_giftPackage.json
index f0f533283..8d382f28e 100644
--- a/shared/resource/jsons/dic_zyz_giftPackage.json
+++ b/shared/resource/jsons/dic_zyz_giftPackage.json
@@ -152,5 +152,33 @@
         "type": 3,
         "count": 1,
         "reward": "2&60001&999|2&60011&999|2&60021&999|2&60031&999"
+    },
+    {
+        "id": 23,
+        "des": "自选ssr*80",
+        "type": 2,
+        "count": 1,
+        "reward": "2&21001&80|2&21002&80|2&21003&80|2&21004&80|2&21005&80|2&21007&80|2&21017&80|2&21018&80|2&21019&80|2&21020&80|2&21021&80|2&21022&80|2&21024&80|2&21032&80|2&21033&80|2&21034&80|2&21035&80|2&21040&80|2&21041&80|2&21044&80|2&21045&80|2&21046&80|2&21047&80|2&21049&80|2&21056&80"
+    },
+    {
+        "id": 24,
+        "des": "自选ssr*120",
+        "type": 2,
+        "count": 1,
+        "reward": "2&21001&120|2&21002&120|2&21003&120|2&21004&120|2&21005&120|2&21007&120|2&21017&120|2&21018&120|2&21019&120|2&21020&120|2&21021&120|2&21022&120|2&21024&120|2&21032&120|2&21033&120|2&21034&120|2&21035&120|2&21040&120|2&21041&120|2&21044&120|2&21045&120|2&21046&120|2&21047&120|2&21049&120|2&21056&120"
+    },
+    {
+        "id": 25,
+        "des": "自选ssr*240",
+        "type": 2,
+        "count": 1,
+        "reward": "2&21001&240|2&21002&240|2&21003&240|2&21004&240|2&21005&240|2&21007&240|2&21017&240|2&21018&240|2&21019&240|2&21020&240|2&21021&240|2&21022&240|2&21024&240|2&21032&240|2&21033&240|2&21034&240|2&21035&240|2&21040&240|2&21041&240|2&21044&240|2&21045&240|2&21046&240|2&21047&240|2&21049&240|2&21056&240"
+    },
+    {
+        "id": 26,
+        "des": "虎符*16/天外陨金*16/乾坤锁*40 3选1",
+        "type": 2,
+        "count": 1,
+        "reward": "2&17042&16|2&17055&16|2&17045&40"
     }
 ]
\ No newline at end of file