diff --git a/shared/resource/jsons/dic_zyz_giftPackage.json b/shared/resource/jsons/dic_zyz_giftPackage.json
index 2bfbfdbda..2036df829 100644
--- a/shared/resource/jsons/dic_zyz_giftPackage.json
+++ b/shared/resource/jsons/dic_zyz_giftPackage.json
@@ -116,21 +116,21 @@
         "des": "将魂全选礼包",
         "type": 1,
         "count": 0,
-        "reward": "2&21001&9999|2&21002&9999|2&21003&9999|2&21004&9999|2&21005&9999|2&21007&9999|2&21008&9999|2&21010&9999|2&21011&9999|2&21012&9999|2&21013&9999|2&21014&9999|2&21015&9999|2&21016&9999|2&21017&9999|2&21018&9999|2&21019&9999|2&21020&9999|2&21021&9999|2&21022&9999|2&21024&9999|2&21025&9999|2&21026&9999|2&21027&9999|2&21028&9999|2&21030&9999|2&21031&9999|2&21032&9999|2&21033&9999|2&21034&9999|2&21035&9999|2&21036&9999|2&21037&9999|2&21038&9999|2&21040&9999|2&21041&9999|2&21044&9999|2&21045&9999|2&21046&9999|2&21047&9999|2&21049&9999|2&21050&9999|2&21051&9999|2&21052&9999|2&21053&9999|2&21054&9999|2&21055&9999|2&21056&9999|2&21062&9999|2&21063&9999|2&21064&9999|2&17001&99999|2&21042&9999|2&21039&9999"
+        "reward": "2&21001&9999|2&21002&9999|2&21003&9999|2&21004&9999|2&21005&9999|2&21007&9999|2&21008&9999|2&21010&9999|2&21011&9999|2&21012&9999|2&21013&9999|2&21014&9999|2&21015&9999|2&21016&9999|2&21017&9999|2&21018&9999|2&21019&9999|2&21020&9999|2&21021&9999|2&21022&9999|2&21024&9999|2&21025&9999|2&21026&9999|2&21027&9999|2&21028&9999|2&21030&9999|2&21031&9999|2&21032&9999|2&21033&9999|2&21034&9999|2&21035&9999|2&21036&9999|2&21037&9999|2&21038&9999|2&21040&9999|2&21041&9999|2&21044&9999|2&21045&9999|2&21046&9999|2&21047&9999|2&21049&9999|2&21050&9999|2&21051&9999|2&21052&9999|2&21053&9999|2&21054&9999|2&21055&9999|2&21056&9999|2&21062&9999|2&21063&9999|2&21064&9999|2&17001&99999|2&21042&9999|2&21039&9999|2&21023&9999"
     },
     {
         "id": 18,
         "des": "将魂自选礼包",
         "type": 2,
         "count": 1,
-        "reward": "2&21001&9999|2&21002&9999|2&21003&9999|2&21004&9999|2&21005&9999|2&21007&9999|2&21008&9999|2&21010&9999|2&21011&9999|2&21012&9999|2&21013&9999|2&21014&9999|2&21015&9999|2&21016&9999|2&21017&9999|2&21018&9999|2&21019&9999|2&21020&9999|2&21021&9999|2&21022&9999|2&21024&9999|2&21025&9999|2&21026&9999|2&21027&9999|2&21028&9999|2&21030&9999|2&21031&9999|2&21032&9999|2&21033&9999|2&21034&9999|2&21035&9999|2&21036&9999|2&21037&9999|2&21038&9999|2&21040&9999|2&21041&9999|2&21044&9999|2&21045&9999|2&21046&9999|2&21047&9999|2&21049&9999|2&21050&9999|2&21051&9999|2&21052&9999|2&21053&9999|2&21054&9999|2&21055&9999|2&21056&9999|2&21062&9999|2&21063&9999|2&21064&9999|2&21042&9999|2&21039&9999|2&17001&99999"
+        "reward": "2&21001&9999|2&21002&9999|2&21003&9999|2&21004&9999|2&21005&9999|2&21007&9999|2&21008&9999|2&21010&9999|2&21011&9999|2&21012&9999|2&21013&9999|2&21014&9999|2&21015&9999|2&21016&9999|2&21017&9999|2&21018&9999|2&21019&9999|2&21020&9999|2&21021&9999|2&21022&9999|2&21024&9999|2&21025&9999|2&21026&9999|2&21027&9999|2&21028&9999|2&21030&9999|2&21031&9999|2&21032&9999|2&21033&9999|2&21034&9999|2&21035&9999|2&21036&9999|2&21037&9999|2&21038&9999|2&21040&9999|2&21041&9999|2&21044&9999|2&21045&9999|2&21046&9999|2&21047&9999|2&21049&9999|2&21050&9999|2&21051&9999|2&21052&9999|2&21053&9999|2&21054&9999|2&21055&9999|2&21056&9999|2&21062&9999|2&21063&9999|2&21064&9999|2&21042&9999|2&21039&9999|2&21023&9999|2&17001&99999"
     },
     {
         "id": 19,
         "des": "将魂随机礼包",
         "type": 3,
         "count": 1,
-        "reward": "2&21001&9999|2&21002&9999|2&21003&9999|2&21004&9999|2&21005&9999|2&21007&9999|2&21008&9999|2&21010&9999|2&21011&9999|2&21012&9999|2&21013&9999|2&21014&9999|2&21015&9999|2&21016&9999|2&21017&9999|2&21018&9999|2&21019&9999|2&21020&9999|2&21021&9999|2&21022&9999|2&21024&9999|2&21025&9999|2&21026&9999|2&21027&9999|2&21028&9999|2&21030&9999|2&21031&9999|2&21032&9999|2&21033&9999|2&21034&9999|2&21035&9999|2&21036&9999|2&21037&9999|2&21038&9999|2&21040&9999|2&21041&9999|2&21044&9999|2&21045&9999|2&21046&9999|2&21047&9999|2&21049&9999|2&21050&9999|2&21051&9999|2&21052&9999|2&21053&9999|2&21054&9999|2&21055&9999|2&21056&9999|2&21062&9999|2&21063&9999|2&21064&9999|2&21042&9999|2&21039&9999|2&17001&99999"
+        "reward": "2&21001&9999|2&21002&9999|2&21003&9999|2&21004&9999|2&21005&9999|2&21007&9999|2&21008&9999|2&21010&9999|2&21011&9999|2&21012&9999|2&21013&9999|2&21014&9999|2&21015&9999|2&21016&9999|2&21017&9999|2&21018&9999|2&21019&9999|2&21020&9999|2&21021&9999|2&21022&9999|2&21024&9999|2&21025&9999|2&21026&9999|2&21027&9999|2&21028&9999|2&21030&9999|2&21031&9999|2&21032&9999|2&21033&9999|2&21034&9999|2&21035&9999|2&21036&9999|2&21037&9999|2&21038&9999|2&21040&9999|2&21041&9999|2&21044&9999|2&21045&9999|2&21046&9999|2&21047&9999|2&21049&9999|2&21050&9999|2&21051&9999|2&21052&9999|2&21053&9999|2&21054&9999|2&21055&9999|2&21056&9999|2&21062&9999|2&21063&9999|2&21064&9999|2&21042&9999|2&21039&9999|2&21023&9999|2&17001&99999"
     },
     {
         "id": 20,
@@ -144,7 +144,7 @@
         "des": "传奇武将随机将魂",
         "type": 3,
         "count": 1,
-        "reward": "2&21001&1|2&21002&1|2&21003&1|2&21004&1|2&21005&1|2&21007&1|2&21017&1|2&21018&1|2&21020&1|2&21021&1|2&21022&1|2&21024&1|2&21032&1|2&21033&1|2&21034&1|2&21035&1|2&21038&1|2&21040&1|2&21041&1|2&21044&1|2&21045&1|2&21046&1|2&21047&1|2&21049&1|2&21056&1|2&21065&1|2&21042&1|2&21039&1"
+        "reward": "2&21001&1|2&21002&1|2&21003&1|2&21004&1|2&21005&1|2&21007&1|2&21017&1|2&21018&1|2&21020&1|2&21021&1|2&21022&1|2&21024&1|2&21032&1|2&21033&1|2&21034&1|2&21035&1|2&21038&1|2&21040&1|2&21041&1|2&21044&1|2&21045&1|2&21046&1|2&21047&1|2&21049&1|2&21056&1|2&21065&1|2&21042&1|2&21039&1|2&21023&1"
     },
     {
         "id": 22,
@@ -158,21 +158,21 @@
         "des": "传奇武将将魂任选宝箱II",
         "type": 2,
         "count": 1,
-        "reward": "2&21001&80|2&21002&80|2&21003&80|2&21004&80|2&21005&80|2&21007&80|2&21015&80|2&21017&80|2&21018&80|2&21020&80|2&21021&80|2&21022&80|2&21024&80|2&21032&80|2&21033&80|2&21034&80|2&21035&80|2&21038&80|2&21040&80|2&21041&80|2&21044&80|2&21045&80|2&21046&80|2&21047&80|2&21049&80|2&21056&80|2&21065&80|2&21042&80|2&21039&80"
+        "reward": "2&21001&80|2&21002&80|2&21003&80|2&21004&80|2&21005&80|2&21007&80|2&21015&80|2&21017&80|2&21018&80|2&21020&80|2&21021&80|2&21022&80|2&21024&80|2&21032&80|2&21033&80|2&21034&80|2&21035&80|2&21038&80|2&21040&80|2&21041&80|2&21044&80|2&21045&80|2&21046&80|2&21047&80|2&21049&80|2&21056&80|2&21065&80|2&21042&80|2&21039&80|2&21023&80"
     },
     {
         "id": 24,
         "des": "传奇武将将魂任选宝箱III",
         "type": 2,
         "count": 1,
-        "reward": "2&21001&120|2&21002&120|2&21003&120|2&21004&120|2&21005&120|2&21007&120|2&21015&120|2&21017&120|2&21018&120|2&21020&120|2&21021&120|2&21022&120|2&21024&120|2&21032&120|2&21033&120|2&21034&120|2&21035&120|2&21038&120|2&21040&120|2&21041&120|2&21044&120|2&21045&120|2&21046&120|2&21047&120|2&21049&120|2&21056&120|2&21065&120|2&21042&120|2&21039&120"
+        "reward": "2&21001&120|2&21002&120|2&21003&120|2&21004&120|2&21005&120|2&21007&120|2&21015&120|2&21017&120|2&21018&120|2&21020&120|2&21021&120|2&21022&120|2&21024&120|2&21032&120|2&21033&120|2&21034&120|2&21035&120|2&21038&120|2&21040&120|2&21041&120|2&21044&120|2&21045&120|2&21046&120|2&21047&120|2&21049&120|2&21056&120|2&21065&120|2&21042&120|2&21039&120|2&21023&120"
     },
     {
         "id": 25,
         "des": "传奇武将将魂任选宝箱V",
         "type": 2,
         "count": 1,
-        "reward": "2&21001&240|2&21002&240|2&21003&240|2&21004&240|2&21005&240|2&21007&240|2&21015&240|2&21017&240|2&21018&240|2&21019&240|2&21020&240|2&21021&240|2&21022&240|2&21024&240|2&21032&240|2&21033&240|2&21034&240|2&21035&240|2&21040&240|2&21041&240|2&21044&240|2&21045&240|2&21046&240|2&21047&240|2&21049&240|2&21056&240|2&21065&240|2&21042&240|2&21039&240"
+        "reward": "2&21001&240|2&21002&240|2&21003&240|2&21004&240|2&21005&240|2&21007&240|2&21015&240|2&21017&240|2&21018&240|2&21019&240|2&21020&240|2&21021&240|2&21022&240|2&21024&240|2&21032&240|2&21033&240|2&21034&240|2&21035&240|2&21040&240|2&21041&240|2&21044&240|2&21045&240|2&21046&240|2&21047&240|2&21049&240|2&21056&240|2&21065&240|2&21042&240|2&21039&240|2&21023&240"
     },
     {
         "id": 26,
@@ -186,14 +186,14 @@
         "des": "传奇武将将魂随机宝箱II",
         "type": 3,
         "count": 1,
-        "reward": "2&21001&40|2&21002&40|2&21003&40|2&21004&40|2&21005&40|2&21007&40|2&21015&40|2&21017&40|2&21018&40|2&21020&40|2&21021&40|2&21022&40|2&21024&40|2&21032&40|2&21033&40|2&21034&40|2&21035&40|2&21038&40|2&21040&40|2&21041&40|2&21044&40|2&21045&40|2&21046&40|2&21047&40|2&21049&40|2&21056&40|2&21065&40|2&21042&40|2&21039&40"
+        "reward": "2&21001&40|2&21002&40|2&21003&40|2&21004&40|2&21005&40|2&21007&40|2&21015&40|2&21017&40|2&21018&40|2&21020&40|2&21021&40|2&21022&40|2&21024&40|2&21032&40|2&21033&40|2&21034&40|2&21035&40|2&21038&40|2&21040&40|2&21041&40|2&21044&40|2&21045&40|2&21046&40|2&21047&40|2&21049&40|2&21056&40|2&21065&40|2&21042&40|2&21039&40|2&21023&40"
     },
     {
         "id": 28,
         "des": "传奇武将将魂任选宝箱IV",
         "type": 2,
         "count": 1,
-        "reward": "2&21001&160|2&21002&160|2&21003&160|2&21004&160|2&21005&160|2&21007&160|2&21015&160|2&21017&160|2&21018&160|2&21020&160|2&21021&160|2&21022&160|2&21024&160|2&21032&160|2&21033&160|2&21034&160|2&21035&160|2&21038&160|2&21040&160|2&21041&160|2&21044&160|2&21045&160|2&21046&160|2&21047&160|2&21049&160|2&21056&160|2&21065&160|2&21042&160|2&21039&160"
+        "reward": "2&21001&160|2&21002&160|2&21003&160|2&21004&160|2&21005&160|2&21007&160|2&21015&160|2&21017&160|2&21018&160|2&21020&160|2&21021&160|2&21022&160|2&21024&160|2&21032&160|2&21033&160|2&21034&160|2&21035&160|2&21038&160|2&21040&160|2&21041&160|2&21044&160|2&21045&160|2&21046&160|2&21047&160|2&21049&160|2&21056&160|2&21065&160|2&21042&160|2&21039&160|2&21023&160"
     },
     {
         "id": 29,
@@ -207,14 +207,14 @@
         "des": "传奇武将将魂随机宝箱I",
         "type": 3,
         "count": 1,
-        "reward": "2&21001&10|2&21002&10|2&21003&10|2&21004&10|2&21005&10|2&21007&10|2&21015&10|2&21017&10|2&21018&10|2&21020&10|2&21021&10|2&21022&10|2&21024&10|2&21032&10|2&21033&10|2&21034&10|2&21035&10|2&21038&10|2&21040&10|2&21041&10|2&21044&10|2&21045&10|2&21046&10|2&21047&10|2&21049&10|2&21056&10|2&21065&10|2&21042&10|2&21039&10"
+        "reward": "2&21001&10|2&21002&10|2&21003&10|2&21004&10|2&21005&10|2&21007&10|2&21015&10|2&21017&10|2&21018&10|2&21020&10|2&21021&10|2&21022&10|2&21024&10|2&21032&10|2&21033&10|2&21034&10|2&21035&10|2&21038&10|2&21040&10|2&21041&10|2&21044&10|2&21045&10|2&21046&10|2&21047&10|2&21049&10|2&21056&10|2&21065&10|2&21042&10|2&21039&10|2&21023&10"
     },
     {
         "id": 31,
         "des": "传奇武将将魂任选宝箱I",
         "type": 2,
         "count": 1,
-        "reward": "2&21001&10|2&21002&10|2&21003&10|2&21004&10|2&21005&10|2&21007&10|2&21015&10|2&21017&10|2&21018&10|2&21020&10|2&21021&10|2&21022&10|2&21024&10|2&21032&10|2&21033&10|2&21034&10|2&21035&10|2&21038&10|2&21040&10|2&21041&10|2&21044&10|2&21045&10|2&21046&10|2&21047&10|2&21049&10|2&21056&10|2&21065&10|2&21042&10|2&21039&10"
+        "reward": "2&21001&10|2&21002&10|2&21003&10|2&21004&10|2&21005&10|2&21007&10|2&21015&10|2&21017&10|2&21018&10|2&21020&10|2&21021&10|2&21022&10|2&21024&10|2&21032&10|2&21033&10|2&21034&10|2&21035&10|2&21038&10|2&21040&10|2&21041&10|2&21044&10|2&21045&10|2&21046&10|2&21047&10|2&21049&10|2&21056&10|2&21065&10|2&21042&10|2&21039&10|2&21023&10"
     },
     {
         "id": 32,
@@ -333,7 +333,7 @@
         "des": "传奇武将将魂随机宝箱II",
         "type": 3,
         "count": 1,
-        "reward": "2&21001&80|2&21002&80|2&21003&80|2&21004&80|2&21005&80|2&21007&80|2&21015&80|2&21017&80|2&21018&80|2&21020&80|2&21021&80|2&21022&80|2&21024&80|2&21032&80|2&21033&80|2&21034&80|2&21035&80|2&21038&80|2&21040&80|2&21041&80|2&21044&80|2&21045&80|2&21046&80|2&21047&80|2&21049&80|2&21056&80|2&21065&80|2&21042&80|2&21039&80"
+        "reward": "2&21001&80|2&21002&80|2&21003&80|2&21004&80|2&21005&80|2&21007&80|2&21015&80|2&21017&80|2&21018&80|2&21020&80|2&21021&80|2&21022&80|2&21024&80|2&21032&80|2&21033&80|2&21034&80|2&21035&80|2&21038&80|2&21040&80|2&21041&80|2&21044&80|2&21045&80|2&21046&80|2&21047&80|2&21049&80|2&21056&80|2&21065&80|2&21042&80|2&21039&80|2&21023&80"
     },
     {
         "id": 49,
@@ -578,7 +578,7 @@
         "des": "自选橙色将灵礼包",
         "type": 2,
         "count": 1,
-        "reward": "2&110001&1|2&110002&1|2&110003&1|2&110004&1|2&110005&1|2&110007&1|2&110015&1|2&110017&1|2&110018&1|2&110020&1|2&110021&1|2&110022&1|2&110023&1|2&110024&1|2&110032&1|2&110033&1|2&110034&1|2&110035&1|2&110038&1|2&110039&1|2&110040&1|2&110041&1|2&110042&1|2&110044&1|2&110045&1|2&110046&1|2&110047&1|2&110049&1|2&110056&1|2&110065&1"
+        "reward": "2&110001&1|2&110002&1|2&110003&1|2&110004&1|2&110005&1|2&110007&1|2&110015&1|2&110017&1|2&110018&1|2&110020&1|2&110021&1|2&110022&1|2&110024&1|2&110032&1|2&110033&1|2&110034&1|2&110035&1|2&110038&1|2&110039&1|2&110040&1|2&110041&1|2&110042&1|2&110044&1|2&110045&1|2&110046&1|2&110047&1|2&110049&1|2&110056&1|2&110065&1"
     },
     {
         "id": 84,
@@ -606,7 +606,7 @@
         "des": "随机橙色将灵礼包",
         "type": 3,
         "count": 1,
-        "reward": "2&110001&1|2&110002&1|2&110003&1|2&110004&1|2&110005&1|2&110007&1|2&110015&1|2&110017&1|2&110018&1|2&110020&1|2&110021&1|2&110022&1|2&110023&1|2&110024&1|2&110032&1|2&110033&1|2&110034&1|2&110035&1|2&110038&1|2&110039&1|2&110040&1|2&110041&1|2&110042&1|2&110044&1|2&110045&1|2&110046&1|2&110047&1|2&110049&1|2&110056&1|2&110065&1"
+        "reward": "2&110001&1|2&110002&1|2&110003&1|2&110004&1|2&110005&1|2&110007&1|2&110015&1|2&110017&1|2&110018&1|2&110020&1|2&110021&1|2&110022&1|2&110024&1|2&110032&1|2&110033&1|2&110034&1|2&110035&1|2&110038&1|2&110039&1|2&110040&1|2&110041&1|2&110042&1|2&110044&1|2&110045&1|2&110046&1|2&110047&1|2&110049&1|2&110056&1|2&110065&1"
     },
     {
         "id": 88,
diff --git a/shared/resource/jsons/dic_zyz_giftPackagePlan.json b/shared/resource/jsons/dic_zyz_giftPackagePlan.json
index 83d301d46..d82faf3ef 100644
--- a/shared/resource/jsons/dic_zyz_giftPackagePlan.json
+++ b/shared/resource/jsons/dic_zyz_giftPackagePlan.json
@@ -4109,6 +4109,16 @@
         "floor": 0,
         "备注": "吴国太将魂"
     },
+    {
+        "id": 17055,
+        "giftPackageId": 17,
+        "contentType": 2,
+        "content": 21023,
+        "count": 9999,
+        "weight": 1,
+        "floor": 0,
+        "备注": "沙摩柯将魂"
+    },
     {
         "id": 18001,
         "giftPackageId": 18,
@@ -4643,6 +4653,16 @@
         "id": 18054,
         "giftPackageId": 18,
         "contentType": 2,
+        "content": 21023,
+        "count": 9999,
+        "weight": 1,
+        "floor": 0,
+        "备注": "沙摩柯将魂"
+    },
+    {
+        "id": 18055,
+        "giftPackageId": 18,
+        "contentType": 2,
         "content": 17001,
         "count": 99999,
         "weight": 1,
@@ -5183,6 +5203,16 @@
         "id": 19054,
         "giftPackageId": 19,
         "contentType": 2,
+        "content": 21023,
+        "count": 9999,
+        "weight": 1,
+        "floor": 0,
+        "备注": "沙摩柯将魂"
+    },
+    {
+        "id": 19055,
+        "giftPackageId": 19,
+        "contentType": 2,
         "content": 17001,
         "count": 99999,
         "weight": 1,
@@ -7529,6 +7559,16 @@
         "floor": 0,
         "备注": "吴国太将魂"
     },
+    {
+        "id": 21029,
+        "giftPackageId": 21,
+        "contentType": 2,
+        "content": 21023,
+        "count": 1,
+        "weight": 1,
+        "floor": 0,
+        "备注": "沙摩柯将魂"
+    },
     {
         "id": 22001,
         "giftPackageId": 22,
@@ -7859,6 +7899,16 @@
         "floor": 0,
         "备注": "吴国太将魂"
     },
+    {
+        "id": 23030,
+        "giftPackageId": 23,
+        "contentType": 2,
+        "content": 21023,
+        "count": 80,
+        "weight": 1,
+        "floor": 0,
+        "备注": "沙摩柯将魂"
+    },
     {
         "id": 24001,
         "giftPackageId": 24,
@@ -8149,6 +8199,16 @@
         "floor": 0,
         "备注": "吴国太将魂"
     },
+    {
+        "id": 24030,
+        "giftPackageId": 24,
+        "contentType": 2,
+        "content": 21023,
+        "count": 120,
+        "weight": 1,
+        "floor": 0,
+        "备注": "沙摩柯将魂"
+    },
     {
         "id": 25001,
         "giftPackageId": 25,
@@ -8439,6 +8499,16 @@
         "floor": 0,
         "备注": "吴国太将魂"
     },
+    {
+        "id": 25030,
+        "giftPackageId": 25,
+        "contentType": 2,
+        "content": 21023,
+        "count": 240,
+        "weight": 1,
+        "floor": 0,
+        "备注": "沙摩柯将魂"
+    },
     {
         "id": 26001,
         "giftPackageId": 26,
@@ -8759,6 +8829,16 @@
         "floor": 0,
         "备注": "吴国太将魂"
     },
+    {
+        "id": 27030,
+        "giftPackageId": 27,
+        "contentType": 2,
+        "content": 21023,
+        "count": 40,
+        "weight": 1,
+        "floor": 0,
+        "备注": "沙摩柯将魂"
+    },
     {
         "id": 28001,
         "giftPackageId": 28,
@@ -9049,6 +9129,16 @@
         "floor": 0,
         "备注": "吴国太将魂"
     },
+    {
+        "id": 28030,
+        "giftPackageId": 28,
+        "contentType": 2,
+        "content": 21023,
+        "count": 160,
+        "weight": 1,
+        "floor": 0,
+        "备注": "沙摩柯将魂"
+    },
     {
         "id": 30001,
         "giftPackageId": 30,
@@ -9339,6 +9429,16 @@
         "floor": 0,
         "备注": "吴国太将魂"
     },
+    {
+        "id": 30030,
+        "giftPackageId": 30,
+        "contentType": 2,
+        "content": 21023,
+        "count": 10,
+        "weight": 1,
+        "floor": 0,
+        "备注": "沙摩柯将魂"
+    },
     {
         "id": 31001,
         "giftPackageId": 31,
@@ -9629,6 +9729,16 @@
         "floor": 0,
         "备注": "吴国太将魂"
     },
+    {
+        "id": 31030,
+        "giftPackageId": 31,
+        "contentType": 2,
+        "content": 21023,
+        "count": 10,
+        "weight": 1,
+        "floor": 0,
+        "备注": "沙摩柯将魂"
+    },
     {
         "id": 32001,
         "giftPackageId": 32,
@@ -10689,6 +10799,16 @@
         "floor": 0,
         "备注": "吴国太将魂"
     },
+    {
+        "id": 48030,
+        "giftPackageId": 48,
+        "contentType": 2,
+        "content": 21023,
+        "count": 80,
+        "weight": 1,
+        "floor": 0,
+        "备注": "沙摩柯将魂"
+    },
     {
         "id": 49001,
         "giftPackageId": 49,
@@ -18183,16 +18303,6 @@
         "id": 83013,
         "giftPackageId": 83,
         "contentType": 2,
-        "content": 110023,
-        "count": 1,
-        "weight": 1,
-        "floor": 0,
-        "备注": "沙摩柯将灵"
-    },
-    {
-        "id": 83014,
-        "giftPackageId": 83,
-        "contentType": 2,
         "content": 110024,
         "count": 1,
         "weight": 1,
@@ -18200,7 +18310,7 @@
         "备注": "魏延将灵"
     },
     {
-        "id": 83015,
+        "id": 83014,
         "giftPackageId": 83,
         "contentType": 2,
         "content": 110032,
@@ -18210,7 +18320,7 @@
         "备注": "周泰将灵"
     },
     {
-        "id": 83016,
+        "id": 83015,
         "giftPackageId": 83,
         "contentType": 2,
         "content": 110033,
@@ -18220,7 +18330,7 @@
         "备注": "孙策将灵"
     },
     {
-        "id": 83017,
+        "id": 83016,
         "giftPackageId": 83,
         "contentType": 2,
         "content": 110034,
@@ -18230,7 +18340,7 @@
         "备注": "周瑜将灵"
     },
     {
-        "id": 83018,
+        "id": 83017,
         "giftPackageId": 83,
         "contentType": 2,
         "content": 110035,
@@ -18240,7 +18350,7 @@
         "备注": "太史慈将灵"
     },
     {
-        "id": 83019,
+        "id": 83018,
         "giftPackageId": 83,
         "contentType": 2,
         "content": 110038,
@@ -18250,7 +18360,7 @@
         "备注": "孙尚香将灵"
     },
     {
-        "id": 83020,
+        "id": 83019,
         "giftPackageId": 83,
         "contentType": 2,
         "content": 110039,
@@ -18260,7 +18370,7 @@
         "备注": "吴国太将灵"
     },
     {
-        "id": 83021,
+        "id": 83020,
         "giftPackageId": 83,
         "contentType": 2,
         "content": 110040,
@@ -18270,7 +18380,7 @@
         "备注": "小乔将灵"
     },
     {
-        "id": 83022,
+        "id": 83021,
         "giftPackageId": 83,
         "contentType": 2,
         "content": 110041,
@@ -18280,7 +18390,7 @@
         "备注": "大乔将灵"
     },
     {
-        "id": 83023,
+        "id": 83022,
         "giftPackageId": 83,
         "contentType": 2,
         "content": 110042,
@@ -18290,7 +18400,7 @@
         "备注": "步练师将灵"
     },
     {
-        "id": 83024,
+        "id": 83023,
         "giftPackageId": 83,
         "contentType": 2,
         "content": 110044,
@@ -18300,7 +18410,7 @@
         "备注": "吕布将灵"
     },
     {
-        "id": 83025,
+        "id": 83024,
         "giftPackageId": 83,
         "contentType": 2,
         "content": 110045,
@@ -18310,7 +18420,7 @@
         "备注": "张任将灵"
     },
     {
-        "id": 83026,
+        "id": 83025,
         "giftPackageId": 83,
         "contentType": 2,
         "content": 110046,
@@ -18320,7 +18430,7 @@
         "备注": "华佗将灵"
     },
     {
-        "id": 83027,
+        "id": 83026,
         "giftPackageId": 83,
         "contentType": 2,
         "content": 110047,
@@ -18330,7 +18440,7 @@
         "备注": "张角将灵"
     },
     {
-        "id": 83028,
+        "id": 83027,
         "giftPackageId": 83,
         "contentType": 2,
         "content": 110049,
@@ -18340,7 +18450,7 @@
         "备注": "高顺将灵"
     },
     {
-        "id": 83029,
+        "id": 83028,
         "giftPackageId": 83,
         "contentType": 2,
         "content": 110056,
@@ -18350,7 +18460,7 @@
         "备注": "貂蝉将灵"
     },
     {
-        "id": 83030,
+        "id": 83029,
         "giftPackageId": 83,
         "contentType": 2,
         "content": 110065,
@@ -18763,16 +18873,6 @@
         "id": 87013,
         "giftPackageId": 87,
         "contentType": 2,
-        "content": 110023,
-        "count": 1,
-        "weight": 1,
-        "floor": 0,
-        "备注": "沙摩柯将灵"
-    },
-    {
-        "id": 87014,
-        "giftPackageId": 87,
-        "contentType": 2,
         "content": 110024,
         "count": 1,
         "weight": 1,
@@ -18780,7 +18880,7 @@
         "备注": "魏延将灵"
     },
     {
-        "id": 87015,
+        "id": 87014,
         "giftPackageId": 87,
         "contentType": 2,
         "content": 110032,
@@ -18790,7 +18890,7 @@
         "备注": "周泰将灵"
     },
     {
-        "id": 87016,
+        "id": 87015,
         "giftPackageId": 87,
         "contentType": 2,
         "content": 110033,
@@ -18800,7 +18900,7 @@
         "备注": "孙策将灵"
     },
     {
-        "id": 87017,
+        "id": 87016,
         "giftPackageId": 87,
         "contentType": 2,
         "content": 110034,
@@ -18810,7 +18910,7 @@
         "备注": "周瑜将灵"
     },
     {
-        "id": 87018,
+        "id": 87017,
         "giftPackageId": 87,
         "contentType": 2,
         "content": 110035,
@@ -18820,7 +18920,7 @@
         "备注": "太史慈将灵"
     },
     {
-        "id": 87019,
+        "id": 87018,
         "giftPackageId": 87,
         "contentType": 2,
         "content": 110038,
@@ -18830,7 +18930,7 @@
         "备注": "孙尚香将灵"
     },
     {
-        "id": 87020,
+        "id": 87019,
         "giftPackageId": 87,
         "contentType": 2,
         "content": 110039,
@@ -18840,7 +18940,7 @@
         "备注": "吴国太将灵"
     },
     {
-        "id": 87021,
+        "id": 87020,
         "giftPackageId": 87,
         "contentType": 2,
         "content": 110040,
@@ -18850,7 +18950,7 @@
         "备注": "小乔将灵"
     },
     {
-        "id": 87022,
+        "id": 87021,
         "giftPackageId": 87,
         "contentType": 2,
         "content": 110041,
@@ -18860,7 +18960,7 @@
         "备注": "大乔将灵"
     },
     {
-        "id": 87023,
+        "id": 87022,
         "giftPackageId": 87,
         "contentType": 2,
         "content": 110042,
@@ -18870,7 +18970,7 @@
         "备注": "步练师将灵"
     },
     {
-        "id": 87024,
+        "id": 87023,
         "giftPackageId": 87,
         "contentType": 2,
         "content": 110044,
@@ -18880,7 +18980,7 @@
         "备注": "吕布将灵"
     },
     {
-        "id": 87025,
+        "id": 87024,
         "giftPackageId": 87,
         "contentType": 2,
         "content": 110045,
@@ -18890,7 +18990,7 @@
         "备注": "张任将灵"
     },
     {
-        "id": 87026,
+        "id": 87025,
         "giftPackageId": 87,
         "contentType": 2,
         "content": 110046,
@@ -18900,7 +19000,7 @@
         "备注": "华佗将灵"
     },
     {
-        "id": 87027,
+        "id": 87026,
         "giftPackageId": 87,
         "contentType": 2,
         "content": 110047,
@@ -18910,7 +19010,7 @@
         "备注": "张角将灵"
     },
     {
-        "id": 87028,
+        "id": 87027,
         "giftPackageId": 87,
         "contentType": 2,
         "content": 110049,
@@ -18920,7 +19020,7 @@
         "备注": "高顺将灵"
     },
     {
-        "id": 87029,
+        "id": 87028,
         "giftPackageId": 87,
         "contentType": 2,
         "content": 110056,
@@ -18930,7 +19030,7 @@
         "备注": "貂蝉将灵"
     },
     {
-        "id": 87030,
+        "id": 87029,
         "giftPackageId": 87,
         "contentType": 2,
         "content": 110065,