From 63a2ddbb623b49e3492da989a11807fb4339d231 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Thu, 12 May 2022 18:35:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=EF=BC=9A=E5=95=86=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/resource/jsons/dic_zyz_shop.json     | 838 +++-----------------
 shared/resource/jsons/dic_zyz_shopList.json |   4 +-
 2 files changed, 101 insertions(+), 741 deletions(-)

diff --git a/shared/resource/jsons/dic_zyz_shop.json b/shared/resource/jsons/dic_zyz_shop.json
index 3f9406e48..20d57702a 100644
--- a/shared/resource/jsons/dic_zyz_shop.json
+++ b/shared/resource/jsons/dic_zyz_shop.json
@@ -12,15 +12,7 @@
         "money": 31002,
         "price": 800,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 2,
@@ -35,15 +27,7 @@
         "money": 31002,
         "price": 1000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 3,
@@ -58,15 +42,7 @@
         "money": 31002,
         "price": 300,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 4,
@@ -81,15 +57,7 @@
         "money": 31002,
         "price": 300,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 5,
@@ -104,15 +72,7 @@
         "money": 31002,
         "price": 400,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6,
@@ -127,15 +87,7 @@
         "money": 31002,
         "price": 250,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 7,
@@ -150,15 +102,7 @@
         "money": 31002,
         "price": 200,
         "chosen": 1,
-        "indirectId": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 1
     },
     {
         "id": 8,
@@ -173,15 +117,7 @@
         "money": 31002,
         "price": 500,
         "chosen": 1,
-        "indirectId": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 2
     },
     {
         "id": 9,
@@ -196,15 +132,7 @@
         "money": 31002,
         "price": 500,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 10,
@@ -219,20 +147,12 @@
         "money": 31002,
         "price": 200,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 2001,
         "goodid": 50001,
-        "goodname": "蓝品图纸",
+        "goodname": "下品装备图纸",
         "shop": 2,
         "type": 11,
         "guildlvlimit": 1,
@@ -242,22 +162,14 @@
         "money": 40005,
         "price": 200,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 2002,
         "goodid": 50002,
-        "goodname": "紫品图纸",
+        "goodname": "中品装备图纸",
         "shop": 2,
-        "type": 12,
+        "type": 11,
         "guildlvlimit": 2,
         "lvlimit": 0,
         "purchaselimit": 20,
@@ -265,22 +177,14 @@
         "money": 40005,
         "price": 500,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 2003,
         "goodid": 50003,
-        "goodname": "橙品图纸",
+        "goodname": "上品装备图纸",
         "shop": 2,
-        "type": 13,
+        "type": 11,
         "guildlvlimit": 3,
         "lvlimit": 0,
         "purchaselimit": 20,
@@ -288,22 +192,14 @@
         "money": 40005,
         "price": 1200,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 2004,
         "goodid": 50004,
-        "goodname": "红品图纸",
+        "goodname": "极品装备图纸",
         "shop": 2,
-        "type": 14,
+        "type": 11,
         "guildlvlimit": 4,
         "lvlimit": 0,
         "purchaselimit": 20,
@@ -311,22 +207,14 @@
         "money": 40005,
         "price": 2400,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 2005,
         "goodid": 50005,
-        "goodname": "金品图纸",
+        "goodname": "圣品装备图纸",
         "shop": 2,
-        "type": 15,
+        "type": 11,
         "guildlvlimit": 6,
         "lvlimit": 0,
         "purchaselimit": 20,
@@ -334,15 +222,7 @@
         "money": 40005,
         "price": 10000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 2006,
@@ -357,22 +237,14 @@
         "money": 40005,
         "price": 30,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 2007,
         "goodid": 71009,
         "goodname": "一阶宝石随机礼包",
         "shop": 2,
-        "type": 2,
+        "type": 5,
         "guildlvlimit": 1,
         "lvlimit": 0,
         "purchaselimit": 100,
@@ -380,15 +252,7 @@
         "money": 40005,
         "price": 25,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 2008,
@@ -403,15 +267,7 @@
         "money": 40005,
         "price": 200,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 2009,
@@ -426,15 +282,7 @@
         "money": 40005,
         "price": 1500,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 3001,
@@ -449,15 +297,7 @@
         "money": 40001,
         "price": 100,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 3002,
@@ -472,15 +312,7 @@
         "money": 40001,
         "price": 400,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 3003,
@@ -495,15 +327,7 @@
         "money": 40001,
         "price": 10,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 3004,
@@ -518,15 +342,7 @@
         "money": 40001,
         "price": 20,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 3005,
@@ -541,15 +357,7 @@
         "money": 40001,
         "price": 30,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 3006,
@@ -564,15 +372,7 @@
         "money": 40001,
         "price": 50,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 4001,
@@ -587,15 +387,7 @@
         "money": 40004,
         "price": 400,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 4002,
@@ -610,15 +402,7 @@
         "money": 40004,
         "price": 10,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 4003,
@@ -633,15 +417,7 @@
         "money": 40004,
         "price": 45,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 4004,
@@ -656,15 +432,7 @@
         "money": 40004,
         "price": 60,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 4005,
@@ -679,15 +447,7 @@
         "money": 40004,
         "price": 75,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 4006,
@@ -702,15 +462,7 @@
         "money": 40004,
         "price": 90,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 4007,
@@ -725,15 +477,7 @@
         "money": 40004,
         "price": 120,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 4008,
@@ -748,15 +492,7 @@
         "money": 40004,
         "price": 100,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 5001,
@@ -771,15 +507,7 @@
         "money": 40014,
         "price": 30,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 5002,
@@ -794,15 +522,7 @@
         "money": 40014,
         "price": 30,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 5003,
@@ -817,15 +537,7 @@
         "money": 40006,
         "price": 30,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 5004,
@@ -840,15 +552,7 @@
         "money": 40006,
         "price": 10,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6001,
@@ -863,15 +567,7 @@
         "money": 40002,
         "price": 500,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6002,
@@ -886,15 +582,7 @@
         "money": 40002,
         "price": 400,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6003,
@@ -909,15 +597,7 @@
         "money": 40002,
         "price": 250,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6004,
@@ -932,15 +612,7 @@
         "money": 40002,
         "price": 500,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6005,
@@ -955,15 +627,7 @@
         "money": 40002,
         "price": 200,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6006,
@@ -978,15 +642,7 @@
         "money": 40002,
         "price": 200,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6007,
@@ -1001,15 +657,7 @@
         "money": 40002,
         "price": 200,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6008,
@@ -1024,15 +672,7 @@
         "money": 40002,
         "price": 200,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6009,
@@ -1047,15 +687,7 @@
         "money": 40002,
         "price": 200,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6010,
@@ -1070,15 +702,7 @@
         "money": 40002,
         "price": 500,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6011,
@@ -1093,15 +717,7 @@
         "money": 40002,
         "price": 500,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6012,
@@ -1116,15 +732,7 @@
         "money": 40002,
         "price": 500,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6013,
@@ -1139,15 +747,7 @@
         "money": 40002,
         "price": 500,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6014,
@@ -1162,15 +762,7 @@
         "money": 40002,
         "price": 1000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6015,
@@ -1185,15 +777,7 @@
         "money": 40002,
         "price": 1000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6016,
@@ -1208,15 +792,7 @@
         "money": 40002,
         "price": 1000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6017,
@@ -1231,15 +807,7 @@
         "money": 40002,
         "price": 1000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6018,
@@ -1254,15 +822,7 @@
         "money": 40002,
         "price": 2500,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6019,
@@ -1277,15 +837,7 @@
         "money": 40002,
         "price": 2500,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6020,
@@ -1300,15 +852,7 @@
         "money": 40002,
         "price": 2500,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6021,
@@ -1323,15 +867,7 @@
         "money": 40002,
         "price": 2500,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6022,
@@ -1346,15 +882,7 @@
         "money": 40002,
         "price": 5000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6023,
@@ -1369,15 +897,7 @@
         "money": 40002,
         "price": 5000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6024,
@@ -1392,15 +912,7 @@
         "money": 40002,
         "price": 5000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6025,
@@ -1415,15 +927,7 @@
         "money": 40002,
         "price": 5000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6026,
@@ -1438,15 +942,7 @@
         "money": 40002,
         "price": 8000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6027,
@@ -1461,15 +957,7 @@
         "money": 40002,
         "price": 8000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6028,
@@ -1484,15 +972,7 @@
         "money": 40002,
         "price": 8000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6029,
@@ -1507,15 +987,7 @@
         "money": 40002,
         "price": 8000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6030,
@@ -1530,15 +1002,7 @@
         "money": 40002,
         "price": 15000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6031,
@@ -1553,15 +1017,7 @@
         "money": 40002,
         "price": 15000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6032,
@@ -1576,15 +1032,7 @@
         "money": 40002,
         "price": 15000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 6033,
@@ -1599,20 +1047,12 @@
         "money": 40002,
         "price": 15000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 7001,
         "goodid": 50001,
-        "goodname": "蓝品图纸",
+        "goodname": "下品装备图纸",
         "shop": 7,
         "type": 11,
         "guildlvlimit": "&",
@@ -1622,20 +1062,12 @@
         "money": 40007,
         "price": 100,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 7002,
         "goodid": 50002,
-        "goodname": "紫品图纸",
+        "goodname": "中品装备图纸",
         "shop": 7,
         "type": 11,
         "guildlvlimit": "&",
@@ -1645,20 +1077,12 @@
         "money": 40007,
         "price": 250,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 7003,
         "goodid": 50003,
-        "goodname": "橙品图纸",
+        "goodname": "上品装备图纸",
         "shop": 7,
         "type": 11,
         "guildlvlimit": "&",
@@ -1668,20 +1092,12 @@
         "money": 40007,
         "price": 600,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 7004,
         "goodid": 50004,
-        "goodname": "红品图纸",
+        "goodname": "极品装备图纸",
         "shop": 7,
         "type": 11,
         "guildlvlimit": "&",
@@ -1691,20 +1107,12 @@
         "money": 40007,
         "price": 1200,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 7005,
         "goodid": 50005,
-        "goodname": "金品图纸",
+        "goodname": "圣品装备图纸",
         "shop": 7,
         "type": 11,
         "guildlvlimit": "&",
@@ -1714,15 +1122,7 @@
         "money": 40007,
         "price": 5000,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 7006,
@@ -1737,22 +1137,14 @@
         "money": 40007,
         "price": 20,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 8001,
         "goodid": 60001,
         "goodname": "地玉·破（一品）",
         "shop": 8,
-        "type": 2,
+        "type": 10,
         "guildlvlimit": "&",
         "lvlimit": 0,
         "purchaselimit": 9999,
@@ -1760,22 +1152,14 @@
         "money": 40011,
         "price": 10,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 8002,
         "goodid": 60011,
         "goodname": "地玉·护（一品）",
         "shop": 8,
-        "type": 2,
+        "type": 10,
         "guildlvlimit": "&",
         "lvlimit": 0,
         "purchaselimit": 9999,
@@ -1783,22 +1167,14 @@
         "money": 40011,
         "price": 10,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 8003,
         "goodid": 60021,
         "goodname": "地玉·御（一品）",
         "shop": 8,
-        "type": 2,
+        "type": 10,
         "guildlvlimit": "&",
         "lvlimit": 0,
         "purchaselimit": 9999,
@@ -1806,22 +1182,14 @@
         "money": 40011,
         "price": 10,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     },
     {
         "id": 8004,
         "goodid": 60031,
         "goodname": "地玉·命（一品）",
         "shop": 8,
-        "type": 2,
+        "type": 10,
         "guildlvlimit": "&",
         "lvlimit": 0,
         "purchaselimit": 9999,
@@ -1829,14 +1197,6 @@
         "money": 40011,
         "price": 10,
         "chosen": 0,
-        "indirectId": 0,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0
+        "indirectId": 0
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/jsons/dic_zyz_shopList.json b/shared/resource/jsons/dic_zyz_shopList.json
index 7db796cd8..f6d42ecc2 100644
--- a/shared/resource/jsons/dic_zyz_shopList.json
+++ b/shared/resource/jsons/dic_zyz_shopList.json
@@ -11,7 +11,7 @@
         "shopid": 2,
         "shopname": "军团商店",
         "shopicon": "shoptubiaozi_juntuan",
-        "typeid": "5&",
+        "typeid": "5&11",
         "moneyid": "31002&40005",
         "openLimit": "22&"
     },
@@ -37,7 +37,7 @@
         "shopicon": "shoptubiaozi_shizhuang",
         "typeid": "7&12",
         "moneyid": "40006&40014",
-        "openLimit": "1&"
+        "openLimit": "20&"
     },
     {
         "shopid": 6,