diff --git a/shared/resource/jsons/dic_goods.json b/shared/resource/jsons/dic_goods.json index 044cc64d2..af046c2a7 100644 --- a/shared/resource/jsons/dic_goods.json +++ b/shared/resource/jsons/dic_goods.json @@ -6301,7 +6301,7 @@ }, { "good_id": 41119, - "name": "枪出如龙*赵云", + "name": "枪出如龙", "quality": 5, "image_id": 1, "itid": 39, @@ -6319,7 +6319,7 @@ }, { "good_id": 41122, - "name": "连弩武侯*诸葛亮", + "name": "连弩武侯", "quality": 5, "image_id": 1, "itid": 39, @@ -6445,7 +6445,7 @@ }, { "good_id": 41138, - "name": "红袖枭姬*孙尚香", + "name": "红袖枭姬", "quality": 5, "image_id": 1, "itid": 39, @@ -6463,7 +6463,7 @@ }, { "good_id": 41140, - "name": "曲误周顾*小乔", + "name": "曲误周顾", "quality": 5, "image_id": 1, "itid": 39, @@ -6499,7 +6499,7 @@ }, { "good_id": 41144, - "name": "无双飞将[吕布]", + "name": "无双飞将", "quality": 5, "image_id": 1, "itid": 39, @@ -6517,7 +6517,7 @@ }, { "good_id": 41153, - "name": "少女无暇*夏侯轻衣", + "name": "少女无暇", "quality": 5, "image_id": 1, "itid": 39, @@ -6535,7 +6535,7 @@ }, { "good_id": 41156, - "name": "有女初成*貂蝉", + "name": "有女初成", "quality": 5, "image_id": 1, "itid": 39, @@ -6553,7 +6553,7 @@ }, { "good_id": 41200, - "name": "重甲英姿*夏侯轻衣", + "name": "重甲英姿", "quality": 5, "image_id": 1, "itid": 39, @@ -6571,7 +6571,7 @@ }, { "good_id": 41201, - "name": "凌波剑意*夏侯轻衣", + "name": "凌波剑意", "quality": 5, "image_id": 1, "itid": 39, @@ -6589,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 1345fe367..6dbe452f0 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": "1&800|2&400|4&240|5&240", "actorAttr": "&", @@ -235,7 +235,7 @@ }, { "goodId": 41122, - "name": "连弩武侯*诸葛亮", + "name": "连弩武侯", "heroId": 41122, "globalAttr": "1&1200|2&600|4&360|5&360", "actorAttr": "&", @@ -424,7 +424,7 @@ }, { "goodId": 41138, - "name": "红袖枭姬*孙尚香", + "name": "红袖枭姬", "heroId": 41138, "globalAttr": "1&1200|2&600|4&360|5&360", "actorAttr": "&", @@ -442,7 +442,7 @@ }, { "goodId": 41140, - "name": "曲误周顾*小乔", + "name": "曲误周顾", "heroId": 41140, "globalAttr": "1&800|2&400|4&240|5&240", "actorAttr": "&", @@ -478,7 +478,7 @@ }, { "goodId": 41144, - "name": "无双飞将*吕布", + "name": "无双飞将", "heroId": 41144, "globalAttr": "1&1200|2&600|4&360|5&360", "actorAttr": "&", @@ -559,7 +559,7 @@ }, { "goodId": 41153, - "name": "少女无暇*夏侯轻衣", + "name": "少女无暇", "heroId": 41153, "globalAttr": "1&800|2&400|4&240|5&240", "actorAttr": "&", @@ -595,7 +595,7 @@ }, { "goodId": 41156, - "name": "有女初成*貂蝉", + "name": "有女初成", "heroId": 41156, "globalAttr": "1&800|2&400|4&240|5&240", "actorAttr": "&", @@ -676,7 +676,7 @@ }, { "goodId": 41200, - "name": "重甲英姿*夏侯轻衣", + "name": "重甲英姿", "heroId": 41200, "globalAttr": "1&800|2&400|4&240|5&240", "actorAttr": "&", @@ -685,7 +685,7 @@ }, { "goodId": 41201, - "name": "凌波剑意*夏侯轻衣", + "name": "凌波剑意", "heroId": 41201, "globalAttr": "1&800|2&400|4&240|5&240", "actorAttr": "&", @@ -694,7 +694,7 @@ }, { "goodId": 41202, - "name": "银枪白马*赵云", + "name": "银枪白马", "heroId": 41202, "globalAttr": "1&1200|2&600|4&360|5&360", "actorAttr": "&", diff --git a/shared/resource/jsons/dic_zyz_hero.json b/shared/resource/jsons/dic_zyz_hero.json index 66b80bcdc..eb69775d4 100644 --- a/shared/resource/jsons/dic_zyz_hero.json +++ b/shared/resource/jsons/dic_zyz_hero.json @@ -5922,7 +5922,7 @@ { "heroId": 1040, "spineName": "SL_manzu", - "rSpineName": "&", + "rSpineName": "LH_wuhuanjiangling", "name": "乌桓将领", "actorId": 1040, "face_id": "wuhuanjiangling", @@ -6494,7 +6494,7 @@ "cost": 0, "jobid": 4, "jobClass": 4, - "skill": 1034, + "skill": 1036, "pieceId": 0, "hp": 1000, "atk": 20, @@ -6774,7 +6774,7 @@ "cost": 0, "jobid": 100, "jobClass": 1, - "skill": 1001, + "skill": 1031, "pieceId": 0, "hp": 1000, "atk": 20, @@ -6814,7 +6814,7 @@ "cost": 0, "jobid": 600, "jobClass": 6, - "skill": 1006, + "skill": 1036, "pieceId": 0, "hp": 1000, "atk": 20, @@ -6854,7 +6854,7 @@ "cost": 0, "jobid": 600, "jobClass": 6, - "skill": 1006, + "skill": 1036, "pieceId": 0, "hp": 1000, "atk": 20, @@ -6894,7 +6894,7 @@ "cost": 0, "jobid": 700, "jobClass": 6, - "skill": 1007, + "skill": 1037, "pieceId": 0, "hp": 1000, "atk": 20, @@ -6932,9 +6932,9 @@ "camp": 0, "area": 0, "cost": 0, - "jobid": 400, + "jobid": 410, "jobClass": 4, - "skill": 1004, + "skill": 1065, "pieceId": 0, "hp": 1000, "atk": 20, @@ -6974,7 +6974,7 @@ "cost": 0, "jobid": 600, "jobClass": 6, - "skill": 1006, + "skill": 1037, "pieceId": 0, "hp": 1000, "atk": 20, @@ -7361,8 +7361,8 @@ }, { "heroId": 1085, - "spineName": "wuhuanjiangling", - "rSpineName": "&", + "spineName": "SL_manzu", + "rSpineName": "LH_wuhuanjiangling", "name": "蹋顿", "actorId": 1085, "face_id": "wuhuanjiangling", @@ -8814,7 +8814,7 @@ "cost": 0, "jobid": 600, "jobClass": 6, - "skill": 1006, + "skill": 1036, "pieceId": 0, "hp": 1000, "atk": 20, @@ -8885,7 +8885,7 @@ "rSpineName": "&", "name": "冰狼萨满", "actorId": 1132, - "face_id": "wuhuanqibing", + "face_id": "wuhuansaman", "quality": 3, "initialStars": 3, "pieceCount": 0, @@ -9679,6 +9679,366 @@ "isdeath": 1, "talentId": 3 }, + { + "heroId": 1152, + "spineName": "SL_qibing", + "rSpineName": "LH_SL_daobing", + "name": "高览", + "actorId": 1152, + "face_id": "tongyongbubingjiangling", + "quality": 3, + "initialStars": 6, + "pieceCount": 0, + "camp": 0, + "area": 0, + "cost": 0, + "jobid": 306, + "jobClass": 3, + "skill": 1033, + "pieceId": 0, + "hp": 1000, + "atk": 20, + "def": 20, + "mdef": 20, + "hp_up": 5, + "atk_up": 1, + "def_up": 1, + "mdef_up": 1, + "sound_click": 1, + "sound_fight": 1, + "info": "&", + "actorinfo": "&", + "skillScroll": "&", + "position": "&", + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "liqi", + "probation": 0, + "center_y": 0, + "show_animation": "&", + "isdeath": 1, + "talentId": 1 + }, + { + "heroId": 1153, + "spineName": "SL_qiangbing", + "rSpineName": "LH_xiaobing2", + "name": "晏明", + "actorId": 1153, + "face_id": "tongyongjunguan", + "quality": 3, + "initialStars": 6, + "pieceCount": 0, + "camp": 0, + "area": 0, + "cost": 0, + "jobid": 206, + "jobClass": 2, + "skill": 1032, + "pieceId": 0, + "hp": 1000, + "atk": 20, + "def": 20, + "mdef": 20, + "hp_up": 5, + "atk_up": 1, + "def_up": 1, + "mdef_up": 1, + "sound_click": 1, + "sound_fight": 1, + "info": "&", + "actorinfo": "&", + "skillScroll": "&", + "position": "&", + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "liqi", + "probation": 0, + "center_y": 0, + "show_animation": "&", + "isdeath": 1, + "talentId": 1 + }, + { + "heroId": 1154, + "spineName": "SL_bubing", + "rSpineName": "LH_xiaobing2", + "name": "夏侯杰", + "actorId": 1154, + "face_id": "tongyongjunguan", + "quality": 3, + "initialStars": 6, + "pieceCount": 0, + "camp": 0, + "area": 0, + "cost": 0, + "jobid": 109, + "jobClass": 1, + "skill": 1031, + "pieceId": 0, + "hp": 1000, + "atk": 20, + "def": 20, + "mdef": 20, + "hp_up": 5, + "atk_up": 1, + "def_up": 1, + "mdef_up": 1, + "sound_click": 1, + "sound_fight": 1, + "info": "&", + "actorinfo": "&", + "skillScroll": "&", + "position": "&", + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "liqi", + "probation": 0, + "center_y": 0, + "show_animation": "&", + "isdeath": 1, + "talentId": 1 + }, + { + "heroId": 1155, + "spineName": "xiliangjiangling", + "rSpineName": "LH_xiliangjiangling", + "name": "夏侯恩", + "actorId": 1155, + "face_id": "xiliangjiangling", + "quality": 3, + "initialStars": 6, + "pieceCount": 0, + "camp": 0, + "area": 0, + "cost": 0, + "jobid": 210, + "jobClass": 2, + "skill": 1032, + "pieceId": 0, + "hp": 1000, + "atk": 20, + "def": 20, + "mdef": 20, + "hp_up": 5, + "atk_up": 1, + "def_up": 1, + "mdef_up": 1, + "sound_click": 1, + "sound_fight": 1, + "info": "&", + "actorinfo": "&", + "skillScroll": "&", + "position": "&", + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "liqi", + "probation": 0, + "center_y": 0, + "show_animation": "&", + "isdeath": 1, + "talentId": 1 + }, + { + "heroId": 1156, + "spineName": "SL_gongbing", + "rSpineName": "LH_xiaobing2", + "name": "张南", + "actorId": 1156, + "face_id": "tongyongjunguan", + "quality": 3, + "initialStars": 6, + "pieceCount": 0, + "camp": 0, + "area": 0, + "cost": 0, + "jobid": 406, + "jobClass": 4, + "skill": 1034, + "pieceId": 0, + "hp": 1000, + "atk": 20, + "def": 20, + "mdef": 20, + "hp_up": 5, + "atk_up": 1, + "def_up": 1, + "mdef_up": 1, + "sound_click": 1, + "sound_fight": 1, + "info": "&", + "actorinfo": "&", + "skillScroll": "&", + "position": "&", + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "liqi", + "probation": 0, + "center_y": 0, + "show_animation": "&", + "isdeath": 1, + "talentId": 1 + }, + { + "heroId": 1157, + "spineName": "SL_qiangbing", + "rSpineName": "LH_xiaobing2", + "name": "焦触", + "actorId": 1157, + "face_id": "tongyongjunguan", + "quality": 3, + "initialStars": 6, + "pieceCount": 0, + "camp": 0, + "area": 0, + "cost": 0, + "jobid": 207, + "jobClass": 2, + "skill": 1032, + "pieceId": 0, + "hp": 1000, + "atk": 20, + "def": 20, + "mdef": 20, + "hp_up": 5, + "atk_up": 1, + "def_up": 1, + "mdef_up": 1, + "sound_click": 1, + "sound_fight": 1, + "info": "&", + "actorinfo": "&", + "skillScroll": "&", + "position": "&", + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "liqi", + "probation": 0, + "center_y": 0, + "show_animation": "&", + "isdeath": 1, + "talentId": 1 + }, + { + "heroId": 1158, + "spineName": "SL_qibing", + "rSpineName": "LH_SL_daobing", + "name": "文聘", + "actorId": 1158, + "face_id": "tongyongbubingjiangling", + "quality": 3, + "initialStars": 6, + "pieceCount": 0, + "camp": 0, + "area": 0, + "cost": 0, + "jobid": 309, + "jobClass": 3, + "skill": 1033, + "pieceId": 0, + "hp": 1000, + "atk": 20, + "def": 20, + "mdef": 20, + "hp_up": 5, + "atk_up": 1, + "def_up": 1, + "mdef_up": 1, + "sound_click": 1, + "sound_fight": 1, + "info": "&", + "actorinfo": "&", + "skillScroll": "&", + "position": "&", + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "liqi", + "probation": 0, + "center_y": 0, + "show_animation": "&", + "isdeath": 1, + "talentId": 1 + }, + { + "heroId": 1159, + "spineName": "SL_gongbing", + "rSpineName": "LH_xiaobing2", + "name": "陈应", + "actorId": 1159, + "face_id": "tongyongjunguan", + "quality": 3, + "initialStars": 6, + "pieceCount": 0, + "camp": 0, + "area": 0, + "cost": 0, + "jobid": 409, + "jobClass": 4, + "skill": 1034, + "pieceId": 0, + "hp": 1000, + "atk": 20, + "def": 20, + "mdef": 20, + "hp_up": 5, + "atk_up": 1, + "def_up": 1, + "mdef_up": 1, + "sound_click": 1, + "sound_fight": 1, + "info": "&", + "actorinfo": "&", + "skillScroll": "&", + "position": "&", + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "liqi", + "probation": 0, + "center_y": 0, + "show_animation": "&", + "isdeath": 1, + "talentId": 1 + }, + { + "heroId": 1160, + "spineName": "SL_qiangbing", + "rSpineName": "LH_xiaobing2", + "name": "鲍隆", + "actorId": 1160, + "face_id": "tongyongjunguan", + "quality": 3, + "initialStars": 6, + "pieceCount": 0, + "camp": 0, + "area": 0, + "cost": 0, + "jobid": 209, + "jobClass": 2, + "skill": 1032, + "pieceId": 0, + "hp": 1000, + "atk": 20, + "def": 20, + "mdef": 20, + "hp_up": 5, + "atk_up": 1, + "def_up": 1, + "mdef_up": 1, + "sound_click": 1, + "sound_fight": 1, + "info": "&", + "actorinfo": "&", + "skillScroll": "&", + "position": "&", + "initialSkin": 0, + "gender": 1, + "atkSpineEffect": "liqi", + "probation": 0, + "center_y": 0, + "show_animation": "&", + "isdeath": 1, + "talentId": 1 + }, { "heroId": 1501, "spineName": "dongzhuoboss", @@ -10925,7 +11285,7 @@ "rSpineName": "&", "name": "乌桓萨满", "actorId": 1532, - "face_id": "wuhuanqibing", + "face_id": "wuhuansaman", "quality": 3, "initialStars": 3, "pieceCount": 0, @@ -15765,7 +16125,7 @@ "rSpineName": "&", "name": "乌桓萨满", "actorId": 3406, - "face_id": "wuhuanqibing", + "face_id": "wuhuansaman", "quality": 3, "initialStars": 6, "pieceCount": 0, @@ -16762,7 +17122,7 @@ { "heroId": 3610, "spineName": "budongmingwang", - "rSpineName": "&", + "rSpineName": "LH_sengren", "name": "不动明王", "actorId": 3610, "face_id": "budongmingwang", @@ -17081,11 +17441,11 @@ }, { "heroId": 3701, - "spineName": "zhaoyun", + "spineName": "houwang", "rSpineName": "&", "name": "野猿之王", "actorId": 3701, - "face_id": 0, + "face_id": "houwang", "quality": 3, "initialStars": 6, "pieceCount": 0, @@ -17161,11 +17521,11 @@ }, { "heroId": 3703, - "spineName": "zhaoyun", + "spineName": "wenyinuxiong", "rSpineName": "&", "name": "瘟疫怒熊", "actorId": 3703, - "face_id": 0, + "face_id": "wenyinuxiong", "quality": 3, "initialStars": 6, "pieceCount": 0, @@ -17201,8 +17561,8 @@ }, { "heroId": 3704, - "spineName": "huatuo", - "rSpineName": "zhangzhongjing", + "spineName": "zhangzhongjing", + "rSpineName": "LH_zhangzhongjing", "name": "张仲景", "actorId": 3704, "face_id": "zhangzhongjing", @@ -17282,7 +17642,7 @@ { "heroId": 3706, "spineName": "zhizhunvwangboss", - "rSpineName": "zhizhunvwangboss", + "rSpineName": "LH_zhizhunvwangboss", "name": "蜘蛛女王", "actorId": 3706, "face_id": "zhizhunvwangboss", @@ -20683,7 +21043,7 @@ "heroId": 41119, "spineName": "zhaoyun_qiangchurulong", "rSpineName": "LH_zhaoyun_qiangchurulong", - "name": "枪出如龙*赵云", + "name": "枪出如龙", "actorId": 19, "face_id": "zy_qiangchurulong", "quality": 3, @@ -20723,7 +21083,7 @@ "heroId": 41122, "spineName": "zhugeliang_liannuwuhou", "rSpineName": "LH_zhugelinag_liannuwuhou", - "name": "连弩武侯*诸葛亮", + "name": "连弩武侯", "actorId": 22, "face_id": "zgl_wuhouliannu", "quality": 3, @@ -21003,7 +21363,7 @@ "heroId": 41138, "spineName": "sunshangxiang_hongxiuxiaoji", "rSpineName": "LH_sunshangxiang_hongxiuxiaoji", - "name": "红袖枭姬*孙尚香", + "name": "红袖枭姬", "actorId": 38, "face_id": "ssx_hongxiuxiaoji", "quality": 2, @@ -21043,7 +21403,7 @@ "heroId": 41140, "spineName": "xiaoqiao_quwuzhougu", "rSpineName": "LH_xiaoqiao_quwuzhougu", - "name": "曲误周顾*小乔", + "name": "曲误周顾", "actorId": 40, "face_id": "xq_quwuzhougu", "quality": 3, @@ -21123,7 +21483,7 @@ "heroId": 41144, "spineName": "lvbu_wushuangfeijiang", "rSpineName": "LH_lvbu_wushuangfeijiang", - "name": "无双飞将*吕布", + "name": "无双飞将", "actorId": 44, "face_id": "lb_wushuangfeijiang", "quality": 3, @@ -21163,7 +21523,7 @@ "heroId": 41153, "spineName": "xiahouqingyi_shaonvwuxia", "rSpineName": "LH_xiahouqingyi_shaonvwuxia", - "name": "少女无暇*夏侯轻衣", + "name": "少女无暇", "actorId": 53, "face_id": "xhqy_shaonvwuxia", "quality": 2, @@ -21203,7 +21563,7 @@ "heroId": 41156, "spineName": "diaochan_nvchucheng", "rSpineName": "LH_diaochan_nvchucheng", - "name": "有女初成*貂蝉", + "name": "有女初成", "actorId": 56, "face_id": "dc_younvchucheng", "quality": 3, @@ -21243,7 +21603,7 @@ "heroId": 41200, "spineName": "xiahouqingyii_zhongjiayingzi", "rSpineName": "LH_xiahouqingyi_zhongjiayingzi", - "name": "重甲英姿*夏侯轻衣", + "name": "重甲英姿", "actorId": 53, "face_id": "xhqy_zhongjiayingzi", "quality": 2, @@ -21283,7 +21643,7 @@ "heroId": 41201, "spineName": "xiahouqingyi_lingbojianyi", "rSpineName": "LH_xiahouqingyi_lingbojianyi", - "name": "凌波剑意*夏侯轻衣", + "name": "凌波剑意", "actorId": 53, "face_id": "xhqy_lingbojianyi", "quality": 2, @@ -21323,9 +21683,9 @@ "heroId": 41202, "spineName": "zhaoyun_yinqiangbaima", "rSpineName": "LH_zhaoyun_yinqiangbaima", - "name": "银枪白马*赵云", + "name": "银枪白马", "actorId": 19, - "face_id": "zhaoyun", + "face_id": "zy_baimayinqiang", "quality": 3, "initialStars": 3, "pieceCount": 80, diff --git a/shared/resource/jsons/dic_zyz_shop.json b/shared/resource/jsons/dic_zyz_shop.json index 264f4c155..6485584c4 100644 --- a/shared/resource/jsons/dic_zyz_shop.json +++ b/shared/resource/jsons/dic_zyz_shop.json @@ -761,7 +761,7 @@ { "id": 5001, "goodid": 41122, - "goodname": "连弩武侯*诸葛亮", + "goodname": "连弩武侯", "shop": 5, "type": 7, "guildlvlimit": "&", @@ -784,7 +784,7 @@ { "id": 5002, "goodid": 41138, - "goodname": "红袖枭姬*孙尚香", + "goodname": "红袖枭姬", "shop": 5, "type": 7, "guildlvlimit": "&", @@ -807,7 +807,7 @@ { "id": 5003, "goodid": 41144, - "goodname": "无双飞将*吕布", + "goodname": "无双飞将", "shop": 5, "type": 12, "guildlvlimit": "&", @@ -830,7 +830,7 @@ { "id": 5004, "goodid": 41156, - "goodname": "有女初成*貂蝉", + "goodname": "有女初成", "shop": 5, "type": 12, "guildlvlimit": "&",