diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json
index 1d7533e6c..92d1893fc 100644
--- a/bin/json/game_buriedtype.json
+++ b/bin/json/game_buriedtype.json
@@ -1065,7 +1065,7 @@
     "id": 121,
     "insert": 0,
     "desc": "A阵营英雄觉醒N级(从接到任务开始，A阵营的英雄觉醒每升1级进度+1)",
-    "data1": "等级",
+    "data1": "次数",
     "data2": "阵营id",
     "data3": "",
     "data4": ""
@@ -1523,7 +1523,7 @@
   {
     "id": 172,
     "insert": 0,
-    "desc": "连续战斗X次（接取任务后，在任意战斗内使用连续战斗一次，进度便加一）",
+    "desc": "维京体系内战斗X次（接取任务后，在任意战斗内使用连续战斗一次，进度便加一）",
     "data1": "次数",
     "data2": "",
     "data3": "",
diff --git a/bin/json/game_mail.json b/bin/json/game_mail.json
index 84ae95167..d242bbf23 100644
--- a/bin/json/game_mail.json
+++ b/bin/json/game_mail.json
@@ -244,7 +244,7 @@
     },
     "recipient": {
       "key": "mail_mail_recipient_12",
-      "text": "亲爱的的玩家你在跑商中荣获第{0}名：这是您的排名奖励请查收"
+      "text": "亲爱的{0}："
     },
     "content": {
       "key": "mail_mail_content_12",
diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json
index 760a7e7bb..9049fe6fd 100644
--- a/bin/json/game_rdtaskcondi.json
+++ b/bin/json/game_rdtaskcondi.json
@@ -7603,13 +7603,13 @@
     "data": 2,
     "type_sp": 1,
     "tasktxt": {
-      "key": "连续战斗10次",
-      "text": "连续战斗10次"
+      "key": "连续战斗3次",
+      "text": "连续战斗3次"
     },
     "type": 172,
     "valid": 0,
     "NPC": 10241,
-    "data1": 10,
+    "data1": 3,
     "data2": 0,
     "data3": 0,
     "data4": 0,
@@ -7912,10 +7912,10 @@
       "key": "将炉温拉满1次",
       "text": "将炉温拉满1次"
     },
-    "type": 105,
+    "type": 175,
     "valid": 0,
     "NPC": 0,
-    "data1": 3,
+    "data1": 100,
     "data2": 0,
     "data3": 0,
     "data4": 0,
@@ -8014,11 +8014,11 @@
       "key": "解锁2阶段装备1个图纸",
       "text": "解锁2阶段装备1个图纸"
     },
-    "type": 105,
+    "type": 179,
     "valid": 0,
     "NPC": 0,
     "data1": 1,
-    "data2": 0,
+    "data2": 2,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -8028,14 +8028,14 @@
     "data": 2,
     "type_sp": 1,
     "tasktxt": {
-      "key": "解锁3阶段装备1个图纸",
-      "text": "解锁3阶段装备1个图纸"
+      "key": "解锁3阶段装备2个图纸",
+      "text": "解锁3阶段装备2个图纸"
     },
-    "type": 105,
+    "type": 179,
     "valid": 0,
     "NPC": 0,
-    "data1": 1,
-    "data2": 0,
+    "data1": 2,
+    "data2": 3,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -8045,14 +8045,14 @@
     "data": 2,
     "type_sp": 1,
     "tasktxt": {
-      "key": "解锁5阶段装备1个图纸",
-      "text": "解锁5阶段装备1个图纸"
+      "key": "解锁5阶段装备3个图纸",
+      "text": "解锁5阶段装备3个图纸"
     },
-    "type": 105,
+    "type": 179,
     "valid": 0,
     "NPC": 0,
-    "data1": 1,
-    "data2": 0,
+    "data1": 3,
+    "data2": 5,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -8116,11 +8116,11 @@
       "key": "指定A套装强化6",
       "text": "指定A套装强化6"
     },
-    "type": 105,
+    "type": 93,
     "valid": 0,
     "NPC": 0,
     "data1": 6,
-    "data2": 0,
+    "data2": 1,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -8133,11 +8133,11 @@
       "key": "指定B套装强化6",
       "text": "指定B套装强化6"
     },
-    "type": 105,
+    "type": 93,
     "valid": 0,
     "NPC": 0,
     "data1": 6,
-    "data2": 0,
+    "data2": 2,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -8402,15 +8402,15 @@
     "data": 2,
     "type_sp": 1,
     "tasktxt": {
-      "key": "自动战斗装备副本难度5",
-      "text": "自动战斗装备副本难度5"
+      "key": "自动战斗装备副本难度2",
+      "text": "自动战斗装备副本难度2"
     },
-    "type": 105,
+    "type": 181,
     "valid": 0,
     "NPC": 0,
     "data1": 1,
-    "data2": 0,
-    "data3": 0,
+    "data2": 11,
+    "data3": 2,
     "data4": 0,
     "data5": 0
   },
@@ -8419,15 +8419,15 @@
     "data": 2,
     "type_sp": 1,
     "tasktxt": {
-      "key": "自动战斗装备副本难度10",
-      "text": "自动战斗装备副本难度10"
+      "key": "自动战斗装备副本难度3",
+      "text": "自动战斗装备副本难度3"
     },
-    "type": 105,
+    "type": 181,
     "valid": 0,
     "NPC": 0,
     "data1": 1,
-    "data2": 0,
-    "data3": 0,
+    "data2": 11,
+    "data3": 3,
     "data4": 0,
     "data5": 0
   },
@@ -8456,7 +8456,7 @@
       "key": "解锁木桩1根",
       "text": "解锁木桩1根"
     },
-    "type": 105,
+    "type": 152,
     "valid": 0,
     "NPC": 0,
     "data1": 1,
@@ -8473,10 +8473,10 @@
       "key": "解锁木桩2根",
       "text": "解锁木桩2根"
     },
-    "type": 105,
+    "type": 152,
     "valid": 0,
     "NPC": 0,
-    "data1": 1,
+    "data1": 2,
     "data2": 0,
     "data3": 0,
     "data4": 0,
@@ -8490,10 +8490,10 @@
       "key": "解锁木桩3根",
       "text": "解锁木桩3根"
     },
-    "type": 105,
+    "type": 152,
     "valid": 0,
     "NPC": 0,
-    "data1": 1,
+    "data1": 3,
     "data2": 0,
     "data3": 0,
     "data4": 0,
@@ -8507,7 +8507,7 @@
       "key": "抵御踢馆2次",
       "text": "抵御踢馆2次"
     },
-    "type": 105,
+    "type": 182,
     "valid": 0,
     "NPC": 0,
     "data1": 2,
@@ -8524,7 +8524,7 @@
       "key": "抵御踢馆4次",
       "text": "抵御踢馆4次"
     },
-    "type": 105,
+    "type": 182,
     "valid": 0,
     "NPC": 0,
     "data1": 4,
@@ -8541,7 +8541,7 @@
       "key": "抵御踢馆6次",
       "text": "抵御踢馆6次"
     },
-    "type": 105,
+    "type": 182,
     "valid": 0,
     "NPC": 0,
     "data1": 6,
@@ -8592,7 +8592,7 @@
       "key": "完成一次每日1健",
       "text": "完成一次每日1健"
     },
-    "type": 105,
+    "type": 185,
     "valid": 0,
     "NPC": 0,
     "data1": 1,
@@ -8609,7 +8609,7 @@
       "key": "完成一次每日3健",
       "text": "完成一次每日3健"
     },
-    "type": 105,
+    "type": 185,
     "valid": 0,
     "NPC": 0,
     "data1": 3,
@@ -8626,7 +8626,7 @@
       "key": "完成一次每日5健",
       "text": "完成一次每日5健"
     },
-    "type": 105,
+    "type": 185,
     "valid": 0,
     "NPC": 0,
     "data1": 5,
@@ -8677,11 +8677,11 @@
       "key": "5名25级英雄",
       "text": "5名25级英雄"
     },
-    "type": 105,
+    "type": 111,
     "valid": 0,
     "NPC": 0,
     "data1": 5,
-    "data2": 0,
+    "data2": 25,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -8694,11 +8694,11 @@
       "key": "5名40级英雄",
       "text": "5名40级英雄"
     },
-    "type": 105,
+    "type": 111,
     "valid": 0,
     "NPC": 0,
     "data1": 5,
-    "data2": 0,
+    "data2": 40,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -8711,11 +8711,11 @@
       "key": "5名50级英雄",
       "text": "5名50级英雄"
     },
-    "type": 105,
+    "type": 111,
     "valid": 0,
     "NPC": 0,
     "data1": 5,
-    "data2": 0,
+    "data2": 50,
     "data3": 0,
     "data4": 0,
     "data5": 0
@@ -8728,7 +8728,7 @@
       "key": "武馆的派遣悬赏3次",
       "text": "武馆的派遣悬赏3次"
     },
-    "type": 105,
+    "type": 186,
     "valid": 0,
     "NPC": 0,
     "data1": 3,
@@ -8745,7 +8745,7 @@
       "key": "武馆的派遣悬赏8次",
       "text": "武馆的派遣悬赏8次"
     },
-    "type": 105,
+    "type": 186,
     "valid": 0,
     "NPC": 0,
     "data1": 8,
@@ -8796,7 +8796,7 @@
       "key": "武馆的派遣悬赏10次",
       "text": "武馆的派遣悬赏10次"
     },
-    "type": 105,
+    "type": 186,
     "valid": 0,
     "NPC": 0,
     "data1": 10,
@@ -8830,7 +8830,7 @@
       "key": "10名50级英雄",
       "text": "10名50级英雄"
     },
-    "type": 105,
+    "type": 111,
     "valid": 0,
     "NPC": 0,
     "data1": 10,
@@ -12556,7 +12556,7 @@
     "type": 172,
     "valid": 0,
     "NPC": 0,
-    "data1": 10,
+    "data1": 3,
     "data2": 0,
     "data3": 0,
     "data4": 0,
diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go
index aa1824544..e7954cf74 100644
--- a/modules/hero/api_awaken.go
+++ b/modules/hero/api_awaken.go
@@ -108,8 +108,7 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c
 	szTask = append(szTask, comm.GettaskParam(comm.Rtype122, _hero.JuexingLv, _hero.Star))
 	cfg := this.module.configure.GetHeroConfig(_hero.HeroID)
 	if cfg != nil {
-		szTask = append(szTask, comm.GettaskParam(comm.Rtype121, cfg.Race, utils.ToInt32(_hero.HeroID), _hero.JuexingLv))
-
+		szTask = append(szTask, comm.GettaskParam(comm.Rtype121, 1, cfg.Race))
 
 		//xx英雄满级、共鸣、觉醒至最高状态
 		nextAwaken := this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1)