diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index 4b4f3e687..0ddf0f88d 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -38370,5 +38370,275 @@
       25001
     ],
     "filter2": []
+  },
+  {
+    "id": 17100001,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1193",
+      "text": "完成俱乐部任务3次"
+    },
+    "type": 156,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "tipstxt": {
+      "key": "",
+      "text": ""
+    },
+    "value": 3,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 17100002,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1194",
+      "text": "累计消费3000钻石"
+    },
+    "type": 104,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "tipstxt": {
+      "key": "",
+      "text": ""
+    },
+    "value": 3000,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 17100003,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1195",
+      "text": "传承者达到20级"
+    },
+    "type": 20,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "tipstxt": {
+      "key": "",
+      "text": ""
+    },
+    "value": 20,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 17100004,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1196",
+      "text": "累计召唤20次守护者"
+    },
+    "type": 14,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "tipstxt": {
+      "key": "",
+      "text": ""
+    },
+    "value": 20,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 17100005,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1197",
+      "text": "完成5个日常任务"
+    },
+    "type": 240,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "tipstxt": {
+      "key": "",
+      "text": ""
+    },
+    "value": 5,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 17100006,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1198",
+      "text": "在任意商店购买5次商品"
+    },
+    "type": 241,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "tipstxt": {
+      "key": "",
+      "text": ""
+    },
+    "value": 5,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 17100007,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1199",
+      "text": "进行10次竞技挑战"
+    },
+    "type": 130,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "tipstxt": {
+      "key": "",
+      "text": ""
+    },
+    "value": 10,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 17100008,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1200",
+      "text": "参加3次捕羊大赛"
+    },
+    "type": 234,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "tipstxt": {
+      "key": "",
+      "text": ""
+    },
+    "value": 3,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 17100009,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1201",
+      "text": "辉月等级达到3级"
+    },
+    "type": 242,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "tipstxt": {
+      "key": "",
+      "text": ""
+    },
+    "value": 3,
+    "filter": [],
+    "filter2": []
+  },
+  {
+    "id": 17100010,
+    "rtype": 1,
+    "ctype": 1,
+    "notify": [],
+    "type_sp": 1,
+    "tasktxt": {
+      "key": "buried_buried_condi_tasktxt_1202",
+      "text": "完成3次每日一练"
+    },
+    "type": 185,
+    "valid": 0,
+    "head": {
+      "a": "attr",
+      "t": "gold",
+      "n": 1
+    },
+    "Npc_event_type": 0,
+    "NPC": 0,
+    "tipstxt": {
+      "key": "",
+      "text": ""
+    },
+    "value": 3,
+    "filter": [],
+    "filter2": []
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json
index 9ba3a47c8..15960435d 100644
--- a/bin/json/game_buriedtype.json
+++ b/bin/json/game_buriedtype.json
@@ -1397,5 +1397,20 @@
     "filter": [
       "eq"
     ]
+  },
+  {
+    "id": 240,
+    "insert": 1,
+    "filter": []
+  },
+  {
+    "id": 241,
+    "insert": 1,
+    "filter": []
+  },
+  {
+    "id": 242,
+    "insert": 1,
+    "filter": []
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_catchbugreward.json b/bin/json/game_catchbugreward.json
index f57ea60ee..22ae31fad 100644
--- a/bin/json/game_catchbugreward.json
+++ b/bin/json/game_catchbugreward.json
@@ -138,7 +138,7 @@
   {
     "key": 2001,
     "type": 2,
-    "condition": 1,
+    "condition": 30,
     "reward": [
       {
         "a": "item",
@@ -155,7 +155,7 @@
   {
     "key": 2002,
     "type": 2,
-    "condition": 2,
+    "condition": 60,
     "reward": [
       {
         "a": "item",
@@ -172,7 +172,7 @@
   {
     "key": 2003,
     "type": 2,
-    "condition": 3,
+    "condition": 90,
     "reward": [
       {
         "a": "item",
@@ -189,7 +189,7 @@
   {
     "key": 2004,
     "type": 2,
-    "condition": 4,
+    "condition": 120,
     "reward": [
       {
         "a": "item",
@@ -206,7 +206,7 @@
   {
     "key": 2005,
     "type": 2,
-    "condition": 5,
+    "condition": 150,
     "reward": [
       {
         "a": "item",
@@ -223,7 +223,7 @@
   {
     "key": 2006,
     "type": 2,
-    "condition": 6,
+    "condition": 180,
     "reward": [
       {
         "a": "item",
@@ -240,7 +240,7 @@
   {
     "key": 2007,
     "type": 2,
-    "condition": 7,
+    "condition": 210,
     "reward": [
       {
         "a": "item",
@@ -257,7 +257,7 @@
   {
     "key": 2008,
     "type": 2,
-    "condition": 8,
+    "condition": 240,
     "reward": [
       {
         "a": "item",
diff --git a/bin/json/game_integralcondition.json b/bin/json/game_integralcondition.json
index e30bba05a..ac4d2c7e5 100644
--- a/bin/json/game_integralcondition.json
+++ b/bin/json/game_integralcondition.json
@@ -2,9 +2,8 @@
   {
     "id": 1001,
     "condition": "完成主线任务：寻找龙之花",
-    "TaskId": 16000013,
+    "TaskId": 17100001,
     "iType": 1,
-    "condval": "",
     "jumpto": 166,
     "des": "[敌方]暴击伤害降低10%",
     "skillid": 934004432
@@ -12,9 +11,8 @@
   {
     "id": 1002,
     "condition": "完成主线任务：神奇的原住人",
-    "TaskId": 16000016,
+    "TaskId": 17100002,
     "iType": 1,
-    "condval": "",
     "jumpto": 166,
     "des": "[敌方]防御降低10%",
     "skillid": 934004432
@@ -22,9 +20,8 @@
   {
     "id": 1003,
     "condition": "传承者达到20级",
-    "TaskId": 16000017,
+    "TaskId": 17100003,
     "iType": 1,
-    "condval": "20",
     "jumpto": 0,
     "des": "[敌方]攻击降低10%",
     "skillid": 934004432
@@ -32,9 +29,8 @@
   {
     "id": 1004,
     "condition": "累计完成5个日常任务",
-    "TaskId": 16000019,
+    "TaskId": 17100004,
     "iType": 1,
-    "condval": "30",
     "jumpto": 0,
     "des": "[敌方]速度降低10点",
     "skillid": 934004432
@@ -42,9 +38,8 @@
   {
     "id": 1005,
     "condition": "累计召唤20次守护者",
-    "TaskId": 16000020,
+    "TaskId": 17100005,
     "iType": 1,
-    "condval": "40",
     "jumpto": 0,
     "des": "[敌方]命中降低10%",
     "skillid": 934004432
@@ -52,9 +47,8 @@
   {
     "id": 1006,
     "condition": "累计在商店购买5次商品",
-    "TaskId": 16000021,
+    "TaskId": 17100006,
     "iType": 1,
-    "condval": "50",
     "jumpto": 0,
     "des": "[敌方]暴击降低10%",
     "skillid": 934004432
@@ -62,9 +56,8 @@
   {
     "id": 1007,
     "condition": "进行10次竞技挑战",
-    "TaskId": 16000022,
+    "TaskId": 17100007,
     "iType": 1,
-    "condval": "60",
     "jumpto": 0,
     "des": "[敌方]受到增益效果降低30%",
     "skillid": 934004432
@@ -72,9 +65,8 @@
   {
     "id": 1008,
     "condition": "完成1次捕羊大赛",
-    "TaskId": 16000023,
+    "TaskId": 17100008,
     "iType": 1,
-    "condval": "5",
     "jumpto": 0,
     "des": "[敌方]所有减益效果持续回合数+1",
     "skillid": 934004432
@@ -82,9 +74,8 @@
   {
     "id": 1009,
     "condition": "辉月等级达到3级",
-    "TaskId": 16000024,
+    "TaskId": 17100009,
     "iType": 1,
-    "condval": "80",
     "jumpto": 0,
     "des": "[敌方]受到持续伤害增加50%",
     "skillid": 934004432
@@ -92,9 +83,8 @@
   {
     "id": 1010,
     "condition": "累计完成3次每日一练",
-    "TaskId": 16000025,
+    "TaskId": 17100010,
     "iType": 1,
-    "condval": "100",
     "jumpto": 0,
     "des": "[敌方]无法触发强击",
     "skillid": 934004432
@@ -104,7 +94,6 @@
     "condition": "上阵2个属性为感官之林的继承者",
     "TaskId": 0,
     "iType": 2,
-    "condval": "2,2",
     "jumpto": 0,
     "des": "[敌方]3技能最大回合数+1",
     "skillid": 934004432
@@ -114,7 +103,6 @@
     "condition": "上阵1名攻击型守护者",
     "TaskId": 0,
     "iType": 2,
-    "condval": "1,1",
     "jumpto": 0,
     "des": "[敌方]开战后，减少2个被动效果",
     "skillid": 934004432
diff --git a/bin/json/game_model.json b/bin/json/game_model.json
index 8e92eee0c..13fda69d3 100644
--- a/bin/json/game_model.json
+++ b/bin/json/game_model.json
@@ -6649,6 +6649,76 @@
       "z": 1
     }
   },
+  {
+    "id": "51056",
+    "preson": "51056",
+    "presonshow": "51056_exhibition",
+    "presonstory": "51053",
+    "presondraw": "",
+    "height": 1,
+    "weight": 1,
+    "ico": "tx_js_51053",
+    "fight": "tx_js_51053",
+    "img": "sbkp_js_51053",
+    "heroimg": "hbkp_js_51053",
+    "portrait": "zm_img_51053",
+    "bust": "bust_51053",
+    "postxyz": [
+      0,
+      0,
+      0
+    ],
+    "rotation": {
+      "x": 0,
+      "y": 180,
+      "z": 0
+    },
+    "boxPos": {
+      "x": 0,
+      "y": 0.5,
+      "z": 0
+    },
+    "boxSize": {
+      "x": 1,
+      "y": 1,
+      "z": 1
+    }
+  },
+  {
+    "id": "51057",
+    "preson": "51057",
+    "presonshow": "51057_exhibition",
+    "presonstory": "51053",
+    "presondraw": "",
+    "height": 1,
+    "weight": 1,
+    "ico": "tx_js_51053",
+    "fight": "tx_js_51053",
+    "img": "sbkp_js_51053",
+    "heroimg": "hbkp_js_51053",
+    "portrait": "zm_img_51053",
+    "bust": "bust_51053",
+    "postxyz": [
+      0,
+      0,
+      0
+    ],
+    "rotation": {
+      "x": 0,
+      "y": 180,
+      "z": 0
+    },
+    "boxPos": {
+      "x": 0,
+      "y": 0.5,
+      "z": 0
+    },
+    "boxSize": {
+      "x": 1,
+      "y": 1,
+      "z": 1
+    }
+  },
   {
     "id": "54011",
     "preson": "54011",
diff --git a/bin/json/game_playerinfor_barrage.json b/bin/json/game_playerinfor_barrage.json
index 969bf2ea2..55ac97856 100644
--- a/bin/json/game_playerinfor_barrage.json
+++ b/bin/json/game_playerinfor_barrage.json
@@ -9,7 +9,7 @@
       "text": "这好像不是熊猫？"
     },
     "time": 90,
-    "speed": 11426
+    "speed": 12278
   },
   {
     "id": "2",
@@ -20,8 +20,8 @@
       "key": "playerinfor_barrage_2",
       "text": "看起来像个画家。"
     },
-    "time": 321,
-    "speed": 11163
+    "time": 209,
+    "speed": 9556
   },
   {
     "id": "3",
@@ -32,8 +32,8 @@
       "key": "playerinfor_barrage_3",
       "text": "为什么会觉得是熊猫啊？"
     },
-    "time": 470,
-    "speed": 11907
+    "time": 404,
+    "speed": 8152
   },
   {
     "id": "4",
@@ -44,8 +44,8 @@
       "key": "playerinfor_barrage_4",
       "text": "从石头里蹦出来的人？怎么感觉有点熟悉……"
     },
-    "time": 606,
-    "speed": 11347
+    "time": 519,
+    "speed": 11834
   },
   {
     "id": "5",
@@ -56,8 +56,8 @@
       "key": "playerinfor_barrage_5",
       "text": "你可能是听说过从石头里蹦出来的猴子。"
     },
-    "time": 803,
-    "speed": 10249
+    "time": 647,
+    "speed": 10668
   },
   {
     "id": "6",
@@ -68,8 +68,8 @@
       "key": "playerinfor_barrage_6",
       "text": "你是从石头里蹦出来的？！"
     },
-    "time": 942,
-    "speed": 10281
+    "time": 750,
+    "speed": 8239
   },
   {
     "id": "7",
@@ -80,8 +80,8 @@
       "key": "playerinfor_barrage_7",
       "text": "不！那不是我！"
     },
-    "time": 1059,
-    "speed": 11227
+    "time": 925,
+    "speed": 9298
   },
   {
     "id": "8",
@@ -92,8 +92,8 @@
       "key": "playerinfor_barrage_8",
       "text": "哦，传承之人……"
     },
-    "time": 1213,
-    "speed": 9276
+    "time": 1139,
+    "speed": 7917
   },
   {
     "id": "9",
@@ -104,8 +104,8 @@
       "key": "playerinfor_barrage_9",
       "text": "月光能量都汇集在他身上了！"
     },
-    "time": 1453,
-    "speed": 9290
+    "time": 1257,
+    "speed": 9516
   },
   {
     "id": "10",
@@ -116,8 +116,8 @@
       "key": "playerinfor_barrage_10",
       "text": "那应该不会爆炸吧？"
     },
-    "time": 1584,
-    "speed": 7811
+    "time": 1383,
+    "speed": 11033
   },
   {
     "id": "11",
@@ -128,8 +128,8 @@
       "key": "playerinfor_barrage_11",
       "text": "阿宝，你为什么站那么远？"
     },
-    "time": 1788,
-    "speed": 7004
+    "time": 1608,
+    "speed": 8883
   },
   {
     "id": "312",
@@ -141,7 +141,7 @@
       "text": "哦！那是什么？"
     },
     "time": 90,
-    "speed": 10628
+    "speed": 10881
   },
   {
     "id": "313",
@@ -152,8 +152,8 @@
       "key": "playerinfor_barrage_313",
       "text": "我有种被她注视的感觉……"
     },
-    "time": 206,
-    "speed": 11134
+    "time": 324,
+    "speed": 9563
   },
   {
     "id": "314",
@@ -164,8 +164,8 @@
       "key": "playerinfor_barrage_314",
       "text": "好像是一种叫做“照相”的魔法……"
     },
-    "time": 315,
-    "speed": 8012
+    "time": 467,
+    "speed": 10882
   },
   {
     "id": "315",
@@ -176,8 +176,8 @@
       "key": "playerinfor_barrage_315",
       "text": "我看这魔法不是很疼。"
     },
-    "time": 468,
-    "speed": 12436
+    "time": 695,
+    "speed": 7548
   },
   {
     "id": "316",
@@ -188,8 +188,8 @@
       "key": "playerinfor_barrage_316",
       "text": "据说它的作用是封印灵魂？"
     },
-    "time": 618,
-    "speed": 9124
+    "time": 803,
+    "speed": 10280
   },
   {
     "id": "317",
@@ -200,8 +200,8 @@
       "key": "playerinfor_barrage_317",
       "text": "月中人的传承居然这么可怕？！"
     },
-    "time": 850,
-    "speed": 8299
+    "time": 981,
+    "speed": 10986
   },
   {
     "id": "318",
@@ -212,8 +212,8 @@
       "key": "playerinfor_barrage_318",
       "text": "哦！你们真是够了！"
     },
-    "time": 986,
-    "speed": 10471
+    "time": 1083,
+    "speed": 10722
   },
   {
     "id": "319",
@@ -224,8 +224,8 @@
       "key": "playerinfor_barrage_319",
       "text": "照相不是魔法！也不能封印灵魂！"
     },
-    "time": 1138,
-    "speed": 10110
+    "time": 1257,
+    "speed": 10011
   },
   {
     "id": "320",
@@ -236,8 +236,8 @@
       "key": "playerinfor_barrage_320",
       "text": "那她是在干什么？"
     },
-    "time": 1245,
-    "speed": 8058
+    "time": 1496,
+    "speed": 10837
   },
   {
     "id": "321",
@@ -248,8 +248,8 @@
       "key": "playerinfor_barrage_321",
       "text": "……别问。"
     },
-    "time": 1471,
-    "speed": 8833
+    "time": 1620,
+    "speed": 7630
   },
   {
     "id": "322",
@@ -260,8 +260,8 @@
       "key": "playerinfor_barrage_322",
       "text": "那可以教我吗？"
     },
-    "time": 1667,
-    "speed": 10965
+    "time": 1738,
+    "speed": 12200
   },
   {
     "id": "323",
@@ -272,8 +272,8 @@
       "key": "playerinfor_barrage_323",
       "text": "我也想学。"
     },
-    "time": 1810,
-    "speed": 9501
+    "time": 1949,
+    "speed": 12536
   },
   {
     "id": "324",
@@ -284,7 +284,7 @@
       "key": "playerinfor_barrage_324",
       "text": "要不你们问问这个传承者？"
     },
-    "time": 1979,
-    "speed": 8500
+    "time": 2077,
+    "speed": 11522
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_playerinfor_overview.json b/bin/json/game_playerinfor_overview.json
index 5e93b41b5..edd9d7540 100644
--- a/bin/json/game_playerinfor_overview.json
+++ b/bin/json/game_playerinfor_overview.json
@@ -11,8 +11,8 @@
     "url": "100001",
     "tips": 10000,
     "resources": "Person/10000/25001M.prefab",
-    "pvpAnimator": "",
-    "mainq": "",
+    "pvpAnimator": "Person/10000/10000_MPvp.controller",
+    "mainq": "Person/10000/10000M_q.prefab",
     "name": {
       "key": "playerinfor_playerinfor_overview_name_1",
       "text": "陈旧服饰"
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index 3ae96412f..bbc296b29 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -47693,7 +47693,9 @@
       3,
       1,
       390001401,
-      390001404
+      500,
+      390001404,
+      500
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -47741,7 +47743,9 @@
       3,
       2,
       390001401,
-      390001404
+      500,
+      390001404,
+      500
     ],
     "FollowSK": [],
     "SucFollowSK": [],
diff --git a/comm/const.go b/comm/const.go
index b22a56a30..a89deefce 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -973,6 +973,13 @@ const (
 	Rtype235 TaskType = 235 // 指定X龙的等级达到Y级
 	Rtype236 TaskType = 236 // 购买X章的商店物品数量达到Y件
 	Rtype237 TaskType = 237 // 在梦境回廊内消耗X点体力
+
+	Rtype240 TaskType = 240 //累计完成x次日常任务
+	Rtype241 TaskType = 241 //在任意商店累计购买x次商品
+	Rtype242 TaskType = 242 //辉月等级达到x级
+
+	Rtype243 TaskType = 243 //指定英雄满级且共鸣和觉醒升至最高状态
+
 )
 const (
 	MailLineEasy      int32 = 1 // 简单
@@ -988,13 +995,6 @@ const (
 	RaceSy int32 = 5 // 闪耀
 )
 
-// 共鸣属性
-const (
-	ResonanceHpPro  = "hppro"
-	ResonanceAtkPro = "atkpro"
-	ResonanceDefPro = "defpro"
-)
-
 const (
 	MailPeackReward = "PeackReward"
 )
diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go
index b20a6aec7..18023ba34 100644
--- a/modules/hero/api_awaken.go
+++ b/modules/hero/api_awaken.go
@@ -5,6 +5,7 @@ import (
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/utils"
+	"strconv"
 )
 
 // 参数校验
@@ -127,12 +128,13 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (e
 			bManAwaken = true
 		}
 		tasks = append(tasks, comm.GetBuriedParam(comm.Rtype121, 1, cfg.Race))
-		tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype36, _hero.HeroID, cfg.Color, cfg.Job, cfg.Race, _hero.JuexingLv))
-		_, err = this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1)
 		if err != nil { // 达到满级觉醒
 			if _hero.Lv == this.module.configure.GetHeroMaxLv(_hero.Star) && bManAwaken {
-				tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype38, _hero.HeroID))
 				tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype37, _hero.HeroID, cfg.Color))
+				tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype38, _hero.HeroID))
+				tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype36, _hero.HeroID, cfg.Color, cfg.Job, cfg.Race, _hero.JuexingLv))
+				iHeroId, _ := strconv.Atoi(_hero.HeroID)
+				tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype243, _hero.HeroID, int32(iHeroId)))
 			}
 		}
 
diff --git a/modules/hero/api_talentlearn.go b/modules/hero/api_talentlearn.go
index 9fdfa458b..81bdf57c4 100644
--- a/modules/hero/api_talentlearn.go
+++ b/modules/hero/api_talentlearn.go
@@ -6,6 +6,7 @@ import (
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/utils"
+	"strconv"
 )
 
 // 参数校验
@@ -207,7 +208,8 @@ func (this *apiComp) TalentLearn(session comm.IUserSession, req *pb.HeroTalentLe
 				if this.module.configure.GetHeroTalentMaxLv(heroObj.HeroID) == int32(len(talent.Talent)) {
 					tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype37, heroObj.HeroID, cfg.Color))
 					tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype38, heroObj.HeroID))
-
+					iHeroId, _ := strconv.Atoi(heroObj.HeroID)
+					tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype243, heroObj.HeroID, int32(iHeroId)))
 				}
 			}
 		}
diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go
index 13236e2a9..759ffb06e 100644
--- a/modules/hero/model_hero.go
+++ b/modules/hero/model_hero.go
@@ -13,6 +13,7 @@ import (
 	"math"
 	"math/big"
 	"reflect"
+	"strconv"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
@@ -200,59 +201,12 @@ func (this *ModelHero) resetJuexingProperty(hero *pb.DBHero) {
 		awakenData, err := this.module.configure.GetHeroAwakenConfig(hero.HeroID, int32(i))
 		if err == nil {
 			for _, v := range awakenData.Phasebonus {
-				value := v.D
-				switch v.S {
-				case comm.Hp:
-					hero.JuexProperty[comm.Hp] += int32(value)
-				case comm.Def:
-					hero.JuexProperty[comm.Def] += int32(value)
-				case comm.Atk:
-					hero.JuexProperty[comm.Atk] += int32(value)
-				case comm.Speed:
-					hero.JuexProperty[comm.Speed] += int32(value)
-				case comm.Cri:
-					hero.JuexProperty[comm.Cri] += int32(value)
-				case comm.ResonanceHpPro:
-					hero.JuexProperty[comm.ResonanceHpPro] += int32(value)
-					//hero.JuexProperty[comm.Hp] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Hp])))
-				case comm.ResonanceAtkPro:
-					hero.JuexProperty[comm.ResonanceAtkPro] += int32(value)
-					//hero.JuexProperty[comm.Atk] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Atk])))
-				case comm.ResonanceDefPro:
-					hero.JuexProperty[comm.ResonanceDefPro] += int32(value)
-					//hero.JuexProperty[comm.Def] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Def])))
-
-				default:
-					this.module.Errorf("unkonw Resonance property:%s", v.S)
-				}
+				hero.JuexProperty[v.S] += int32(v.D)
 			}
 		}
 	}
 }
 
-// 觉醒
-func (this *ModelHero) setJuexingProperty(hero *pb.DBHero, key string, value int32) {
-	switch key {
-	case comm.Hp:
-		hero.JuexProperty[comm.Hp] += value
-	case comm.Def:
-		hero.JuexProperty[comm.Def] += value
-	case comm.Atk:
-		hero.JuexProperty[comm.Atk] += value
-	case comm.Speed:
-		hero.JuexProperty[comm.Speed] += value
-	case comm.ResonanceHpPro:
-		hero.JuexProperty[comm.ResonanceHpPro] += value
-		//hero.JuexProperty[comm.Hp] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Hp])))
-	case comm.ResonanceAtkPro:
-		hero.JuexProperty[comm.ResonanceAtkPro] += value
-		//hero.JuexProperty[comm.Atk] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Atk])))
-	case comm.ResonanceDefPro:
-		hero.JuexProperty[comm.ResonanceDefPro] += value
-		//hero.JuexProperty[comm.Def] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Def])))
-	}
-}
-
 // 设置装备属性
 func (this *ModelHero) setEquipProperty(hero *pb.DBHero, equip []*pb.DB_Equipment) {
 
@@ -586,6 +540,8 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, hero *pb.DBHero, ex
 					if this.module.configure.GetHeroTalentMaxLv(hero.HeroID) == _l {
 						tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype37, hero.HeroID, cfg.Color))
 						tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype38, hero.HeroID))
+						iHeroId, _ := strconv.Atoi(hero.HeroID)
+						tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype243, hero.HeroID, int32(iHeroId)))
 					}
 				}
 			}
@@ -892,25 +848,6 @@ func (this *ModelHero) SetHeroFetterProperty(hero *pb.DBHero, attr []*cfg.Gameat
 	}
 	for _, key := range attr {
 		hero.Fetters[key.A] += key.N
-		// value := key.N
-		// switch key.A {
-		// case comm.Hp:
-		// 	hero.Fetters[comm.Hp] += value
-		// case comm.Def:
-		// 	hero.Fetters[comm.Def] += value
-		// case comm.Atk:
-		// 	hero.Fetters[comm.Atk] += value
-		// case comm.Speed:
-		// 	hero.Fetters[comm.Speed] += value
-		// case comm.HpPro:
-		// 	hero.Fetters[comm.Hp] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Hp])))
-		// case comm.AtkPro:
-		// 	hero.Fetters[comm.Atk] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Atk])))
-		// case comm.DefPro:
-		// 	hero.Fetters[comm.Def] += int32(math.Floor((float64(value) / 1000) * float64(hero.Property[comm.Def])))
-		// default:
-		// 	this.module.Errorf("unkonw hero fetter property:%v", key)
-		// }
 	}
 }
 
diff --git a/modules/integral/api_challenge.go b/modules/integral/api_challenge.go
index c4d730ba0..8d99ec824 100644
--- a/modules/integral/api_challenge.go
+++ b/modules/integral/api_challenge.go
@@ -19,7 +19,9 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.IntegralC
 
 // /挑战主线关卡
 func (this *apiComp) Challenge(session comm.IUserSession, req *pb.IntegralChallengeReq) (errdata *pb.ErrorData) {
-
+	var (
+		dibuff []int32
+	)
 	errdata = this.ChallengeCheck(session, req)
 	if errdata != nil {
 		return // 参数校验失败直接返回
@@ -50,14 +52,16 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.IntegralChalle
 		}
 		return
 	}
-
-	errdata, record := this.module.battle.CreatePveBattle(session, &pb.BattlePVEReq{
+	for k := range list.Buff {
+		dibuff = append(dibuff, k)
+	}
+	errdata, record := this.module.battle.CreateDebuffBattle(session, &pb.BattlePVEReq{
 		Rulesid: cfgData.BattleReadyID,
 		Ptype:   pb.PlayType_integral,
 		Title:   "",
 		Format:  req.Battle,
 		Mformat: cfgData.Boss,
-	})
+	}, dibuff)
 
 	if errdata != nil {
 		return
diff --git a/modules/monkey/api_award.go b/modules/monkey/api_award.go
index 09818672f..d9cc6b25c 100644
--- a/modules/monkey/api_award.go
+++ b/modules/monkey/api_award.go
@@ -12,12 +12,12 @@ func (this *apiComp) AwardCheck(session comm.IUserSession, req *pb.MonkeyAwardRe
 
 func (this *apiComp) Award(session comm.IUserSession, req *pb.MonkeyAwardReq) (errdata *pb.ErrorData) {
 	var (
-		err       error
-		info      *pb.DBMonkey
-		conf      []*cfg.GameMonkeyRewardData
-		res       []*cfg.Gameatn
-		atno      []*pb.UserAtno
-		totalstar int32 //
+		err  error
+		info *pb.DBMonkey
+		conf []*cfg.GameMonkeyRewardData
+		res  []*cfg.Gameatn
+		atno []*pb.UserAtno
+		//totalstar int32 //
 	)
 	if errdata = this.AwardCheck(session, req); errdata != nil {
 		return
@@ -45,16 +45,16 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.MonkeyAwardReq) (e
 		}
 		return
 	}
-	for _, v := range info.Data[req.ChapterId].Award {
-		totalstar += v
-	}
-	if totalstar < req.Starnum { // 星级不够 不能领奖
-		errdata = &pb.ErrorData{
-			Code:  pb.ErrorCode_UserNoReward,
-			Title: pb.ErrorCode_UserNoReward.ToString(),
-		}
-		return
-	}
+	// for _, v := range info.Data[req.ChapterId].Award {
+	// 	totalstar += v
+	// }
+	// if totalstar < req.Starnum { // 星级不够 不能领奖
+	// 	errdata = &pb.ErrorData{
+	// 		Code:  pb.ErrorCode_UserNoReward,
+	// 		Title: pb.ErrorCode_UserNoReward.ToString(),
+	// 	}
+	// 	return
+	// }
 	if conf, err = this.module.configure.getGameMonkeyRewardData(req.ChapterId); err == nil {
 		for _, v := range conf {
 			if v.Starnum > info.Reward[req.ChapterId] && v.Starnum <= req.Starnum {
diff --git a/modules/monkey/api_updatestar.go b/modules/monkey/api_updatestar.go
index 2b28c5581..1a8033bdc 100644
--- a/modules/monkey/api_updatestar.go
+++ b/modules/monkey/api_updatestar.go
@@ -55,7 +55,7 @@ func (this *apiComp) UpdateStar(session comm.IUserSession, req *pb.MonkeyUpdateS
 
 		update["data"] = info.Data
 	} else {
-		if info.Data[conf.Chapter].Award[req.Stage] < req.Star {
+		if info.Data[conf.Chapter].Award[req.Stage] != req.Star {
 			info.Data[conf.Chapter].Award[req.Stage] = req.Star
 			update["data"] = info.Data
 		}
diff --git a/modules/moonlv/api_lvaward.go b/modules/moonlv/api_lvaward.go
index 65dd45771..de87af5d1 100644
--- a/modules/moonlv/api_lvaward.go
+++ b/modules/moonlv/api_lvaward.go
@@ -108,6 +108,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.MoonlvAwardReq) (e
 	})
 	go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
 		this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypeMoonLv, list.Lv)
+		this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype242, list.Lv))
 	})
 	return
 }
diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go
index cfbbc7f8f..f34bbbd4a 100644
--- a/modules/shop/api_buy.go
+++ b/modules/shop/api_buy.go
@@ -196,7 +196,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (errdata
 			// this.module.ModuleRtask.SendToRtask(session, comm.Rtype67, v.N, utils.ToInt32(v.T))
 		}
 	}
-
+	tasks = append(tasks, comm.GetBuriedParam(comm.Rtype241, 1))
 	session.SendMsg(string(this.module.GetType()), "buy", &pb.ShopBuyResp{Award: award})
 	if len(tasks) > 0 {
 		go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
diff --git a/sys/configure/structs/Game.IntegralConditionData.go b/sys/configure/structs/Game.IntegralConditionData.go
index ba97a04d1..2c2d48287 100644
--- a/sys/configure/structs/Game.IntegralConditionData.go
+++ b/sys/configure/structs/Game.IntegralConditionData.go
@@ -15,7 +15,6 @@ type GameIntegralConditionData struct {
     Condition string
     TaskId int32
     IType int32
-    Condval string
     Jumpto int32
     Des string
     Skillid int32
@@ -32,7 +31,6 @@ func (_v *GameIntegralConditionData)Deserialize(_buf map[string]interface{}) (er
     { var _ok_ bool; if _v.Condition, _ok_ = _buf["condition"].(string); !_ok_ { err = errors.New("condition error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["TaskId"].(float64); !_ok_ { err = errors.New("TaskId error"); return }; _v.TaskId = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["iType"].(float64); !_ok_ { err = errors.New("iType error"); return }; _v.IType = int32(_tempNum_) }
-    { var _ok_ bool; if _v.Condval, _ok_ = _buf["condval"].(string); !_ok_ { err = errors.New("condval error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["jumpto"].(float64); !_ok_ { err = errors.New("jumpto error"); return }; _v.Jumpto = int32(_tempNum_) }
     { var _ok_ bool; if _v.Des, _ok_ = _buf["des"].(string); !_ok_ { err = errors.New("des error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillid"].(float64); !_ok_ { err = errors.New("skillid error"); return }; _v.Skillid = int32(_tempNum_) }