From cd314e2d13a7112587f5be72beb4d7f0b387e424 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Thu, 5 May 2022 10:20:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=EF=BC=9A=E7=89=A9=E5=93=81?=
 =?UTF-8?q?=E5=88=86=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/resource/jsons/dic_goods.json | 142 +++++++++++++--------------
 1 file changed, 71 insertions(+), 71 deletions(-)

diff --git a/shared/resource/jsons/dic_goods.json b/shared/resource/jsons/dic_goods.json
index 6eb1a68c7..d21b02e6c 100644
--- a/shared/resource/jsons/dic_goods.json
+++ b/shared/resource/jsons/dic_goods.json
@@ -7081,7 +7081,7 @@
         "itid": 42,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&100",
+        "decomposeItem": "40007&10",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60001",
@@ -7099,7 +7099,7 @@
         "itid": 42,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&200",
+        "decomposeItem": "40007&30",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60002",
@@ -7117,7 +7117,7 @@
         "itid": 42,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&300",
+        "decomposeItem": "40007&90",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60003",
@@ -7135,7 +7135,7 @@
         "itid": 42,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&400",
+        "decomposeItem": "40007&270",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60004",
@@ -7153,7 +7153,7 @@
         "itid": 42,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&500",
+        "decomposeItem": "40007&810",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60005",
@@ -7171,7 +7171,7 @@
         "itid": 42,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&600",
+        "decomposeItem": "40007&2430",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60006",
@@ -7189,7 +7189,7 @@
         "itid": 42,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&700",
+        "decomposeItem": "40007&7290",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60007",
@@ -7207,7 +7207,7 @@
         "itid": 42,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&800",
+        "decomposeItem": "40007&21870",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60008",
@@ -7225,7 +7225,7 @@
         "itid": 42,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&900",
+        "decomposeItem": "40007&65610",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60009",
@@ -7243,7 +7243,7 @@
         "itid": 43,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&100",
+        "decomposeItem": "40007&10",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60011",
@@ -7261,7 +7261,7 @@
         "itid": 43,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&200",
+        "decomposeItem": "40007&30",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60012",
@@ -7279,7 +7279,7 @@
         "itid": 43,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&300",
+        "decomposeItem": "40007&90",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60013",
@@ -7297,7 +7297,7 @@
         "itid": 43,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&400",
+        "decomposeItem": "40007&270",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60014",
@@ -7315,7 +7315,7 @@
         "itid": 43,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&500",
+        "decomposeItem": "40007&810",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60015",
@@ -7333,7 +7333,7 @@
         "itid": 43,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&600",
+        "decomposeItem": "40007&2430",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60016",
@@ -7351,7 +7351,7 @@
         "itid": 43,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&700",
+        "decomposeItem": "40007&7290",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60017",
@@ -7369,7 +7369,7 @@
         "itid": 43,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&800",
+        "decomposeItem": "40007&21870",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60018",
@@ -7387,7 +7387,7 @@
         "itid": 43,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&900",
+        "decomposeItem": "40007&65610",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60019",
@@ -7405,7 +7405,7 @@
         "itid": 44,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&100",
+        "decomposeItem": "40007&10",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60021",
@@ -7423,7 +7423,7 @@
         "itid": 44,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&200",
+        "decomposeItem": "40007&30",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60022",
@@ -7441,7 +7441,7 @@
         "itid": 44,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&300",
+        "decomposeItem": "40007&90",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60023",
@@ -7459,7 +7459,7 @@
         "itid": 44,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&400",
+        "decomposeItem": "40007&270",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60024",
@@ -7477,7 +7477,7 @@
         "itid": 44,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&500",
+        "decomposeItem": "40007&810",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60025",
@@ -7495,7 +7495,7 @@
         "itid": 44,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&600",
+        "decomposeItem": "40007&2430",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60026",
@@ -7513,7 +7513,7 @@
         "itid": 44,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&700",
+        "decomposeItem": "40007&7290",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60027",
@@ -7531,7 +7531,7 @@
         "itid": 44,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&800",
+        "decomposeItem": "40007&21870",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60028",
@@ -7549,7 +7549,7 @@
         "itid": 44,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&900",
+        "decomposeItem": "40007&65610",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60029",
@@ -7567,7 +7567,7 @@
         "itid": 45,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&100",
+        "decomposeItem": "40007&10",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60031",
@@ -7585,7 +7585,7 @@
         "itid": 45,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&200",
+        "decomposeItem": "40007&30",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60032",
@@ -7603,7 +7603,7 @@
         "itid": 45,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&300",
+        "decomposeItem": "40007&90",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60033",
@@ -7621,7 +7621,7 @@
         "itid": 45,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&400",
+        "decomposeItem": "40007&270",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60034",
@@ -7639,7 +7639,7 @@
         "itid": 45,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&500",
+        "decomposeItem": "40007&810",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60035",
@@ -7657,7 +7657,7 @@
         "itid": 45,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&600",
+        "decomposeItem": "40007&2430",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60036",
@@ -7675,7 +7675,7 @@
         "itid": 45,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&700",
+        "decomposeItem": "40007&7290",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60037",
@@ -7693,7 +7693,7 @@
         "itid": 45,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&800",
+        "decomposeItem": "40007&21870",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60038",
@@ -7711,7 +7711,7 @@
         "itid": 45,
         "goodType": 5,
         "redPoint": 0,
-        "decomposeItem": "40007&900",
+        "decomposeItem": "40007&65610",
         "hid": 0,
         "getWays": "90|85|21|6",
         "useWays": "126&60039",
@@ -8335,7 +8335,7 @@
     },
     {
         "good_id": 71035,
-        "name": "萌新限定-黄金礼包",
+        "name": "萌新限定-黄金礼包 ",
         "quality": 2,
         "image_id": "zhongjibaoxiang",
         "itid": 24,
@@ -8371,7 +8371,7 @@
     },
     {
         "good_id": 71037,
-        "name": "萌新限定-至尊礼包",
+        "name": "萌新限定-至尊礼包 ",
         "quality": 2,
         "image_id": "zhongjibaoxiang",
         "itid": 24,
@@ -8389,7 +8389,7 @@
     },
     {
         "good_id": 71038,
-        "name": "萌新限定-皇者礼包",
+        "name": "萌新限定-皇者礼包 ",
         "quality": 2,
         "image_id": "zhongjibaoxiang",
         "itid": 24,
@@ -8629,7 +8629,7 @@
         "itid": 59,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&200",
+        "decomposeItem": "40002&250",
         "hid": 0,
         "getWays": "82&33002",
         "useWays": "143|144",
@@ -8647,7 +8647,7 @@
         "itid": 59,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&300",
+        "decomposeItem": "40002&500",
         "hid": 0,
         "getWays": "82&33003",
         "useWays": "143|144",
@@ -8665,7 +8665,7 @@
         "itid": 59,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&400",
+        "decomposeItem": "40002&1250",
         "hid": 0,
         "getWays": "82&33004",
         "useWays": "143|144",
@@ -8683,7 +8683,7 @@
         "itid": 59,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&500",
+        "decomposeItem": "40002&2500",
         "hid": 0,
         "getWays": "82&33005",
         "useWays": "143|144",
@@ -8701,7 +8701,7 @@
         "itid": 59,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&600",
+        "decomposeItem": "40002&4000",
         "hid": 0,
         "getWays": "82&33006",
         "useWays": "143|144",
@@ -8719,7 +8719,7 @@
         "itid": 59,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&700",
+        "decomposeItem": "40002&7500",
         "hid": 0,
         "getWays": "82&33007",
         "useWays": "143|144",
@@ -8737,7 +8737,7 @@
         "itid": 59,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&800",
+        "decomposeItem": "40002&12000",
         "hid": 0,
         "getWays": "82&33008",
         "useWays": "143|144",
@@ -8755,7 +8755,7 @@
         "itid": 59,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&900",
+        "decomposeItem": "40002&17500",
         "hid": 0,
         "getWays": "&",
         "useWays": "143|144",
@@ -8791,7 +8791,7 @@
         "itid": 60,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&200",
+        "decomposeItem": "40002&250",
         "hid": 0,
         "getWays": "82&33011",
         "useWays": "143|144",
@@ -8809,7 +8809,7 @@
         "itid": 60,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&300",
+        "decomposeItem": "40002&500",
         "hid": 0,
         "getWays": "82&33012",
         "useWays": "143|144",
@@ -8827,7 +8827,7 @@
         "itid": 60,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&400",
+        "decomposeItem": "40002&1250",
         "hid": 0,
         "getWays": "82&33013",
         "useWays": "143|144",
@@ -8845,7 +8845,7 @@
         "itid": 60,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&500",
+        "decomposeItem": "40002&2500",
         "hid": 0,
         "getWays": "82&33014",
         "useWays": "143|144",
@@ -8863,7 +8863,7 @@
         "itid": 60,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&600",
+        "decomposeItem": "40002&4000",
         "hid": 0,
         "getWays": "82&33015",
         "useWays": "143|144",
@@ -8881,7 +8881,7 @@
         "itid": 60,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&700",
+        "decomposeItem": "40002&7500",
         "hid": 0,
         "getWays": "82&33016",
         "useWays": "143|144",
@@ -8899,7 +8899,7 @@
         "itid": 60,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&800",
+        "decomposeItem": "40002&12000",
         "hid": 0,
         "getWays": "82&33017",
         "useWays": "143|144",
@@ -8917,7 +8917,7 @@
         "itid": 60,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&900",
+        "decomposeItem": "40002&17500",
         "hid": 0,
         "getWays": "&",
         "useWays": "143|144",
@@ -8953,7 +8953,7 @@
         "itid": 61,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&200",
+        "decomposeItem": "40002&250",
         "hid": 0,
         "getWays": "82&33020",
         "useWays": "143|144",
@@ -8971,7 +8971,7 @@
         "itid": 61,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&300",
+        "decomposeItem": "40002&500",
         "hid": 0,
         "getWays": "82&33021",
         "useWays": "143|144",
@@ -8989,7 +8989,7 @@
         "itid": 61,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&400",
+        "decomposeItem": "40002&1250",
         "hid": 0,
         "getWays": "82&33022",
         "useWays": "143|144",
@@ -9007,7 +9007,7 @@
         "itid": 61,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&500",
+        "decomposeItem": "40002&2500",
         "hid": 0,
         "getWays": "82&33023",
         "useWays": "143|144",
@@ -9025,7 +9025,7 @@
         "itid": 61,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&600",
+        "decomposeItem": "40002&4000",
         "hid": 0,
         "getWays": "82&33024",
         "useWays": "143|144",
@@ -9043,7 +9043,7 @@
         "itid": 61,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&700",
+        "decomposeItem": "40002&7500",
         "hid": 0,
         "getWays": "82&33025",
         "useWays": "143|144",
@@ -9061,7 +9061,7 @@
         "itid": 61,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&800",
+        "decomposeItem": "40002&12000",
         "hid": 0,
         "getWays": "82&33026",
         "useWays": "143|144",
@@ -9079,7 +9079,7 @@
         "itid": 61,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&900",
+        "decomposeItem": "40002&17500",
         "hid": 0,
         "getWays": "&",
         "useWays": "143|144",
@@ -9115,7 +9115,7 @@
         "itid": 62,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&200",
+        "decomposeItem": "40002&250",
         "hid": 0,
         "getWays": "82&33029",
         "useWays": "143|144",
@@ -9133,7 +9133,7 @@
         "itid": 62,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&300",
+        "decomposeItem": "40002&500",
         "hid": 0,
         "getWays": "82&33030",
         "useWays": "143|144",
@@ -9151,7 +9151,7 @@
         "itid": 62,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&400",
+        "decomposeItem": "40002&1250",
         "hid": 0,
         "getWays": "82&33031",
         "useWays": "143|144",
@@ -9169,7 +9169,7 @@
         "itid": 62,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&500",
+        "decomposeItem": "40002&2500",
         "hid": 0,
         "getWays": "82&33032",
         "useWays": "143|144",
@@ -9187,7 +9187,7 @@
         "itid": 62,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&600",
+        "decomposeItem": "40002&4000",
         "hid": 0,
         "getWays": "82&33033",
         "useWays": "143|144",
@@ -9205,7 +9205,7 @@
         "itid": 62,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&700",
+        "decomposeItem": "40002&7500",
         "hid": 0,
         "getWays": "82&33034",
         "useWays": "143|144",
@@ -9223,7 +9223,7 @@
         "itid": 62,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&800",
+        "decomposeItem": "40002&12000",
         "hid": 0,
         "getWays": "82&33035",
         "useWays": "143|144",
@@ -9241,7 +9241,7 @@
         "itid": 62,
         "goodType": 4,
         "redPoint": 0,
-        "decomposeItem": "40002&900",
+        "decomposeItem": "40002&17500",
         "hid": 0,
         "getWays": "&",
         "useWays": "143|144",