diff --git a/shared/resource/jsons/dic_goods.json b/shared/resource/jsons/dic_goods.json
index cfcaea455..044cc64d2 100644
--- a/shared/resource/jsons/dic_goods.json
+++ b/shared/resource/jsons/dic_goods.json
@@ -5183,6 +5183,24 @@
         "gift": 0,
         "info": "糜家商队兑换道具"
     },
+    {
+        "good_id": 40014,
+        "name": "龙纹蜀锦",
+        "quality": 3,
+        "image_id": 40006,
+        "itid": 34,
+        "goodType": 8,
+        "redPoint": 0,
+        "decomposeItem": "&",
+        "hid": 0,
+        "getWays": "1&0",
+        "useWays": "&",
+        "value": 0,
+        "condition": 0,
+        "timelimit": 0,
+        "gift": 0,
+        "info": "蜀锦，时装商店货币"
+    },
     {
         "good_id": 41001,
         "name": "曹操-初始",
@@ -6283,7 +6301,7 @@
     },
     {
         "good_id": 41119,
-        "name": "枪出如龙[赵云]",
+        "name": "枪出如龙*赵云",
         "quality": 5,
         "image_id": 1,
         "itid": 39,
@@ -6301,7 +6319,7 @@
     },
     {
         "good_id": 41122,
-        "name": "连弩武侯[诸葛亮]",
+        "name": "连弩武侯*诸葛亮",
         "quality": 5,
         "image_id": 1,
         "itid": 39,
@@ -6427,7 +6445,7 @@
     },
     {
         "good_id": 41138,
-        "name": "红袖枭姬[孙尚香]",
+        "name": "红袖枭姬*孙尚香",
         "quality": 5,
         "image_id": 1,
         "itid": 39,
@@ -6445,7 +6463,7 @@
     },
     {
         "good_id": 41140,
-        "name": "曲误周顾[小乔]",
+        "name": "曲误周顾*小乔",
         "quality": 5,
         "image_id": 1,
         "itid": 39,
@@ -6499,7 +6517,7 @@
     },
     {
         "good_id": 41153,
-        "name": "少女无暇[夏侯轻衣]",
+        "name": "少女无暇*夏侯轻衣",
         "quality": 5,
         "image_id": 1,
         "itid": 39,
@@ -6517,7 +6535,7 @@
     },
     {
         "good_id": 41156,
-        "name": "女初成[貂蝉]",
+        "name": "有女初成*貂蝉",
         "quality": 5,
         "image_id": 1,
         "itid": 39,
@@ -6535,7 +6553,7 @@
     },
     {
         "good_id": 41200,
-        "name": "重甲英姿[夏侯轻衣]",
+        "name": "重甲英姿*夏侯轻衣",
         "quality": 5,
         "image_id": 1,
         "itid": 39,
@@ -6553,7 +6571,7 @@
     },
     {
         "good_id": 41201,
-        "name": "凌波剑意[夏侯轻衣]",
+        "name": "凌波剑意*夏侯轻衣",
         "quality": 5,
         "image_id": 1,
         "itid": 39,
@@ -6571,7 +6589,7 @@
     },
     {
         "good_id": 41202,
-        "name": "银枪白马[赵云]",
+        "name": "银枪白马*赵云",
         "quality": 5,
         "image_id": 1,
         "itid": 39,
diff --git a/shared/resource/jsons/dic_zyz_fashions.json b/shared/resource/jsons/dic_zyz_fashions.json
index 09b09b0e3..6b458edf8 100644
--- a/shared/resource/jsons/dic_zyz_fashions.json
+++ b/shared/resource/jsons/dic_zyz_fashions.json
@@ -199,7 +199,7 @@
     },
     {
         "goodId": 41119,
-        "name": "枪出如龙[赵云]",
+        "name": "枪出如龙*赵云",
         "heroId": 41119,
         "globalAttr": "&",
         "actorAttr": "1&1000|2&500|4&300|5&300",
@@ -235,7 +235,7 @@
     },
     {
         "goodId": 41122,
-        "name": "连弩武侯[诸葛亮]",
+        "name": "连弩武侯*诸葛亮",
         "heroId": 41122,
         "globalAttr": "1&1000|2&500|4&300|5&300",
         "actorAttr": "1&1000|2&500|4&300|5&300",
@@ -424,7 +424,7 @@
     },
     {
         "goodId": 41138,
-        "name": "红袖枭姬[孙尚香]",
+        "name": "红袖枭姬*孙尚香",
         "heroId": 41138,
         "globalAttr": "1&1000|2&500|4&300|5&300",
         "actorAttr": "1&1000|2&500|4&300|5&300",
@@ -442,7 +442,7 @@
     },
     {
         "goodId": 41140,
-        "name": "曲误周顾",
+        "name": "曲误周顾*小乔",
         "heroId": 41140,
         "globalAttr": "&",
         "actorAttr": "1&1000|2&500|4&300|5&300",
@@ -478,7 +478,7 @@
     },
     {
         "goodId": 41144,
-        "name": "无双飞将[吕布]",
+        "name": "无双飞将*吕布",
         "heroId": 41144,
         "globalAttr": "1&1000|2&500|4&300|5&300",
         "actorAttr": "1&1000|2&500|4&300|5&300",
@@ -559,7 +559,7 @@
     },
     {
         "goodId": 41153,
-        "name": "少女无暇[夏侯轻衣]",
+        "name": "少女无暇*夏侯轻衣",
         "heroId": 41153,
         "globalAttr": "&",
         "actorAttr": "1&1000|2&500|4&300|5&300",
@@ -595,7 +595,7 @@
     },
     {
         "goodId": 41156,
-        "name": "女初成[貂蝉]",
+        "name": "有女初成*貂蝉",
         "heroId": 41156,
         "globalAttr": "&",
         "actorAttr": "1&1000|2&500|4&300|5&300",
@@ -676,7 +676,7 @@
     },
     {
         "goodId": 41200,
-        "name": "重甲英姿[夏侯轻衣]",
+        "name": "重甲英姿*夏侯轻衣",
         "heroId": 41200,
         "globalAttr": "&",
         "actorAttr": "1&1000|2&500|4&300|5&300",
@@ -685,7 +685,7 @@
     },
     {
         "goodId": 41201,
-        "name": "凌波剑意[夏侯轻衣]",
+        "name": "凌波剑意*夏侯轻衣",
         "heroId": 41201,
         "globalAttr": "&",
         "actorAttr": "1&1000|2&500|4&300|5&300",
@@ -694,7 +694,7 @@
     },
     {
         "goodId": 41202,
-        "name": "银枪白马[赵云]",
+        "name": "银枪白马*赵云",
         "heroId": 41202,
         "globalAttr": "&",
         "actorAttr": "1&1000|2&500|4&300|5&300",
diff --git a/shared/resource/jsons/dic_zyz_hero.json b/shared/resource/jsons/dic_zyz_hero.json
index d14fca6ef..66b80bcdc 100644
--- a/shared/resource/jsons/dic_zyz_hero.json
+++ b/shared/resource/jsons/dic_zyz_hero.json
@@ -14525,7 +14525,7 @@
         "rSpineName": "LH_zhaofan",
         "name": "赵范",
         "actorId": 2072,
-        "face_id": "tongyongwenjiang",
+        "face_id": "zhaofan",
         "quality": 3,
         "initialStars": 6,
         "pieceCount": 0,
@@ -14605,7 +14605,7 @@
         "rSpineName": "LH_zhaofan",
         "name": "赵范",
         "actorId": 2074,
-        "face_id": "tongyongwenjiang",
+        "face_id": "zhaofan",
         "quality": 3,
         "initialStars": 6,
         "pieceCount": 0,
@@ -14685,7 +14685,7 @@
         "rSpineName": "LH_zhaofan",
         "name": "赵范",
         "actorId": 2076,
-        "face_id": "tongyongwenjiang",
+        "face_id": "zhaofan",
         "quality": 3,
         "initialStars": 6,
         "pieceCount": 0,
@@ -15852,8 +15852,8 @@
         "camp": 0,
         "area": 0,
         "cost": 0,
-        "jobid": 600,
-        "jobClass": 6,
+        "jobid": 25,
+        "jobClass": 10,
         "skill": 1036,
         "pieceId": 0,
         "hp": 1000,
@@ -16160,7 +16160,7 @@
         "talentId": 1
     },
     {
-        "heroId": 3501,
+        "heroId": 3505,
         "spineName": "leixu",
         "rSpineName": "LH_leixu",
         "name": "雷绪",
@@ -20683,7 +20683,7 @@
         "heroId": 41119,
         "spineName": "zhaoyun_qiangchurulong",
         "rSpineName": "LH_zhaoyun_qiangchurulong",
-        "name": "枪出如龙[赵云]",
+        "name": "枪出如龙*赵云",
         "actorId": 19,
         "face_id": "zy_qiangchurulong",
         "quality": 3,
@@ -20723,7 +20723,7 @@
         "heroId": 41122,
         "spineName": "zhugeliang_liannuwuhou",
         "rSpineName": "LH_zhugelinag_liannuwuhou",
-        "name": "连弩武侯[诸葛亮]",
+        "name": "连弩武侯*诸葛亮",
         "actorId": 22,
         "face_id": "zgl_wuhouliannu",
         "quality": 3,
@@ -21003,7 +21003,7 @@
         "heroId": 41138,
         "spineName": "sunshangxiang_hongxiuxiaoji",
         "rSpineName": "LH_sunshangxiang_hongxiuxiaoji",
-        "name": "红袖枭姬[孙尚香]",
+        "name": "红袖枭姬*孙尚香",
         "actorId": 38,
         "face_id": "ssx_hongxiuxiaoji",
         "quality": 2,
@@ -21043,7 +21043,7 @@
         "heroId": 41140,
         "spineName": "xiaoqiao_quwuzhougu",
         "rSpineName": "LH_xiaoqiao_quwuzhougu",
-        "name": "曲误周顾[小乔]",
+        "name": "曲误周顾*小乔",
         "actorId": 40,
         "face_id": "xq_quwuzhougu",
         "quality": 3,
@@ -21123,7 +21123,7 @@
         "heroId": 41144,
         "spineName": "lvbu_wushuangfeijiang",
         "rSpineName": "LH_lvbu_wushuangfeijiang",
-        "name": "无双飞将[吕布]",
+        "name": "无双飞将*吕布",
         "actorId": 44,
         "face_id": "lb_wushuangfeijiang",
         "quality": 3,
@@ -21163,7 +21163,7 @@
         "heroId": 41153,
         "spineName": "xiahouqingyi_shaonvwuxia",
         "rSpineName": "LH_xiahouqingyi_shaonvwuxia",
-        "name": "少女无暇[夏侯轻衣]",
+        "name": "少女无暇*夏侯轻衣",
         "actorId": 53,
         "face_id": "xhqy_shaonvwuxia",
         "quality": 2,
@@ -21203,7 +21203,7 @@
         "heroId": 41156,
         "spineName": "diaochan_nvchucheng",
         "rSpineName": "LH_diaochan_nvchucheng",
-        "name": "女初成[貂蝉]",
+        "name": "有女初成*貂蝉",
         "actorId": 56,
         "face_id": "dc_younvchucheng",
         "quality": 3,
@@ -21243,7 +21243,7 @@
         "heroId": 41200,
         "spineName": "xiahouqingyii_zhongjiayingzi",
         "rSpineName": "LH_xiahouqingyi_zhongjiayingzi",
-        "name": "重甲英姿[夏侯轻衣]",
+        "name": "重甲英姿*夏侯轻衣",
         "actorId": 53,
         "face_id": "xhqy_zhongjiayingzi",
         "quality": 2,
@@ -21283,7 +21283,7 @@
         "heroId": 41201,
         "spineName": "xiahouqingyi_lingbojianyi",
         "rSpineName": "LH_xiahouqingyi_lingbojianyi",
-        "name": "凌波剑意[夏侯轻衣]",
+        "name": "凌波剑意*夏侯轻衣",
         "actorId": 53,
         "face_id": "xhqy_lingbojianyi",
         "quality": 2,
@@ -21323,7 +21323,7 @@
         "heroId": 41202,
         "spineName": "zhaoyun_yinqiangbaima",
         "rSpineName": "LH_zhaoyun_yinqiangbaima",
-        "name": "银枪白马[赵云]",
+        "name": "银枪白马*赵云",
         "actorId": 19,
         "face_id": "zhaoyun",
         "quality": 3,
diff --git a/shared/resource/jsons/dic_zyz_heroskill.json b/shared/resource/jsons/dic_zyz_heroskill.json
index 30755a6d1..8a08c67f6 100644
--- a/shared/resource/jsons/dic_zyz_heroskill.json
+++ b/shared/resource/jsons/dic_zyz_heroskill.json
@@ -541,7 +541,7 @@
     },
     {
         "skillid": 65,
-        "name": "连弩武侯[诸葛亮]",
+        "name": "连弩武侯*诸葛亮",
         "starSkill": "1&40111&1|3&40121&2",
         "colorStarSkill": "2&40112&1|4&40122&2",
         "starSeid": "2&401311&3|4&401411&4|5&401321&3|6&31&6",
@@ -551,7 +551,7 @@
     },
     {
         "skillid": 66,
-        "name": "红袖枭姬[孙尚香]",
+        "name": "红袖枭姬*孙尚香",
         "starSkill": "1&520111&1|3&520121&2",
         "colorStarSkill": "2&520112&1|4&520122&2",
         "starSeid": "2&5201311&3|4&5201411&4|5&5201321&3|6&31&6",
@@ -561,7 +561,7 @@
     },
     {
         "skillid": 67,
-        "name": "无双飞将[吕布]",
+        "name": "无双飞将*吕布",
         "starSkill": "1&330111&1|3&330121&2",
         "colorStarSkill": "2&330112&1|4&330122&2",
         "starSeid": "2&3301311&3|4&3301411&4|5&3301321&3|6&31&6",
@@ -571,7 +571,7 @@
     },
     {
         "skillid": 68,
-        "name": "银枪白马[赵云]",
+        "name": "银枪白马*赵云",
         "starSkill": "1&30111&1|3&30121&2",
         "colorStarSkill": "2&30112&1|4&30122&2",
         "starSeid": "2&301311&3|4&301411&4|5&301321&3|6&31&6",
diff --git a/shared/resource/jsons/dic_zyz_shop.json b/shared/resource/jsons/dic_zyz_shop.json
index 21d54c8ed..b3757a272 100644
--- a/shared/resource/jsons/dic_zyz_shop.json
+++ b/shared/resource/jsons/dic_zyz_shop.json
@@ -497,7 +497,7 @@
     {
         "id": 5001,
         "goodid": 41122,
-        "goodname": "连弩武侯[诸葛亮]",
+        "goodname": "连弩武侯*诸葛亮",
         "shop": 5,
         "type": 7,
         "guildlvlimit": "&",
@@ -512,14 +512,14 @@
     {
         "id": 5002,
         "goodid": 41138,
-        "goodname": "红袖枭姬[孙尚香]",
+        "goodname": "红袖枭姬*孙尚香",
         "shop": 5,
-        "type": 7,
+        "type": 12,
         "guildlvlimit": "&",
         "lvlimit": 0,
         "purchaselimit": 1,
         "refreshType": 1,
-        "money": 40006,
+        "money": 40014,
         "price": 90,
         "chosen": 0,
         "indirectId": 0
@@ -527,22 +527,27 @@
     {
         "id": 5003,
         "goodid": 41144,
-        "goodname": "无双飞将[吕布]",
+        "goodname": "无双飞将*吕布",
         "shop": 5,
-        "type": 7,
+        "type": 12,
         "guildlvlimit": "&",
         "lvlimit": 0,
         "purchaselimit": 1,
         "refreshType": 1,
-        "money": 40006,
+        "money": 40014,
         "price": 90,
         "chosen": 0,
         "indirectId": 0
     },
     {
         "id": 5004,
+<<<<<<< Updated upstream
         "goodid": 41156,
         "goodname": "女初成[貂蝉]",
+=======
+        "goodid": 41140,
+        "goodname": "曲误周顾*小乔",
+>>>>>>> Stashed changes
         "shop": 5,
         "type": 7,
         "guildlvlimit": "&",
@@ -1190,6 +1195,84 @@
         "goodname": "地玉·命（一品）",
         "shop": 8,
         "type": 2,
+<<<<<<< Updated upstream
+=======
+        "guildlvlimit": "&",
+        "lvlimit": 0,
+        "purchaselimit": 9999,
+        "refreshType": 1,
+        "money": 40011,
+        "price": 20,
+        "chosen": 0,
+        "indirectId": 0
+    },
+    {
+        "id": 81,
+        "goodid": 17045,
+        "goodname": "乾坤锁",
+        "shop": 1,
+        "type": 5,
+        "guildlvlimit": "&",
+        "lvlimit": 0,
+        "purchaselimit": 9999,
+        "refreshType": 1,
+        "money": 31002,
+        "price": 500,
+        "chosen": 0,
+        "indirectId": 0
+    },
+    {
+        "id": 82,
+        "goodid": 17045,
+        "goodname": "乾坤锁",
+        "shop": 6,
+        "type": 5,
+        "guildlvlimit": "&",
+        "lvlimit": 0,
+        "purchaselimit": 9999,
+        "refreshType": 1,
+        "money": 40002,
+        "price": 500,
+        "chosen": 0,
+        "indirectId": 0
+    },
+    {
+        "id": 83,
+        "goodid": 17056,
+        "goodname": "息壤",
+        "shop": 1,
+        "type": 5,
+        "guildlvlimit": "&",
+        "lvlimit": 0,
+        "purchaselimit": 9999,
+        "refreshType": 1,
+        "money": 31002,
+        "price": 200,
+        "chosen": 0,
+        "indirectId": 0
+    },
+    {
+        "id": 84,
+        "goodid": 17056,
+        "goodname": "息壤",
+        "shop": 6,
+        "type": 5,
+        "guildlvlimit": "&",
+        "lvlimit": 0,
+        "purchaselimit": 9999,
+        "refreshType": 1,
+        "money": 40002,
+        "price": 200,
+        "chosen": 0,
+        "indirectId": 0
+    },
+    {
+        "id": 85,
+        "goodid": 17056,
+        "goodname": "息壤",
+        "shop": 6,
+        "type": 5,
+>>>>>>> Stashed changes
         "guildlvlimit": "&",
         "lvlimit": 0,
         "purchaselimit": 9999,
diff --git a/shared/resource/jsons/dic_zyz_shopList.json b/shared/resource/jsons/dic_zyz_shopList.json
index eeac5031f..6e92ad288 100644
--- a/shared/resource/jsons/dic_zyz_shopList.json
+++ b/shared/resource/jsons/dic_zyz_shopList.json
@@ -35,8 +35,8 @@
         "shopid": 5,
         "shopname": "时装商店",
         "shopicon": "shoptubiaozi_shizhuang",
-        "typeid": "7&",
-        "moneyid": "40006&",
+        "typeid": "7&12",
+        "moneyid": "40006&40014",
         "openLimit": "20&"
     },
     {
diff --git a/shared/resource/jsons/dic_zyz_shopType.json b/shared/resource/jsons/dic_zyz_shopType.json
index ec63ec79b..d195618d7 100644
--- a/shared/resource/jsons/dic_zyz_shopType.json
+++ b/shared/resource/jsons/dic_zyz_shopType.json
@@ -17,7 +17,7 @@
     },
     {
         "typeid": 5,
-        "name": "杂物"
+        "name": "奇珍"
     },
     {
         "typeid": 6,
@@ -25,7 +25,7 @@
     },
     {
         "typeid": 7,
-        "name": "时装"
+        "name": "臻选"
     },
     {
         "typeid": 9,
@@ -38,5 +38,9 @@
     {
         "typeid": 11,
         "name": "图纸"
+    },
+    {
+        "typeid": 12,
+        "name": "竞技"
     }
 ]
\ No newline at end of file