上传战斗代码

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
 }

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
 }

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
 }

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,
 	})

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 {

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

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