From 9229af420f2b865acc24524e309edc8aef6b503f Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Wed, 15 Mar 2023 18:00:47 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20build(=E6=95=B0=E5=80=BC):=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=99=E5=B0=9A=E9=A6=99=E4=B8=93=E5=B1=9E?=
 =?UTF-8?q?=E5=AE=9D=E7=89=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource/jsons/dic_zyz_giftPackage.json   |  16 +--
 .../jsons/dic_zyz_giftPackagePlan.json        | 112 +++++++++++-------
 shared/resource/jsons/dic_zyz_shop.json       |  19 +++
 3 files changed, 93 insertions(+), 54 deletions(-)

diff --git a/shared/resource/jsons/dic_zyz_giftPackage.json b/shared/resource/jsons/dic_zyz_giftPackage.json
index 1089dff50..e95d6a801 100644
--- a/shared/resource/jsons/dic_zyz_giftPackage.json
+++ b/shared/resource/jsons/dic_zyz_giftPackage.json
@@ -414,17 +414,17 @@
     },
     {
         "id": 60,
-        "des": "郭嘉/诸葛亮/周瑜专属宝物自选箱",
+        "des": "专属宝物自选箱",
         "type": 2,
         "count": 1,
-        "reward": "2&83001&1|2&83101&1|2&83201&1"
+        "reward": "2&83001&1|2&83101&1|2&83201&1|2&83901&1"
     },
     {
         "id": 61,
-        "des": "三国策士随机宝物宝箱",
+        "des": "上品专属宝物箱",
         "type": 3,
         "count": 1,
-        "reward": "2&82101&1|2&82102&1|2&82103&1|2&82106&1|2&82121&1|2&82122&1|2&82123&1|2&82126&1|2&82201&1|2&82202&1|2&82203&1|2&82206&1|2&82221&1|2&82222&1|2&82223&1|2&82226&1|2&82301&1|2&82302&1|2&82303&1|2&82306&1|2&82321&1|2&82322&1|2&82323&1|2&82326&1|2&82401&1|2&82402&1|2&82403&1|2&82406&1|2&82421&1|2&82422&1|2&82423&1|2&82426&1|2&82501&1|2&82502&1|2&82503&1|2&82506&1|2&82521&1|2&82522&1|2&82523&1|2&82526&1|2&82601&1|2&82602&1|2&82603&1|2&82606&1|2&82621&1|2&82622&1|2&82623&1|2&82626&1|2&82701&1|2&82702&1|2&82703&1|2&82706&1|2&82721&1|2&82722&1|2&82723&1|2&82726&1|2&83001&1|2&83101&1|2&83201&1"
+        "reward": "2&82101&1|2&82102&1|2&82103&1|2&82106&1|2&82121&1|2&82122&1|2&82123&1|2&82126&1|2&82201&1|2&82202&1|2&82203&1|2&82206&1|2&82221&1|2&82222&1|2&82223&1|2&82226&1|2&82301&1|2&82302&1|2&82303&1|2&82306&1|2&82321&1|2&82322&1|2&82323&1|2&82326&1|2&82401&1|2&82402&1|2&82403&1|2&82406&1|2&82421&1|2&82422&1|2&82423&1|2&82426&1|2&82501&1|2&82502&1|2&82503&1|2&82506&1|2&82521&1|2&82522&1|2&82523&1|2&82526&1|2&82601&1|2&82602&1|2&82603&1|2&82606&1|2&82621&1|2&82622&1|2&82623&1|2&82626&1|2&82701&1|2&82702&1|2&82703&1|2&82706&1|2&82721&1|2&82722&1|2&82723&1|2&82726&1|2&83001&1|2&83101&1|2&83201&1|2&83901&1"
     },
     {
         "id": 62,
@@ -477,28 +477,28 @@
     },
     {
         "id": 69,
-        "des": "每日宝物礼包",
+        "des": "上品通用宝物箱",
         "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"
     },
     {
         "id": 70,
-        "des": "每周宝物礼包",
+        "des": "精选专属宝物箱",
         "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&71060&1"
     },
     {
         "id": 71,
-        "des": "橙色宝物自选宝箱",
+        "des": "上品通用宝物自选箱",
         "type": 2,
         "count": 1,
         "reward": "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"
     },
     {
         "id": 72,
-        "des": "红色宝物随机宝箱",
+        "des": "极品通用宝物箱",
         "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"
diff --git a/shared/resource/jsons/dic_zyz_giftPackagePlan.json b/shared/resource/jsons/dic_zyz_giftPackagePlan.json
index a2514df0a..d9a0bcd5c 100644
--- a/shared/resource/jsons/dic_zyz_giftPackagePlan.json
+++ b/shared/resource/jsons/dic_zyz_giftPackagePlan.json
@@ -12659,13 +12659,23 @@
         "floor": 0,
         "备注": "凤尾琴"
     },
+    {
+        "id": 60004,
+        "giftPackageId": 60,
+        "contentType": 2,
+        "content": 83901,
+        "count": 1,
+        "weight": 1,
+        "floor": 0,
+        "备注": "落英天香弓"
+    },
     {
         "id": 61001,
         "giftPackageId": 61,
         "contentType": 2,
         "content": 82101,
         "count": 1,
-        "weight": 336,
+        "weight": 224,
         "floor": 0,
         "备注": "蓝色尚方剑"
     },
@@ -12675,7 +12685,7 @@
         "contentType": 2,
         "content": 82121,
         "count": 1,
-        "weight": 336,
+        "weight": 224,
         "floor": 0,
         "备注": "蓝色握奇经"
     },
@@ -12685,7 +12695,7 @@
         "contentType": 2,
         "content": 82201,
         "count": 1,
-        "weight": 336,
+        "weight": 224,
         "floor": 0,
         "备注": "蓝色黄钺斧"
     },
@@ -12695,7 +12705,7 @@
         "contentType": 2,
         "content": 82221,
         "count": 1,
-        "weight": 336,
+        "weight": 224,
         "floor": 0,
         "备注": "蓝色断魂枪"
     },
@@ -12705,7 +12715,7 @@
         "contentType": 2,
         "content": 82301,
         "count": 1,
-        "weight": 336,
+        "weight": 224,
         "floor": 0,
         "备注": "蓝色穿龙槊"
     },
@@ -12715,7 +12725,7 @@
         "contentType": 2,
         "content": 82321,
         "count": 1,
-        "weight": 336,
+        "weight": 224,
         "floor": 0,
         "备注": "蓝色铁甲马"
     },
@@ -12725,7 +12735,7 @@
         "contentType": 2,
         "content": 82401,
         "count": 1,
-        "weight": 336,
+        "weight": 224,
         "floor": 0,
         "备注": "蓝色龙雀刀"
     },
@@ -12735,7 +12745,7 @@
         "contentType": 2,
         "content": 82421,
         "count": 1,
-        "weight": 336,
+        "weight": 224,
         "floor": 0,
         "备注": "蓝色吞云盾"
     },
@@ -12745,7 +12755,7 @@
         "contentType": 2,
         "content": 82501,
         "count": 1,
-        "weight": 336,
+        "weight": 224,
         "floor": 0,
         "备注": "蓝色神臂弓"
     },
@@ -12755,7 +12765,7 @@
         "contentType": 2,
         "content": 82521,
         "count": 1,
-        "weight": 336,
+        "weight": 224,
         "floor": 0,
         "备注": "蓝色镇天箭"
     },
@@ -12765,7 +12775,7 @@
         "contentType": 2,
         "content": 82601,
         "count": 1,
-        "weight": 336,
+        "weight": 224,
         "floor": 0,
         "备注": "蓝色博浪锥"
     },
@@ -12775,7 +12785,7 @@
         "contentType": 2,
         "content": 82621,
         "count": 1,
-        "weight": 336,
+        "weight": 224,
         "floor": 0,
         "备注": "蓝色鱼肠剑"
     },
@@ -12785,7 +12795,7 @@
         "contentType": 2,
         "content": 82701,
         "count": 1,
-        "weight": 336,
+        "weight": 224,
         "floor": 0,
         "备注": "蓝色神木鼎"
     },
@@ -12795,7 +12805,7 @@
         "contentType": 2,
         "content": 82721,
         "count": 1,
-        "weight": 336,
+        "weight": 224,
         "floor": 0,
         "备注": "蓝色太平要术"
     },
@@ -12805,7 +12815,7 @@
         "contentType": 2,
         "content": 82102,
         "count": 1,
-        "weight": 246,
+        "weight": 164,
         "floor": 0,
         "备注": "紫色尚方剑"
     },
@@ -12815,7 +12825,7 @@
         "contentType": 2,
         "content": 82122,
         "count": 1,
-        "weight": 246,
+        "weight": 164,
         "floor": 0,
         "备注": "紫色握奇经"
     },
@@ -12825,7 +12835,7 @@
         "contentType": 2,
         "content": 82202,
         "count": 1,
-        "weight": 246,
+        "weight": 164,
         "floor": 0,
         "备注": "紫色黄钺斧"
     },
@@ -12835,7 +12845,7 @@
         "contentType": 2,
         "content": 82222,
         "count": 1,
-        "weight": 246,
+        "weight": 164,
         "floor": 0,
         "备注": "紫色断魂枪"
     },
@@ -12845,7 +12855,7 @@
         "contentType": 2,
         "content": 82302,
         "count": 1,
-        "weight": 246,
+        "weight": 164,
         "floor": 0,
         "备注": "紫色穿龙槊"
     },
@@ -12855,7 +12865,7 @@
         "contentType": 2,
         "content": 82322,
         "count": 1,
-        "weight": 246,
+        "weight": 164,
         "floor": 0,
         "备注": "紫色铁甲马"
     },
@@ -12865,7 +12875,7 @@
         "contentType": 2,
         "content": 82402,
         "count": 1,
-        "weight": 246,
+        "weight": 164,
         "floor": 0,
         "备注": "紫色龙雀刀"
     },
@@ -12875,7 +12885,7 @@
         "contentType": 2,
         "content": 82422,
         "count": 1,
-        "weight": 246,
+        "weight": 164,
         "floor": 0,
         "备注": "紫色吞云盾"
     },
@@ -12885,7 +12895,7 @@
         "contentType": 2,
         "content": 82502,
         "count": 1,
-        "weight": 246,
+        "weight": 164,
         "floor": 0,
         "备注": "紫色神臂弓"
     },
@@ -12895,7 +12905,7 @@
         "contentType": 2,
         "content": 82522,
         "count": 1,
-        "weight": 246,
+        "weight": 164,
         "floor": 0,
         "备注": "紫色镇天箭"
     },
@@ -12905,7 +12915,7 @@
         "contentType": 2,
         "content": 82602,
         "count": 1,
-        "weight": 246,
+        "weight": 164,
         "floor": 0,
         "备注": "紫色博浪锥"
     },
@@ -12915,7 +12925,7 @@
         "contentType": 2,
         "content": 82622,
         "count": 1,
-        "weight": 246,
+        "weight": 164,
         "floor": 0,
         "备注": "紫色鱼肠剑"
     },
@@ -12925,7 +12935,7 @@
         "contentType": 2,
         "content": 82702,
         "count": 1,
-        "weight": 246,
+        "weight": 164,
         "floor": 0,
         "备注": "紫色神木鼎"
     },
@@ -12935,7 +12945,7 @@
         "contentType": 2,
         "content": 82722,
         "count": 1,
-        "weight": 246,
+        "weight": 164,
         "floor": 0,
         "备注": "紫色太平要术"
     },
@@ -12945,7 +12955,7 @@
         "contentType": 2,
         "content": 82103,
         "count": 1,
-        "weight": 15,
+        "weight": 10,
         "floor": 1,
         "备注": "橙色尚方剑"
     },
@@ -12955,7 +12965,7 @@
         "contentType": 2,
         "content": 82123,
         "count": 1,
-        "weight": 15,
+        "weight": 10,
         "floor": 1,
         "备注": "橙色握奇经"
     },
@@ -12965,7 +12975,7 @@
         "contentType": 2,
         "content": 82203,
         "count": 1,
-        "weight": 15,
+        "weight": 10,
         "floor": 1,
         "备注": "橙色黄钺斧"
     },
@@ -12975,7 +12985,7 @@
         "contentType": 2,
         "content": 82223,
         "count": 1,
-        "weight": 15,
+        "weight": 10,
         "floor": 1,
         "备注": "橙色断魂枪"
     },
@@ -12985,7 +12995,7 @@
         "contentType": 2,
         "content": 82303,
         "count": 1,
-        "weight": 15,
+        "weight": 10,
         "floor": 1,
         "备注": "橙色穿龙槊"
     },
@@ -12995,7 +13005,7 @@
         "contentType": 2,
         "content": 82323,
         "count": 1,
-        "weight": 15,
+        "weight": 10,
         "floor": 1,
         "备注": "橙色铁甲马"
     },
@@ -13005,7 +13015,7 @@
         "contentType": 2,
         "content": 82403,
         "count": 1,
-        "weight": 15,
+        "weight": 10,
         "floor": 1,
         "备注": "橙色龙雀刀"
     },
@@ -13015,7 +13025,7 @@
         "contentType": 2,
         "content": 82423,
         "count": 1,
-        "weight": 15,
+        "weight": 10,
         "floor": 1,
         "备注": "橙色吞云盾"
     },
@@ -13025,7 +13035,7 @@
         "contentType": 2,
         "content": 82503,
         "count": 1,
-        "weight": 15,
+        "weight": 10,
         "floor": 1,
         "备注": "橙色神臂弓"
     },
@@ -13035,7 +13045,7 @@
         "contentType": 2,
         "content": 82523,
         "count": 1,
-        "weight": 15,
+        "weight": 10,
         "floor": 1,
         "备注": "橙色镇天箭"
     },
@@ -13045,7 +13055,7 @@
         "contentType": 2,
         "content": 82603,
         "count": 1,
-        "weight": 15,
+        "weight": 10,
         "floor": 1,
         "备注": "橙色博浪锥"
     },
@@ -13055,7 +13065,7 @@
         "contentType": 2,
         "content": 82623,
         "count": 1,
-        "weight": 15,
+        "weight": 10,
         "floor": 1,
         "备注": "橙色鱼肠剑"
     },
@@ -13065,7 +13075,7 @@
         "contentType": 2,
         "content": 82703,
         "count": 1,
-        "weight": 15,
+        "weight": 10,
         "floor": 1,
         "备注": "橙色神木鼎"
     },
@@ -13075,7 +13085,7 @@
         "contentType": 2,
         "content": 82723,
         "count": 1,
-        "weight": 15,
+        "weight": 10,
         "floor": 1,
         "备注": "橙色太平要术"
     },
@@ -13085,7 +13095,7 @@
         "contentType": 2,
         "content": 83001,
         "count": 1,
-        "weight": 14,
+        "weight": 7,
         "floor": 2,
         "备注": "兵法廿四篇"
     },
@@ -13095,7 +13105,7 @@
         "contentType": 2,
         "content": 83101,
         "count": 1,
-        "weight": 14,
+        "weight": 7,
         "floor": 2,
         "备注": "杜康樽"
     },
@@ -13105,10 +13115,20 @@
         "contentType": 2,
         "content": 83201,
         "count": 1,
-        "weight": 14,
+        "weight": 7,
         "floor": 2,
         "备注": "凤尾琴"
     },
+    {
+        "id": 61046,
+        "giftPackageId": 61,
+        "contentType": 2,
+        "content": 83901,
+        "count": 1,
+        "weight": 7,
+        "floor": 2,
+        "备注": "落英天香弓"
+    },
     {
         "id": 62001,
         "giftPackageId": 62,
@@ -15807,7 +15827,7 @@
         "count": 1,
         "weight": 14,
         "floor": 2,
-        "备注": "郭嘉/诸葛亮/周瑜专属宝物自选箱"
+        "备注": "郭嘉/诸葛亮/周瑜/孙尚香专属宝物自选箱"
     },
     {
         "id": 71001,
diff --git a/shared/resource/jsons/dic_zyz_shop.json b/shared/resource/jsons/dic_zyz_shop.json
index 43222d02f..6b1b43b05 100644
--- a/shared/resource/jsons/dic_zyz_shop.json
+++ b/shared/resource/jsons/dic_zyz_shop.json
@@ -493,6 +493,25 @@
         "vipPurchaseLimit": 0,
         "seasonNum": 0
     },
+    {
+        "id": 2205,
+        "goodId": 83901,
+        "goodName": "落英天香弓",
+        "num": 1,
+        "shop": 2,
+        "type": 21,
+        "guildLvLimit": 3,
+        "lvLimit": 0,
+        "ranklimit": 0,
+        "purchaseLimit": 1,
+        "refreshType": 2,
+        "money": 40016,
+        "price": "1&100000",
+        "chosen": 0,
+        "indirectId": 0,
+        "vipPurchaseLimit": 0,
+        "seasonNum": 0
+    },
     {
         "id": 3002,
         "goodId": 17042,