diff --git a/shared/resource/jsons/dic_goods.json b/shared/resource/jsons/dic_goods.json
index 64cbd2373..6eb1a68c7 100644
--- a/shared/resource/jsons/dic_goods.json
+++ b/shared/resource/jsons/dic_goods.json
@@ -81,7 +81,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&11011|117|21|68|6",
+        "getWays": "137&11011|117|21|68|149|6",
         "useWays": "34&",
         "value": 5,
         "condition": 0,
@@ -99,7 +99,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&11012|117|21|68|6",
+        "getWays": "137&11012|117|21|68|149|6",
         "useWays": "34&",
         "value": 10,
         "condition": 0,
@@ -117,7 +117,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&11013|117|21|68|6",
+        "getWays": "137&11013|117|21|68|149|6",
         "useWays": "34&",
         "value": 15,
         "condition": 0,
@@ -135,7 +135,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&11014|117|21|68|6",
+        "getWays": "137&11014|117|21|68|149|6",
         "useWays": "34&",
         "value": 20,
         "condition": 0,
@@ -2295,7 +2295,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "84|86|87",
+        "getWays": "84|86|87|91&1",
         "useWays": "32&",
         "value": 0,
         "condition": 0,
@@ -2313,7 +2313,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17002|148&17002",
+        "getWays": "148&17002|137&17002",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2331,7 +2331,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17003|148&17003",
+        "getWays": "148&17003|137&17003",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2349,7 +2349,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17004|148&17004",
+        "getWays": "148&17004|137&17004",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2367,7 +2367,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17005|148&17005",
+        "getWays": "148&17005|137&17005",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2385,7 +2385,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17006|148&17006",
+        "getWays": "148&17006|137&17006",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2403,7 +2403,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17007|148&17007",
+        "getWays": "148&17007|137&17007",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2421,7 +2421,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17008|148&17008",
+        "getWays": "148&17008|137&17008",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2439,7 +2439,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17009|148&17009",
+        "getWays": "148&17009|137&17009",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2457,7 +2457,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17010|148&17010",
+        "getWays": "148&17010|137&17010",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2475,7 +2475,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17011|148&17011",
+        "getWays": "148&17011|137&17011",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2493,7 +2493,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17012|148&17012",
+        "getWays": "148&17012|137&17012",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2511,7 +2511,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17013|148&17013",
+        "getWays": "148&17013|137&17013",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2529,7 +2529,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17014|148&17014",
+        "getWays": "148&17014|137&17014",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2547,7 +2547,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17015|148&17015",
+        "getWays": "148&17015|137&17015",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2565,7 +2565,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17016|148&17016",
+        "getWays": "148&17016|137&17016",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2583,7 +2583,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17017|148&17017",
+        "getWays": "148&17017|137&17017",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2601,7 +2601,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17018|148&17018",
+        "getWays": "148&17018|137&17018",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2619,7 +2619,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17019|148&17019",
+        "getWays": "148&17019|137&17019",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2637,7 +2637,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17020|148&17020",
+        "getWays": "148&17020|137&17020",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2655,7 +2655,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17021|148&17021",
+        "getWays": "148&17021|137&17021",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2673,7 +2673,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17022|148&17022",
+        "getWays": "148&17022|137&17022",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2691,7 +2691,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17023|148&17023",
+        "getWays": "148&17023|137&17023",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2709,7 +2709,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17024|148&17024",
+        "getWays": "148&17024|137&17024",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2727,7 +2727,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17025|148&17025",
+        "getWays": "148&17025|137&17025",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2745,7 +2745,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17026|148&17026",
+        "getWays": "148&17026|137&17026",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2763,7 +2763,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17027|148&17027",
+        "getWays": "148&17027|137&17027",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2781,7 +2781,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17028|148&17028",
+        "getWays": "148&17028|137&17028",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2799,7 +2799,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17029|148&17029",
+        "getWays": "148&17029|137&17029",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2817,7 +2817,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17030|148&17030",
+        "getWays": "148&17030|137&17030",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2835,7 +2835,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17031|148&17031",
+        "getWays": "148&17031|137&17031",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2853,7 +2853,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17032|148&17032",
+        "getWays": "148&17032|137&17032",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2871,7 +2871,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17033|148&17033",
+        "getWays": "148&17033|137&17033",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2889,7 +2889,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17034|148&17034",
+        "getWays": "148&17034|137&17034",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2907,7 +2907,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17035|148&17035",
+        "getWays": "148&17035|137&17035",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2925,7 +2925,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17036|148&17036",
+        "getWays": "148&17036|137&17036",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2943,7 +2943,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17037|148&17037",
+        "getWays": "148&17037|137&17037",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2961,7 +2961,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17038|148&17038",
+        "getWays": "148&17038|137&17038",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2979,7 +2979,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17039|148&17039",
+        "getWays": "148&17039|137&17039",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -2997,7 +2997,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17040|148&17040",
+        "getWays": "148&17040|137&17040",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -3015,7 +3015,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "137&17041|148&17041",
+        "getWays": "148&17041|137&17041",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -3033,7 +3033,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "84|87|86|6|116",
+        "getWays": "84|86|87|3",
         "useWays": "33&",
         "value": 0,
         "condition": 0,
@@ -3051,7 +3051,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "84|85|90",
+        "getWays": "&",
         "useWays": "37&",
         "value": 0,
         "condition": 0,
@@ -3069,7 +3069,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "84|89|81|149|117|81|6",
+        "getWays": "84|89|150|81|6",
         "useWays": "38&",
         "value": 0,
         "condition": 0,
@@ -3195,7 +3195,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "40|41",
+        "getWays": "&",
         "useWays": "119&",
         "value": 0,
         "condition": 0,
@@ -3213,7 +3213,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "78|85|149|117|68|21|6",
+        "getWays": "65|85|21|117|6",
         "useWays": "53&",
         "value": 0,
         "condition": 0,
@@ -3231,7 +3231,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "84|85|81|68|6",
+        "getWays": "65|64|85|117|6",
         "useWays": "53&",
         "value": 0,
         "condition": 0,
@@ -3249,7 +3249,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|90|67|85|117|21",
+        "getWays": "149|79|67|85|117|21",
         "useWays": "36&",
         "value": 0,
         "condition": 0,
@@ -3267,7 +3267,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "84|89|90|81",
+        "getWays": "149|84|89|90|117|6",
         "useWays": "36&",
         "value": 0,
         "condition": 0,
@@ -3297,13 +3297,13 @@
         "good_id": 17057,
         "name": "淬炼石",
         "quality": 5,
-        "image_id": 40010,
+        "image_id": "gengjin",
         "itid": 38,
         "goodType": 2,
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "84|89|77|6",
+        "getWays": "84|89|6",
         "useWays": "45&",
         "value": 0,
         "condition": 0,
@@ -3321,7 +3321,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "84|89|77|6",
+        "getWays": "&",
         "useWays": "45&",
         "value": 0,
         "condition": 0,
@@ -4329,7 +4329,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "107|114|76|104|117|81",
+        "getWays": "148&31001|137&31001|21|76|104|117|149|150|68",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -4383,7 +4383,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33001|89|6",
         "useWays": "82&33001",
         "value": 0,
         "condition": 0,
@@ -4401,7 +4401,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33002|89|6",
         "useWays": "82&33002",
         "value": 0,
         "condition": 0,
@@ -4419,7 +4419,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33003|89|6",
         "useWays": "82&33003",
         "value": 0,
         "condition": 0,
@@ -4437,7 +4437,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33004|89|6",
         "useWays": "82&33004",
         "value": 0,
         "condition": 0,
@@ -4455,7 +4455,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33005|89|6",
         "useWays": "82&33005",
         "value": 0,
         "condition": 0,
@@ -4473,7 +4473,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33006|89|6",
         "useWays": "82&33006",
         "value": 0,
         "condition": 0,
@@ -4491,7 +4491,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33007|89|6",
         "useWays": "82&33007",
         "value": 0,
         "condition": 0,
@@ -4509,7 +4509,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33008|89|6",
         "useWays": "82&33008",
         "value": 0,
         "condition": 0,
@@ -4527,7 +4527,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33010|89|6",
         "useWays": "82&33010",
         "value": 0,
         "condition": 0,
@@ -4545,7 +4545,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33011|89|6",
         "useWays": "82&33011",
         "value": 0,
         "condition": 0,
@@ -4563,7 +4563,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33012|89|6",
         "useWays": "82&33012",
         "value": 0,
         "condition": 0,
@@ -4581,7 +4581,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33013|89|6",
         "useWays": "82&33013",
         "value": 0,
         "condition": 0,
@@ -4599,7 +4599,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33014|89|6",
         "useWays": "82&33014",
         "value": 0,
         "condition": 0,
@@ -4617,7 +4617,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33015|89|6",
         "useWays": "82&33015",
         "value": 0,
         "condition": 0,
@@ -4635,7 +4635,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33016|89|6",
         "useWays": "82&33016",
         "value": 0,
         "condition": 0,
@@ -4653,7 +4653,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33017|89|6",
         "useWays": "82&33017",
         "value": 0,
         "condition": 0,
@@ -4671,7 +4671,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33019|89|6",
         "useWays": "82&33019",
         "value": 0,
         "condition": 0,
@@ -4689,7 +4689,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33020|89|6",
         "useWays": "82&33020",
         "value": 0,
         "condition": 0,
@@ -4707,7 +4707,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33021|89|6",
         "useWays": "82&33021",
         "value": 0,
         "condition": 0,
@@ -4725,7 +4725,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33022|89|6",
         "useWays": "82&33022",
         "value": 0,
         "condition": 0,
@@ -4743,7 +4743,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33023|89|6",
         "useWays": "82&33023",
         "value": 0,
         "condition": 0,
@@ -4761,7 +4761,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33024|89|6",
         "useWays": "82&33024",
         "value": 0,
         "condition": 0,
@@ -4779,7 +4779,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33025|89|6",
         "useWays": "82&33025",
         "value": 0,
         "condition": 0,
@@ -4797,7 +4797,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33026|89|6",
         "useWays": "82&33026",
         "value": 0,
         "condition": 0,
@@ -4815,7 +4815,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33028|89|6",
         "useWays": "82&33028",
         "value": 0,
         "condition": 0,
@@ -4833,7 +4833,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33029|89|6",
         "useWays": "82&33029",
         "value": 0,
         "condition": 0,
@@ -4851,7 +4851,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33030|89|6",
         "useWays": "82&33030",
         "value": 0,
         "condition": 0,
@@ -4869,7 +4869,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33031|89|6",
         "useWays": "82&33031",
         "value": 0,
         "condition": 0,
@@ -4887,7 +4887,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33032|89|6",
         "useWays": "82&33032",
         "value": 0,
         "condition": 0,
@@ -4905,7 +4905,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33033|89|6",
         "useWays": "82&33033",
         "value": 0,
         "condition": 0,
@@ -4923,7 +4923,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33034|89|6",
         "useWays": "82&33034",
         "value": 0,
         "condition": 0,
@@ -4941,7 +4941,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83|89|6",
+        "getWays": "83&33035|89|6",
         "useWays": "82&33035",
         "value": 0,
         "condition": 0,
@@ -4977,7 +4977,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "82&",
+        "getWays": "147&",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -5067,7 +5067,7 @@
         "redPoint": 0,
         "decomposeItem": "&",
         "hid": 0,
-        "getWays": "83&",
+        "getWays": "83&40007|43",
         "useWays": "&",
         "value": 0,
         "condition": 0,
@@ -6993,7 +6993,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&20",
         "hid": 0,
-        "getWays": "83|90|67|68|64|85|6",
+        "getWays": "83&50001|67|64|90|85|6",
         "useWays": "140&",
         "value": 0,
         "condition": 0,
@@ -7011,7 +7011,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&60",
         "hid": 0,
-        "getWays": "83|90|67|68|64|85|6",
+        "getWays": "83&50002|67|64|90|85|6",
         "useWays": "140&",
         "value": 0,
         "condition": 0,
@@ -7029,7 +7029,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&180",
         "hid": 0,
-        "getWays": "83|90|67|68|64|85|6",
+        "getWays": "83&50003|67|64|90|85|6",
         "useWays": "140&",
         "value": 0,
         "condition": 0,
@@ -7047,7 +7047,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&540",
         "hid": 0,
-        "getWays": "83|90|67|68|64|85|6",
+        "getWays": "83&50004|67|64|90|85|6",
         "useWays": "140&",
         "value": 0,
         "condition": 0,
@@ -7065,7 +7065,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&1800",
         "hid": 0,
-        "getWays": "83|90|67|68|64|85|6",
+        "getWays": "83&50005|67|64|90|85|6",
         "useWays": "140&",
         "value": 0,
         "condition": 0,
@@ -7083,7 +7083,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&100",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60001",
         "value": 0,
         "condition": 0,
@@ -7101,7 +7101,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&200",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60002",
         "value": 0,
         "condition": 0,
@@ -7119,7 +7119,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&300",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60003",
         "value": 0,
         "condition": 0,
@@ -7137,7 +7137,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&400",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60004",
         "value": 0,
         "condition": 0,
@@ -7155,7 +7155,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&500",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60005",
         "value": 0,
         "condition": 0,
@@ -7173,7 +7173,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&600",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60006",
         "value": 0,
         "condition": 0,
@@ -7191,7 +7191,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&700",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60007",
         "value": 0,
         "condition": 0,
@@ -7209,7 +7209,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&800",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60008",
         "value": 0,
         "condition": 0,
@@ -7227,7 +7227,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&900",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60009",
         "value": 0,
         "condition": 0,
@@ -7245,7 +7245,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&100",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60011",
         "value": 0,
         "condition": 0,
@@ -7263,7 +7263,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&200",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60012",
         "value": 0,
         "condition": 0,
@@ -7281,7 +7281,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&300",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60013",
         "value": 0,
         "condition": 0,
@@ -7299,7 +7299,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&400",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60014",
         "value": 0,
         "condition": 0,
@@ -7317,7 +7317,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&500",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60015",
         "value": 0,
         "condition": 0,
@@ -7335,7 +7335,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&600",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60016",
         "value": 0,
         "condition": 0,
@@ -7353,7 +7353,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&700",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60017",
         "value": 0,
         "condition": 0,
@@ -7371,7 +7371,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&800",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60018",
         "value": 0,
         "condition": 0,
@@ -7389,7 +7389,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&900",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60019",
         "value": 0,
         "condition": 0,
@@ -7407,7 +7407,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&100",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60021",
         "value": 0,
         "condition": 0,
@@ -7425,7 +7425,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&200",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60022",
         "value": 0,
         "condition": 0,
@@ -7443,7 +7443,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&300",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60023",
         "value": 0,
         "condition": 0,
@@ -7461,7 +7461,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&400",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60024",
         "value": 0,
         "condition": 0,
@@ -7479,7 +7479,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&500",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60025",
         "value": 0,
         "condition": 0,
@@ -7497,7 +7497,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&600",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60026",
         "value": 0,
         "condition": 0,
@@ -7515,7 +7515,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&700",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60027",
         "value": 0,
         "condition": 0,
@@ -7533,7 +7533,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&800",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60028",
         "value": 0,
         "condition": 0,
@@ -7551,7 +7551,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&900",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60029",
         "value": 0,
         "condition": 0,
@@ -7569,7 +7569,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&100",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60031",
         "value": 0,
         "condition": 0,
@@ -7587,7 +7587,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&200",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60032",
         "value": 0,
         "condition": 0,
@@ -7605,7 +7605,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&300",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60033",
         "value": 0,
         "condition": 0,
@@ -7623,7 +7623,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&400",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60034",
         "value": 0,
         "condition": 0,
@@ -7641,7 +7641,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&500",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60035",
         "value": 0,
         "condition": 0,
@@ -7659,7 +7659,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&600",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60036",
         "value": 0,
         "condition": 0,
@@ -7677,7 +7677,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&700",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60037",
         "value": 0,
         "condition": 0,
@@ -7695,7 +7695,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&800",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60038",
         "value": 0,
         "condition": 0,
@@ -7713,7 +7713,7 @@
         "redPoint": 0,
         "decomposeItem": "40007&900",
         "hid": 0,
-        "getWays": "83|90|85|6|21|81",
+        "getWays": "90|85|21|6",
         "useWays": "126&60039",
         "value": 0,
         "condition": 0,
@@ -8757,7 +8757,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&900",
         "hid": 0,
-        "getWays": "82&33009",
+        "getWays": "&",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -8919,7 +8919,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&900",
         "hid": 0,
-        "getWays": "82&33018",
+        "getWays": "&",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -9081,7 +9081,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&900",
         "hid": 0,
-        "getWays": "82&33027",
+        "getWays": "&",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
@@ -9243,7 +9243,7 @@
         "redPoint": 0,
         "decomposeItem": "40002&900",
         "hid": 0,
-        "getWays": "82&33036",
+        "getWays": "&",
         "useWays": "143|144",
         "value": 0,
         "condition": 0,
diff --git a/shared/resource/jsons/dic_zyz_approach.json b/shared/resource/jsons/dic_zyz_approach.json
index 795ca1df9..785d63960 100644
--- a/shared/resource/jsons/dic_zyz_approach.json
+++ b/shared/resource/jsons/dic_zyz_approach.json
@@ -5,7 +5,8 @@
         "typeName": "MAIN_WINDOW",
         "name": "主界面",
         "description": "主界面",
-        "icon": "tubiao2_shangcheng"
+        "icon": "&",
+        "comment": 0
     },
     {
         "id": 2,
@@ -13,7 +14,8 @@
         "typeName": "ROLE_SET",
         "name": "玩家设置",
         "description": "玩家设置",
-        "icon": "tubiao2_shangcheng"
+        "icon": "&",
+        "comment": 0
     },
     {
         "id": 3,
@@ -21,7 +23,8 @@
         "typeName": "RANK",
         "name": "排行榜",
         "description": "排行榜",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhujiemian_paihang",
+        "comment": 0
     },
     {
         "id": 4,
@@ -29,7 +32,8 @@
         "typeName": "MAIL",
         "name": "邮件",
         "description": "邮件",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhujiemian_youjian",
+        "comment": 0
     },
     {
         "id": 5,
@@ -37,7 +41,8 @@
         "typeName": "FRIEND",
         "name": "好友",
         "description": "好友",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhujiemian_haoyou",
+        "comment": 0
     },
     {
         "id": 6,
@@ -45,7 +50,8 @@
         "typeName": "AUCTION",
         "name": "拍卖行",
         "description": "拍卖行",
-        "icon": "tubiao_hecheng"
+        "icon": "zhujiemian_paimai",
+        "comment": 0
     },
     {
         "id": 7,
@@ -53,7 +59,8 @@
         "typeName": "MAIN_TASK",
         "name": "主线任务",
         "description": "主线任务",
-        "icon": "tubiao2_shangcheng"
+        "icon": "renwu_lilian",
+        "comment": 0
     },
     {
         "id": 8,
@@ -61,7 +68,8 @@
         "typeName": "CHAT_LIST",
         "name": "聊天列表",
         "description": "聊天",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhujiemian_liaotian",
+        "comment": 0
     },
     {
         "id": 9,
@@ -69,7 +77,8 @@
         "typeName": "HEROS",
         "name": "武将养成——武将列表",
         "description": "武将养成",
-        "icon": "tubiao2_shangcheng"
+        "icon": "wujiang",
+        "comment": 0
     },
     {
         "id": 10,
@@ -77,7 +86,8 @@
         "typeName": "EQUIP",
         "name": "装备页面（非装备养成内容，武将养成界面的装备界面）",
         "description": "武将装备",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhuangbei_wujiang",
+        "comment": 0
     },
     {
         "id": 11,
@@ -85,15 +95,17 @@
         "typeName": "BAG",
         "name": "背包初始界面",
         "description": "背包",
-        "icon": "tubiao2_shangcheng"
+        "icon": "beibao",
+        "comment": 0
     },
     {
         "id": 12,
         "type": 12,
         "typeName": "FORGING",
-        "name": "合成初始界面",
+        "name": "合成初始界面(弃用)",
         "description": "合成",
-        "icon": "tubiao_hecheng"
+        "icon": "hecheng",
+        "comment": 0
     },
     {
         "id": 13,
@@ -101,15 +113,17 @@
         "typeName": "RECRUIT",
         "name": "招募初始界面",
         "description": "招募",
-        "icon": "tubiao_hecheng"
+        "icon": "zhaomu",
+        "comment": 0
     },
     {
         "id": 14,
         "type": 14,
         "typeName": "ASSIST",
         "name": "助阵初始界面",
-        "description": "助阵",
-        "icon": "tubiao2_shangcheng"
+        "description": "奇遇",
+        "icon": "qiyu",
+        "comment": 0
     },
     {
         "id": 15,
@@ -117,15 +131,17 @@
         "typeName": "LEGION",
         "name": "军团初始界面（玩家无军团为加入军团的初始界面，有军团未军团主界面）",
         "description": "军团",
-        "icon": "tubiao2_shangcheng"
+        "icon": "juntuan",
+        "comment": 0
     },
     {
         "id": 16,
         "type": 16,
         "typeName": "PVP",
         "name": "pvp初始界面",
-        "description": "演武",
-        "icon": "tubiao2_shangcheng"
+        "description": "竞技",
+        "icon": "juntuan_jingji",
+        "comment": 0
     },
     {
         "id": 17,
@@ -133,7 +149,8 @@
         "typeName": "CHALLENGE",
         "name": "挑战列表界面",
         "description": "挑战",
-        "icon": "tubiao2_shangcheng"
+        "icon": "tiaozhan",
+        "comment": 0
     },
     {
         "id": 18,
@@ -141,7 +158,8 @@
         "typeName": "SHOP",
         "name": "商店初始界面",
         "description": "商店",
-        "icon": "tubiao2_shangcheng"
+        "icon": "huodongzi_shangcheng",
+        "comment": 0
     },
     {
         "id": 19,
@@ -149,7 +167,8 @@
         "typeName": "FIRST_RECHARGE",
         "name": "首冲界面",
         "description": "首冲活动",
-        "icon": "tubiao2_shangcheng"
+        "icon": "huodongzi_shouchong",
+        "comment": 0
     },
     {
         "id": 20,
@@ -157,7 +176,8 @@
         "typeName": "ACTIVITY_LIST",
         "name": "活动列表界面",
         "description": "活动",
-        "icon": "tubiao_hecheng"
+        "icon": "huodongzi_huodong",
+        "comment": 0
     },
     {
         "id": 21,
@@ -165,7 +185,8 @@
         "typeName": "DAILY_TASK",
         "name": "日常任务界面",
         "description": "日常",
-        "icon": "tubiao2_shangcheng"
+        "icon": "huodong_meiri",
+        "comment": 0
     },
     {
         "id": 22,
@@ -173,7 +194,8 @@
         "typeName": "ACHIEVEMENT",
         "name": "成就界面",
         "description": "成就",
-        "icon": "tubiao2_shangcheng"
+        "icon": "renwu_chengjiu",
+        "comment": 0
     },
     {
         "id": 23,
@@ -181,7 +203,8 @@
         "typeName": "RECHARGE",
         "name": "充值初始界面",
         "description": "充值活动",
-        "icon": "tubiao2_shangcheng"
+        "icon": "&",
+        "comment": 0
     },
     {
         "id": 24,
@@ -189,7 +212,8 @@
         "typeName": "HAPPY_DAY_ACTIVITY",
         "name": "714天乐界面",
         "description": "714天乐活动",
-        "icon": "tubiao2_shangcheng"
+        "icon": "&",
+        "comment": 0
     },
     {
         "id": 25,
@@ -197,7 +221,8 @@
         "typeName": "TREASURE_HUNT_ACTIVITY",
         "name": "神州探秘界面",
         "description": "神州探秘",
-        "icon": "tubiao2_shangcheng"
+        "icon": "&",
+        "comment": 0
     },
     {
         "id": 26,
@@ -205,7 +230,8 @@
         "typeName": "MI_JIA_SHOP_ACTIVITY",
         "name": "糜家商队界面",
         "description": "糜家商队",
-        "icon": "tubiao2_shangcheng"
+        "icon": "&",
+        "comment": 0
     },
     {
         "id": 27,
@@ -213,7 +239,8 @@
         "typeName": "BIG_TARGET_ACTIVITY",
         "name": "30或者更多天活动界面",
         "description": "30或者更多天活动界面",
-        "icon": "tubiao_hecheng"
+        "icon": 0,
+        "comment": 0
     },
     {
         "id": 28,
@@ -221,7 +248,8 @@
         "typeName": "FESTIVAL_ACTIVITY",
         "name": "节日活动界面",
         "description": "节日活动",
-        "icon": "tubiao2_shangcheng"
+        "icon": "&",
+        "comment": 0
     },
     {
         "id": 29,
@@ -229,7 +257,8 @@
         "typeName": "NEW_HEROS_ACTIVITY",
         "name": "新武将活动界面",
         "description": "新武将活动",
-        "icon": "tubiao2_shangcheng"
+        "icon": "&",
+        "comment": 0
     },
     {
         "id": 30,
@@ -237,7 +266,8 @@
         "typeName": "HERO_MSG",
         "name": "武将信息界面",
         "description": "武将养成",
-        "icon": "tubiao2_shangcheng"
+        "icon": "wujiang",
+        "comment": 0
     },
     {
         "id": 31,
@@ -245,7 +275,8 @@
         "typeName": "HERO_UP",
         "name": "武将升级界面",
         "description": "武将升级",
-        "icon": "tubiao2_shangcheng"
+        "icon": "wujiang_shengji",
+        "comment": 0
     },
     {
         "id": 32,
@@ -253,7 +284,8 @@
         "typeName": "HERO_UP_STAR",
         "name": "武将升星界面",
         "description": "武将升星",
-        "icon": "tubiao2_shangcheng"
+        "icon": "wujiang_shengxing",
+        "comment": 0
     },
     {
         "id": 33,
@@ -261,7 +293,8 @@
         "typeName": "HERO_JOB",
         "name": "武将职业界面",
         "description": "武将职业",
-        "icon": "tubiao2_shangcheng"
+        "icon": "wujiang_zhiye",
+        "comment": 0
     },
     {
         "id": 34,
@@ -269,7 +302,8 @@
         "typeName": "HERO_FRIENDSHIP",
         "name": "武将羁绊界面",
         "description": "武将羁绊",
-        "icon": "tubiao_hecheng"
+        "icon": "wujiang_jiban",
+        "comment": 0
     },
     {
         "id": 35,
@@ -277,7 +311,8 @@
         "typeName": "EQUIP_STRENGTHEN",
         "name": "装备强化界面",
         "description": "装备强化",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhuangbei_qianghua",
+        "comment": 0
     },
     {
         "id": 36,
@@ -285,7 +320,8 @@
         "typeName": "EQUIP_REFINE",
         "name": "装备精炼界面",
         "description": "装备精炼",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhuangbei_jinglian",
+        "comment": 0
     },
     {
         "id": 37,
@@ -293,79 +329,89 @@
         "typeName": "EQUIP_FILL_IN",
         "name": "装备镶嵌界面",
         "description": "装备镶嵌",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhuangbei_xiangqian",
+        "comment": 0
     },
     {
         "id": 38,
         "type": 38,
         "typeName": "EQUIP_CLEAR",
-        "name": "装备洗练界面",
+        "name": "装备洗练界面（弃用）",
         "description": "装备洗练",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhuangbei_xilian",
+        "comment": 0
     },
     {
         "id": 39,
         "type": 39,
         "typeName": "BAG_PROP",
         "name": "背包——道具界面",
-        "description": "背包",
-        "icon": "tubiao2_shangcheng"
+        "description": "背包道具",
+        "icon": "beibao",
+        "comment": 0
     },
     {
         "id": 40,
         "type": 40,
         "typeName": "BAG_EQUIP",
-        "name": "背包——装备界面",
-        "description": "背包",
-        "icon": "tubiao2_shangcheng"
+        "name": "背包——装备界面（弃用）",
+        "description": "背包装备",
+        "icon": "beibao",
+        "comment": 0
     },
     {
         "id": 41,
         "type": 41,
         "typeName": "BAG_EQUIP_CHIP",
-        "name": "背包——装备碎片界面",
-        "description": "背包",
-        "icon": "tubiao_hecheng"
+        "name": "背包——装备碎片界面（弃用）",
+        "description": "背包装备碎片",
+        "icon": "beibao",
+        "comment": 0
     },
     {
         "id": 42,
         "type": 42,
         "typeName": "BAG_EQUIP_MAP",
         "name": "背包——藏宝图界面",
-        "description": "背包",
-        "icon": "tubiao2_shangcheng"
+        "description": "背包藏宝图",
+        "icon": "beibao",
+        "comment": 0
     },
     {
         "id": 43,
         "type": 43,
         "typeName": "BAG_EQUIP_STONE",
         "name": "背包——宝石界面",
-        "description": "背包",
-        "icon": "tubiao2_shangcheng"
+        "description": "地玉分解",
+        "icon": "beibao",
+        "comment": 0
     },
     {
         "id": 44,
         "type": 44,
         "typeName": "BAG_EQUIP_PICTURE",
         "name": "背包——图纸界面",
-        "description": "背包",
-        "icon": "tubiao2_shangcheng"
+        "description": "背包图纸",
+        "icon": "beibao",
+        "comment": 0
     },
     {
         "id": 45,
         "type": 45,
         "typeName": "FORGING_STONE_AND",
-        "name": "合成——宝石界面",
-        "description": "合成",
-        "icon": "tubiao_hecheng"
+        "name": "合成——宝石界面（弃用）",
+        "description": "合成宝石",
+        "icon": "hecheng_baoshi",
+        "comment": 0
     },
     {
         "id": 46,
         "type": 46,
         "typeName": "FORGING_SUIT_AND",
-        "name": "合成——套装界面",
-        "description": "合成",
-        "icon": "tubiao_hecheng"
+        "name": "合成——套装界面（弃用）",
+        "description": "合成套装",
+        "icon": "hecheng_zhuangbei",
+        "comment": 0
     },
     {
         "id": 47,
@@ -373,7 +419,8 @@
         "typeName": "RECRUIT_SIMPLE",
         "name": "招募——普通招募界面",
         "description": "将令招募",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhaomu_yuanbao",
+        "comment": 0
     },
     {
         "id": 48,
@@ -381,7 +428,8 @@
         "typeName": "RECRUIT_SAGE",
         "name": "招募——求贤若渴界面",
         "description": "求贤若渴",
-        "icon": "tubiao_hecheng"
+        "icon": "zhaomu_qiuxrk",
+        "comment": 0
     },
     {
         "id": 49,
@@ -389,7 +437,8 @@
         "typeName": "RECRUIT_FRIENDSHIP",
         "name": "招募——情谊招募界面",
         "description": "情谊招募",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhaomu_youqing",
+        "comment": 0
     },
     {
         "id": 50,
@@ -397,7 +446,8 @@
         "typeName": "RECRUIT_VISIT",
         "name": "招募——拜访界面",
         "description": "武将拜访",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhaomu_baifang",
+        "comment": 0
     },
     {
         "id": 51,
@@ -405,7 +455,8 @@
         "typeName": "STATUE_LIST",
         "name": "神像列表界面",
         "description": "神像",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhuzhen_shengshou",
+        "comment": 0
     },
     {
         "id": 52,
@@ -413,7 +464,8 @@
         "typeName": "STATUE_MSG",
         "name": "神像——信息界面",
         "description": "神像",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhuzhen_shengshou",
+        "comment": 0
     },
     {
         "id": 53,
@@ -421,15 +473,17 @@
         "typeName": "STATUE_STRENGTHEN",
         "name": "神像——强化界面",
         "description": "神像",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhuzhen_shengshou",
+        "comment": 0
     },
     {
         "id": 54,
         "type": 54,
         "typeName": "SCHOOL",
         "name": "百家学宫界面",
-        "description": "百家学宫",
-        "icon": "tubiao2_shangcheng"
+        "description": "百家典籍",
+        "icon": "zhuzhen_baijia",
+        "comment": 0
     },
     {
         "id": 55,
@@ -437,7 +491,8 @@
         "typeName": "TITLE",
         "name": "爵位界面",
         "description": "爵位",
-        "icon": "tubiao_hecheng"
+        "icon": "zhuzhen_juewei",
+        "comment": 0
     },
     {
         "id": 56,
@@ -445,7 +500,8 @@
         "typeName": "FAM_GEN",
         "name": "名将谱界面",
         "description": "名将谱",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhuzhen_mingjiangpu",
+        "comment": 0
     },
     {
         "id": 57,
@@ -453,7 +509,8 @@
         "typeName": "FAM_GEN_WEI",
         "name": "名将谱——魏界面",
         "description": "名将谱",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhuzhen_mingjiangpu",
+        "comment": 0
     },
     {
         "id": 58,
@@ -461,7 +518,8 @@
         "typeName": "FAM_GEN_SHU",
         "name": "名将谱——蜀界面",
         "description": "名将谱",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhuzhen_mingjiangpu",
+        "comment": 0
     },
     {
         "id": 59,
@@ -469,7 +527,8 @@
         "typeName": "FAM_GEN_WU",
         "name": "名将谱——吴界面",
         "description": "名将谱",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhuzhen_mingjiangpu",
+        "comment": 0
     },
     {
         "id": 60,
@@ -477,7 +536,8 @@
         "typeName": "FAM_GEN_QUN",
         "name": "名将谱——群界面",
         "description": "名将谱",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhuzhen_mingjiangpu",
+        "comment": 0
     },
     {
         "id": 61,
@@ -485,7 +545,8 @@
         "typeName": "LEGION_ENTER",
         "name": "军团——加入界面",
         "description": "加入军团",
-        "icon": "tubiao2_shangcheng"
+        "icon": "juntuan",
+        "comment": 0
     },
     {
         "id": 62,
@@ -493,7 +554,8 @@
         "typeName": "LEGION_MAIN",
         "name": "军团——主界面",
         "description": "军团",
-        "icon": "tubiao_hecheng"
+        "icon": "juntuan",
+        "comment": 0
     },
     {
         "id": 63,
@@ -501,7 +563,8 @@
         "typeName": "LEGION_BOSS",
         "name": "军团——演舞台界面",
         "description": "军团演武台",
-        "icon": "tubiao2_shangcheng"
+        "icon": "juntuan_yanwutai",
+        "comment": 0
     },
     {
         "id": 64,
@@ -509,7 +572,8 @@
         "typeName": "LEGION_WISH_POOL",
         "name": "军团——许愿池界面",
         "description": "军团许愿池",
-        "icon": "tubiao2_shangcheng"
+        "icon": "juntuan_xuyuanchi",
+        "comment": 0
     },
     {
         "id": 65,
@@ -517,15 +581,17 @@
         "typeName": "LEGION_DONATION",
         "name": "军团——捐献所界面",
         "description": "军团捐献所",
-        "icon": "tubiao2_shangcheng"
+        "icon": "juntuan_juanxiansuo",
+        "comment": 0
     },
     {
         "id": 66,
         "type": 66,
         "typeName": "LEGION_HALL",
         "name": "军团——中军大帐界面",
-        "description": "军团中军大帐",
-        "icon": "tubiao2_shangcheng"
+        "description": "军团中军大殿",
+        "icon": "juntuan_dadian",
+        "comment": 0
     },
     {
         "id": 67,
@@ -533,7 +599,8 @@
         "typeName": "LEGION_REFINE",
         "name": "军团——炼器堂界面",
         "description": "军团炼器堂",
-        "icon": "tubiao2_shangcheng"
+        "icon": "juntuan_lianqitang",
+        "comment": 0
     },
     {
         "id": 68,
@@ -541,7 +608,8 @@
         "typeName": "LEGION_TRAIN",
         "name": "军团——练兵场界面",
         "description": "军团练兵场",
-        "icon": "tubiao2_shangcheng"
+        "icon": "juntuan_lianbingchang",
+        "comment": 0
     },
     {
         "id": 69,
@@ -549,7 +617,8 @@
         "typeName": "LEGION_RANK",
         "name": "军团——军团排行界面",
         "description": "军团排行",
-        "icon": "tubiao_hecheng"
+        "icon": "&",
+        "comment": 0
     },
     {
         "id": 70,
@@ -557,7 +626,8 @@
         "typeName": "LEGION_ACTIVITY_VALUE",
         "name": "军团——军团活跃界面",
         "description": "军团活跃",
-        "icon": "tubiao2_shangcheng"
+        "icon": "&",
+        "comment": 0
     },
     {
         "id": 71,
@@ -565,7 +635,8 @@
         "typeName": "LEGION_ACTIVITY_LIST",
         "name": "军团——军团活动列表界面",
         "description": "军团活动",
-        "icon": "tubiao2_shangcheng"
+        "icon": "&",
+        "comment": 0
     },
     {
         "id": 72,
@@ -573,7 +644,8 @@
         "typeName": "LEGION_ACTIVITY_MANYI_BATTLE",
         "name": "军团——活动——蛮夷入侵界面",
         "description": "蛮夷入侵",
-        "icon": "tubiao2_shangcheng"
+        "icon": "juntuan_manyiruqin",
+        "comment": 0
     },
     {
         "id": 73,
@@ -581,7 +653,8 @@
         "typeName": "LEGION_ACTIVITY_PRINCE_BATTLE",
         "name": "军团——活动——诸侯混战界面",
         "description": "诸侯混战",
-        "icon": "tubiao2_shangcheng"
+        "icon": "juntuan_zhuhouhunzhan",
+        "comment": 0
     },
     {
         "id": 74,
@@ -589,7 +662,8 @@
         "typeName": "LEGION_ACTIVITY_RACE",
         "name": "军团——活动——粮草先行界面",
         "description": "粮草先行",
-        "icon": "tubiao2_shangcheng"
+        "icon": "juntuan_liangcao",
+        "comment": 0
     },
     {
         "id": 75,
@@ -597,7 +671,8 @@
         "typeName": "DAILY_BATTLE",
         "name": "每日战斗主界面",
         "description": "每日关卡",
-        "icon": "tubiao2_shangcheng"
+        "icon": "tiaozhan_meiriguanka",
+        "comment": 0
     },
     {
         "id": 76,
@@ -605,7 +680,8 @@
         "typeName": "DAILY_BATTLE_PROTECT_MAN",
         "name": "每日战斗——保护商人",
         "description": "每日—保护商人",
-        "icon": "tubiao_hecheng"
+        "icon": "tiaozhan_meiriguanka",
+        "comment": 0
     },
     {
         "id": 77,
@@ -613,23 +689,26 @@
         "typeName": "DAILY_BATTLE_PROTECT_CITY",
         "name": "每日战斗——保护城池",
         "description": "每日—保护城池",
-        "icon": "tubiao2_shangcheng"
+        "icon": "tiaozhan_meiriguanka",
+        "comment": 0
     },
     {
         "id": 78,
         "type": 78,
         "typeName": "DAILY_BATTLE_PROTECT_GOODS",
-        "name": "每日战斗——保护物资",
-        "description": "每日—保护物资",
-        "icon": "tubiao2_shangcheng"
+        "name": "每日战斗——宝石争夺",
+        "description": "每日—矿石争夺",
+        "icon": "tiaozhan_meiriguanka",
+        "comment": 0
     },
     {
         "id": 79,
         "type": 79,
         "typeName": "DAILY_BATTLE_PROTECT_MINERALS",
-        "name": "每日战斗——保护矿产",
-        "description": "每日—保护矿产",
-        "icon": "tubiao2_shangcheng"
+        "name": "每日战斗——保护矿场",
+        "description": "每日—保卫矿场",
+        "icon": "tiaozhan_meiriguanka",
+        "comment": 0
     },
     {
         "id": 80,
@@ -637,7 +716,8 @@
         "typeName": "EXPEDITION",
         "name": "远征主界面",
         "description": "远征",
-        "icon": "tubiao2_shangcheng"
+        "icon": "tiaozhan_yuanzheng",
+        "comment": 0
     },
     {
         "id": 81,
@@ -645,7 +725,8 @@
         "typeName": "TOWER",
         "name": "镇念塔主界面",
         "description": "镇念塔",
-        "icon": "tubiao2_shangcheng"
+        "icon": "tiaozhan_zhennianta",
+        "comment": 0
     },
     {
         "id": 82,
@@ -653,7 +734,8 @@
         "typeName": "TREASURE_HUNT",
         "name": "寻宝主界面",
         "description": "寻宝",
-        "icon": "tubiao2_shangcheng"
+        "icon": "tiaozhan_xunbao",
+        "comment": "82&藏宝图id"
     },
     {
         "id": 83,
@@ -661,7 +743,8 @@
         "typeName": "SECRET_PLACE",
         "name": "秘境主界面",
         "description": "秘境",
-        "icon": "tubiao_hecheng"
+        "icon": "tiaozhan_mijing",
+        "comment": "83&物品id 显示关卡名，如怒狼洞穴1\r\n若该道具有可扫荡的关卡，则跳转至可扫荡的最新关卡；若无可扫荡的关卡，则跳转至有该道具的可挑战的最新关卡；若既没有可扫荡，且挑战关卡未解锁，则按钮置灰显示未解锁，点击后提示解锁条件"
     },
     {
         "id": 84,
@@ -669,7 +752,8 @@
         "typeName": "SHOP_SIMPLE",
         "name": "商店——普通/元宝商店",
         "description": "普通商店",
-        "icon": "tubiao2_shangcheng"
+        "icon": "shangdian",
+        "comment": 0
     },
     {
         "id": 85,
@@ -677,7 +761,8 @@
         "typeName": "SHOP_LEGION",
         "name": "商店——军团",
         "description": "军团商店",
-        "icon": "tubiao2_shangcheng"
+        "icon": "shangdian_juntuan",
+        "comment": 0
     },
     {
         "id": 86,
@@ -685,15 +770,17 @@
         "typeName": "SHOP_EXPEDITION",
         "name": "商店——远征",
         "description": "远征商店",
-        "icon": "tubiao2_shangcheng"
+        "icon": "shangdian_yuanzheng",
+        "comment": 0
     },
     {
         "id": 87,
         "type": 87,
         "typeName": "SHOP_PVP",
         "name": "商店——pvp",
-        "description": "演武商店",
-        "icon": "tubiao2_shangcheng"
+        "description": "竞技商店",
+        "icon": "shangdian_yanwu",
+        "comment": 0
     },
     {
         "id": 88,
@@ -701,7 +788,8 @@
         "typeName": "SHOP_SKIN",
         "name": "商店——皮肤",
         "description": "时装商店",
-        "icon": "tubiao2_shangcheng"
+        "icon": "shangdian_shizhuang",
+        "comment": 0
     },
     {
         "id": 89,
@@ -709,7 +797,8 @@
         "typeName": "SHOP_TREASURE_HUNT",
         "name": "商店——寻宝",
         "description": "寻宝商店",
-        "icon": "tubiao2_shangcheng"
+        "icon": "shangdian_xunbao",
+        "comment": 0
     },
     {
         "id": 90,
@@ -717,7 +806,8 @@
         "typeName": "SHOP_SECRET_PLACE",
         "name": "商店——秘境",
         "description": "秘境商店",
-        "icon": "tubiao_hecheng"
+        "icon": "shangdian_mijing",
+        "comment": 0
     },
     {
         "id": 91,
@@ -725,7 +815,8 @@
         "typeName": "RECHARGE_TIMES",
         "name": "充值——限购",
         "description": "充值—限购",
-        "icon": "tubiao2_shangcheng"
+        "icon": "huodong_chongzhi",
+        "comment": "每日限购：91&0\r\n每周限购：91&1"
     },
     {
         "id": 92,
@@ -733,7 +824,8 @@
         "typeName": "RECHARGE_MONTH_CARD",
         "name": "充值——月卡",
         "description": "充值—月卡",
-        "icon": "tubiao2_shangcheng"
+        "icon": "huodong_chongzhi",
+        "comment": 0
     },
     {
         "id": 93,
@@ -741,7 +833,8 @@
         "typeName": "RECHARGE_RECHARGE",
         "name": "充值——充值",
         "description": "充值—充值",
-        "icon": "tubiao2_shangcheng"
+        "icon": "huodong_chongzhi",
+        "comment": 0
     },
     {
         "id": 94,
@@ -749,7 +842,8 @@
         "typeName": "RECHARGE_JOB",
         "name": "充值——官职",
         "description": "充值—官职",
-        "icon": "tubiao2_shangcheng"
+        "icon": "huodong_chongzhi",
+        "comment": 0
     },
     {
         "id": 95,
@@ -757,7 +851,8 @@
         "typeName": "ACTIVITY_LIST_MAIN_REWARD",
         "name": "活动列表——主线战令",
         "description": "主线战令",
-        "icon": "tubiao2_shangcheng"
+        "icon": "&",
+        "comment": 0
     },
     {
         "id": 96,
@@ -765,7 +860,8 @@
         "typeName": "ACTIVITY_LIST_TOWER_REWARD",
         "name": "活动列表——天梯战令",
         "description": "天梯战令",
-        "icon": "tubiao2_shangcheng"
+        "icon": "&",
+        "comment": 0
     },
     {
         "id": 97,
@@ -773,7 +869,8 @@
         "typeName": "ACTIVITY_LIST_BATTLER_MAIN_REWARD",
         "name": "活动列表——精英战令",
         "description": "精英战令",
-        "icon": "tubiao_hecheng"
+        "icon": "&",
+        "comment": 0
     },
     {
         "id": 98,
@@ -781,7 +878,8 @@
         "typeName": "ACTIVITY_LIST_DAILY_RMB_SHOP",
         "name": "活动列表——每日特惠",
         "description": "每日特惠",
-        "icon": "tubiao2_shangcheng"
+        "icon": "huodong_meiri",
+        "comment": 0
     },
     {
         "id": 99,
@@ -789,7 +887,8 @@
         "typeName": "ACTIVITY_LIST_NEW_ROLE_SIGN_IN",
         "name": "活动列表——新手签到",
         "description": "新手签到",
-        "icon": "tubiao2_shangcheng"
+        "icon": "huodong_qiandao",
+        "comment": 0
     },
     {
         "id": 100,
@@ -797,7 +896,8 @@
         "typeName": "ACTIVITY_LIST_SIMPLE_SIGN_IN",
         "name": "活动列表——签到福利",
         "description": "签到福利",
-        "icon": "tubiao2_shangcheng"
+        "icon": "huodong_qiandao",
+        "comment": 0
     },
     {
         "id": 101,
@@ -805,7 +905,8 @@
         "typeName": "ACTIVITY_LIST_VIP_SIGN_IN",
         "name": "活动列表——高级签到",
         "description": "高级签到",
-        "icon": "tubiao2_shangcheng"
+        "icon": "huodong_qiandao",
+        "comment": 0
     },
     {
         "id": 102,
@@ -813,7 +914,8 @@
         "typeName": "ACTIVITY_LIST_MONTH_CARD",
         "name": "活动列表——月卡",
         "description": "月卡",
-        "icon": "tubiao2_shangcheng"
+        "icon": "&",
+        "comment": 0
     },
     {
         "id": 103,
@@ -821,7 +923,8 @@
         "typeName": "ACTIVITY_LIST_MEAL",
         "name": "活动列表——用膳",
         "description": "用膳",
-        "icon": "tubiao2_shangcheng"
+        "icon": "&",
+        "comment": 0
     },
     {
         "id": 104,
@@ -829,7 +932,8 @@
         "typeName": "ACTIVITY_LIST_COIN_TREE",
         "name": "活动列表——摇钱树",
         "description": "摇钱树",
-        "icon": "tubiao_hecheng"
+        "icon": "huodong_yaoqianshu",
+        "comment": 0
     },
     {
         "id": 105,
@@ -837,7 +941,8 @@
         "typeName": "BUY_AP",
         "name": "体力购买",
         "description": "体力购买",
-        "icon": "tubiao2_shangcheng"
+        "icon": "&",
+        "comment": 0
     },
     {
         "id": 106,
@@ -845,23 +950,26 @@
         "typeName": "USE_AP",
         "name": "体力道具使用",
         "description": "体力道具使用",
-        "icon": "tubiao2_shangcheng"
+        "icon": "&",
+        "comment": 0
     },
     {
         "id": 107,
         "type": 107,
         "typeName": "MOST_NEW_GK",
         "name": "主线最新关卡",
-        "description": "最新关卡",
-        "icon": "tubiao2_shangcheng"
+        "description": "主线",
+        "icon": "zhuxian",
+        "comment": 0
     },
     {
         "id": 108,
         "type": 108,
         "typeName": "APPOINT_GK",
         "name": "主线指定关卡",
-        "description": "指定关卡",
-        "icon": "tubiao2_shangcheng"
+        "description": "主线",
+        "icon": "zhuxian",
+        "comment": 0
     },
     {
         "id": 109,
@@ -869,7 +977,8 @@
         "typeName": "CHAT_SYS",
         "name": "聊天系统",
         "description": "聊天系统",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhujiemian_liaotian",
+        "comment": 0
     },
     {
         "id": 110,
@@ -877,7 +986,8 @@
         "typeName": "CHAT_WORLD",
         "name": "聊天世界",
         "description": "聊天世界",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhujiemian_liaotian",
+        "comment": 0
     },
     {
         "id": 111,
@@ -885,7 +995,8 @@
         "typeName": "CHAT_LEGION",
         "name": "聊天军团",
         "description": "聊天军团",
-        "icon": "tubiao_hecheng"
+        "icon": "zhujiemian_liaotian",
+        "comment": 0
     },
     {
         "id": 112,
@@ -893,7 +1004,8 @@
         "typeName": "CHAT_TEAM",
         "name": "聊天组队",
         "description": "聊天组队",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhujiemian_liaotian",
+        "comment": 0
     },
     {
         "id": 113,
@@ -901,70 +1013,340 @@
         "typeName": "CHAT_PERSON",
         "name": "聊天私聊",
         "description": "聊天私聊",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhujiemian_liaotian",
+        "comment": 0
     },
     {
         "id": 114,
         "type": 114,
         "typeName": "MOST_NEW_ELITEGK",
         "name": "精英主线最新关卡",
-        "description": "最新关卡",
-        "icon": "tubiao2_shangcheng"
+        "description": "梦魇模式",
+        "icon": "tiaozhan_yiji",
+        "comment": 0
     },
     {
         "id": 115,
         "type": 115,
-        "typeName": "APPOINT_ELITEGK",
-        "name": "精英主线指定关卡",
-        "description": "指定关卡",
-        "icon": "tubiao2_shangcheng"
+        "typeName": "MOST_NEW_MAINGK",
+        "name": "主线最新普通关卡",
+        "description": "主线",
+        "icon": "zhuxian",
+        "comment": 0
     },
     {
         "id": 116,
         "type": 116,
         "typeName": "REMAINS",
         "name": "遗迹主界面",
-        "description": "遗迹",
-        "icon": "tubiao2_shangcheng"
+        "description": "支线",
+        "icon": "tiaozhan_yiji",
+        "comment": 0
     },
     {
         "id": 117,
         "type": 117,
         "typeName": "ADVENTURE",
         "name": "奇遇",
-        "description": "奇遇",
-        "icon": "tubiao2_shangcheng"
+        "description": "事件",
+        "icon": "zhujiemian_shijian",
+        "comment": 0
     },
     {
         "id": 118,
         "type": 118,
-        "typeName": "HERO_PIECES",
+        "typeName": "SHOP_HERO_PIECES",
         "name": "商店-将魂商店",
         "description": "将魂商店",
-        "icon": "tubiao2_shangcheng"
+        "icon": "shangdian_jianghun",
+        "comment": 0
     },
     {
         "id": 119,
         "type": 119,
         "typeName": "EQUIP_QUENCH",
-        "name": "装备淬火界面",
+        "name": "装备淬火界面（弃用）",
         "description": "装备淬火",
-        "icon": "tubiao2_shangcheng"
+        "icon": "zhuangbei_cuihuo",
+        "comment": 0
     },
     {
         "id": 120,
         "type": 120,
         "typeName": "FORGING_TREASURE_MAP",
-        "name": "合成——藏宝图界面",
+        "name": "合成——藏宝图界面（弃用）",
         "description": "合成",
-        "icon": "tubiao2_shangcheng"
+        "icon": "hecheng_baotu",
+        "comment": 0
     },
     {
         "id": 121,
         "type": 121,
         "typeName": "EQUIP_CHIP",
-        "name": "背包——装备碎片界面",
+        "name": "背包——装备碎片界面（弃用）",
         "description": "碎片合成",
-        "icon": "tubiao_hecheng"
+        "icon": "beibao",
+        "comment": 0
+    },
+    {
+        "id": 122,
+        "type": 122,
+        "typeName": "EQUIP_WEAR_AI",
+        "name": "装备智能穿戴（弃用）",
+        "description": "装备养成",
+        "icon": "zhuangbei_wujiang",
+        "comment": 0
+    },
+    {
+        "id": 123,
+        "type": 123,
+        "typeName": "EQUIP_STRENGTHEN_AI",
+        "name": "装备智能强化",
+        "description": "装备养成",
+        "icon": "zhuangbei_qianghua",
+        "comment": 0
+    },
+    {
+        "id": 124,
+        "type": 124,
+        "typeName": "EQUIP_QUENCH_AI",
+        "name": "装备智能淬火（弃用）",
+        "description": "装备养成",
+        "icon": "zhuangbei_cuihuo",
+        "comment": 0
+    },
+    {
+        "id": 125,
+        "type": 125,
+        "typeName": "EQUIP_REFINER_AI",
+        "name": "装备智能精炼",
+        "description": "装备养成",
+        "icon": "zhuangbei_jinglian",
+        "comment": 0
+    },
+    {
+        "id": 126,
+        "type": 126,
+        "typeName": "EQUIP_FILL_IN_AI",
+        "name": "装备智能镶嵌",
+        "description": "装备养成",
+        "icon": "zhuangbei_xiangqian",
+        "comment": "126&将被镶嵌宝石的goodsId"
+    },
+    {
+        "id": 127,
+        "type": 127,
+        "typeName": "EQUIP_CLEAR_AI",
+        "name": "装备智能洗练（弃用）",
+        "description": "装备养成",
+        "icon": "zhuangbei_xilian",
+        "comment": 0
+    },
+    {
+        "id": 128,
+        "type": 128,
+        "typeName": "FRIEND_LIST",
+        "name": "好友列表",
+        "description": "好友",
+        "icon": "zhujiemian_haoyou",
+        "comment": 0
+    },
+    {
+        "id": 129,
+        "type": 129,
+        "typeName": "FRIEND_ADD",
+        "name": "好友添加",
+        "description": "好友",
+        "icon": "zhujiemian_haoyou",
+        "comment": 0
+    },
+    {
+        "id": 130,
+        "type": 130,
+        "typeName": "FRIEND_APPLY",
+        "name": "好友申请",
+        "description": "好友",
+        "icon": "zhujiemian_haoyou",
+        "comment": 0
+    },
+    {
+        "id": 131,
+        "type": 131,
+        "typeName": "FRIEND_BLACK",
+        "name": "好友黑名单",
+        "description": "好友",
+        "icon": "zhujiemian_haoyou",
+        "comment": 0
+    },
+    {
+        "id": 132,
+        "type": 132,
+        "typeName": "HERO_UP_AI",
+        "name": "优先武将升级",
+        "description": "武将养成",
+        "icon": "wujiang_shengji",
+        "comment": "优先前往可升级武将"
+    },
+    {
+        "id": 133,
+        "type": 133,
+        "typeName": "HERO_UP_STAR_AI",
+        "name": "优先武将升星",
+        "description": "武将养成",
+        "icon": "wujiang_shengxing",
+        "comment": "优先前往可升星武将 , 有传将魂id则优先去这个将魂对应的武将，如果没有该武将则去这个武将的合成，如果不足够合成则弹出将魂的获取途径；不传将魂则优先前往最先可升星的武将；\r\n有传觉醒石，则优先去可用觉醒石升星/升品的武将,没有则去需要使用到觉醒石的武将，没有需要用到觉醒石的武将则优先前往最先可升星的武将\r\n"
+    },
+    {
+        "id": 134,
+        "type": 134,
+        "typeName": "HERO_UP_JOB_AI",
+        "name": "优先武将职业进阶",
+        "description": "武将养成",
+        "icon": "wujiang_zhiye",
+        "comment": "优先前往武将升级职业，有传物品id则优先跳到可以使用这个升级职业物品的武将且这个武将职业可以升级，然后再是可以使用这个升级职业物品的武将，都没的话就选择可以升级职业的武将"
+    },
+    {
+        "id": 135,
+        "type": 135,
+        "typeName": "HERO_UP_FRIENDSHIP",
+        "name": "优先武将羁绊提升",
+        "description": "武将养成",
+        "icon": "wujiang_jiban",
+        "comment": "优先前往可升级羁绊的武将"
+    },
+    {
+        "id": 136,
+        "type": 136,
+        "typeName": "HERO_UP_FAVOR",
+        "name": "优先武将声望提升",
+        "description": "武将养成",
+        "icon": "wujiang_jiban",
+        "comment": "优先前往好感度/声望可升级页面"
+    },
+    {
+        "id": 137,
+        "type": 137,
+        "typeName": "TO_MAIN_PROP_GET",
+        "name": "主线道具获得",
+        "description": "主线关卡",
+        "icon": "zhuxian",
+        "comment": "主线掉落的道具应能跳转到最新完成的三星产该道具的主线节点关卡，如果没有三星的，则跳到最新完成的产该道具的主线节点关卡，并打开关卡详情 137&道具id"
+    },
+    {
+        "id": 138,
+        "type": 138,
+        "typeName": "EQUIP_MAIN",
+        "name": "装备主界面",
+        "description": "装备养成",
+        "icon": "hecheng_zhuangbei",
+        "comment": 0
+    },
+    {
+        "id": 139,
+        "type": 139,
+        "typeName": "EQUIP_COMPOSE",
+        "name": "装备合成",
+        "description": "装备养成",
+        "icon": "zhuangbei_qianghua",
+        "comment": 0
+    },
+    {
+        "id": 140,
+        "type": 140,
+        "typeName": "EQUIP_UP_QUALITY",
+        "name": "装备装备升品",
+        "description": "装备养成",
+        "icon": "zhuangbei_cuihuo",
+        "comment": 0
+    },
+    {
+        "id": 141,
+        "type": 141,
+        "typeName": "EQUIP_UP_QUALITY_AI",
+        "name": "装备升品优先",
+        "description": "装备养成",
+        "icon": "zhuangbei_cuihuo",
+        "comment": 0
+    },
+    {
+        "id": 142,
+        "type": 142,
+        "typeName": "JEWEL_SYS",
+        "name": "天晶系统",
+        "description": "天晶",
+        "icon": "hecheng_baoshi",
+        "comment": 0
+    },
+    {
+        "id": 143,
+        "type": 143,
+        "typeName": "JEWEL_CLEAR",
+        "name": "天晶洗练",
+        "description": "天晶洗练",
+        "icon": "hecheng_baoshi",
+        "comment": 0
+    },
+    {
+        "id": 144,
+        "type": 144,
+        "typeName": "JEWEL_QUENCH",
+        "name": "天晶淬炼",
+        "description": "天晶淬炼",
+        "icon": "hecheng_baoshi",
+        "comment": 0
+    },
+    {
+        "id": 145,
+        "type": 145,
+        "typeName": "STONE_COMPOSE",
+        "name": "地玉合成",
+        "description": "地玉合成",
+        "icon": "hecheng_baoshi",
+        "comment": 0
+    },
+    {
+        "id": 146,
+        "type": 146,
+        "typeName": "BAG_GIFT",
+        "name": "背包-礼包",
+        "description": "背包礼包",
+        "icon": "beibao",
+        "comment": 0
+    },
+    {
+        "id": 147,
+        "type": 147,
+        "typeName": "BAG_JEWEL",
+        "name": "背包-天晶",
+        "description": "天晶分解",
+        "icon": "beibao",
+        "comment": 0
+    },
+    {
+        "id": 148,
+        "type": 148,
+        "typeName": "TO_ELITEGK_PROP_GET",
+        "name": "梦魇道具获得",
+        "description": "梦魇模式",
+        "icon": "tiaozhan_yiji",
+        "comment": "148&道具id 和主线道具获得逻辑相同"
+    },
+    {
+        "id": 149,
+        "type": 149,
+        "typeName": "TOWER_COLLECT",
+        "name": "镇念塔收集页面",
+        "description": "镇念塔收集",
+        "icon": "tiaozhan_zhennianta",
+        "comment": 0
+    },
+    {
+        "id": 150,
+        "type": 150,
+        "typeName": "TOWER_COLLECT",
+        "name": "镇念塔派遣页面",
+        "description": "镇念塔派遣",
+        "icon": "tiaozhan_zhennianta",
+        "comment": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/jsons/dic_zyz_dailyTask.json b/shared/resource/jsons/dic_zyz_dailyTask.json
index f37b3a16c..878e3d392 100644
--- a/shared/resource/jsons/dic_zyz_dailyTask.json
+++ b/shared/resource/jsons/dic_zyz_dailyTask.json
@@ -217,7 +217,7 @@
         "taskReward": "31002&50",
         "point": 5,
         "condition": 1,
-        "exp": "&",
+        "exp": "72031&100",
         "skip": "83&"
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/jsons/dic_zyz_mainTask.json b/shared/resource/jsons/dic_zyz_mainTask.json
index 15621e733..72a602bf0 100644
--- a/shared/resource/jsons/dic_zyz_mainTask.json
+++ b/shared/resource/jsons/dic_zyz_mainTask.json
@@ -17,7 +17,7 @@
         "taskInfo": "主线通关第1-12关",
         "taskParam": "1&116",
         "taskStage": 1,
-        "taskReward": "11002&50",
+        "taskReward": "11002&20",
         "condition": 1,
         "skip": "115&"
     },
@@ -105,7 +105,7 @@
         "taskInfo": "主线扫荡5次",
         "taskParam": "5&",
         "taskStage": 2,
-        "taskReward": "11002&50",
+        "taskReward": "11002&20",
         "condition": 5,
         "skip": "137&0"
     },
@@ -113,8 +113,8 @@
         "id": 11,
         "mainTaskId": 11,
         "taskType": 97,
-        "taskInfo": "2名武将装备4件装备",
-        "taskParam": "2&4",
+        "taskInfo": "2名武将装备2件装备",
+        "taskParam": "2&2",
         "taskStage": 2,
         "taskReward": "17054&200",
         "condition": 2,
@@ -127,7 +127,7 @@
         "taskInfo": "6名武将升至13级",
         "taskParam": "6&13",
         "taskStage": 2,
-        "taskReward": "17055&10",
+        "taskReward": "17055&2",
         "condition": 6,
         "skip": "132&"
     },
@@ -182,7 +182,7 @@
         "taskInfo": "参与防守城池1次",
         "taskParam": "2&1",
         "taskStage": 3,
-        "taskReward": "11002&50",
+        "taskReward": "11002&30",
         "condition": 1,
         "skip": "77&"
     },
@@ -248,7 +248,7 @@
         "taskInfo": "镶嵌1颗天晶",
         "taskParam": "1&",
         "taskStage": 4,
-        "taskReward": "17051&500",
+        "taskReward": "71008&100",
         "condition": 1,
         "skip": "46&"
     },
@@ -281,7 +281,7 @@
         "taskInfo": "10名武将升至30级",
         "taskParam": "10&30",
         "taskStage": 5,
-        "taskReward": "11002&50",
+        "taskReward": "11002&30",
         "condition": 10,
         "skip": "132&"
     },
@@ -292,7 +292,7 @@
         "taskInfo": "主线通关第2-16关",
         "taskParam": "1&216",
         "taskStage": 5,
-        "taskReward": "33037&1",
+        "taskReward": "17053&10",
         "condition": 1,
         "skip": "115&"
     },
@@ -322,11 +322,11 @@
         "id": 30,
         "mainTaskId": 30,
         "taskType": 12,
-        "taskInfo": "对5名武将进行觉醒",
-        "taskParam": "5&",
+        "taskInfo": "对2名武将进行觉醒",
+        "taskParam": "2&",
         "taskStage": 5,
         "taskReward": "17001&2",
-        "condition": 5,
+        "condition": 2,
         "skip": "133&"
     },
     {
@@ -402,7 +402,7 @@
         "taskInfo": "主公等级达35级",
         "taskParam": "35&",
         "taskStage": 7,
-        "taskReward": "11002&50",
+        "taskReward": "11002&30",
         "condition": 35,
         "skip": "115&"
     },
@@ -421,11 +421,11 @@
         "id": 39,
         "mainTaskId": 39,
         "taskType": 12,
-        "taskInfo": "20名武将觉醒",
-        "taskParam": "20&",
+        "taskInfo": "3名武将觉醒",
+        "taskParam": "3&",
         "taskStage": 7,
-        "taskReward": "17001&2",
-        "condition": 20,
+        "taskReward": "17001&4",
+        "condition": 3,
         "skip": "133&"
     },
     {
@@ -443,22 +443,22 @@
         "id": 41,
         "mainTaskId": 41,
         "taskType": 87,
-        "taskInfo": "40件装备强化至35级",
-        "taskParam": "40&35",
+        "taskInfo": "12件装备强化至35级",
+        "taskParam": "12&35",
         "taskStage": 7,
         "taskReward": "31001&100000",
-        "condition": 40,
+        "condition": 12,
         "skip": "123&"
     },
     {
         "id": 42,
         "mainTaskId": 42,
         "taskType": 92,
-        "taskInfo": "6名武将各激活2条词条属性",
-        "taskParam": "6&2",
+        "taskInfo": "1名武将各激活2条词条属性",
+        "taskParam": "1&2",
         "taskStage": 7,
-        "taskReward": "17051&1000",
-        "condition": 6,
+        "taskReward": "17055&2",
+        "condition": 1,
         "skip": "46&"
     },
     {
@@ -498,8 +498,8 @@
         "id": 46,
         "mainTaskId": 46,
         "taskType": 38,
-        "taskInfo": "使用曹操挑战防守矿场难度三1次",
-        "taskParam": "1&3302&1",
+        "taskInfo": "使用赵云挑战防守矿场难度三1次",
+        "taskParam": "19&3302&1",
         "taskStage": 8,
         "taskReward": "22001&2",
         "condition": 1,
@@ -509,11 +509,11 @@
         "id": 47,
         "mainTaskId": 47,
         "taskType": 102,
-        "taskInfo": "3名武将镶嵌6个5阶地玉",
-        "taskParam": "3&6&5",
+        "taskInfo": "1名武将镶嵌1个5阶地玉",
+        "taskParam": "1&1&5",
         "taskStage": 8,
-        "taskReward": "71008&10",
-        "condition": 6,
+        "taskReward": "71008&100",
+        "condition": 1,
         "skip": "126&"
     },
     {
@@ -575,22 +575,22 @@
         "id": 53,
         "mainTaskId": 53,
         "taskType": 59,
-        "taskInfo": "领取5次竞技巅峰之路宝箱",
-        "taskParam": "5&",
+        "taskInfo": "领取1次竞技巅峰之路宝箱",
+        "taskParam": "1&",
         "taskStage": 9,
         "taskReward": "40004&50",
-        "condition": 5,
+        "condition": 1,
         "skip": "16&"
     },
     {
         "id": 54,
         "mainTaskId": 54,
         "taskType": 49,
-        "taskInfo": "开启远征5次",
-        "taskParam": "5&",
+        "taskInfo": "开启远征3次",
+        "taskParam": "3&",
         "taskStage": 9,
         "taskReward": "40001&100",
-        "condition": 5,
+        "condition": 3,
         "skip": "80&"
     },
     {
@@ -630,7 +630,7 @@
         "id": 58,
         "mainTaskId": 58,
         "taskType": 38,
-        "taskInfo": "使用赵云挑战秘境秘境乌桓大营难度二1次",
+        "taskInfo": "使用赵云挑战秘境乌桓大营难度二1次",
         "taskParam": "19&5031",
         "taskStage": 10,
         "taskReward": "22001&10",
@@ -641,22 +641,22 @@
         "id": 59,
         "mainTaskId": 59,
         "taskType": 76,
-        "taskInfo": "6名武将觉醒至神话6星",
-        "taskParam": "6&6",
+        "taskInfo": "1名武将觉醒至神话6星",
+        "taskParam": "1&6",
         "taskStage": 10,
         "taskReward": "17001&5",
-        "condition": 6,
+        "condition": 1,
         "skip": "133&"
     },
     {
         "id": 60,
         "mainTaskId": 60,
-        "taskType": 107,
-        "taskInfo": "天晶成功淬炼5次",
-        "taskParam": "5&",
+        "taskType": 88,
+        "taskInfo": "2件装备镶嵌4阶天晶石",
+        "taskParam": "2&4&",
         "taskStage": 10,
         "taskReward": "17045&10",
-        "condition": 5,
+        "condition": 2,
         "skip": "127&"
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/jsons/dic_zyz_mainTaskStage.json b/shared/resource/jsons/dic_zyz_mainTaskStage.json
index b69836647..07fc4035b 100644
--- a/shared/resource/jsons/dic_zyz_mainTaskStage.json
+++ b/shared/resource/jsons/dic_zyz_mainTaskStage.json
@@ -4,69 +4,69 @@
         "stageId": 1,
         "stageName": "阶段一",
         "mainTaskId": "1&2&3&4&5&6",
-        "reward": "31002&800"
+        "reward": "31002&500"
     },
     {
         "id": 2,
         "stageId": 2,
         "stageName": "阶段二",
         "mainTaskId": "7&8&9&10&11&12",
-        "reward": "31002&1500"
+        "reward": "31002&750"
     },
     {
         "id": 3,
         "stageId": 3,
         "stageName": "阶段三",
         "mainTaskId": "13&14&15&16&17&18",
-        "reward": "31002&2000"
+        "reward": "31002&1000"
     },
     {
         "id": 4,
         "stageId": 4,
         "stageName": "阶段四",
         "mainTaskId": "19&20&21&22&23&24",
-        "reward": "31002&2000"
+        "reward": "31002&1250"
     },
     {
         "id": 5,
         "stageId": 5,
         "stageName": "阶段五",
         "mainTaskId": "25&26&27&28&29&30",
-        "reward": "31002&2000"
+        "reward": "31002&1500"
     },
     {
         "id": 6,
         "stageId": 6,
         "stageName": "阶段六",
         "mainTaskId": "31&32&33&34&35&36",
-        "reward": "31002&2000"
+        "reward": "31002&1500"
     },
     {
         "id": 7,
         "stageId": 7,
         "stageName": "阶段七",
         "mainTaskId": "37&38&39&40&41&42",
-        "reward": "31002&2000"
+        "reward": "31002&1500"
     },
     {
         "id": 8,
         "stageId": 8,
         "stageName": "阶段八",
         "mainTaskId": "43&44&45&46&47",
-        "reward": "31002&2000"
+        "reward": "31002&1500"
     },
     {
         "id": 9,
         "stageId": 9,
         "stageName": "阶段九",
         "mainTaskId": "48&49&50&51&52&53&54",
-        "reward": "31002&2000"
+        "reward": "31002&1500"
     },
     {
         "id": 10,
         "stageId": 10,
         "stageName": "阶段十",
         "mainTaskId": "55&56&57&58&59&60",
-        "reward": "31002&2000"
+        "reward": "31002&1500"
     }
 ]
\ No newline at end of file