diff --git a/shared/resource/jsons/dic_goods.json b/shared/resource/jsons/dic_goods.json index f9e036400..e753050d1 100644 --- a/shared/resource/jsons/dic_goods.json +++ b/shared/resource/jsons/dic_goods.json @@ -1426,7 +1426,7 @@ "timelimit": 0, "gift": 0, "randomShow": 1, - "seasonNum": 1, + "seasonNum": 0, "info": "枪出如龙（赵云）头像" }, { @@ -1847,6 +1847,50 @@ "seasonNum": 0, "info": "烈火救主（典韦）头像" }, + { + "good_id": 11287, + "name": "朱明祝融头像", + "quality": 1, + "image_id": 41107, + "itid": 50, + "goodType": 9, + "urType": 0, + "redPoint": 0, + "decomposeItem": "&", + "hid": 0, + "getWays": "&", + "addGetWay": "&", + "useWays": "&", + "value": 0, + "condition": "8&11287", + "timelimit": 0, + "gift": 0, + "randomShow": 1, + "seasonNum": 0, + "info": "朱明集会2023专属头像" + }, + { + "good_id": 11288, + "name": "枪剑合一头像", + "quality": 1, + "image_id": 41219, + "itid": 50, + "goodType": 9, + "urType": 0, + "redPoint": 0, + "decomposeItem": "&", + "hid": 0, + "getWays": "&", + "addGetWay": "&", + "useWays": "&", + "value": 0, + "condition": "7&41219", + "timelimit": 0, + "gift": 0, + "randomShow": 1, + "seasonNum": 1, + "info": "朱明集会2023专属头像" + }, { "good_id": 11301, "name": "新人头像框", @@ -2287,6 +2331,50 @@ "seasonNum": 3, "info": "第三赛季巅峰演武季军专属" }, + { + "good_id": 11329, + "name": "百步穿杨头像框", + "quality": 3, + "image_id": "ceshi", + "itid": 51, + "goodType": 10, + "urType": 0, + "redPoint": 0, + "decomposeItem": "&", + "hid": 0, + "getWays": "&", + "addGetWay": "&", + "useWays": "&", + "value": 0, + "condition": "8&11329", + "timelimit": 0, + "gift": 0, + "randomShow": 0, + "seasonNum": 0, + "info": "朱明集会2023射戏·连珠成就头像框" + }, + { + "good_id": 11330, + "name": "五谷丰登头像框", + "quality": 3, + "image_id": "ceshi", + "itid": 51, + "goodType": 10, + "urType": 0, + "redPoint": 0, + "decomposeItem": "&", + "hid": 0, + "getWays": "&", + "addGetWay": "&", + "useWays": "&", + "value": 0, + "condition": "8&11330", + "timelimit": 0, + "gift": 0, + "randomShow": 0, + "seasonNum": 0, + "info": "朱明集会2023辨戏·五谷成就头像框" + }, { "good_id": 11401, "name": "曹操形象", @@ -3472,7 +3560,7 @@ "timelimit": 0, "gift": 0, "randomShow": 1, - "seasonNum": 1, + "seasonNum": 0, "info": "枪出如龙（赵云）的形象" }, { @@ -3937,6 +4025,28 @@ "seasonNum": 0, "info": "烈火救主（典韦）的形象" }, + { + "good_id": 12472, + "name": "枪剑合一形象", + "quality": 1, + "image_id": 41219, + "itid": 52, + "goodType": 11, + "urType": 0, + "redPoint": 0, + "decomposeItem": "&", + "hid": 0, + "getWays": "&", + "addGetWay": "&", + "useWays": "&", + "value": 0, + "condition": "7&41219", + "timelimit": 0, + "gift": 0, + "randomShow": 1, + "seasonNum": 1, + "info": "烈火救主（典韦）的形象" + }, { "good_id": 15001, "name": "逐鹿中原城池守卫头像", @@ -9229,14 +9339,14 @@ "decomposeItem": "&", "hid": 0, "getWays": "1000&", - "addGetWay": "1&156&41119|2&88&1", + "addGetWay": "&", "useWays": "&", "value": 0, "condition": 0, "timelimit": 0, "gift": 0, "randomShow": 0, - "seasonNum": 1, + "seasonNum": 0, "info": "苍龙裂天穹，龙枪震乾坤。一枪既出，有龙吟震天，恍如封龙出山，火凤伏首，气贯长虹。" }, { @@ -9591,6 +9701,28 @@ "seasonNum": 0, "info": "涯角枪，白龙驹，银鳞铠，素锦袍。龙驹银枪震界桥，白袍飞将初显名。" }, + { + "good_id": 41219, + "name": "枪剑合一", + "quality": 3, + "image_id": 1, + "itid": 39, + "goodType": 13, + "urType": 0, + "redPoint": 0, + "decomposeItem": "&", + "hid": 0, + "getWays": "1000&", + "addGetWay": "1&156&41119|2&88&1", + "useWays": "&", + "value": 0, + "condition": 0, + "timelimit": 0, + "gift": 0, + "randomShow": 0, + "seasonNum": 1, + "info": "&" + }, { "good_id": 41256, "name": "顾鉴媚影", @@ -10240,7 +10372,7 @@ "redPoint": 0, "decomposeItem": "40007&60", "hid": 0, - "getWays": "151&50005|81|90", + "getWays": "151&50005", "addGetWay": "&", "useWays": "140&", "value": 0, @@ -12627,6 +12759,50 @@ "seasonNum": 0, "info": "打开后随机获得1件宝物，概率如下：下品宝物 55%；中品宝物 40%；上品宝物 4%；极品宝物 1%（40次内必得1件上品或上品以上宝物，100次内必得1件极品宝物）\r\n必得上品宝物：（%d/%d）\r\n必得极品宝物：（%d/%d）" }, + { + "good_id": 71073, + "name": "朱明祭祀豪华宝箱", + "quality": 4, + "image_id": "gaojibaoxiang", + "itid": 24, + "goodType": 1, + "urType": 0, + "redPoint": 1, + "decomposeItem": "&", + "hid": 0, + "getWays": "163&", + "addGetWay": "&", + "useWays": "&", + "value": 0, + "condition": 0, + "timelimit": 0, + "gift": 73, + "randomShow": 0, + "seasonNum": 0, + "info": "朱明集会火神祭祀材料箱，打开后可获得1000岩脉赤铁、1000极地铬石和1000矿心镍沙" + }, + { + "good_id": 71074, + "name": "朱明祭祀基础宝箱", + "quality": 3, + "image_id": "zhongjibaoxiang", + "itid": 24, + "goodType": 1, + "urType": 0, + "redPoint": 1, + "decomposeItem": "&", + "hid": 0, + "getWays": "163&", + "addGetWay": "&", + "useWays": "&", + "value": 0, + "condition": 0, + "timelimit": 0, + "gift": 74, + "randomShow": 0, + "seasonNum": 0, + "info": "朱明集会火神祭祀材料箱，打开后可获得100岩脉赤铁、100极地铬石和100矿心镍沙" + }, { "good_id": 72001, "name": "烧肉", diff --git a/shared/resource/jsons/dic_pvp_boxReward.json b/shared/resource/jsons/dic_pvp_boxReward.json index f10b3f647..25e762d17 100644 --- a/shared/resource/jsons/dic_pvp_boxReward.json +++ b/shared/resource/jsons/dic_pvp_boxReward.json @@ -67,7 +67,7 @@ "seasonNum": 1, "index": 10, "winTimes": 100, - "reward": "41119&1" + "reward": "41219&1" }, { "id": 201, diff --git a/shared/resource/jsons/dic_zyz_fashions.json b/shared/resource/jsons/dic_zyz_fashions.json index 3d7959afe..4fc2500aa 100644 --- a/shared/resource/jsons/dic_zyz_fashions.json +++ b/shared/resource/jsons/dic_zyz_fashions.json @@ -233,6 +233,15 @@ "skinQuality": 1, "cv": "宁冀荣" }, + { + "goodId": 41219, + "name": "枪剑合一", + "heroId": 41219, + "globalAttr": "1&0.5|2&0.5|4&0.5|5&0.5", + "actorId": 19, + "skinQuality": 1, + "cv": "宁冀荣" + }, { "goodId": 41020, "name": "初出茅庐", diff --git a/shared/resource/jsons/dic_zyz_giftPackage.json b/shared/resource/jsons/dic_zyz_giftPackage.json index 5fad8aef3..76fac0302 100644 --- a/shared/resource/jsons/dic_zyz_giftPackage.json +++ b/shared/resource/jsons/dic_zyz_giftPackage.json @@ -502,5 +502,19 @@ "type": 3, "count": 1, "reward": "2&82101&1|2&82121&1|2&82201&1|2&82221&1|2&82301&1|2&82321&1|2&82401&1|2&82421&1|2&82501&1|2&82521&1|2&82601&1|2&82621&1|2&82701&1|2&82721&1|2&82102&1|2&82122&1|2&82202&1|2&82222&1|2&82302&1|2&82322&1|2&82402&1|2&82422&1|2&82502&1|2&82522&1|2&82602&1|2&82622&1|2&82702&1|2&82722&1|2&82103&1|2&82123&1|2&82203&1|2&82223&1|2&82303&1|2&82323&1|2&82403&1|2&82423&1|2&82503&1|2&82523&1|2&82603&1|2&82623&1|2&82703&1|2&82723&1|2&82106&1|2&82126&1|2&82206&1|2&82226&1|2&82306&1|2&82326&1|2&82406&1|2&82426&1|2&82506&1|2&82526&1|2&82606&1|2&82626&1|2&82706&1|2&82726&1" + }, + { + "id": 73, + "des": "火神祭祀豪华宝箱", + "type": 1, + "count": 3, + "reward": "2&73001&1000|2&73002&1000|2&73003&1000" + }, + { + "id": 74, + "des": "火神祭祀豪华宝箱", + "type": 1, + "count": 3, + "reward": "2&73001&100|2&73002&100|2&73003&100" } ] \ No newline at end of file diff --git a/shared/resource/jsons/dic_zyz_giftPackagePlan.json b/shared/resource/jsons/dic_zyz_giftPackagePlan.json index 3af8bcae7..22721c3cf 100644 --- a/shared/resource/jsons/dic_zyz_giftPackagePlan.json +++ b/shared/resource/jsons/dic_zyz_giftPackagePlan.json @@ -16528,5 +16528,65 @@ "weight": 1, "floor": 3, "备注": "红色太平要术" + }, + { + "id": 72057, + "giftPackageId": 73, + "contentType": 2, + "content": 73001, + "count": 1000, + "weight": 1, + "floor": 0, + "备注": "岩脉赤铁" + }, + { + "id": 72058, + "giftPackageId": 73, + "contentType": 2, + "content": 73002, + "count": 1000, + "weight": 1, + "floor": 0, + "备注": "极地铬石" + }, + { + "id": 72059, + "giftPackageId": 73, + "contentType": 2, + "content": 73003, + "count": 1000, + "weight": 1, + "floor": 0, + "备注": "矿心镍沙" + }, + { + "id": 72060, + "giftPackageId": 74, + "contentType": 2, + "content": 73001, + "count": 100, + "weight": 1, + "floor": 0, + "备注": "岩脉赤铁" + }, + { + "id": 72061, + "giftPackageId": 74, + "contentType": 2, + "content": 73002, + "count": 100, + "weight": 1, + "floor": 0, + "备注": "极地铬石" + }, + { + "id": 72062, + "giftPackageId": 74, + "contentType": 2, + "content": 73003, + "count": 100, + "weight": 1, + "floor": 0, + "备注": "矿心镍沙" } ] \ No newline at end of file diff --git a/shared/resource/jsons/dic_zyz_shop.json b/shared/resource/jsons/dic_zyz_shop.json index 8b0dcc1bf..570fa66a0 100644 --- a/shared/resource/jsons/dic_zyz_shop.json +++ b/shared/resource/jsons/dic_zyz_shop.json @@ -1426,7 +1426,7 @@ }, { "id": 5605, - "goodId": 41119, + "goodId": 41219, "goodName": "枪出如龙", "num": 1, "shop": 5,