diff --git a/modules/academy/api_challenge.go b/modules/academy/api_challenge.go
index 466155b28..7158b860c 100644
--- a/modules/academy/api_challenge.go
+++ b/modules/academy/api_challenge.go
@@ -50,7 +50,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.AcademyChallen
 		Redflist:   record.Redflist,
 		BlueCompId: record.BlueCompId,
 		Buleflist:  record.Buleflist,
-		Tasks:      level.Task,
+		Tasks:      record.Tasks,
 	}})
 	return
 }
diff --git a/modules/academy/api_teaching.go b/modules/academy/api_teaching.go
index f4cc2dd34..9becccb87 100644
--- a/modules/academy/api_teaching.go
+++ b/modules/academy/api_teaching.go
@@ -53,7 +53,7 @@ func (this *apiComp) Teaching(session comm.IUserSession, req *pb.AcademyTeaching
 			Redflist:   record.Redflist,
 			BlueCompId: record.BlueCompId,
 			Buleflist:  record.Buleflist,
-			Tasks:      level.Task,
+			Tasks:      record.Tasks,
 		}})
 	return
 }
diff --git a/modules/combat/api_challenge.go b/modules/combat/api_challenge.go
index 02e90c95e..76adabc72 100644
--- a/modules/combat/api_challenge.go
+++ b/modules/combat/api_challenge.go
@@ -49,7 +49,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.CombatChalleng
 		Redflist:   record.Redflist,
 		BlueCompId: record.BlueCompId,
 		Buleflist:  record.Buleflist,
-		Tasks:      nil,
+		Tasks:      record.Tasks,
 	}})
 	return
 }
diff --git a/modules/pagoda/api_racechallenge.go b/modules/pagoda/api_racechallenge.go
index 21a74e7fc..13aacbb48 100644
--- a/modules/pagoda/api_racechallenge.go
+++ b/modules/pagoda/api_racechallenge.go
@@ -134,7 +134,7 @@ func (this *apiComp) ChallengeRace(session comm.IUserSession, req *pb.PagodaChal
 			Redflist:   record.Redflist,
 			BlueCompId: record.BlueCompId,
 			Buleflist:  record.Buleflist,
-			Tasks:      conf.Fightevents,
+			Tasks:      record.Tasks,
 		},
 		Cid: req.Cid,
 	})
diff --git a/modules/worldtask/api_battlestart.go b/modules/worldtask/api_battlestart.go
index e13f80383..c62bcf872 100644
--- a/modules/worldtask/api_battlestart.go
+++ b/modules/worldtask/api_battlestart.go
@@ -74,7 +74,7 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat
 					Redflist:   record.Redflist,
 					BlueCompId: record.BlueCompId,
 					Buleflist:  record.Buleflist,
-					Tasks:      battleConf.EventList,
+					Tasks:      record.Tasks,
 				},
 			}
 		} else {
diff --git a/modules/wtask/api_battleevent.go b/modules/wtask/api_battleevent.go
index e0d32cc24..335d52549 100644
--- a/modules/wtask/api_battleevent.go
+++ b/modules/wtask/api_battleevent.go
@@ -62,7 +62,7 @@ func (this *apiComp) BattleEvent(session comm.IUserSession, req *pb.WTaskBattleE
 			Redflist:   record.Redflist,
 			BlueCompId: record.BlueCompId,
 			Buleflist:  record.Buleflist,
-			Tasks:      []int32{conf.Battleid},
+			Tasks:      record.Tasks,
 		},
 	})
 	return
diff --git a/modules/wtask/api_battlestart.go b/modules/wtask/api_battlestart.go
index 8f2215668..06945cfc6 100644
--- a/modules/wtask/api_battlestart.go
+++ b/modules/wtask/api_battlestart.go
@@ -59,7 +59,7 @@ func (this *apiComp) BattleStart(session comm.IUserSession, req *pb.WTaskBattleS
 			Redflist:   record.Redflist,
 			BlueCompId: record.BlueCompId,
 			Buleflist:  record.Buleflist,
-			Tasks:      battleConf.EventList,
+			Tasks:      record.Tasks,
 		},
 	})
 	return