diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index 8c4c030e3..02952e7b6 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -769,7 +769,7 @@
       "key": "story_80",
       "text": "新手引导"
     },
-    "npc": 29,
+    "npc": 30,
     "completetask": [
       20003
     ],
diff --git a/modules/sys/model_sys.go b/modules/sys/model_sys.go
index 49e4ba6b1..34a64f6e4 100644
--- a/modules/sys/model_sys.go
+++ b/modules/sys/model_sys.go
@@ -74,23 +74,24 @@ func (this *ModelSys) validCond(uid string, condData *cfg.GameOpencondData) stri
 			}
 
 		case 3: //世界任务ID
-			module, err := this.service.GetModule(comm.ModuleWorldtask)
-			if err != nil {
-				this.moduleSys.Debugln(err)
-				flag = false
-				return ""
-			}
-			if i, ok := module.(comm.IWorldtask); ok {
-				d := i.GetMyWorldtask(uid)
-				for _, v := range d.LastTaskIds {
-					if v.TaskId >= conf.Param {
-						flag = true
-						continue
-					}
-				}
-			} else {
-				flag = false
-			}
+			// module, err := this.service.GetModule(comm.ModuleWorldtask)
+			// if err != nil {
+			// 	this.moduleSys.Debugln(err)
+			// 	flag = false
+			// 	return ""
+			// }
+			// if i, ok := module.(comm.IWorldtask); ok {
+			// 	d := i.GetMyWorldtask(uid)
+			// 	for _, v := range d.LastTaskIds {
+			// 		if v.TaskId >= conf.Param {
+			// 			flag = true
+			// 			continue
+			// 		}
+			// 	}
+			// } else {
+			// 	flag = false
+			// }
+			flag = true
 		}
 	}
 
diff --git a/modules/worldtask/api_accept.go b/modules/worldtask/api_accept.go
index f13c2ad31..bf19c7f5d 100644
--- a/modules/worldtask/api_accept.go
+++ b/modules/worldtask/api_accept.go
@@ -34,16 +34,16 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
 		return
 	}
 
-	if myWorldtask.CurrentTaskIds == nil {
-		myWorldtask.CurrentTaskIds = make(map[int32]*pb.Worldtask)
+	if myWorldtask.CurrentTask == nil {
+		myWorldtask.CurrentTask = make(map[int32]*pb.Worldtask)
 	}
-	myWorldtask.CurrentTaskIds[curTaskConf.Group] = &pb.Worldtask{
+	myWorldtask.CurrentTask[curTaskConf.Group] = &pb.Worldtask{
 		TaskId:   req.TaskId,
 		TaskType: 2,
 	}
 
 	update := map[string]interface{}{
-		"currentTaskIds": myWorldtask.CurrentTaskIds,
+		"currentTaskIds": myWorldtask.CurrentTask,
 		"npcStatus":      1,
 	}
 	if err := a.module.modelWorldtask.Change(uid, update); err != nil {
diff --git a/modules/worldtask/api_battlefinish.go b/modules/worldtask/api_battlefinish.go
index b83cf8cb7..724c3e403 100644
--- a/modules/worldtask/api_battlefinish.go
+++ b/modules/worldtask/api_battlefinish.go
@@ -62,8 +62,13 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
 		}
 
 		if taskConf.IdAfter != 0 {
+			nextTaskIds := this.module.modelWorldtask.findNextTasks(req.TaskId)
+			nextMap := make(map[int32]*pb.Worldtask)
+			nextMap[req.GroupId] = &pb.Worldtask{
+				CondiIds: nextTaskIds,
+			}
 			if err := session.SendMsg(string(this.module.GetType()), "nexttask", &pb.WorldtaskNexttaskPush{
-				NextTaskId: taskConf.IdAfter,
+				NextTask: nextMap,
 			}); err != nil {
 				log.Error("任务条件达成推送",
 					log.Field{Key: "uid", Value: uid},
diff --git a/modules/worldtask/api_completetask.go b/modules/worldtask/api_completetask.go
index 72fb0b084..390e0084e 100644
--- a/modules/worldtask/api_completetask.go
+++ b/modules/worldtask/api_completetask.go
@@ -28,18 +28,19 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
 		return
 	}
 
+	wt := myWorldtask.CurrentTask[req.GroupId]
 	if m, err := this.module.service.GetModule(comm.ModuleRtask); err == nil {
 		iwt, ok := m.(comm.IRtask)
 		if ok {
 			if code = iwt.CheckCondi(uid, req.CondiId); code != pb.ErrorCode_Success {
 				return
 			}
-			myWorldtask.CondiIds = append(myWorldtask.CondiIds, req.CondiId)
+			wt.CondiIds = append(wt.CondiIds, req.CondiId)
 		}
 	}
 
 	update := map[string]interface{}{
-		"condiIds": myWorldtask.CondiIds,
+		"condiIds": wt.CondiIds,
 	}
 	if err := this.module.modelWorldtask.Change(uid, update); err != nil {
 		code = pb.ErrorCode_DBError
diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go
index caa25c6d3..00629709c 100644
--- a/modules/worldtask/api_finish.go
+++ b/modules/worldtask/api_finish.go
@@ -74,28 +74,18 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
 			return
 		}
 	}
-	var (
-		hero []string
-	)
-	hero = make([]string, 0)
-	var nextTaskId int32
 
-	finishRsp := func() {
-		if err := session.SendMsg(string(this.module.GetType()), WorldtaskSubtypeFinish, rsp); err != nil {
-			code = pb.ErrorCode_SystemError
-			return
-		}
-		if curTaskConf.IdAfter != 0 {
-			nextTaskId = curTaskConf.IdAfter
+	updateCheckCond := func(taskIds []int32) *pb.DBWorldtask {
+		for _, taskId := range taskIds {
 			//检查下个任务的完成条件
-			nextTaskConf, err := this.module.configure.getWorldtaskById(nextTaskId)
+			nextTaskConf, err := this.module.configure.getWorldtaskById(taskId)
 			if err != nil || curTaskConf == nil {
 				code = pb.ErrorCode_ConfigNoFound
-				return
+				return nil
 			}
 
 			if len(nextTaskConf.Completetask) == 1 && nextTaskConf.Completetask[0] == 0 {
-				userTask.CondiIds = []int32{}
+				userTask.CurrentTask[req.GroupId].CondiIds = []int32{}
 			} else {
 				for _, condiId := range nextTaskConf.Completetask {
 					if condiId == 0 {
@@ -105,33 +95,51 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
 						iwt, ok := m.(comm.IRtask)
 						if ok {
 							if code = iwt.CheckCondi(uid, condiId); code != pb.ErrorCode_Success {
-								return
+								return nil
 							}
-							userTask.CondiIds = append(userTask.CondiIds, condiId)
+							userTask.CurrentTask[req.GroupId].CondiIds = append(userTask.CurrentTask[req.GroupId].CondiIds, condiId)
 						}
 					}
 				}
 			}
 			//设置当前进行的任务
-			userTask.CurrentTaskIds[curTaskConf.Group] = &pb.Worldtask{
-				TaskId:   nextTaskId,
-				TaskType: 2,
+			userTask.CurrentTask[curTaskConf.Group] = &pb.Worldtask{
+				TaskId:   taskId,
+				TaskType: nextTaskConf.Des,
 			}
+		}
 
-			update := map[string]interface{}{
-				"condiIds":       userTask.CondiIds,
-				"currentTaskIds": userTask.CurrentTaskIds,
+		update := map[string]interface{}{
+			"currentTask": userTask.CurrentTask,
+		}
+
+		if err := this.module.modelWorldtask.Change(uid, update); err != nil {
+			code = pb.ErrorCode_DBError
+			return nil
+		}
+
+		return userTask
+	}
+
+	finishRsp := func() {
+		if err := session.SendMsg(string(this.module.GetType()), WorldtaskSubtypeFinish, rsp); err != nil {
+			code = pb.ErrorCode_SystemError
+			return
+		}
+		if curTaskConf.IdAfter != 0 {
+			nextTaskIds := this.module.modelWorldtask.findNextTasks(curTaskConf.Key)
+
+			userTask = updateCheckCond(nextTaskIds)
+
+			nextTask := make(map[int32]*pb.Worldtask)
+			for k, v := range userTask.CurrentTask {
+				nextTask[k] = &pb.Worldtask{
+					CondiIds: v.CondiIds,
+				}
 			}
-
-			if err := this.module.modelWorldtask.Change(uid, update); err != nil {
-				code = pb.ErrorCode_DBError
-				return
-			}
-
 			// 任务完成推送
 			if err := session.SendMsg(string(this.module.GetType()), WorldtaskNexttaskPush, &pb.WorldtaskNexttaskPush{
-				NextTaskId: nextTaskId,
-				CondIds:    userTask.CondiIds,
+				NextTask: nextTask,
 			}); err != nil {
 				code = pb.ErrorCode_SystemError
 				return
@@ -143,12 +151,6 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
 
 	finishCall := func() {
 
-		for _, v := range curTaskConf.Reword {
-			if v.A == comm.HeroType {
-				hero = append(hero, v.T)
-			}
-		}
-
 		// 完成任务
 		if err := this.module.modelWorldtask.finishTask(req.GroupId, req.TaskId, userTask); err != nil {
 			code = pb.ErrorCode_WorldtaskFinish
diff --git a/modules/worldtask/api_mine.go b/modules/worldtask/api_mine.go
index 9159ff1ff..da2189eb5 100644
--- a/modules/worldtask/api_mine.go
+++ b/modules/worldtask/api_mine.go
@@ -28,13 +28,13 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.WorldtaskMineReq) (
 		}
 	}
 
-	var wtMp = make(map[int32]*pb.Worldtask)
-	for k, v := range myWorldtask.LastTaskIds {
-		if v.TaskType == 2 {
-			wtMp[k] = v
-		}
-	}
-	myWorldtask.LastTaskIds = wtMp
+	// var wtMp = make(map[int32]*pb.Worldtask)
+	// for k, v := range myWorldtask.LastTaskIds {
+	// 	if v.TaskType == 2 {
+	// 		wtMp[k] = v
+	// 	}
+	// }
+	// myWorldtask.LastTaskIds = wtMp
 	myWorldtask.TaskList = list 
 	rsp := &pb.WorldtaskMineResp{
 		Task: myWorldtask,
diff --git a/modules/worldtask/model_worldtask.go b/modules/worldtask/model_worldtask.go
index c86d39591..92b8104ab 100644
--- a/modules/worldtask/model_worldtask.go
+++ b/modules/worldtask/model_worldtask.go
@@ -76,9 +76,6 @@ func (this *ModelWorldtask) finishTask(groupId, taskId int32, task *pb.DBWorldta
 		return errors.New("worldtask is nil")
 	}
 	update := map[string]interface{}{}
-	if task.LastTaskIds == nil {
-		task.LastTaskIds = make(map[int32]*pb.Worldtask)
-	}
 
 	taskConf := this.moduleWorldtask.worldtaskConf.GetDataMap()[taskId]
 	if taskConf == nil {
@@ -91,10 +88,8 @@ func (this *ModelWorldtask) finishTask(groupId, taskId int32, task *pb.DBWorldta
 		TaskType: taskConf.Des,
 	}
 	task.TaskList = append(task.TaskList, wt)
-	task.LastTaskIds[groupId] = wt
 
 	update["taskList"] = task.TaskList
-	update["lastTaskIds"] = task.LastTaskIds
 	update["deliverNpc"] = 1
 	update["condiIds"] = []int32{}
 	update["npcStatus"] = 0
@@ -130,3 +125,18 @@ func (this *ModelWorldtask) finishTask(groupId, taskId int32, task *pb.DBWorldta
 	}
 	return nil
 }
+
+// 查找后续任务
+func (this *ModelWorldtask) findNextTasks(parentTaskId int32) (taskIds []int32) {
+	gwt, err := this.moduleWorldtask.configure.getWorldtaskCfg()
+	if err != nil || gwt == nil {
+		return
+	}
+
+	for _, v := range gwt.GetDataList() {
+		if v.Ontxe == parentTaskId {
+			taskIds = append(taskIds, v.Key)
+		}
+	}
+	return
+}
diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go
index 4a7868051..849267b65 100644
--- a/modules/worldtask/module.go
+++ b/modules/worldtask/module.go
@@ -64,12 +64,15 @@ func (this *Worldtask) TaskCondFinishNotify(session comm.IUserSession, condId in
 		return err
 	}
 
+	var groupId int32
 	// 检索condId是否是世界任务的完成条件
 	finishedTaskIds := make(map[int32]int32) //达成的任务条件
 	for _, c := range this.worldtaskConf.GetDataList() {
 		for _, v := range c.Completetask {
 			if v == condId {
 				finishedTaskIds[c.Group] = c.Key
+				groupId = c.Group
+				break
 			}
 		}
 	}
@@ -78,20 +81,25 @@ func (this *Worldtask) TaskCondFinishNotify(session comm.IUserSession, condId in
 		return nil
 	}
 
-	userTask.CondiIds = append(userTask.CondiIds, condId)
+	if userTask.CurrentTask == nil {
+		userTask.CurrentTask = make(map[int32]*pb.Worldtask)
+	}
+
+	wt := userTask.CurrentTask[groupId]
+	wt.CondiIds = append(wt.CondiIds, condId)
 
 	update := map[string]interface{}{
-		"condiIds": userTask.CondiIds,
+		"condiIds": wt.CondiIds,
 	}
 	this.modelWorldtask.Change(uid, update)
 
-	for k, v := range userTask.CurrentTaskIds {
+	for k, v := range userTask.CurrentTask {
 		session.SendMsg(string(this.GetType()), "completecondis", &pb.WorldtaskCompletecondisPush{
 			GroupId:  k,
 			TaskId:   v.TaskId,
-			CondiIds: userTask.CondiIds,
+			CondiIds: wt.CondiIds,
 		})
-		this.Debug("推送完成条件",log.Field{Key: "condiIds",Value: v.TaskId})
+		this.Debug("推送完成条件", log.Field{Key: "condiIds", Value: v.TaskId})
 	}
 
 	return nil
@@ -179,7 +187,7 @@ func (this *Worldtask) TaskcondNotify(session comm.IUserSession, condId int32) e
 
 				if nextTaskId != 0 && taskConf.Des == 2 {
 					if err := session.SendMsg(string(this.GetType()), "nexttask", &pb.WorldtaskNexttaskPush{
-						NextTaskId: nextTaskId,
+						// NextTaskId: nextTaskId,
 					}); err != nil {
 						logFields = append(logFields, log.Field{Key: "err", Value: err.Error()})
 						log.Error("任务条件达成推送", logFields...)
@@ -211,7 +219,6 @@ func (this *Worldtask) GetMyWorldtask(uid string) *pb.DBWorldtask {
 func (this *Worldtask) BingoAllTask(session comm.IUserSession) error {
 	uid := session.GetUserId()
 	mytask := &pb.DBWorldtask{Uid: uid}
-	mytask.LastTaskIds = make(map[int32]*pb.Worldtask)
 
 	tasklist := this.worldtaskConf.GetDataList()
 
@@ -222,7 +229,6 @@ func (this *Worldtask) BingoAllTask(session comm.IUserSession) error {
 				TaskId:   conf.Key,
 				TaskType: conf.Des,
 			}
-			mytask.LastTaskIds[conf.Group] = wt
 			mytask.TaskList = append(mytask.TaskList, wt)
 		}
 	}
@@ -254,9 +260,6 @@ func (this *Worldtask) BingoJumpTask(session comm.IUserSession, groupId, taskId
 		return fmt.Errorf("taskId: %v config is nil", taskId)
 	}
 
-	if mytask.LastTaskIds == nil {
-		mytask.LastTaskIds = make(map[int32]*pb.Worldtask)
-	}
 	//重置taskList
 	mytask.TaskList = []*pb.Worldtask{}
 
@@ -268,7 +271,6 @@ func (this *Worldtask) BingoJumpTask(session comm.IUserSession, groupId, taskId
 					TaskId:   v.Key,
 					TaskType: v.Des,
 				}
-				mytask.LastTaskIds[groupId] = wt
 				mytask.TaskList = append(mytask.TaskList, wt)
 			}
 
@@ -278,12 +280,10 @@ func (this *Worldtask) BingoJumpTask(session comm.IUserSession, groupId, taskId
 			TaskId:   taskId,
 			TaskType: taskConf.Des,
 		}
-		mytask.LastTaskIds[groupId] = wt
 		mytask.TaskList = append(mytask.TaskList, wt)
 	}
 	update = map[string]interface{}{
-		"lastTaskIds": mytask.LastTaskIds,
-		"taskList":    mytask.TaskList,
+		"taskList": mytask.TaskList,
 	}
 
 	if err := this.modelWorldtask.Change(uid, update); err != nil {
diff --git a/pb/worldtask_db.pb.go b/pb/worldtask_db.pb.go
index 725b92508..bcecfebd0 100644
--- a/pb/worldtask_db.pb.go
+++ b/pb/worldtask_db.pb.go
@@ -25,13 +25,9 @@ type DBWorldtask struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Uid            string               `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"`                                                                                                                           //玩家ID
-	LastTaskIds    map[int32]*Worldtask `protobuf:"bytes,2,rep,name=lastTaskIds,proto3" json:"lastTaskIds" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"lastTaskIds"`          //上一次完成的任务 key:groupId val:任务ID
-	TaskList       []*Worldtask         `protobuf:"bytes,3,rep,name=taskList,proto3" json:"taskList" bson:"taskList"`                                                                                                            // 任务列表
-	CurrentTaskIds map[int32]*Worldtask `protobuf:"bytes,4,rep,name=currentTaskIds,proto3" json:"currentTaskIds" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"currentTaskIds"` //正在进行的任务
-	NpcStatus      int32                `protobuf:"varint,5,opt,name=npcStatus,proto3" json:"npcStatus" bson:"npcStatus"`                                                                                                        //NPC任务完成状态0未完成 1完成
-	CondiIds       []int32              `protobuf:"varint,6,rep,packed,name=condiIds,proto3" json:"condiIds" bson:"condiIds"`                                                                                                    //任务完成条件
-	DeliverNpc     int32                `protobuf:"varint,7,opt,name=deliverNpc,proto3" json:"deliverNpc" bson:"deliverNpc"`                                                                                                     //交付NPC完成状态0未完成 1完成
+	Uid         string               `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"`                                                                                                                  //玩家ID
+	TaskList    []*Worldtask         `protobuf:"bytes,3,rep,name=taskList,proto3" json:"taskList" bson:"taskList"`                                                                                                   // 任务列表
+	CurrentTask map[int32]*Worldtask `protobuf:"bytes,4,rep,name=currentTask,proto3" json:"currentTask" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"currentTask"` //正在进行的任务
 }
 
 func (x *DBWorldtask) Reset() {
@@ -73,13 +69,6 @@ func (x *DBWorldtask) GetUid() string {
 	return ""
 }
 
-func (x *DBWorldtask) GetLastTaskIds() map[int32]*Worldtask {
-	if x != nil {
-		return x.LastTaskIds
-	}
-	return nil
-}
-
 func (x *DBWorldtask) GetTaskList() []*Worldtask {
 	if x != nil {
 		return x.TaskList
@@ -87,41 +76,23 @@ func (x *DBWorldtask) GetTaskList() []*Worldtask {
 	return nil
 }
 
-func (x *DBWorldtask) GetCurrentTaskIds() map[int32]*Worldtask {
+func (x *DBWorldtask) GetCurrentTask() map[int32]*Worldtask {
 	if x != nil {
-		return x.CurrentTaskIds
+		return x.CurrentTask
 	}
 	return nil
 }
 
-func (x *DBWorldtask) GetNpcStatus() int32 {
-	if x != nil {
-		return x.NpcStatus
-	}
-	return 0
-}
-
-func (x *DBWorldtask) GetCondiIds() []int32 {
-	if x != nil {
-		return x.CondiIds
-	}
-	return nil
-}
-
-func (x *DBWorldtask) GetDeliverNpc() int32 {
-	if x != nil {
-		return x.DeliverNpc
-	}
-	return 0
-}
-
 type Worldtask struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	TaskId   int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId" bson:"taskIds"`      //任务ID
-	TaskType int32 `protobuf:"varint,3,opt,name=taskType,proto3" json:"taskType" bson:"taskType"` //任务类型 1 日/周常 2随机任务 3支线剧情
+	TaskId     int32   `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId" bson:"taskIds"`             //任务ID
+	TaskType   int32   `protobuf:"varint,3,opt,name=taskType,proto3" json:"taskType" bson:"taskType"`        //任务类型 1 日/周常 2随机任务 3支线剧情
+	NpcStatus  int32   `protobuf:"varint,5,opt,name=npcStatus,proto3" json:"npcStatus" bson:"npcStatus"`     //NPC任务完成状态0未完成 1完成
+	CondiIds   []int32 `protobuf:"varint,6,rep,packed,name=condiIds,proto3" json:"condiIds" bson:"condiIds"` //任务完成条件
+	DeliverNpc int32   `protobuf:"varint,7,opt,name=deliverNpc,proto3" json:"deliverNpc" bson:"deliverNpc"`  //交付NPC完成状态0未完成 1完成
 }
 
 func (x *Worldtask) Reset() {
@@ -170,45 +141,57 @@ func (x *Worldtask) GetTaskType() int32 {
 	return 0
 }
 
+func (x *Worldtask) GetNpcStatus() int32 {
+	if x != nil {
+		return x.NpcStatus
+	}
+	return 0
+}
+
+func (x *Worldtask) GetCondiIds() []int32 {
+	if x != nil {
+		return x.CondiIds
+	}
+	return nil
+}
+
+func (x *Worldtask) GetDeliverNpc() int32 {
+	if x != nil {
+		return x.DeliverNpc
+	}
+	return 0
+}
+
 var File_worldtask_worldtask_db_proto protoreflect.FileDescriptor
 
 var file_worldtask_worldtask_db_proto_rawDesc = []byte{
 	0x0a, 0x1c, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x77, 0x6f, 0x72, 0x6c,
-	0x64, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc7,
-	0x03, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x10,
+	0x64, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd4,
+	0x01, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x10,
 	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
-	0x12, 0x3f, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
-	0x61, 0x73, 0x6b, 0x2e, 0x4c, 0x61, 0x73, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64,
-	0x73, 0x12, 0x26, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52,
-	0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x48, 0x0a, 0x0e, 0x63, 0x75, 0x72,
-	0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x20, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e,
-	0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x52, 0x0e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b,
-	0x49, 0x64, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, 0x06, 0x20,
-	0x03, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x12, 0x1e, 0x0a,
-	0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, 0x63, 0x1a, 0x4a, 0x0a,
-	0x10, 0x4c, 0x61, 0x73, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
-	0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x4d, 0x0a, 0x13, 0x43, 0x75, 0x72,
-	0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b,
-	0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3f, 0x0a, 0x09, 0x57, 0x6f, 0x72, 0x6c,
-	0x64, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a,
-	0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x12, 0x26, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x08,
+	0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0b, 0x63, 0x75, 0x72, 0x72,
+	0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e,
+	0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x43, 0x75, 0x72, 0x72,
+	0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x63, 0x75,
+	0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x1a, 0x4a, 0x0a, 0x10, 0x43, 0x75, 0x72,
+	0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a,
+	0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x99, 0x01, 0x0a, 0x09, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
+	0x61, 0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74,
+	0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74,
+	0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6e, 0x70, 0x63, 0x53,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64,
+	0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64,
+	0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, 0x63, 0x18,
+	0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70,
+	0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
@@ -223,24 +206,21 @@ func file_worldtask_worldtask_db_proto_rawDescGZIP() []byte {
 	return file_worldtask_worldtask_db_proto_rawDescData
 }
 
-var file_worldtask_worldtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_worldtask_worldtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_worldtask_worldtask_db_proto_goTypes = []interface{}{
 	(*DBWorldtask)(nil), // 0: DBWorldtask
 	(*Worldtask)(nil),   // 1: Worldtask
-	nil,                 // 2: DBWorldtask.LastTaskIdsEntry
-	nil,                 // 3: DBWorldtask.CurrentTaskIdsEntry
+	nil,                 // 2: DBWorldtask.CurrentTaskEntry
 }
 var file_worldtask_worldtask_db_proto_depIdxs = []int32{
-	2, // 0: DBWorldtask.lastTaskIds:type_name -> DBWorldtask.LastTaskIdsEntry
-	1, // 1: DBWorldtask.taskList:type_name -> Worldtask
-	3, // 2: DBWorldtask.currentTaskIds:type_name -> DBWorldtask.CurrentTaskIdsEntry
-	1, // 3: DBWorldtask.LastTaskIdsEntry.value:type_name -> Worldtask
-	1, // 4: DBWorldtask.CurrentTaskIdsEntry.value:type_name -> Worldtask
-	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
+	1, // 0: DBWorldtask.taskList:type_name -> Worldtask
+	2, // 1: DBWorldtask.currentTask:type_name -> DBWorldtask.CurrentTaskEntry
+	1, // 2: DBWorldtask.CurrentTaskEntry.value:type_name -> Worldtask
+	3, // [3:3] is the sub-list for method output_type
+	3, // [3:3] is the sub-list for method input_type
+	3, // [3:3] is the sub-list for extension type_name
+	3, // [3:3] is the sub-list for extension extendee
+	0, // [0:3] is the sub-list for field type_name
 }
 
 func init() { file_worldtask_worldtask_db_proto_init() }
@@ -280,7 +260,7 @@ func file_worldtask_worldtask_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_worldtask_worldtask_db_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   4,
+			NumMessages:   3,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/worldtask_msg.pb.go b/pb/worldtask_msg.pb.go
index 886063bf7..3f91bae49 100644
--- a/pb/worldtask_msg.pb.go
+++ b/pb/worldtask_msg.pb.go
@@ -525,8 +525,7 @@ type WorldtaskNexttaskPush struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	NextTaskId int32   `protobuf:"varint,1,opt,name=nextTaskId,proto3" json:"nextTaskId"`  //下一个任务ID
-	CondIds    []int32 `protobuf:"varint,2,rep,packed,name=condIds,proto3" json:"condIds"` // 条件ID
+	NextTask map[int32]*Worldtask `protobuf:"bytes,1,rep,name=nextTask,proto3" json:"nextTask" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
 func (x *WorldtaskNexttaskPush) Reset() {
@@ -561,16 +560,9 @@ func (*WorldtaskNexttaskPush) Descriptor() ([]byte, []int) {
 	return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{9}
 }
 
-func (x *WorldtaskNexttaskPush) GetNextTaskId() int32 {
+func (x *WorldtaskNexttaskPush) GetNextTask() map[int32]*Worldtask {
 	if x != nil {
-		return x.NextTaskId
-	}
-	return 0
-}
-
-func (x *WorldtaskNexttaskPush) GetCondIds() []int32 {
-	if x != nil {
-		return x.CondIds
+		return x.NextTask
 	}
 	return nil
 }
@@ -684,9 +676,10 @@ type WorldtaskBattleFinishReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	TaskId       int32         `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"`             //任务ID
-	BattleConfId int32         `protobuf:"varint,2,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID
-	Report       *BattleReport `protobuf:"bytes,3,opt,name=report,proto3" json:"report"`              //战报
+	GroupId      int32         `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"`
+	TaskId       int32         `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"`             //任务ID
+	BattleConfId int32         `protobuf:"varint,3,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID
+	Report       *BattleReport `protobuf:"bytes,4,opt,name=report,proto3" json:"report"`              //战报
 }
 
 func (x *WorldtaskBattleFinishReq) Reset() {
@@ -721,6 +714,13 @@ func (*WorldtaskBattleFinishReq) Descriptor() ([]byte, []int) {
 	return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{12}
 }
 
+func (x *WorldtaskBattleFinishReq) GetGroupId() int32 {
+	if x != nil {
+		return x.GroupId
+	}
+	return 0
+}
+
 func (x *WorldtaskBattleFinishReq) GetTaskId() int32 {
 	if x != nil {
 		return x.TaskId
@@ -888,39 +888,45 @@ var file_worldtask_worldtask_msg_proto_rawDesc = []byte{
 	0x70, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74,
 	0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73,
-	0x6b, 0x49, 0x64, 0x22, 0x51, 0x0a, 0x15, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b,
-	0x4e, 0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x0a,
-	0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x0a, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07,
-	0x63, 0x6f, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x63,
-	0x6f, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x67, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
-	0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65,
-	0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43,
-	0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f,
-	0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22,
-	0x3b, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74,
-	0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69,
-	0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74,
-	0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x7d, 0x0a, 0x18,
-	0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46,
-	0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b,
-	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64,
-	0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f,
-	0x6e, 0x66, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70,
-	0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x33, 0x0a, 0x19, 0x57,
-	0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69,
-	0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b,
-	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64,
-	0x22, 0x40, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e,
-	0x69, 0x73, 0x68, 0x49, 0x64, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x08, 0x74, 0x61,
-	0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57,
-	0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69,
-	0x73, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x6b, 0x49, 0x64, 0x22, 0xa2, 0x01, 0x0a, 0x15, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73,
+	0x6b, 0x4e, 0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x12, 0x40, 0x0a,
+	0x08, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x24, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x65, 0x78, 0x74, 0x74,
+	0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x4e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x1a,
+	0x47, 0x0a, 0x0d, 0x4e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b,
+	0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x67, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c,
+	0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74,
+	0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e,
+	0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c,
+	0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
+	0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c,
+	0x65, 0x22, 0x3b, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61,
+	0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a,
+	0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61,
+	0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x97,
+	0x01, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67,
+	0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72,
+	0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x22, 0x0a,
+	0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49,
+	0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74,
+	0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x33, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c,
+	0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73,
+	0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x40, 0x0a,
+	0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68,
+	0x49, 0x64, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c,
+	0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c,
+	0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42,
+	0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -935,7 +941,7 @@ func file_worldtask_worldtask_msg_proto_rawDescGZIP() []byte {
 	return file_worldtask_worldtask_msg_proto_rawDescData
 }
 
-var file_worldtask_worldtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
+var file_worldtask_worldtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
 var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{
 	(*WorldtaskMineReq)(nil),            // 0: WorldtaskMineReq
 	(*WorldtaskMineResp)(nil),           // 1: WorldtaskMineResp
@@ -952,23 +958,26 @@ var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{
 	(*WorldtaskBattleFinishReq)(nil),    // 12: WorldtaskBattleFinishReq
 	(*WorldtaskBattleFinishResp)(nil),   // 13: WorldtaskBattleFinishResp
 	(*WorldtaskFinishIdsPush)(nil),      // 14: WorldtaskFinishIdsPush
-	(*DBWorldtask)(nil),                 // 15: DBWorldtask
-	(*BattleFormation)(nil),             // 16: BattleFormation
-	(*BattleInfo)(nil),                  // 17: BattleInfo
-	(*BattleReport)(nil),                // 18: BattleReport
-	(*Worldtask)(nil),                   // 19: Worldtask
+	nil,                                 // 15: WorldtaskNexttaskPush.NextTaskEntry
+	(*DBWorldtask)(nil),                 // 16: DBWorldtask
+	(*BattleFormation)(nil),             // 17: BattleFormation
+	(*BattleInfo)(nil),                  // 18: BattleInfo
+	(*BattleReport)(nil),                // 19: BattleReport
+	(*Worldtask)(nil),                   // 20: Worldtask
 }
 var file_worldtask_worldtask_msg_proto_depIdxs = []int32{
-	15, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask
-	16, // 1: WorldtaskBattleStartReq.battle:type_name -> BattleFormation
-	17, // 2: WorldtaskBattleStartResp.info:type_name -> BattleInfo
-	18, // 3: WorldtaskBattleFinishReq.report:type_name -> BattleReport
-	19, // 4: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask
-	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
+	16, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask
+	15, // 1: WorldtaskNexttaskPush.nextTask:type_name -> WorldtaskNexttaskPush.NextTaskEntry
+	17, // 2: WorldtaskBattleStartReq.battle:type_name -> BattleFormation
+	18, // 3: WorldtaskBattleStartResp.info:type_name -> BattleInfo
+	19, // 4: WorldtaskBattleFinishReq.report:type_name -> BattleReport
+	20, // 5: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask
+	20, // 6: WorldtaskNexttaskPush.NextTaskEntry.value:type_name -> Worldtask
+	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
 }
 
 func init() { file_worldtask_worldtask_msg_proto_init() }
@@ -1166,7 +1175,7 @@ func file_worldtask_worldtask_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_worldtask_worldtask_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   15,
+			NumMessages:   16,
 			NumExtensions: 0,
 			NumServices:   0,
 		},