diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index f927dc30f..a18a4829f 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -31181,7 +31181,7 @@
     "NPC": 0,
     "value": 10,
     "filter": [
-      10010
+      11001
     ],
     "filter2": []
   },
@@ -31213,7 +31213,7 @@
     "filter2": []
   },
   {
-    "id": 16000001,
+    "id": 11002001,
     "rtype": 1,
     "ctype": 1,
     "notify": [
@@ -31222,6 +31222,493 @@
     "type_sp": 1,
     "tasktxt": {
       "key": "buried_buried_condi_tasktxt_1080",
+      "text": "冒险之旅第二章认识原住民"
+    },
+    "type": 61,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "value": 1,
+    "filter": [
+      1102001
+    ],
+    "filter2": []
+  },
+  {
+    "id": 11002002,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [
+      "achieve"
+    ],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1081",
+      "text": "冒险之旅第二章抢鸟蛋"
+    },
+    "type": 61,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "value": 1,
+    "filter": [
+      1102003
+    ],
+    "filter2": []
+  },
+  {
+    "id": 11002003,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [
+      "achieve"
+    ],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1082",
+      "text": "冒险之旅第二章解开与食人鱼误会"
+    },
+    "type": 61,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "value": 1,
+    "filter": [
+      1102006
+    ],
+    "filter2": []
+  },
+  {
+    "id": 11002004,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [
+      "achieve"
+    ],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1083",
+      "text": "冒险之旅第二章见到3个东西"
+    },
+    "type": 61,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "value": 1,
+    "filter": [
+      1102011
+    ],
+    "filter2": []
+  },
+  {
+    "id": 11002005,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [
+      "achieve"
+    ],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1084",
+      "text": "冒险之旅第二章击败小伊"
+    },
+    "type": 61,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "value": 1,
+    "filter": [
+      1102018
+    ],
+    "filter2": []
+  },
+  {
+    "id": 11002006,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [
+      "achieve"
+    ],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1085",
+      "text": "冒险之旅打败大猩猩"
+    },
+    "type": 61,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "value": 1,
+    "filter": [
+      1102023
+    ],
+    "filter2": []
+  },
+  {
+    "id": 11002007,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [
+      "achieve"
+    ],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1086",
+      "text": "全阵容职业1通关石阵5"
+    },
+    "type": 216,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "value": 1,
+    "filter": [
+      1,
+      10015
+    ],
+    "filter2": []
+  },
+  {
+    "id": 11002008,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [
+      "achieve"
+    ],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1087",
+      "text": "第二章商店购买10件商品"
+    },
+    "type": 236,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "value": 10,
+    "filter": [
+      11002
+    ],
+    "filter2": []
+  },
+  {
+    "id": 11002009,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [
+      "achieve"
+    ],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1088",
+      "text": "完成第二章所有探索"
+    },
+    "type": 61,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "value": 1,
+    "filter": [
+      1102083
+    ],
+    "filter2": []
+  },
+  {
+    "id": 11003001,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [
+      "achieve"
+    ],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1089",
+      "text": "冒险之旅第三章抓住刚越狱的果酱教授"
+    },
+    "type": 61,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "value": 1,
+    "filter": [
+      1103001
+    ],
+    "filter2": []
+  },
+  {
+    "id": 11003002,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [
+      "achieve"
+    ],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1090",
+      "text": "冒险之旅第三章营救沃尔夫"
+    },
+    "type": 61,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "value": 1,
+    "filter": [
+      1103004
+    ],
+    "filter2": []
+  },
+  {
+    "id": 11003003,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [
+      "achieve"
+    ],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1091",
+      "text": "冒险之旅第三章护送月光原石"
+    },
+    "type": 61,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "value": 1,
+    "filter": [
+      1103006
+    ],
+    "filter2": []
+  },
+  {
+    "id": 11003004,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [
+      "achieve"
+    ],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1092",
+      "text": "冒险之旅第三章追击黑衣人"
+    },
+    "type": 61,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "value": 1,
+    "filter": [
+      1103010
+    ],
+    "filter2": []
+  },
+  {
+    "id": 11003005,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [
+      "achieve"
+    ],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1093",
+      "text": "冒险之旅第三章击败豚鼠灵"
+    },
+    "type": 61,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "value": 1,
+    "filter": [
+      1103011
+    ],
+    "filter2": []
+  },
+  {
+    "id": 11003006,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [
+      "achieve"
+    ],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1094",
+      "text": "冒险之旅第三章通关冒险难度挑战"
+    },
+    "type": 61,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "value": 1,
+    "filter": [
+      1103029
+    ],
+    "filter2": []
+  },
+  {
+    "id": 11003007,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [
+      "achieve"
+    ],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1095",
+      "text": "冒险之旅第三章通关困难难度挑战"
+    },
+    "type": 216,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "value": 1,
+    "filter": [
+      1103037
+    ],
+    "filter2": []
+  },
+  {
+    "id": 11003008,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [
+      "achieve"
+    ],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1096",
+      "text": "第三章商店购买10件商品"
+    },
+    "type": 236,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "value": 10,
+    "filter": [
+      11003
+    ],
+    "filter2": []
+  },
+  {
+    "id": 11003009,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [
+      "achieve"
+    ],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1097",
+      "text": "完成第三章所有探索"
+    },
+    "type": 61,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "value": 1,
+    "filter": [
+      1103048
+    ],
+    "filter2": []
+  },
+  {
+    "id": 16000001,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [
+      "achieve"
+    ],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1098",
       "text": "让邦尼兔升到2级"
     },
     "type": 4,
@@ -31248,7 +31735,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1081",
+      "key": "buried_buried_condi_tasktxt_1099",
       "text": "让邦尼兔升到3级"
     },
     "type": 4,
@@ -31275,7 +31762,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1082",
+      "key": "buried_buried_condi_tasktxt_1100",
       "text": "让邦尼兔升到4级"
     },
     "type": 4,
@@ -31302,7 +31789,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1083",
+      "key": "buried_buried_condi_tasktxt_1101",
       "text": "让邦尼兔升到5级"
     },
     "type": 4,
@@ -31329,7 +31816,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1084",
+      "key": "buried_buried_condi_tasktxt_1102",
       "text": "让邦尼兔升到6级"
     },
     "type": 4,
@@ -31356,7 +31843,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1085",
+      "key": "buried_buried_condi_tasktxt_1103",
       "text": "让邦尼兔升到7级"
     },
     "type": 4,
@@ -31383,7 +31870,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1086",
+      "key": "buried_buried_condi_tasktxt_1104",
       "text": "让邦尼兔升到8级"
     },
     "type": 4,
@@ -31410,7 +31897,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1087",
+      "key": "buried_buried_condi_tasktxt_1105",
       "text": "让邦尼兔升到9级"
     },
     "type": 4,
@@ -31437,7 +31924,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1088",
+      "key": "buried_buried_condi_tasktxt_1106",
       "text": "让邦尼兔升到10级"
     },
     "type": 4,
@@ -31464,7 +31951,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1089",
+      "key": "buried_buried_condi_tasktxt_1107",
       "text": "让邦尼兔升到11级"
     },
     "type": 4,
@@ -31491,7 +31978,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1090",
+      "key": "buried_buried_condi_tasktxt_1108",
       "text": "让邦尼兔升到12级"
     },
     "type": 4,
@@ -31518,7 +32005,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1091",
+      "key": "buried_buried_condi_tasktxt_1109",
       "text": "让邦尼兔升到13级"
     },
     "type": 4,
@@ -31545,7 +32032,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1092",
+      "key": "buried_buried_condi_tasktxt_1110",
       "text": "让邦尼兔升到14级"
     },
     "type": 4,
@@ -31572,7 +32059,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1093",
+      "key": "buried_buried_condi_tasktxt_1111",
       "text": "让邦尼兔升到15级"
     },
     "type": 4,
@@ -31599,7 +32086,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1094",
+      "key": "buried_buried_condi_tasktxt_1112",
       "text": "让邦尼兔升到16级"
     },
     "type": 4,
@@ -31626,7 +32113,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1095",
+      "key": "buried_buried_condi_tasktxt_1113",
       "text": "让邦尼兔升到17级"
     },
     "type": 4,
@@ -31653,7 +32140,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1096",
+      "key": "buried_buried_condi_tasktxt_1114",
       "text": "让邦尼兔升到18级"
     },
     "type": 4,
@@ -31680,7 +32167,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1097",
+      "key": "buried_buried_condi_tasktxt_1115",
       "text": "让邦尼兔升到19级"
     },
     "type": 4,
@@ -31707,7 +32194,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1098",
+      "key": "buried_buried_condi_tasktxt_1116",
       "text": "让邦尼兔升到20级"
     },
     "type": 4,
@@ -31734,7 +32221,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1099",
+      "key": "buried_buried_condi_tasktxt_1117",
       "text": "让邦尼兔升到21级"
     },
     "type": 4,
@@ -31761,7 +32248,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1100",
+      "key": "buried_buried_condi_tasktxt_1118",
       "text": "让邦尼兔升到22级"
     },
     "type": 4,
@@ -31788,7 +32275,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1101",
+      "key": "buried_buried_condi_tasktxt_1119",
       "text": "让邦尼兔升到23级"
     },
     "type": 4,
@@ -31815,7 +32302,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1102",
+      "key": "buried_buried_condi_tasktxt_1120",
       "text": "让邦尼兔升到24级"
     },
     "type": 4,
@@ -31842,7 +32329,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1103",
+      "key": "buried_buried_condi_tasktxt_1121",
       "text": "让邦尼兔升到25级"
     },
     "type": 4,
@@ -31869,7 +32356,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1104",
+      "key": "buried_buried_condi_tasktxt_1122",
       "text": "让邦尼兔升到26级"
     },
     "type": 4,
@@ -31896,7 +32383,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1105",
+      "key": "buried_buried_condi_tasktxt_1123",
       "text": "让邦尼兔升到27级"
     },
     "type": 4,
@@ -31923,7 +32410,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1106",
+      "key": "buried_buried_condi_tasktxt_1124",
       "text": "让邦尼兔升到28级"
     },
     "type": 4,
@@ -31950,7 +32437,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1107",
+      "key": "buried_buried_condi_tasktxt_1125",
       "text": "让邦尼兔升到29级"
     },
     "type": 4,
@@ -31977,7 +32464,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1108",
+      "key": "buried_buried_condi_tasktxt_1126",
       "text": "让邦尼兔升到30级"
     },
     "type": 4,
@@ -32004,7 +32491,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1109",
+      "key": "buried_buried_condi_tasktxt_1127",
       "text": "让邦尼兔升到31级"
     },
     "type": 4,
@@ -32031,7 +32518,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1110",
+      "key": "buried_buried_condi_tasktxt_1128",
       "text": "让邦尼兔升到32级"
     },
     "type": 4,
@@ -32058,7 +32545,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1111",
+      "key": "buried_buried_condi_tasktxt_1129",
       "text": "让邦尼兔升到33级"
     },
     "type": 4,
@@ -32085,7 +32572,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1112",
+      "key": "buried_buried_condi_tasktxt_1130",
       "text": "让邦尼兔升到34级"
     },
     "type": 4,
@@ -32112,7 +32599,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1113",
+      "key": "buried_buried_condi_tasktxt_1131",
       "text": "让邦尼兔升到35级"
     },
     "type": 4,
@@ -32139,7 +32626,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1114",
+      "key": "buried_buried_condi_tasktxt_1132",
       "text": "让邦尼兔升到36级"
     },
     "type": 4,
@@ -32166,7 +32653,7 @@
     ],
     "type_sp": 1,
     "tasktxt": {
-      "key": "buried_buried_condi_tasktxt_1115",
+      "key": "buried_buried_condi_tasktxt_1133",
       "text": "让邦尼兔升到37级"
     },
     "type": 4,
diff --git a/bin/json/game_consumebox.json b/bin/json/game_consumebox.json
index 2c5611fd6..2f701e406 100644
--- a/bin/json/game_consumebox.json
+++ b/bin/json/game_consumebox.json
@@ -1,22 +1,98 @@
 [
   {
-    "boxid": 27000100,
-    "cd": 5
+    "boxid": 1001,
+    "color": 0,
+    "name": {
+      "key": "",
+      "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
+    },
+    "icon": "",
+    "group": 0,
+    "cd": 0,
+    "weight": 1000
   },
   {
-    "boxid": 27000101,
-    "cd": 10
+    "boxid": 1002,
+    "color": 1,
+    "name": {
+      "key": "consume_consume_box_name_01",
+      "text": "普通宝箱"
+    },
+    "txt": {
+      "key": "consume_consume_box_txt_01",
+      "text": "普通宝箱，好东西"
+    },
+    "icon": "item_17010001",
+    "group": 18001001,
+    "cd": 5,
+    "weight": 1000
   },
   {
-    "boxid": 27000102,
-    "cd": 15
+    "boxid": 1003,
+    "color": 2,
+    "name": {
+      "key": "consume_consume_box_name_02",
+      "text": "稀有宝箱"
+    },
+    "txt": {
+      "key": "consume_consume_box_txt_02",
+      "text": "稀有宝箱，好东西"
+    },
+    "icon": "item_17020001",
+    "group": 18001002,
+    "cd": 10,
+    "weight": 1000
   },
   {
-    "boxid": 27000103,
-    "cd": 20
+    "boxid": 1004,
+    "color": 3,
+    "name": {
+      "key": "consume_consume_box_name_03",
+      "text": "珍贵宝箱"
+    },
+    "txt": {
+      "key": "consume_consume_box_txt_03",
+      "text": "珍贵宝箱，好东西"
+    },
+    "icon": "item_17030001",
+    "group": 18001003,
+    "cd": 15,
+    "weight": 1000
   },
   {
-    "boxid": 27000104,
-    "cd": 25
+    "boxid": 1005,
+    "color": 4,
+    "name": {
+      "key": "consume_consume_box_name_04",
+      "text": "完美宝箱"
+    },
+    "txt": {
+      "key": "consume_consume_box_txt_04",
+      "text": "完美宝箱，好东西"
+    },
+    "icon": "item_17050001",
+    "group": 17050001,
+    "cd": 20,
+    "weight": 1000
+  },
+  {
+    "boxid": 1006,
+    "color": 5,
+    "name": {
+      "key": "consume_consume_box_name_05",
+      "text": "七彩宝箱"
+    },
+    "txt": {
+      "key": "consume_consume_box_txt_05",
+      "text": "七彩宝箱，好东西"
+    },
+    "icon": "item_17050002",
+    "group": 17050002,
+    "cd": 25,
+    "weight": 1000
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_consumehero.json b/bin/json/game_consumehero.json
index e62454b25..9a588a165 100644
--- a/bin/json/game_consumehero.json
+++ b/bin/json/game_consumehero.json
@@ -48,7 +48,7 @@
         "n": 10
       }
     ],
-    "skilltype": 2,
+    "skilltype": 1,
     "skillload": 7,
     "skilleffect": 2,
     "skillvalue": 0
@@ -138,7 +138,7 @@
         "n": 20
       }
     ],
-    "skilltype": 2,
+    "skilltype": 1,
     "skillload": 7,
     "skilleffect": 5,
     "skillvalue": 0
diff --git a/bin/json/game_consumeintegral.json b/bin/json/game_consumeintegral.json
index 793f44b94..c1b11529e 100644
--- a/bin/json/game_consumeintegral.json
+++ b/bin/json/game_consumeintegral.json
@@ -8,7 +8,11 @@
     "deductrewards": [],
     "name": {
       "key": "consume_consume_integral_name_01",
-      "text": "S1:卧龙凤雏"
+      "text": "三消小游戏"
+    },
+    "txt": {
+      "key": "consume_consume_integral_txt_01",
+      "text": "三消游戏十分的不错，快来玩吧。"
     }
   },
   {
@@ -38,6 +42,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -67,6 +75,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -96,6 +108,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -125,6 +141,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -154,6 +174,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -183,6 +207,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -212,6 +240,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -241,6 +273,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -270,6 +306,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -299,6 +339,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -328,6 +372,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -357,6 +405,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -386,6 +438,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -415,6 +471,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -444,6 +504,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -473,6 +537,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -502,6 +570,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -531,6 +603,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -560,6 +636,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -589,6 +669,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -618,6 +702,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "   ",
+      "text": ""
     }
   },
   {
@@ -647,6 +735,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -676,6 +768,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -705,6 +801,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -734,6 +834,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -763,6 +867,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -792,6 +900,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -821,6 +933,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -850,6 +966,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -879,6 +999,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_integral.json b/bin/json/game_integral.json
index 793f44b94..c1b11529e 100644
--- a/bin/json/game_integral.json
+++ b/bin/json/game_integral.json
@@ -8,7 +8,11 @@
     "deductrewards": [],
     "name": {
       "key": "consume_consume_integral_name_01",
-      "text": "S1:卧龙凤雏"
+      "text": "三消小游戏"
+    },
+    "txt": {
+      "key": "consume_consume_integral_txt_01",
+      "text": "三消游戏十分的不错，快来玩吧。"
     }
   },
   {
@@ -38,6 +42,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -67,6 +75,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -96,6 +108,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -125,6 +141,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -154,6 +174,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -183,6 +207,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -212,6 +240,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -241,6 +273,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -270,6 +306,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -299,6 +339,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -328,6 +372,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -357,6 +405,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -386,6 +438,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -415,6 +471,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -444,6 +504,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -473,6 +537,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -502,6 +570,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -531,6 +603,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -560,6 +636,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -589,6 +669,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -618,6 +702,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "   ",
+      "text": ""
     }
   },
   {
@@ -647,6 +735,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -676,6 +768,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -705,6 +801,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -734,6 +834,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -763,6 +867,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -792,6 +900,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -821,6 +933,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -850,6 +966,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   },
   {
@@ -879,6 +999,10 @@
     "name": {
       "key": "",
       "text": ""
+    },
+    "txt": {
+      "key": "",
+      "text": ""
     }
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_mainachievement.json b/bin/json/game_mainachievement.json
index 9440b4c1f..380c43de4 100644
--- a/bin/json/game_mainachievement.json
+++ b/bin/json/game_mainachievement.json
@@ -157,9 +157,9 @@
     "id": 11002,
     "title": {
       "key": "mainchapter_main_achievement_title_10",
-      "text": "碎片10"
+      "text": "认识原住民"
     },
-    "taskid": 11001001,
+    "taskid": 11002001,
     "reword": [
       {
         "a": "item",
@@ -167,16 +167,16 @@
         "n": 20
       }
     ],
-    "icon": "item_50013001"
+    "icon": "item_10000008"
   },
   {
     "key": 110011,
     "id": 11002,
     "title": {
       "key": "mainchapter_main_achievement_title_11",
-      "text": "碎片11"
+      "text": "抢鸟蛋"
     },
-    "taskid": 11001002,
+    "taskid": 11002002,
     "reword": [
       {
         "a": "item",
@@ -184,16 +184,16 @@
         "n": 20
       }
     ],
-    "icon": "item_50013001"
+    "icon": "item_10000008"
   },
   {
     "key": 110012,
     "id": 11002,
     "title": {
       "key": "mainchapter_main_achievement_title_12",
-      "text": "碎片12"
+      "text": "解开与食人鱼误会"
     },
-    "taskid": 11001003,
+    "taskid": 11002003,
     "reword": [
       {
         "a": "item",
@@ -201,16 +201,16 @@
         "n": 10
       }
     ],
-    "icon": "item_50013001"
+    "icon": "item_10000009"
   },
   {
     "key": 110013,
     "id": 11002,
     "title": {
       "key": "mainchapter_main_achievement_title_13",
-      "text": "碎片13"
+      "text": "见到3个东西"
     },
-    "taskid": 11001004,
+    "taskid": 11002004,
     "reword": [
       {
         "a": "item",
@@ -218,16 +218,16 @@
         "n": 10
       }
     ],
-    "icon": "item_50013001"
+    "icon": "item_10000009"
   },
   {
     "key": 110014,
     "id": 11002,
     "title": {
       "key": "mainchapter_main_achievement_title_14",
-      "text": "碎片14"
+      "text": "击败小伊"
     },
-    "taskid": 11001005,
+    "taskid": 11002005,
     "reword": [
       {
         "a": "item",
@@ -235,16 +235,16 @@
         "n": 15
       }
     ],
-    "icon": "item_50013001"
+    "icon": "item_10000009"
   },
   {
     "key": 110015,
     "id": 11002,
     "title": {
       "key": "mainchapter_main_achievement_title_15",
-      "text": "碎片15"
+      "text": "打败大猩猩"
     },
-    "taskid": 11001006,
+    "taskid": 11002006,
     "reword": [
       {
         "a": "item",
@@ -252,16 +252,16 @@
         "n": 15
       }
     ],
-    "icon": "item_50013001"
+    "icon": "item_10000009"
   },
   {
     "key": 110016,
     "id": 11002,
     "title": {
       "key": "mainchapter_main_achievement_title_16",
-      "text": "碎片16"
+      "text": "全阵容职业1通关石阵5"
     },
-    "taskid": 11001007,
+    "taskid": 11002007,
     "reword": [
       {
         "a": "item",
@@ -269,16 +269,16 @@
         "n": 1
       }
     ],
-    "icon": "item_50013001"
+    "icon": "item_10000001"
   },
   {
     "key": 110017,
     "id": 11002,
     "title": {
       "key": "mainchapter_main_achievement_title_17",
-      "text": "碎片17"
+      "text": "原始购物狂"
     },
-    "taskid": 11001007,
+    "taskid": 11002008,
     "reword": [
       {
         "a": "item",
@@ -286,16 +286,16 @@
         "n": 1
       }
     ],
-    "icon": "item_50013001"
+    "icon": "item_10000001"
   },
   {
     "key": 110018,
     "id": 11002,
     "title": {
       "key": "mainchapter_main_achievement_title_18",
-      "text": "碎片18"
+      "text": "完成第二章所有探索"
     },
-    "taskid": 11001009,
+    "taskid": 11002009,
     "reword": [
       {
         "a": "item",
@@ -303,16 +303,16 @@
         "n": 1
       }
     ],
-    "icon": "item_50013001"
+    "icon": "item_10000001"
   },
   {
     "key": 110019,
     "id": 11003,
     "title": {
       "key": "mainchapter_main_achievement_title_19",
-      "text": "碎片19"
+      "text": "抓住刚越狱的果酱教授"
     },
-    "taskid": 11001001,
+    "taskid": 11003001,
     "reword": [
       {
         "a": "item",
@@ -320,16 +320,16 @@
         "n": 30
       }
     ],
-    "icon": "item_50013001"
+    "icon": "item_10000008"
   },
   {
     "key": 110020,
     "id": 11003,
     "title": {
       "key": "mainchapter_main_achievement_title_20",
-      "text": "碎片20"
+      "text": "营救沃尔夫"
     },
-    "taskid": 11001002,
+    "taskid": 11003002,
     "reword": [
       {
         "a": "item",
@@ -337,16 +337,16 @@
         "n": 30
       }
     ],
-    "icon": "item_50013001"
+    "icon": "item_10000008"
   },
   {
     "key": 110021,
     "id": 11003,
     "title": {
       "key": "mainchapter_main_achievement_title_21",
-      "text": "碎片21"
+      "text": "护送月光原石"
     },
-    "taskid": 11001003,
+    "taskid": 11003003,
     "reword": [
       {
         "a": "item",
@@ -354,16 +354,16 @@
         "n": 15
       }
     ],
-    "icon": "item_50013001"
+    "icon": "item_10000009"
   },
   {
     "key": 110022,
     "id": 11003,
     "title": {
       "key": "mainchapter_main_achievement_title_22",
-      "text": "碎片22"
+      "text": "追击黑衣人"
     },
-    "taskid": 11001004,
+    "taskid": 11003004,
     "reword": [
       {
         "a": "item",
@@ -371,16 +371,16 @@
         "n": 15
       }
     ],
-    "icon": "item_50013001"
+    "icon": "item_10000009"
   },
   {
     "key": 110023,
     "id": 11003,
     "title": {
       "key": "mainchapter_main_achievement_title_23",
-      "text": "碎片23"
+      "text": "击败豚鼠灵"
     },
-    "taskid": 11001005,
+    "taskid": 11003005,
     "reword": [
       {
         "a": "item",
@@ -388,16 +388,16 @@
         "n": 20
       }
     ],
-    "icon": "item_50013001"
+    "icon": "item_10000009"
   },
   {
     "key": 110024,
     "id": 11003,
     "title": {
       "key": "mainchapter_main_achievement_title_24",
-      "text": "碎片24"
+      "text": "通关冒险难度挑战"
     },
-    "taskid": 11001006,
+    "taskid": 11003006,
     "reword": [
       {
         "a": "item",
@@ -405,16 +405,16 @@
         "n": 20
       }
     ],
-    "icon": "item_50013001"
+    "icon": "item_10000009"
   },
   {
     "key": 110025,
     "id": 11003,
     "title": {
       "key": "mainchapter_main_achievement_title_25",
-      "text": "碎片25"
+      "text": "通关困难难度挑战"
     },
-    "taskid": 11001007,
+    "taskid": 11003007,
     "reword": [
       {
         "a": "item",
@@ -422,16 +422,16 @@
         "n": 1
       }
     ],
-    "icon": "item_50013001"
+    "icon": "item_10000001"
   },
   {
     "key": 110026,
     "id": 11003,
     "title": {
       "key": "mainchapter_main_achievement_title_26",
-      "text": "碎片26"
+      "text": "都市购物狂"
     },
-    "taskid": 11001007,
+    "taskid": 11003008,
     "reword": [
       {
         "a": "item",
@@ -439,16 +439,16 @@
         "n": 1
       }
     ],
-    "icon": "item_50013001"
+    "icon": "item_10000001"
   },
   {
     "key": 110027,
     "id": 11003,
     "title": {
       "key": "mainchapter_main_achievement_title_27",
-      "text": "碎片27"
+      "text": "完成第三章所有探索"
     },
-    "taskid": 11001009,
+    "taskid": 11003009,
     "reword": [
       {
         "a": "item",
@@ -456,7 +456,7 @@
         "n": 1
       }
     ],
-    "icon": "item_50013001"
+    "icon": "item_10000001"
   },
   {
     "key": 110028,
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index 98a4ff2ae..57e3d5b54 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -2759,7 +2759,7 @@
     ],
     "BattleReadyID": 10100001,
     "FormatList": [
-      101211,
+      101121,
       101122,
       101123
     ],
diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json
index 0db44f1ec..0e04f18e0 100644
--- a/bin/json/game_worldbattle.json
+++ b/bin/json/game_worldbattle.json
@@ -12,7 +12,24 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 10000
+      },
+      {
+        "a": "item",
+        "t": "10000008",
+        "n": 3
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 20
+      }
+    ]
   },
   {
     "id": 102,
@@ -27,7 +44,29 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 10000
+      },
+      {
+        "a": "item",
+        "t": "10000008",
+        "n": 3
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 20
+      },
+      {
+        "a": "hero",
+        "t": "24004",
+        "n": 1
+      }
+    ]
   },
   {
     "id": 103,
@@ -42,7 +81,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 104,
@@ -57,7 +97,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 105,
@@ -74,7 +115,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 106,
@@ -89,7 +131,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 107,
@@ -106,7 +149,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 108,
@@ -121,7 +165,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 109,
@@ -136,7 +181,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 110,
@@ -151,7 +197,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 111,
@@ -166,7 +213,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 112,
@@ -181,7 +229,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 113,
@@ -196,7 +245,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 114,
@@ -211,7 +261,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 115,
@@ -226,7 +277,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 116,
@@ -241,7 +293,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 117,
@@ -256,7 +309,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 118,
@@ -271,7 +325,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 119,
@@ -286,7 +341,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 120,
@@ -301,7 +357,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 121,
@@ -316,7 +373,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 122,
@@ -331,7 +389,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 123,
@@ -346,7 +405,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 124,
@@ -361,7 +421,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 125,
@@ -376,7 +437,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 126,
@@ -391,7 +453,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 180,
@@ -406,7 +469,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 501,
@@ -421,7 +485,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 502,
@@ -436,7 +501,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 503,
@@ -451,7 +517,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 504,
@@ -466,7 +533,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 505,
@@ -481,7 +549,8 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   },
   {
     "id": 506,
@@ -496,6 +565,7 @@
       "n": 5
     },
     "carexe": 500,
-    "reward": 0
+    "reward": 0,
+    "exreward": []
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index b71cad61f..9cc612c98 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -91,23 +91,7 @@
     "auto_accept": 0,
     "tasktips": 0,
     "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 10000
-      },
-      {
-        "a": "item",
-        "t": "10000008",
-        "n": 3
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 20
-      }
-    ],
+    "reword": [],
     "module": []
   },
   {
@@ -199,28 +183,7 @@
     "auto_accept": 0,
     "tasktips": 0,
     "lock_add": 0,
-    "reword": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 10000
-      },
-      {
-        "a": "item",
-        "t": "10000008",
-        "n": 3
-      },
-      {
-        "a": "attr",
-        "t": "diamond",
-        "n": 20
-      },
-      {
-        "a": "hero",
-        "t": "24004",
-        "n": 1
-      }
-    ],
+    "reword": [],
     "module": []
   },
   {
diff --git a/modules/entertainment/api_boxreward.go b/modules/entertainment/api_boxreward.go
new file mode 100644
index 000000000..22035ccab
--- /dev/null
+++ b/modules/entertainment/api_boxreward.go
@@ -0,0 +1,86 @@
+package entertainment
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+	"go_dreamfactory/sys/configure"
+)
+
+//参数校验
+func (this *apiComp) BoxRewardCheck(session comm.IUserSession, req *pb.EntertainBoxRewardReq) (errdata *pb.ErrorData) {
+	if req.Index < 0 {
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_ReqParameterError,
+			Title: pb.ErrorCode_ReqParameterError.ToString(),
+		}
+	}
+	return
+}
+
+// 赛季奖励
+func (this *apiComp) BoxReward(session comm.IUserSession, req *pb.EntertainBoxRewardReq) (errdata *pb.ErrorData) {
+	var (
+		list *pb.DBXXLData
+		err  error
+		atno []*pb.UserAtno
+	)
+	list, err = this.module.model.getEntertainmList(session.GetUserId())
+	if err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
+	if len(list.Box) <= int(req.Index) {
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_ReqParameterError,
+			Title: pb.ErrorCode_ReqParameterError.ToString(),
+		}
+		return
+	}
+	// 校验时间
+	if configure.Now().Unix() >= list.Box[req.Index].Opentime {
+		list.Box = append(list.Box[:req.Index], list.Box[req.Index+1:]...)
+		this.module.model.modifyEntertainmList(session.GetUserId(), map[string]interface{}{
+			"box": list.Box,
+		})
+		// 发奖
+		if conf, err := this.module.configure.GetGameConsumeBoxConf(list.Box[req.Index].Boxid); err != nil {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ConfigNoFound,
+				Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+				Message: err.Error(),
+			}
+			return
+		} else {
+			user, err := this.module.ModuleUser.GetUser(session.GetUserId())
+			if err != nil {
+				errdata = &pb.ErrorData{
+					Code:    pb.ErrorCode_DBError,
+					Title:   pb.ErrorCode_DBError.ToString(),
+					Message: err.Error(),
+				}
+				return
+			}
+			reward := this.module.ModuleTools.GetGroupDataByLottery(conf.Group, user.Vip, user.Lv)
+			if errdata, atno = this.module.DispenseAtno(session, reward, true); errdata != nil {
+				return
+			}
+		}
+
+	} else { // 时间没到不能开启
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_EntertainBoxEndTime,
+			Title: pb.ErrorCode_EntertainBoxEndTime.ToString(),
+		}
+		return
+	}
+
+	session.SendMsg(string(this.module.GetType()), "boxreward", &pb.EntertainBoxRewardResp{
+		Box:    list.Box,
+		Reward: atno,
+	})
+	return
+}
diff --git a/modules/entertainment/configure.go b/modules/entertainment/configure.go
index 0c6c8d183..bfde45b0d 100644
--- a/modules/entertainment/configure.go
+++ b/modules/entertainment/configure.go
@@ -17,6 +17,7 @@ const (
 	game_integral        = "game_integral.json"
 	game_consumeIntegral = "game_consumeintegral.json"
 	game_playingmethod   = "game_playingmethod.json"
+	consume_box          = "game_consumebox.json"
 )
 
 // /配置管理组件
@@ -37,6 +38,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
 		game_integral:        cfg.NewGameIntegral,
 		game_consumeIntegral: cfg.NewGameConsumeIntegral,
 		game_playingmethod:   cfg.NewGamePlayingMethod,
+		consume_box:          cfg.NewGameConsumeBox,
 	})
 	configure.RegisterConfigure(game_block, cfg.NewGameBlock, this.LoadGameBlock)
 
@@ -197,3 +199,37 @@ func (this *configureComp) GetGameConsumeIntegralByKey(key int32) (conf *cfg.Gam
 	err = comm.NewNotFoundConfErr(moduleName, game_playingmethod, key)
 	return
 }
+
+func (this *configureComp) GetGameConsumeBoxConf(boxid int32) (conf *cfg.GameConsumeBoxData, err error) {
+	var (
+		v interface{}
+	)
+	if v, err = this.GetConfigure(consume_box); err == nil {
+		if configure, ok := v.(*cfg.GameConsumeBox); ok {
+			if conf = configure.Get(boxid); conf != nil {
+				return
+			}
+		}
+	}
+	err = comm.NewNotFoundConfErr(moduleName, consume_box, boxid)
+	return
+}
+
+func (this *configureComp) GetGameRandomConsumeBoxConf() (conf *cfg.GameConsumeBoxData, err error) {
+	var (
+		v        interface{}
+		szWeight []int32
+		boxid    []int32
+	)
+	if v, err = this.GetConfigure(consume_box); err == nil {
+		if configure, ok := v.(*cfg.GameConsumeBox); ok {
+			for _, v1 := range configure.GetDataList() {
+				szWeight = append(szWeight, v1.Weight)
+				boxid = append(boxid, v1.Boxid)
+			}
+		}
+	}
+
+	conf, err = this.GetGameConsumeBoxConf(boxid[comm.GetRandW(szWeight)])
+	return
+}
diff --git a/modules/entertainment/room.go b/modules/entertainment/room.go
index f9f8a7f73..4968fb184 100644
--- a/modules/entertainment/room.go
+++ b/modules/entertainment/room.go
@@ -6,6 +6,7 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/sys/timewheel"
 	"go_dreamfactory/pb"
+	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"time"
 
@@ -534,16 +535,17 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) {
 		winindex   int32
 		bReward    bool
 		res        []*cfg.Gameatn
-		winner     string
+		winner     *pb.PlayerData
 		lostPlayer *pb.PlayerData // 输的玩家
+		box        *pb.BoxData    // 是否可以获得宝箱奖励
 	)
 	if this.operatetimer != nil {
 		timewheel.Remove(this.operatetimer)
 	}
-	winner = this.player1.Userinfo.Uid
+	winner = this.player1
 	bReward = true
 	if this.player1.Score < this.player2.Score {
-		winner = this.player2.Userinfo.Uid
+		winner = this.player2
 		winindex = 1
 		if len(this.szSession) == 1 { // 赢家是AI 的话不发奖
 			bReward = false
@@ -551,7 +553,7 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) {
 	}
 
 	if bReward { // 发奖
-		if user, err := this.module.ModuleUser.GetUser(winner); err == nil {
+		if user, err := this.module.ModuleUser.GetUser(winner.Userinfo.Uid); err == nil {
 			if conf, err := this.module.configure.GetGameConsumeintegral(user.Consumeexp); err == nil {
 				//res = append(res, conf.Onereward...) 这奖励手动领取
 				res = append(res, conf.Rewards...)
@@ -564,7 +566,7 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) {
 	}
 
 	// 失败的一方扣除卡
-	if this.player1.Userinfo.Uid != winner {
+	if this.player1 != winner {
 		lostPlayer = this.player1
 	} else {
 		lostPlayer = this.player2
@@ -582,6 +584,25 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) {
 			}
 		}
 	}
+	// 查看能不能获得箱子
+	if list, err := this.module.model.getEntertainmList(winner.Userinfo.Uid); err == nil {
+		if len(list.Box) <= 3 { // 可以获得一个宝箱
+			if c, err := this.module.configure.GetGameRandomConsumeBoxConf(); err == nil {
+				if c.Color != 0 {
+					box = &pb.BoxData{
+						Boxid:    c.Boxid,
+						Opentime: int64(c.Cd) + configure.Now().Unix(),
+					}
+					list.Box = append(list.Box, box)
+					// 写库
+					this.module.model.modifyEntertainmList(winner.Userinfo.Uid, map[string]interface{}{
+						"box": list.Box,
+					})
+				}
+			}
+
+		}
+	}
 	// 修改房间状态
 	this.Status = 2
 	this.module.SendMsgSyncToSession(string(this.module.GetType()), "gameover", &pb.EntertainGameOverPush{
@@ -592,8 +613,9 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) {
 		},
 		Power:  "", // 清理权限
 		Round:  this.round,
-		Win:    winner,
+		Win:    winner.Userinfo.Uid,
 		Reward: atno,
+		Box:    box,
 	}, this.szSession...)
 	return
 }
diff --git a/pb/entertain_db.pb.go b/pb/entertain_db.pb.go
index e0e5a8cec..c762245e6 100644
--- a/pb/entertain_db.pb.go
+++ b/pb/entertain_db.pb.go
@@ -307,6 +307,61 @@ func (x *DBXXLMatch) GetCardid() string {
 	return ""
 }
 
+type BoxData struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Boxid    int32 `protobuf:"varint,1,opt,name=boxid,proto3" json:"boxid"`       // 宝箱ID
+	Opentime int64 `protobuf:"varint,2,opt,name=opentime,proto3" json:"opentime"` // 开启时间
+}
+
+func (x *BoxData) Reset() {
+	*x = BoxData{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_entertain_entertain_db_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *BoxData) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BoxData) ProtoMessage() {}
+
+func (x *BoxData) ProtoReflect() protoreflect.Message {
+	mi := &file_entertain_entertain_db_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use BoxData.ProtoReflect.Descriptor instead.
+func (*BoxData) Descriptor() ([]byte, []int) {
+	return file_entertain_entertain_db_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *BoxData) GetBoxid() int32 {
+	if x != nil {
+		return x.Boxid
+	}
+	return 0
+}
+
+func (x *BoxData) GetOpentime() int64 {
+	if x != nil {
+		return x.Opentime
+	}
+	return 0
+}
+
 type DBXXLData struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -318,12 +373,14 @@ type DBXXLData struct {
 	Card     map[string]int32 `protobuf:"bytes,4,rep,name=card,proto3" json:"card" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`      // key 卡id  value 数量(可为0)
 	Rtime    int64            `protobuf:"varint,5,opt,name=rtime,proto3" json:"rtime"`                                                                                            // 刷新时间 (客户端不用)
 	Playtype []int32          `protobuf:"varint,6,rep,packed,name=playtype,proto3" json:"playtype"`                                                                               // 每天随机玩法
+	//  map<int32,int64> boxid = 7; // 宝箱 key 宝箱id value 可领取的时间
+	Box []*BoxData `protobuf:"bytes,7,rep,name=box,proto3" json:"box"`
 }
 
 func (x *DBXXLData) Reset() {
 	*x = DBXXLData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_entertain_entertain_db_proto_msgTypes[4]
+		mi := &file_entertain_entertain_db_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -336,7 +393,7 @@ func (x *DBXXLData) String() string {
 func (*DBXXLData) ProtoMessage() {}
 
 func (x *DBXXLData) ProtoReflect() protoreflect.Message {
-	mi := &file_entertain_entertain_db_proto_msgTypes[4]
+	mi := &file_entertain_entertain_db_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -349,7 +406,7 @@ func (x *DBXXLData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DBXXLData.ProtoReflect.Descriptor instead.
 func (*DBXXLData) Descriptor() ([]byte, []int) {
-	return file_entertain_entertain_db_proto_rawDescGZIP(), []int{4}
+	return file_entertain_entertain_db_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *DBXXLData) GetId() string {
@@ -394,6 +451,13 @@ func (x *DBXXLData) GetPlaytype() []int32 {
 	return nil
 }
 
+func (x *DBXXLData) GetBox() []*BoxData {
+	if x != nil {
+		return x.Box
+	}
+	return nil
+}
+
 var File_entertain_entertain_db_proto protoreflect.FileDescriptor
 
 var file_entertain_entertain_db_proto_rawDesc = []byte{
@@ -429,27 +493,33 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{
 	0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73,
 	0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x69, 0x6e, 0x66, 0x6f,
 	0x12, 0x16, 0x0a, 0x06, 0x63, 0x61, 0x72, 0x64, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x06, 0x63, 0x61, 0x72, 0x64, 0x69, 0x64, 0x22, 0xad, 0x02, 0x0a, 0x09, 0x44, 0x42, 0x58,
-	0x58, 0x4c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61,
-	0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c,
-	0x44, 0x61, 0x74, 0x61, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64,
-	0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, 0x61,
-	0x74, 0x61, 0x2e, 0x43, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x63, 0x61,
-	0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x79,
-	0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79,
-	0x74, 0x79, 0x70, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
-	0x37, 0x0a, 0x09, 0x43, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
+	0x52, 0x06, 0x63, 0x61, 0x72, 0x64, 0x69, 0x64, 0x22, 0x3b, 0x0a, 0x07, 0x42, 0x6f, 0x78, 0x44,
+	0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x22, 0xc9, 0x02, 0x0a, 0x09, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44,
+	0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18,
+	0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, 0x61, 0x74,
+	0x61, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72,
+	0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, 0x61, 0x74, 0x61, 0x2e,
+	0x43, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x63, 0x61, 0x72, 0x64, 0x12,
+	0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
+	0x72, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x74, 0x79, 0x70,
+	0x65, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x74, 0x79, 0x70,
+	0x65, 0x12, 0x1a, 0x0a, 0x03, 0x62, 0x6f, 0x78, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x08,
+	0x2e, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74, 0x61, 0x52, 0x03, 0x62, 0x6f, 0x78, 0x1a, 0x39, 0x0a,
+	0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
+	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
 	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x43, 0x61, 0x72, 0x64,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
+	0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
@@ -464,28 +534,30 @@ func file_entertain_entertain_db_proto_rawDescGZIP() []byte {
 	return file_entertain_entertain_db_proto_rawDescData
 }
 
-var file_entertain_entertain_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_entertain_entertain_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
 var file_entertain_entertain_db_proto_goTypes = []interface{}{
 	(*MapData)(nil),      // 0: MapData
 	(*GirdeData)(nil),    // 1: GirdeData
 	(*PlayerData)(nil),   // 2: PlayerData
 	(*DBXXLMatch)(nil),   // 3: DBXXLMatch
-	(*DBXXLData)(nil),    // 4: DBXXLData
-	nil,                  // 5: DBXXLData.RewardEntry
-	nil,                  // 6: DBXXLData.CardEntry
-	(*BaseUserInfo)(nil), // 7: BaseUserInfo
+	(*BoxData)(nil),      // 4: BoxData
+	(*DBXXLData)(nil),    // 5: DBXXLData
+	nil,                  // 6: DBXXLData.RewardEntry
+	nil,                  // 7: DBXXLData.CardEntry
+	(*BaseUserInfo)(nil), // 8: BaseUserInfo
 }
 var file_entertain_entertain_db_proto_depIdxs = []int32{
 	1, // 0: MapData.data:type_name -> GirdeData
-	7, // 1: PlayerData.userinfo:type_name -> BaseUserInfo
-	7, // 2: DBXXLMatch.userinfo:type_name -> BaseUserInfo
-	5, // 3: DBXXLData.reward:type_name -> DBXXLData.RewardEntry
-	6, // 4: DBXXLData.card:type_name -> DBXXLData.CardEntry
-	5, // [5:5] is the sub-list for method output_type
-	5, // [5:5] is the sub-list for method input_type
-	5, // [5:5] is the sub-list for extension type_name
-	5, // [5:5] is the sub-list for extension extendee
-	0, // [0:5] is the sub-list for field type_name
+	8, // 1: PlayerData.userinfo:type_name -> BaseUserInfo
+	8, // 2: DBXXLMatch.userinfo:type_name -> BaseUserInfo
+	6, // 3: DBXXLData.reward:type_name -> DBXXLData.RewardEntry
+	7, // 4: DBXXLData.card:type_name -> DBXXLData.CardEntry
+	4, // 5: DBXXLData.box:type_name -> BoxData
+	6, // [6:6] is the sub-list for method output_type
+	6, // [6:6] is the sub-list for method input_type
+	6, // [6:6] is the sub-list for extension type_name
+	6, // [6:6] is the sub-list for extension extendee
+	0, // [0:6] is the sub-list for field type_name
 }
 
 func init() { file_entertain_entertain_db_proto_init() }
@@ -544,6 +616,18 @@ func file_entertain_entertain_db_proto_init() {
 			}
 		}
 		file_entertain_entertain_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*BoxData); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_entertain_entertain_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DBXXLData); i {
 			case 0:
 				return &v.state
@@ -562,7 +646,7 @@ func file_entertain_entertain_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_entertain_entertain_db_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   7,
+			NumMessages:   8,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/entertain_msg.pb.go b/pb/entertain_msg.pb.go
index 3b0e8ede8..cb05d8429 100644
--- a/pb/entertain_msg.pb.go
+++ b/pb/entertain_msg.pb.go
@@ -401,7 +401,7 @@ type EntertainOperatorReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	Roomid   string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"`      // 房间id
-	Itype    int32  `protobuf:"varint,2,opt,name=itype,proto3" json:"itype"`       // 操作类型 0 默认交换元素
+	Itype    int32  `protobuf:"varint,2,opt,name=itype,proto3" json:"itype"`       // 操作类型 0 默认交换元素 1 技能
 	Curid    int32  `protobuf:"varint,3,opt,name=curid,proto3" json:"curid"`       // 当前key
 	Targetid int32  `protobuf:"varint,4,opt,name=targetid,proto3" json:"targetid"` // 目标key
 }
@@ -647,6 +647,7 @@ type EntertainGameOverPush struct {
 	Round   int32       `protobuf:"varint,5,opt,name=round,proto3" json:"round"`    // 回合数
 	Win     string      `protobuf:"bytes,6,opt,name=win,proto3" json:"win"`         // 谁赢了
 	Reward  []*UserAtno `protobuf:"bytes,7,rep,name=reward,proto3" json:"reward"`   // 获胜的玩家获得的奖励
+	Box     *BoxData    `protobuf:"bytes,8,opt,name=box,proto3" json:"box"`         // 获得的宝箱
 }
 
 func (x *EntertainGameOverPush) Reset() {
@@ -730,6 +731,13 @@ func (x *EntertainGameOverPush) GetReward() []*UserAtno {
 	return nil
 }
 
+func (x *EntertainGameOverPush) GetBox() *BoxData {
+	if x != nil {
+		return x.Box
+	}
+	return nil
+}
+
 type EntertainEnterRoomPush struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1879,6 +1887,109 @@ func (x *EntertainGameReadyPush) GetP2Ready() bool {
 	return false
 }
 
+// 领取宝箱
+type EntertainBoxRewardReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Index int32 `protobuf:"varint,1,opt,name=index,proto3" json:"index"` // 传索引
+}
+
+func (x *EntertainBoxRewardReq) Reset() {
+	*x = EntertainBoxRewardReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_entertain_entertain_msg_proto_msgTypes[33]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *EntertainBoxRewardReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EntertainBoxRewardReq) ProtoMessage() {}
+
+func (x *EntertainBoxRewardReq) ProtoReflect() protoreflect.Message {
+	mi := &file_entertain_entertain_msg_proto_msgTypes[33]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use EntertainBoxRewardReq.ProtoReflect.Descriptor instead.
+func (*EntertainBoxRewardReq) Descriptor() ([]byte, []int) {
+	return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{33}
+}
+
+func (x *EntertainBoxRewardReq) GetIndex() int32 {
+	if x != nil {
+		return x.Index
+	}
+	return 0
+}
+
+type EntertainBoxRewardResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Box    []*BoxData  `protobuf:"bytes,1,rep,name=box,proto3" json:"box"`
+	Reward []*UserAtno `protobuf:"bytes,2,rep,name=reward,proto3" json:"reward"` // 宝箱的奖励
+}
+
+func (x *EntertainBoxRewardResp) Reset() {
+	*x = EntertainBoxRewardResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_entertain_entertain_msg_proto_msgTypes[34]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *EntertainBoxRewardResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EntertainBoxRewardResp) ProtoMessage() {}
+
+func (x *EntertainBoxRewardResp) ProtoReflect() protoreflect.Message {
+	mi := &file_entertain_entertain_msg_proto_msgTypes[34]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use EntertainBoxRewardResp.ProtoReflect.Descriptor instead.
+func (*EntertainBoxRewardResp) Descriptor() ([]byte, []int) {
+	return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{34}
+}
+
+func (x *EntertainBoxRewardResp) GetBox() []*BoxData {
+	if x != nil {
+		return x.Box
+	}
+	return nil
+}
+
+func (x *EntertainBoxRewardResp) GetReward() []*UserAtno {
+	if x != nil {
+		return x.Reward
+	}
+	return nil
+}
+
 var File_entertain_entertain_msg_proto protoreflect.FileDescriptor
 
 var file_entertain_entertain_msg_proto_rawDesc = []byte{
@@ -1946,7 +2057,7 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{
 	0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01,
 	0x28, 0x05, 0x52, 0x05, 0x63, 0x75, 0x72, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72,
 	0x67, 0x65, 0x74, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x72,
-	0x67, 0x65, 0x74, 0x69, 0x64, 0x22, 0xe2, 0x01, 0x0a, 0x15, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74,
+	0x67, 0x65, 0x74, 0x69, 0x64, 0x22, 0xfe, 0x01, 0x0a, 0x15, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74,
 	0x61, 0x69, 0x6e, 0x47, 0x61, 0x6d, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12,
 	0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b,
 	0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65,
@@ -1960,110 +2071,121 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{
 	0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x77, 0x69, 0x6e, 0x18, 0x06, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x03, 0x77, 0x69, 0x6e, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72,
 	0x64, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74,
-	0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x92, 0x01, 0x0a, 0x16, 0x45,
-	0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x6f, 0x6f,
-	0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x72, 0x6f, 0x6f, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73,
-	0x65, 0x72, 0x76, 0x65, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x73, 0x65, 0x72, 0x76, 0x65, 0x70, 0x61, 0x74, 0x68, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65,
-	0x72, 0x31, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65,
-	0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05,
-	0x75, 0x73, 0x65, 0x72, 0x32, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c,
-	0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x22,
-	0x2f, 0x0a, 0x15, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x63, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64,
-	0x22, 0xf8, 0x01, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65,
-	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72,
-	0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f,
-	0x6d, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07,
-	0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x1a, 0x0a,
-	0x08, 0x63, 0x75, 0x72, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x08, 0x63, 0x75, 0x72, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f,
-	0x72, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12,
-	0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
-	0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x07,
+	0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1a, 0x0a, 0x03, 0x62, 0x6f,
+	0x78, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74,
+	0x61, 0x52, 0x03, 0x62, 0x6f, 0x78, 0x22, 0x92, 0x01, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72,
+	0x74, 0x61, 0x69, 0x6e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x75, 0x73,
+	0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x72, 0x6f, 0x6f, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65,
+	0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x72, 0x76,
+	0x65, 0x70, 0x61, 0x74, 0x68, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x03,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74,
 	0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72,
-	0x32, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
-	0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x22, 0x31, 0x0a, 0x17, 0x45,
-	0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x50,
-	0x6c, 0x61, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x3e,
-	0x0a, 0x18, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72, 0x65,
-	0x73, 0x68, 0x50, 0x6c, 0x61, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70,
-	0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61,
-	0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x22, 0x3a,
-	0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72, 0x65,
-	0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74,
-	0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74,
-	0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x22, 0x15, 0x0a, 0x13, 0x45, 0x6e,
-	0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
-	0x71, 0x22, 0x36, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x47, 0x65,
-	0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74,
-	0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44,
-	0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x26, 0x0a, 0x12, 0x45, 0x6e, 0x74,
-	0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12,
-	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
-	0x79, 0x22, 0x58, 0x0a, 0x13, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65,
-	0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, 0x61,
-	0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61,
-	0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
-	0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x82, 0x01, 0x0a, 0x13,
-	0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50,
-	0x75, 0x73, 0x68, 0x12, 0x32, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x1e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x68, 0x61,
-	0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x43, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x04, 0x63, 0x61, 0x72, 0x64, 0x1a, 0x37, 0x0a, 0x09, 0x43, 0x61, 0x72, 0x64, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x22, 0x30, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x72, 0x65,
-	0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x64,
-	0x63, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x64, 0x63, 0x61,
-	0x72, 0x64, 0x22, 0x4f, 0x0a, 0x17, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43,
-	0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a,
-	0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72,
-	0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65, 0x70, 0x61,
-	0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65, 0x70,
-	0x61, 0x74, 0x68, 0x22, 0x46, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e,
-	0x4a, 0x6f, 0x69, 0x6e, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72,
-	0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f,
-	0x6d, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x22, 0x2d, 0x0a, 0x15, 0x45,
-	0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4a, 0x6f, 0x69, 0x6e, 0x52, 0x6f, 0x6f, 0x6d,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x4a, 0x6f, 0x69, 0x6e, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x05, 0x62, 0x4a, 0x6f, 0x69, 0x6e, 0x22, 0x7b, 0x0a, 0x1b, 0x45, 0x6e,
-	0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4a, 0x6f, 0x69, 0x6e, 0x43, 0x72, 0x65, 0x61, 0x74,
-	0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f,
-	0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69,
-	0x64, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
+	0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x22, 0x2f, 0x0a, 0x15, 0x45,
+	0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0xf8, 0x01, 0x0a,
+	0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x6e,
+	0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12,
+	0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64,
+	0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72,
+	0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x75, 0x72,
+	0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72,
+	0x6f, 0x75, 0x6e, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e,
+	0x64, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75,
-	0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x18, 0x03, 0x20,
+	0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x18, 0x08, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61,
 	0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x22, 0x31, 0x0a, 0x17, 0x45, 0x6e, 0x74, 0x65, 0x72,
-	0x74, 0x61, 0x69, 0x6e, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52,
+	0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x50, 0x6c, 0x61, 0x74, 0x52,
 	0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x1a, 0x0a, 0x18, 0x45, 0x6e,
-	0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61,
-	0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x32, 0x0a, 0x18, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74,
+	0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x3e, 0x0a, 0x18, 0x45, 0x6e,
+	0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x50, 0x6c,
+	0x61, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74,
+	0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74,
+	0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x22, 0x3a, 0x0a, 0x14, 0x45, 0x6e,
+	0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x50, 0x75,
+	0x73, 0x68, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x6d,
+	0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x22, 0x15, 0x0a, 0x13, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74,
+	0x61, 0x69, 0x6e, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x36, 0x0a,
+	0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73,
+	0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, 0x61, 0x74, 0x61, 0x52,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x26, 0x0a, 0x12, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61,
+	0x69, 0x6e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x58, 0x0a,
+	0x13, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04,
+	0x64, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52,
+	0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x82, 0x01, 0x0a, 0x13, 0x45, 0x6e, 0x74, 0x65,
+	0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12,
+	0x32, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e,
+	0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50,
+	0x75, 0x73, 0x68, 0x2e, 0x43, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x63,
+	0x61, 0x72, 0x64, 0x1a, 0x37, 0x0a, 0x09, 0x43, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
+	0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x30, 0x0a, 0x16,
+	0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52,
+	0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x22, 0x4f,
+	0x0a, 0x17, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x72, 0x65, 0x61, 0x74,
+	0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f,
+	0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69,
+	0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65, 0x70, 0x61, 0x74, 0x68, 0x22,
+	0x46, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4a, 0x6f, 0x69, 0x6e,
+	0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12,
+	0x16, 0x0a, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x22, 0x2d, 0x0a, 0x15, 0x45, 0x6e, 0x74, 0x65, 0x72,
+	0x74, 0x61, 0x69, 0x6e, 0x4a, 0x6f, 0x69, 0x6e, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x14, 0x0a, 0x05, 0x62, 0x4a, 0x6f, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x05, 0x62, 0x4a, 0x6f, 0x69, 0x6e, 0x22, 0x7b, 0x0a, 0x1b, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74,
+	0x61, 0x69, 0x6e, 0x4a, 0x6f, 0x69, 0x6e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f,
+	0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x21, 0x0a,
+	0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50,
+	0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31,
+	0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73,
+	0x65, 0x72, 0x32, 0x22, 0x31, 0x0a, 0x17, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e,
+	0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16,
+	0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x1a, 0x0a, 0x18, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74,
+	0x61, 0x69, 0x6e, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65,
+	0x73, 0x70, 0x22, 0x32, 0x0a, 0x18, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x44,
+	0x69, 0x73, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16,
+	0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x1b, 0x0a, 0x19, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74,
 	0x61, 0x69, 0x6e, 0x44, 0x69, 0x73, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52,
-	0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x1b, 0x0a, 0x19, 0x45, 0x6e,
-	0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x44, 0x69, 0x73, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x52,
-	0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x22, 0x39, 0x0a, 0x1f, 0x45, 0x6e, 0x74, 0x65, 0x72,
-	0x74, 0x61, 0x69, 0x6e, 0x44, 0x69, 0x73, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x4d, 0x61, 0x73, 0x74,
-	0x65, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f,
-	0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
-	0x69, 0x64, 0x22, 0x4c, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x47,
-	0x61, 0x6d, 0x65, 0x52, 0x65, 0x61, 0x64, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07,
-	0x70, 0x31, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x70,
-	0x31, 0x72, 0x65, 0x61, 0x64, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x32, 0x72, 0x65, 0x61, 0x64,
-	0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x70, 0x32, 0x72, 0x65, 0x61, 0x64, 0x79,
-	0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x73, 0x70, 0x22, 0x39, 0x0a, 0x1f, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e,
+	0x44, 0x69, 0x73, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x52, 0x6f,
+	0x6f, 0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x4c,
+	0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x47, 0x61, 0x6d, 0x65, 0x52,
+	0x65, 0x61, 0x64, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x31, 0x72, 0x65,
+	0x61, 0x64, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x70, 0x31, 0x72, 0x65, 0x61,
+	0x64, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x32, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x07, 0x70, 0x32, 0x72, 0x65, 0x61, 0x64, 0x79, 0x22, 0x2d, 0x0a, 0x15,
+	0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x42, 0x6f, 0x78, 0x52, 0x65, 0x77, 0x61,
+	0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x57, 0x0a, 0x16, 0x45,
+	0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x42, 0x6f, 0x78, 0x52, 0x65, 0x77, 0x61, 0x72,
+	0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x03, 0x62, 0x6f, 0x78, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74, 0x61, 0x52, 0x03, 0x62, 0x6f,
+	0x78, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65,
+	0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2078,7 +2200,7 @@ func file_entertain_entertain_msg_proto_rawDescGZIP() []byte {
 	return file_entertain_entertain_msg_proto_rawDescData
 }
 
-var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 34)
+var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 36)
 var file_entertain_entertain_msg_proto_goTypes = []interface{}{
 	(*EntertainMatchReq)(nil),               // 0: EntertainMatchReq
 	(*EntertainMatchResp)(nil),              // 1: EntertainMatchResp
@@ -2113,41 +2235,47 @@ var file_entertain_entertain_msg_proto_goTypes = []interface{}{
 	(*EntertainDissolveRoomResp)(nil),       // 30: EntertainDissolveRoomResp
 	(*EntertainDissolveMasterRoomPush)(nil), // 31: EntertainDissolveMasterRoomPush
 	(*EntertainGameReadyPush)(nil),          // 32: EntertainGameReadyPush
-	nil,                                     // 33: EntertainChangePush.CardEntry
-	(*PlayerData)(nil),                      // 34: PlayerData
-	(*MapData)(nil),                         // 35: MapData
-	(*UserAtno)(nil),                        // 36: UserAtno
-	(*DBXXLData)(nil),                       // 37: DBXXLData
+	(*EntertainBoxRewardReq)(nil),           // 33: EntertainBoxRewardReq
+	(*EntertainBoxRewardResp)(nil),          // 34: EntertainBoxRewardResp
+	nil,                                     // 35: EntertainChangePush.CardEntry
+	(*PlayerData)(nil),                      // 36: PlayerData
+	(*MapData)(nil),                         // 37: MapData
+	(*UserAtno)(nil),                        // 38: UserAtno
+	(*BoxData)(nil),                         // 39: BoxData
+	(*DBXXLData)(nil),                       // 40: DBXXLData
 }
 var file_entertain_entertain_msg_proto_depIdxs = []int32{
-	34, // 0: EntertainStartGamePush.user1:type_name -> PlayerData
-	34, // 1: EntertainStartGamePush.user2:type_name -> PlayerData
-	35, // 2: EntertainStartGamePush.mpadata:type_name -> MapData
-	35, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData
-	34, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData
-	34, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData
-	34, // 6: EntertainGameOverPush.user1:type_name -> PlayerData
-	34, // 7: EntertainGameOverPush.user2:type_name -> PlayerData
-	35, // 8: EntertainGameOverPush.mpadata:type_name -> MapData
-	36, // 9: EntertainGameOverPush.reward:type_name -> UserAtno
-	34, // 10: EntertainEnterRoomPush.user1:type_name -> PlayerData
-	34, // 11: EntertainEnterRoomPush.user2:type_name -> PlayerData
-	35, // 12: EntertainReconnectResp.mpadata:type_name -> MapData
-	34, // 13: EntertainReconnectResp.user1:type_name -> PlayerData
-	34, // 14: EntertainReconnectResp.user2:type_name -> PlayerData
-	35, // 15: EntertainRefreshPlatResp.mpadata:type_name -> MapData
-	35, // 16: EntertainRefreshPush.mpadata:type_name -> MapData
-	37, // 17: EntertainGetListResp.data:type_name -> DBXXLData
-	37, // 18: EntertainRewardResp.data:type_name -> DBXXLData
-	36, // 19: EntertainRewardResp.reward:type_name -> UserAtno
-	33, // 20: EntertainChangePush.card:type_name -> EntertainChangePush.CardEntry
-	34, // 21: EntertainJoinCreateRoomPush.user1:type_name -> PlayerData
-	34, // 22: EntertainJoinCreateRoomPush.user2:type_name -> PlayerData
-	23, // [23:23] is the sub-list for method output_type
-	23, // [23:23] is the sub-list for method input_type
-	23, // [23:23] is the sub-list for extension type_name
-	23, // [23:23] is the sub-list for extension extendee
-	0,  // [0:23] is the sub-list for field type_name
+	36, // 0: EntertainStartGamePush.user1:type_name -> PlayerData
+	36, // 1: EntertainStartGamePush.user2:type_name -> PlayerData
+	37, // 2: EntertainStartGamePush.mpadata:type_name -> MapData
+	37, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData
+	36, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData
+	36, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData
+	36, // 6: EntertainGameOverPush.user1:type_name -> PlayerData
+	36, // 7: EntertainGameOverPush.user2:type_name -> PlayerData
+	37, // 8: EntertainGameOverPush.mpadata:type_name -> MapData
+	38, // 9: EntertainGameOverPush.reward:type_name -> UserAtno
+	39, // 10: EntertainGameOverPush.box:type_name -> BoxData
+	36, // 11: EntertainEnterRoomPush.user1:type_name -> PlayerData
+	36, // 12: EntertainEnterRoomPush.user2:type_name -> PlayerData
+	37, // 13: EntertainReconnectResp.mpadata:type_name -> MapData
+	36, // 14: EntertainReconnectResp.user1:type_name -> PlayerData
+	36, // 15: EntertainReconnectResp.user2:type_name -> PlayerData
+	37, // 16: EntertainRefreshPlatResp.mpadata:type_name -> MapData
+	37, // 17: EntertainRefreshPush.mpadata:type_name -> MapData
+	40, // 18: EntertainGetListResp.data:type_name -> DBXXLData
+	40, // 19: EntertainRewardResp.data:type_name -> DBXXLData
+	38, // 20: EntertainRewardResp.reward:type_name -> UserAtno
+	35, // 21: EntertainChangePush.card:type_name -> EntertainChangePush.CardEntry
+	36, // 22: EntertainJoinCreateRoomPush.user1:type_name -> PlayerData
+	36, // 23: EntertainJoinCreateRoomPush.user2:type_name -> PlayerData
+	39, // 24: EntertainBoxRewardResp.box:type_name -> BoxData
+	38, // 25: EntertainBoxRewardResp.reward:type_name -> UserAtno
+	26, // [26:26] is the sub-list for method output_type
+	26, // [26:26] is the sub-list for method input_type
+	26, // [26:26] is the sub-list for extension type_name
+	26, // [26:26] is the sub-list for extension extendee
+	0,  // [0:26] is the sub-list for field type_name
 }
 
 func init() { file_entertain_entertain_msg_proto_init() }
@@ -2554,6 +2682,30 @@ func file_entertain_entertain_msg_proto_init() {
 				return nil
 			}
 		}
+		file_entertain_entertain_msg_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EntertainBoxRewardReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_entertain_entertain_msg_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EntertainBoxRewardResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -2561,7 +2713,7 @@ func file_entertain_entertain_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_entertain_entertain_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   34,
+			NumMessages:   36,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index d0c38af20..585e21edd 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -459,6 +459,7 @@ const (
 	ErrorCode_EntertainPlayerNoReady  ErrorCode = 5206 // 玩家1还没准备不能开始游戏
 	ErrorCode_EntertainNotMaster      ErrorCode = 5207 // 不是房主 不能解散
 	ErrorCode_EntertainDissolveFailed ErrorCode = 5208 // 游戏中不允许解散
+	ErrorCode_EntertainBoxEndTime     ErrorCode = 5209 // 宝箱开启时间没到
 )
 
 // Enum value maps for ErrorCode.
@@ -855,6 +856,7 @@ var (
 		5206: "EntertainPlayerNoReady",
 		5207: "EntertainNotMaster",
 		5208: "EntertainDissolveFailed",
+		5209: "EntertainBoxEndTime",
 	}
 	ErrorCode_value = map[string]int32{
 		"Success":                       0,
@@ -1248,6 +1250,7 @@ var (
 		"EntertainPlayerNoReady":        5206,
 		"EntertainNotMaster":            5207,
 		"EntertainDissolveFailed":       5208,
+		"EntertainBoxEndTime":           5209,
 	}
 )
 
@@ -1282,7 +1285,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
 
 var file_errorcode_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2a, 0xd4, 0x48, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0xee, 0x48, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
 	0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10,
 	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e,
 	0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
@@ -1863,8 +1866,10 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x28, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4e, 0x6f,
 	0x74, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x10, 0xd7, 0x28, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x6e,
 	0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x44, 0x69, 0x73, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x46,
-	0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd8, 0x28, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd8, 0x28, 0x12, 0x18, 0x0a, 0x13, 0x45, 0x6e, 0x74, 0x65,
+	0x72, 0x74, 0x61, 0x69, 0x6e, 0x42, 0x6f, 0x78, 0x45, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x10,
+	0xd9, 0x28, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
diff --git a/pb/mail_msg.pb.go b/pb/mail_msg.pb.go
index d0a2ec164..50674b1bf 100644
--- a/pb/mail_msg.pb.go
+++ b/pb/mail_msg.pb.go
@@ -483,9 +483,8 @@ type MailGetAllMailAttachmentResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Res    []*UserAtno `protobuf:"bytes,1,rep,name=res,proto3" json:"res"`       //资源类型
-	Ids    []string    `protobuf:"bytes,2,rep,name=ids,proto3" json:"ids"`       // 已经领取的邮件唯一id
-	Reward []*UserAtno `protobuf:"bytes,3,rep,name=reward,proto3" json:"reward"` //获取资源
+	Ids    []string    `protobuf:"bytes,1,rep,name=ids,proto3" json:"ids"`       // 已经领取的邮件唯一id
+	Reward []*UserAtno `protobuf:"bytes,2,rep,name=reward,proto3" json:"reward"` //获取资源
 }
 
 func (x *MailGetAllMailAttachmentResp) Reset() {
@@ -520,13 +519,6 @@ func (*MailGetAllMailAttachmentResp) Descriptor() ([]byte, []int) {
 	return file_mail_mail_msg_proto_rawDescGZIP(), []int{10}
 }
 
-func (x *MailGetAllMailAttachmentResp) GetRes() []*UserAtno {
-	if x != nil {
-		return x.Res
-	}
-	return nil
-}
-
 func (x *MailGetAllMailAttachmentResp) GetIds() []string {
 	if x != nil {
 		return x.Ids
@@ -660,20 +652,18 @@ var file_mail_mail_msg_proto_rawDesc = []byte{
 	0x69, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69,
 	0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x4d, 0x61, 0x69, 0x6c, 0x22, 0x1d, 0x0a, 0x1b, 0x4d,
 	0x61, 0x69, 0x6c, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x4d, 0x61, 0x69, 0x6c, 0x41, 0x74, 0x74,
-	0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x22, 0x70, 0x0a, 0x1c, 0x4d, 0x61,
+	0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x22, 0x53, 0x0a, 0x1c, 0x4d, 0x61,
 	0x69, 0x6c, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x4d, 0x61, 0x69, 0x6c, 0x41, 0x74, 0x74, 0x61,
-	0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x03, 0x72, 0x65,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74,
-	0x6e, 0x6f, 0x52, 0x03, 0x72, 0x65, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x02,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x69, 0x64, 0x73, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77,
-	0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72,
-	0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x13, 0x0a, 0x11,
-	0x4d, 0x61, 0x69, 0x6c, 0x44, 0x65, 0x6c, 0x41, 0x6c, 0x6c, 0x4d, 0x61, 0x69, 0x6c, 0x52, 0x65,
-	0x71, 0x22, 0x37, 0x0a, 0x12, 0x4d, 0x61, 0x69, 0x6c, 0x44, 0x65, 0x6c, 0x41, 0x6c, 0x6c, 0x4d,
-	0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x4d, 0x61, 0x69, 0x6c, 0x73,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6c, 0x44,
-	0x61, 0x74, 0x61, 0x52, 0x05, 0x4d, 0x61, 0x69, 0x6c, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
-	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x69, 0x64, 0x73, 0x12, 0x21, 0x0a, 0x06,
+	0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55,
+	0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22,
+	0x13, 0x0a, 0x11, 0x4d, 0x61, 0x69, 0x6c, 0x44, 0x65, 0x6c, 0x41, 0x6c, 0x6c, 0x4d, 0x61, 0x69,
+	0x6c, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x12, 0x4d, 0x61, 0x69, 0x6c, 0x44, 0x65, 0x6c, 0x41,
+	0x6c, 0x6c, 0x4d, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x4d, 0x61,
+	0x69, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x4d, 0x61,
+	0x69, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x4d, 0x61, 0x69, 0x6c, 0x73, 0x42, 0x06, 0x5a,
+	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -711,14 +701,13 @@ var file_mail_mail_msg_proto_depIdxs = []int32{
 	13, // 1: MailReadMailResp.Mail:type_name -> DBMailData
 	13, // 2: MailGetUserMailAttachmentResp.Mail:type_name -> DBMailData
 	13, // 3: MailGetNewMailPush.Mail:type_name -> DBMailData
-	14, // 4: MailGetAllMailAttachmentResp.res:type_name -> UserAtno
-	14, // 5: MailGetAllMailAttachmentResp.reward:type_name -> UserAtno
-	13, // 6: MailDelAllMailResp.Mails:type_name -> DBMailData
-	7,  // [7:7] is the sub-list for method output_type
-	7,  // [7:7] is the sub-list for method input_type
-	7,  // [7:7] is the sub-list for extension type_name
-	7,  // [7:7] is the sub-list for extension extendee
-	0,  // [0:7] is the sub-list for field type_name
+	14, // 4: MailGetAllMailAttachmentResp.reward:type_name -> UserAtno
+	13, // 5: MailDelAllMailResp.Mails:type_name -> DBMailData
+	6,  // [6:6] is the sub-list for method output_type
+	6,  // [6:6] is the sub-list for method input_type
+	6,  // [6:6] is the sub-list for extension type_name
+	6,  // [6:6] is the sub-list for extension extendee
+	0,  // [0:6] is the sub-list for field type_name
 }
 
 func init() { file_mail_mail_msg_proto_init() }
diff --git a/sys/configure/structs/Game.ConsumeBoxData.go b/sys/configure/structs/Game.ConsumeBoxData.go
index 8df498ca2..0a2d076df 100644
--- a/sys/configure/structs/Game.ConsumeBoxData.go
+++ b/sys/configure/structs/Game.ConsumeBoxData.go
@@ -12,7 +12,13 @@ import "errors"
 
 type GameConsumeBoxData struct {
     Boxid int32
+    Color int32
+    Name string
+    Txt string
+    Icon string
+    Group int32
     Cd int32
+    Weight int32
 }
 
 const TypeId_GameConsumeBoxData = -456316427
@@ -23,7 +29,13 @@ func (*GameConsumeBoxData) GetTypeId() int32 {
 
 func (_v *GameConsumeBoxData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boxid"].(float64); !_ok_ { err = errors.New("boxid error"); return }; _v.Boxid = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cd"].(float64); !_ok_ { err = errors.New("cd error"); return }; _v.Cd = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weight"].(float64); !_ok_ { err = errors.New("weight error"); return }; _v.Weight = int32(_tempNum_) }
     return
 }
 
diff --git a/sys/configure/structs/Game.ConsumeIntegralData.go b/sys/configure/structs/Game.ConsumeIntegralData.go
index 323f53c8d..a1bb3f977 100644
--- a/sys/configure/structs/Game.ConsumeIntegralData.go
+++ b/sys/configure/structs/Game.ConsumeIntegralData.go
@@ -18,6 +18,7 @@ type GameConsumeIntegralData struct {
     Boxid int32
     Deductrewards []*Gameatn
     Name string
+    Txt string
 }
 
 const TypeId_GameConsumeIntegralData = -1538782826
@@ -73,6 +74,7 @@ func (_v *GameConsumeIntegralData)Deserialize(_buf map[string]interface{}) (err
             }
 
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     return
 }
 
diff --git a/sys/configure/structs/Game.IntegralData.go b/sys/configure/structs/Game.IntegralData.go
index f9899515f..6a72e96be 100644
--- a/sys/configure/structs/Game.IntegralData.go
+++ b/sys/configure/structs/Game.IntegralData.go
@@ -18,6 +18,7 @@ type GameIntegralData struct {
     Boxid int32
     Deductrewards []*Gameatn
     Name string
+    Txt string
 }
 
 const TypeId_GameIntegralData = 1942319090
@@ -73,6 +74,7 @@ func (_v *GameIntegralData)Deserialize(_buf map[string]interface{}) (err error)
             }
 
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     return
 }
 
diff --git a/sys/configure/structs/Game.WorldBattleData.go b/sys/configure/structs/Game.WorldBattleData.go
index de3fcfa84..976955e05 100644
--- a/sys/configure/structs/Game.WorldBattleData.go
+++ b/sys/configure/structs/Game.WorldBattleData.go
@@ -18,6 +18,7 @@ type GameWorldBattleData struct {
     Playexp *Gameatn
     Carexe int32
     Reward int32
+    Exreward []*Gameatn
 }
 
 const TypeId_GameWorldBattleData = 1096332216
@@ -60,6 +61,20 @@ func (_v *GameWorldBattleData)Deserialize(_buf map[string]interface{}) (err erro
     { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["playexp"].(map[string]interface{}); !_ok_ { err = errors.New("playexp error"); return }; if _v.Playexp, err = DeserializeGameatn(_x_); err != nil { return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["carexe"].(float64); !_ok_ { err = errors.New("carexe error"); return }; _v.Carexe = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["reward"].(float64); !_ok_ { err = errors.New("reward error"); return }; _v.Reward = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["exreward"].([]interface{}); !_ok_ { err = errors.New("exreward error"); return }
+
+                _v.Exreward = make([]*Gameatn, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ *Gameatn
+                    { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+                    _v.Exreward = append(_v.Exreward, _list_v_)
+                }
+            }
+
     return
 }