diff --git a/modules/worldtask/api_battlefinish.go b/modules/worldtask/api_battlefinish.go
index 49df25c94..4445344ce 100644
--- a/modules/worldtask/api_battlefinish.go
+++ b/modules/worldtask/api_battlefinish.go
@@ -6,7 +6,6 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-	"go_dreamfactory/utils"
 )
 
 // 战斗结束的请求
@@ -100,26 +99,6 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
 					} else {
 						//触发任务
 						go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype70, 1, req.BattleConfId))
-						if userTask.CurrentTask == nil {
-							userTask.CurrentTask = make(map[int32]*pb.Worldtask)
-						}
-
-						if _, ok := utils.Findx(userTask.CurrentTask[req.GroupId].CondiIds, req.CondiId); !ok {
-							userTask.CurrentTask[req.GroupId].CondiIds = append(userTask.CurrentTask[req.GroupId].CondiIds, req.CondiId)
-						}
-
-						update := map[string]interface{}{
-							"currentTask": userTask.CurrentTask,
-						}
-						if err := this.module.modelWorldtask.Change(uid, update); err != nil {
-							errdata = &pb.ErrorData{
-								Code:    pb.ErrorCode_DBError,
-								Title:   pb.ErrorCode_DBError.ToString(),
-								Message: err.Error(),
-							}
-							return
-						}
-
 					}
 				}
 			}
diff --git a/modules/worldtask/api_completetask.go b/modules/worldtask/api_completetask.go
index d545db340..670ad02f4 100644
--- a/modules/worldtask/api_completetask.go
+++ b/modules/worldtask/api_completetask.go
@@ -65,8 +65,11 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
 		}
 	}
 	for _, cond := range conds {
-		if cond.State == pb.BuriedItemFinishState_buried_finish {
-			wt.CondiIds = append(wt.CondiIds, cond.Conid)
+		for _, exist_cond := range wt.Conds {
+			if cond.Conid == exist_cond.Conid {
+				continue
+			}
+			wt.Conds = append(wt.Conds, cond)
 		}
 	}
 
diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go
index cf0574170..a02a70b1f 100644
--- a/modules/worldtask/api_finish.go
+++ b/modules/worldtask/api_finish.go
@@ -6,7 +6,6 @@ import (
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
-	"go_dreamfactory/utils"
 )
 
 // 世界任务完成
@@ -117,39 +116,78 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
 		}
 	}
 
-	var condiFlag bool
+	// var condiFlag bool
 	// 检查当前任务的完成条件
-	for _, condId := range curTaskConf.Completetask {
-		if v, ok := userTask.CurrentTask[req.GroupId]; ok {
-			if _, ok := utils.Findx(v.CondiIds, condId); !ok {
-				conds, err := this.module.ModuleBuried.CheckCondition(uid, condId)
-				if err != nil {
-					errdata = &pb.ErrorData{
-						Code:    pb.ErrorCode_ExternalModule,
-						Title:   pb.ErrorCode_ExternalModule.ToString(),
-						Message: comm.NewExternalModuleErr("Buried", "CheckCondition", uid, condId).Error(),
-					}
-					return
-				}
-				for _, cond := range conds {
-					if cond.Conid == condId && cond.State == pb.BuriedItemFinishState_buried_finish {
-						condiFlag = true
-					}
-				}
-			} else {
-				condiFlag = true
-			}
-		}
-	}
+	// for _, condId := range curTaskConf.Completetask {
+	// 	if v, ok := userTask.CurrentTask[req.GroupId]; ok {
+	// 		if _, ok := utils.Findx(v.CondiIds, condId); !ok {
+	// 	conds, err := this.module.ModuleBuried.CheckCondition(uid, condId)
+	// 	if err != nil {
+	// 		errdata = &pb.ErrorData{
+	// 			Code:    pb.ErrorCode_ExternalModule,
+	// 			Title:   pb.ErrorCode_ExternalModule.ToString(),
+	// 			Message: comm.NewExternalModuleErr("Buried", "CheckCondition", uid, condId).Error(),
+	// 		}
+	// 		return
+	// 	}
+	// 	for _, cond := range conds {
+	// 		if cond.Conid == condId && cond.State == pb.BuriedItemFinishState_buried_finish {
+	// 			condiFlag = true
+	// 		}
+	// 	}
+	// } else {
+	// 	condiFlag = true
+	// }
+	// =======
+	// 	conds, err := this.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...)
+	// 	if err != nil {
+	// 		code = pb.ErrorCode_ExternalModule
+	// 		data = &pb.ErrorData{
+	// 			Title:   code.ToString(),
+	// 			Message: comm.NewExternalModuleErr("Buried", "CheckCondition", uid, curTaskConf.Completetask).Error(),
+	// >>>>>>> 2f603a49 (更新当前任务包含进度值)
+	// 	}
+	// 	return
+	// }
 
-	if !condiFlag {
+	// <<<<<<< HEAD
+	// 	if !condiFlag {
+	// 		errdata = &pb.ErrorData{
+	// 			Code:  pb.ErrorCode_RtaskCondiNoReach,
+	// 			Title: pb.ErrorCode_RtaskCondiNoReach.ToString(),
+	// 		}
+
+	conds, err := this.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...)
+	if err != nil {
 		errdata = &pb.ErrorData{
-			Code:  pb.ErrorCode_RtaskCondiNoReach,
-			Title: pb.ErrorCode_RtaskCondiNoReach.ToString(),
+			Code:    pb.ErrorCode_ExternalModule,
+			Title:   pb.ErrorCode_ExternalModule.ToString(),
+			Message: comm.NewExternalModuleErr("Buried", "CheckCondition", uid, curTaskConf.Completetask).Error(),
 		}
 		return
 	}
 
+	if len(conds) == 0 {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_RtaskCondiNoReach,
+			Title:   pb.ErrorCode_RtaskCondiNoReach.ToString(),
+			Message: fmt.Sprintf("世界任务[%v] 条件[%v]未达成", req.TaskId, curTaskConf.Completetask),
+		}
+
+		return
+	}
+
+	for _, cond := range conds {
+		if cond.State == pb.BuriedItemFinishState_buried_unfinish {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_RtaskCondiNoReach,
+				Title:   pb.ErrorCode_RtaskCondiNoReach.ToString(),
+				Message: fmt.Sprintf("世界任务[%v]条件[%v]未达标,类型:%v 实际:%v 期望:%v", req.TaskId, cond.Conid, cond.Btype, cond.Value, cond.Target),
+			}
+			return
+		}
+	}
+
 	// 完成任务
 	if err := this.module.modelWorldtask.finishTask(req.GroupId, req.TaskId, userTask); err != nil {
 		errdata = &pb.ErrorData{
@@ -186,69 +224,3 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
 	this.module.modelWorldtask.taskFinishPush(session, req.GroupId, userTask, curTaskConf)
 	return
 }
-
-// Deprecated
-func (this *apiComp) updateCheckCond(uid string, userTask *pb.DBWorldtask, nextTaskId int32) (*pb.DBWorldtask, error) {
-	//检查下个任务的完成条件
-	nextTaskConf, err := this.module.configure.getWorldtaskById(nextTaskId)
-	if err != nil {
-		return nil, err
-	}
-
-	if nextTaskConf.Des == 1 || nextTaskConf.Des == 4 {
-		return nil, comm.NewCustomError(pb.ErrorCode_WorldtaskNoProcess)
-	}
-
-	if userTask.CurrentTask == nil {
-		userTask.CurrentTask = make(map[int32]*pb.Worldtask)
-	}
-
-	update := make(map[string]interface{})
-	if (len(nextTaskConf.Completetask) == 1 && nextTaskConf.Completetask[0] == 0) ||
-		len(nextTaskConf.Completetask) == 0 {
-		wt := &pb.Worldtask{
-			TaskId:   nextTaskId,
-			TaskType: nextTaskConf.Des,
-			CondiIds: []int32{},
-		}
-		userTask.CurrentTask[nextTaskConf.Group] = wt
-		update["currentTask"] = userTask.CurrentTask
-	} else {
-		nwt, ok := userTask.CurrentTask[nextTaskConf.Group]
-		if ok {
-			nwt.TaskId = nextTaskId
-			nwt.TaskType = nextTaskConf.Des
-		} else {
-			nwt = &pb.Worldtask{
-				TaskId:   nextTaskId,
-				TaskType: nextTaskConf.Des,
-			}
-		}
-
-		conds, err := this.module.ModuleBuried.CheckCondition(uid, nextTaskConf.Completetask...)
-		if err != nil {
-			this.module.Errorf("buried err:%v", err.Error())
-			return nil, err
-		}
-
-		var condIds []int32
-		for _, cond := range conds {
-			if cond.State == pb.BuriedItemFinishState_buried_finish {
-				condIds = append(condIds, cond.Conid)
-			}
-		}
-
-		nwt.CondiIds = condIds
-		userTask.CurrentTask[nextTaskConf.Group] = nwt
-		update["currentTask"] = userTask.CurrentTask
-	}
-
-	if len(update) > 0 {
-		if err := this.module.modelWorldtask.Change(uid, update); err != nil {
-			this.module.Error("DB err", log.Field{Key: "err", Value: err.Error()})
-			return nil, err
-		}
-	}
-
-	return userTask, nil
-}
diff --git a/modules/worldtask/api_mine.go b/modules/worldtask/api_mine.go
index 3fa6df024..e1543c149 100644
--- a/modules/worldtask/api_mine.go
+++ b/modules/worldtask/api_mine.go
@@ -4,6 +4,7 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
+	"go_dreamfactory/utils"
 )
 
 var (
@@ -44,6 +45,43 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.WorldtaskMineReq) (
 		myWorldtask.CurrentTask = make(map[int32]*pb.Worldtask)
 	}
 
+	//查询当前所有任务组下的完成条件数据
+	var condIds []int32
+	condMap := make(map[int32][]int32)
+	for k, v := range myWorldtask.CurrentTask {
+		cfg, err := this.module.configure.getWorldtaskById(v.TaskId)
+		if err != nil {
+			code = pb.ErrorCode_ConfigNoFound
+			data.Title = code.ToString()
+			data.Message = err.Error()
+			return
+		}
+		if ((len(cfg.Completetask) == 1 && cfg.Completetask[0] > 0) &&
+			len(cfg.Completetask) > 0) {
+			condIds = append(condIds, cfg.Completetask...)
+			condMap[k] = cfg.Completetask
+		}
+	}
+
+	condIds = utils.RemoveDuplicate(condIds)
+
+	conds, err := this.module.ModuleBuried.CheckCondition(uid, condIds...)
+	if err != nil {
+		code = pb.ErrorCode_ExternalModule
+		data.Title = code.ToString()
+		data.Message = comm.NewExternalModuleErr("buried", "CheckCondition", condIds).Error()
+		return
+	}
+
+	for k, v := range condMap {
+		mw := myWorldtask.CurrentTask[k]
+		for _, cond := range conds {
+			if _, ok := utils.Findx(v, cond.Conid); ok {
+				mw.Conds = append(mw.Conds, cond)
+			}
+		}
+	}
+
 	this.module.modelWorldtask.updateRandomTask(uid, myWorldtask)
 
 	rsp := &pb.WorldtaskMineResp{
diff --git a/modules/worldtask/model_worldtask.go b/modules/worldtask/model_worldtask.go
index 9fc1353d4..8679e7fb5 100644
--- a/modules/worldtask/model_worldtask.go
+++ b/modules/worldtask/model_worldtask.go
@@ -113,7 +113,6 @@ func (this *ModelWorldtask) finishTask(groupId, taskId int32, task *pb.DBWorldta
 	if taskConf.IdAfter != 0 {
 		wt.NpcStatus = 0
 		wt.DeliverNpc = 0
-		wt.CondiIds = []int32{}
 		task.CurrentTask[groupId] = wt
 		update["currentTask"] = task.CurrentTask
 	}
@@ -172,7 +171,6 @@ func (this *ModelWorldtask) updateCurrentTaskCond(uid string, userLv int32, user
 		wt := &pb.Worldtask{
 			TaskId:   nextTaskId,
 			TaskType: nextTaskConf.Des,
-			CondiIds: []int32{},
 		}
 		userTask.CurrentTask[nextTaskConf.Group] = wt
 		update["currentTask"] = userTask.CurrentTask
@@ -188,20 +186,6 @@ func (this *ModelWorldtask) updateCurrentTaskCond(uid string, userLv int32, user
 			}
 		}
 
-		conds, err := this.moduleWorldtask.ModuleBuried.CheckCondition(uid, nextTaskConf.Completetask...)
-		if err != nil {
-			this.moduleWorldtask.Errorf("buried err:%v", err.Error())
-			return nil
-		}
-
-		var condIds []int32
-		for _, cond := range conds {
-			if cond.State == pb.BuriedItemFinishState_buried_finish {
-				condIds = append(condIds, cond.Conid)
-			}
-		}
-
-		nwt.CondiIds = condIds
 		userTask.CurrentTask[nextTaskConf.Group] = nwt
 		update["currentTask"] = userTask.CurrentTask
 	}
diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go
index e1899ca01..7026b021a 100644
--- a/modules/worldtask/module.go
+++ b/modules/worldtask/module.go
@@ -122,17 +122,18 @@ func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) {
 	var groupId, taskId int32
 	// 检索condId是否是世界任务的完成条件
 
-	finishedCondIds := []int32{}
-	for _, c := range worldtaskConf.GetDataList() {
-		for _, v := range c.Completetask {
+
+	finishedCondIds := []*pb.ConIProgress{}
+	for _, cfg := range worldtaskConf.GetDataList() {
+		for _, condId := range cfg.Completetask {
 			for _, cond := range conds {
-				if v == cond.Conid {
+				if condId == cond.Conid {
 					//校验任务是否是当前任务
-					if task, ok := userTask.CurrentTask[c.Group]; ok {
-						if task.NpcStatus == 1 && c.Key == task.TaskId {
-							groupId = c.Group
-							taskId = c.Key
-							finishedCondIds = append(finishedCondIds, cond.Conid)
+					if task, ok := userTask.CurrentTask[cfg.Group]; ok {
+						if task.NpcStatus == 1 && cfg.Key == task.TaskId {
+							groupId = cfg.Group
+							taskId = cfg.Key
+							finishedCondIds = append(finishedCondIds, cond)
 						}
 					}
 					break
@@ -149,6 +150,12 @@ func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) {
 		return
 	}
 
+	// 当前任务配置
+	curTaskConf, err := this.configure.getWorldtaskById(taskId)
+	if err != nil || curTaskConf == nil {
+		return
+	}
+
 	if userTask.CurrentTask == nil {
 		userTask.CurrentTask = make(map[int32]*pb.Worldtask)
 	}
@@ -159,38 +166,31 @@ func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) {
 	}
 
 	for _, condId := range finishedCondIds {
-		if _, ok := utils.Findx(wt.CondiIds, condId); !ok {
-			wt.CondiIds = append(wt.CondiIds, condId)
-		}
+		wt.Conds = append(wt.Conds, condId)
 	}
 
 	userTask.CurrentTask[groupId] = wt
 
-	update := map[string]interface{}{
-		"currentTask": userTask.CurrentTask,
+	for _, v := range userTask.CurrentTask {
+		if curTaskConf.Key == v.TaskId {
+			if len(v.Conds) == len(curTaskConf.Completetask) && curTaskConf.DeliverNpc == 0 { // 所有条件全部完成且无需交付
+				this.modelWorldtask.taskFinish(session, groupId, taskId, userTask, curTaskConf)
+				this.modelWorldtask.taskFinishPush(session, groupId, userTask, curTaskConf)
+			} else {
+				update := map[string]interface{}{
+					"currentTask": userTask.CurrentTask,
+				}
+				this.modelWorldtask.Change(uid, update)
+			}
+			break
+		}
 	}
-	this.modelWorldtask.Change(uid, update)
 
 	session.SendMsg(string(this.GetType()), "completecondis", &pb.WorldtaskCompletecondisPush{
-		GroupId:  groupId,
-		TaskId:   taskId,
-		CondiIds: wt.CondiIds,
+		GroupId: groupId,
+		TaskId:  taskId,
+		Conds:   wt.Conds,
 	})
-	this.Debug("当前任务所有条件完成",
-		log.Field{Key: "condiIds", Value: wt.CondiIds},
-		log.Field{Key: "taskId", Value: taskId})
-
-	// 当前任务配置
-	curTaskConf, err := this.configure.getWorldtaskById(taskId)
-	if err != nil || curTaskConf == nil {
-		return
-	}
-
-	//结束任务
-	if curTaskConf.DeliverNpc == 0 {
-		this.modelWorldtask.taskFinish(session, groupId, taskId, userTask, curTaskConf)
-		this.modelWorldtask.taskFinishPush(session, groupId, userTask, curTaskConf)
-	}
 
 	return
 }
diff --git a/pb/worldtask_db.pb.go b/pb/worldtask_db.pb.go
index 2c469d97d..10ade568d 100644
--- a/pb/worldtask_db.pb.go
+++ b/pb/worldtask_db.pb.go
@@ -112,11 +112,11 @@ type Worldtask struct {
 	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支线剧情
-	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完成
+	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完成
+	Conds      []*ConIProgress `protobuf:"bytes,6,rep,name=conds,proto3" json:"conds" bson:"conds"`                 //任务完成条件
+	DeliverNpc int32           `protobuf:"varint,7,opt,name=deliverNpc,proto3" json:"deliverNpc" bson:"deliverNpc"` //交付NPC完成状态0未完成 1完成
 }
 
 func (x *Worldtask) Reset() {
@@ -172,9 +172,9 @@ func (x *Worldtask) GetNpcStatus() int32 {
 	return 0
 }
 
-func (x *Worldtask) GetCondiIds() []int32 {
+func (x *Worldtask) GetConds() []*ConIProgress {
 	if x != nil {
-		return x.CondiIds
+		return x.Conds
 	}
 	return nil
 }
@@ -190,43 +190,46 @@ 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, 0x93,
-	0x03, 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, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x03,
-	0x28, 0x05, 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, 0x12, 0x36, 0x0a,
-	0x08, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x1a, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x43, 0x68,
-	0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x63, 0x68, 0x61,
-	0x70, 0x74, 0x65, 0x72, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x64, 0x61, 0x6c, 0x69, 0x79, 0x52, 0x65,
-	0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x64, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16,
+	0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x2f, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x62,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x93, 0x03, 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, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b,
+	0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 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, 0x12, 0x36, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72,
+	0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c,
+	0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x52, 0x08, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x12, 0x2a, 0x0a,
 	0x10, 0x64, 0x61, 0x6c, 0x69, 0x79, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d,
-	0x65, 0x12, 0x28, 0x0a, 0x0f, 0x77, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
-	0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x77, 0x65, 0x65, 0x6b,
-	0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 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, 0x1a, 0x3b, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x70, 0x74,
-	0x65, 0x72, 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, 0x14, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 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,
+	0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x64, 0x61, 0x6c, 0x69, 0x79, 0x52, 0x65,
+	0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x77, 0x65, 0x65,
+	0x6b, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x0f, 0x77, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54,
+	0x69, 0x6d, 0x65, 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, 0x1a,
+	0x3b, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 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, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa2, 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, 0x23, 0x0a, 0x05,
+	0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f,
+	0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x05, 0x63, 0x6f, 0x6e, 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 (
@@ -243,20 +246,22 @@ func file_worldtask_worldtask_db_proto_rawDescGZIP() []byte {
 
 var file_worldtask_worldtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
 var file_worldtask_worldtask_db_proto_goTypes = []interface{}{
-	(*DBWorldtask)(nil), // 0: DBWorldtask
-	(*Worldtask)(nil),   // 1: Worldtask
-	nil,                 // 2: DBWorldtask.CurrentTaskEntry
-	nil,                 // 3: DBWorldtask.ChaptersEntry
+	(*DBWorldtask)(nil),  // 0: DBWorldtask
+	(*Worldtask)(nil),    // 1: Worldtask
+	nil,                  // 2: DBWorldtask.CurrentTaskEntry
+	nil,                  // 3: DBWorldtask.ChaptersEntry
+	(*ConIProgress)(nil), // 4: ConIProgress
 }
 var file_worldtask_worldtask_db_proto_depIdxs = []int32{
 	2, // 0: DBWorldtask.currentTask:type_name -> DBWorldtask.CurrentTaskEntry
 	3, // 1: DBWorldtask.chapters:type_name -> DBWorldtask.ChaptersEntry
-	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
+	4, // 2: Worldtask.conds:type_name -> ConIProgress
+	1, // 3: DBWorldtask.CurrentTaskEntry.value:type_name -> Worldtask
+	4, // [4:4] is the sub-list for method output_type
+	4, // [4:4] is the sub-list for method input_type
+	4, // [4:4] is the sub-list for extension type_name
+	4, // [4:4] is the sub-list for extension extendee
+	0, // [0:4] is the sub-list for field type_name
 }
 
 func init() { file_worldtask_worldtask_db_proto_init() }
@@ -264,6 +269,7 @@ func file_worldtask_worldtask_db_proto_init() {
 	if File_worldtask_worldtask_db_proto != nil {
 		return
 	}
+	file_buried_buried_db_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_worldtask_worldtask_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DBWorldtask); i {
diff --git a/pb/worldtask_msg.pb.go b/pb/worldtask_msg.pb.go
index 243b0e529..5c21db2d0 100644
--- a/pb/worldtask_msg.pb.go
+++ b/pb/worldtask_msg.pb.go
@@ -215,9 +215,9 @@ type WorldtaskCompletecondisPush struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	GroupId  int32   `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"`
-	TaskId   int32   `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"`
-	CondiIds []int32 `protobuf:"varint,3,rep,packed,name=condiIds,proto3" json:"condiIds"`
+	GroupId int32           `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"`
+	TaskId  int32           `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"`
+	Conds   []*ConIProgress `protobuf:"bytes,3,rep,name=conds,proto3" json:"conds"`
 }
 
 func (x *WorldtaskCompletecondisPush) Reset() {
@@ -266,9 +266,9 @@ func (x *WorldtaskCompletecondisPush) GetTaskId() int32 {
 	return 0
 }
 
-func (x *WorldtaskCompletecondisPush) GetCondiIds() []int32 {
+func (x *WorldtaskCompletecondisPush) GetConds() []*ConIProgress {
 	if x != nil {
-		return x.CondiIds
+		return x.Conds
 	}
 	return nil
 }
@@ -932,95 +932,97 @@ var file_worldtask_worldtask_msg_proto_rawDesc = []byte{
 	0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d,
 	0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 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, 0x12, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
-	0x61, 0x73, 0x6b, 0x4d, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x22, 0x35, 0x0a, 0x11, 0x57, 0x6f,
-	0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4d, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x20, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e,
-	0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73,
-	0x6b, 0x22, 0x46, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63,
-	0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x2f, 0x62,
+	0x75, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x12,
+	0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4d, 0x69, 0x6e, 0x65, 0x52,
+	0x65, 0x71, 0x22, 0x35, 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4d,
+	0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
+	0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x46, 0x0a, 0x12, 0x57, 0x6f, 0x72,
+	0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 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, 0x22, 0x31, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63,
+	0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64,
+	0x69, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64,
+	0x69, 0x49, 0x64, 0x73, 0x22, 0x74, 0x0a, 0x1b, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73,
+	0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x73, 0x50,
+	0x75, 0x73, 0x68, 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, 0x23, 0x0a, 0x05, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x03,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72,
+	0x65, 0x73, 0x73, 0x52, 0x05, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x22, 0x67, 0x0a, 0x19, 0x57, 0x6f,
+	0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43,
+	0x6f, 0x6e, 0x64, 0x69, 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, 0x22, 0x31, 0x0a, 0x13, 0x57, 0x6f, 0x72,
-	0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70,
-	0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x22, 0x6b, 0x0a, 0x1b,
-	0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74,
-	0x65, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x73, 0x50, 0x75, 0x73, 0x68, 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, 0x1a, 0x0a,
-	0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52,
-	0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x22, 0x67, 0x0a, 0x19, 0x57, 0x6f, 0x72,
-	0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f,
-	0x6e, 0x64, 0x69, 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, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64,
-	0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69,
-	0x49, 0x64, 0x22, 0x4e, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43,
-	0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 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, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64,
-	0x69, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69,
-	0x49, 0x64, 0x22, 0x46, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 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, 0x22, 0x2d, 0x0a, 0x13, 0x57, 0x6f,
-	0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73,
+	0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e,
+	0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64,
+	0x69, 0x49, 0x64, 0x22, 0x4e, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b,
+	0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 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, 0xcc, 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, 0x12, 0x28, 0x0a, 0x0f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65,
-	0x64, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0f,
-	0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 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, 0xb1,
-	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, 0x18, 0x0a,
-	0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
-	0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c,
-	0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x04, 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, 0x05, 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, 0x22, 0x35, 0x0a, 0x19, 0x57, 0x6f, 0x72,
-	0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x72, 0x65, 0x77,
-	0x61, 0x72, 0x64, 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,
-	0x22, 0x36, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61,
-	0x70, 0x74, 0x65, 0x72, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e,
+	0x64, 0x69, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64,
+	0x69, 0x49, 0x64, 0x22, 0x46, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b,
+	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, 0x22, 0x2d, 0x0a, 0x13, 0x57,
+	0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 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, 0xcc, 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, 0x12, 0x28, 0x0a, 0x0f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68,
+	0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52,
+	0x0f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73,
+	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,
+	0xb1, 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, 0x18,
+	0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74,
+	0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x04, 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, 0x05, 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, 0x22, 0x35, 0x0a, 0x19, 0x57, 0x6f,
+	0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x72, 0x65,
+	0x77, 0x61, 0x72, 0x64, 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, 0x22, 0x36, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68,
+	0x61, 0x70, 0x74, 0x65, 0x72, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1056,24 +1058,26 @@ var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{
 	(*WorldtaskChapterrewardResp)(nil),  // 16: WorldtaskChapterrewardResp
 	nil,                                 // 17: WorldtaskNexttaskPush.NextTaskEntry
 	(*DBWorldtask)(nil),                 // 18: DBWorldtask
-	(*BattleFormation)(nil),             // 19: BattleFormation
-	(*BattleInfo)(nil),                  // 20: BattleInfo
-	(*BattleReport)(nil),                // 21: BattleReport
-	(*Worldtask)(nil),                   // 22: Worldtask
+	(*ConIProgress)(nil),                // 19: ConIProgress
+	(*BattleFormation)(nil),             // 20: BattleFormation
+	(*BattleInfo)(nil),                  // 21: BattleInfo
+	(*BattleReport)(nil),                // 22: BattleReport
+	(*Worldtask)(nil),                   // 23: Worldtask
 }
 var file_worldtask_worldtask_msg_proto_depIdxs = []int32{
 	18, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask
-	17, // 1: WorldtaskNexttaskPush.nextTask:type_name -> WorldtaskNexttaskPush.NextTaskEntry
-	19, // 2: WorldtaskBattleStartReq.battle:type_name -> BattleFormation
-	20, // 3: WorldtaskBattleStartResp.info:type_name -> BattleInfo
-	21, // 4: WorldtaskBattleFinishReq.report:type_name -> BattleReport
-	22, // 5: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask
-	22, // 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
+	19, // 1: WorldtaskCompletecondisPush.conds:type_name -> ConIProgress
+	17, // 2: WorldtaskNexttaskPush.nextTask:type_name -> WorldtaskNexttaskPush.NextTaskEntry
+	20, // 3: WorldtaskBattleStartReq.battle:type_name -> BattleFormation
+	21, // 4: WorldtaskBattleStartResp.info:type_name -> BattleInfo
+	22, // 5: WorldtaskBattleFinishReq.report:type_name -> BattleReport
+	23, // 6: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask
+	23, // 7: WorldtaskNexttaskPush.NextTaskEntry.value:type_name -> Worldtask
+	8,  // [8:8] is the sub-list for method output_type
+	8,  // [8:8] is the sub-list for method input_type
+	8,  // [8:8] is the sub-list for extension type_name
+	8,  // [8:8] is the sub-list for extension extendee
+	0,  // [0:8] is the sub-list for field type_name
 }
 
 func init() { file_worldtask_worldtask_msg_proto_init() }
@@ -1083,6 +1087,7 @@ func file_worldtask_worldtask_msg_proto_init() {
 	}
 	file_battle_battle_msg_proto_init()
 	file_worldtask_worldtask_db_proto_init()
+	file_buried_buried_db_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_worldtask_worldtask_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*WorldtaskMineReq); i {
diff --git a/utils/trans.go b/utils/trans.go
index d25879b2c..03f7ccd7e 100644
--- a/utils/trans.go
+++ b/utils/trans.go
@@ -16,6 +16,7 @@ func ConvertReward(data ...*cfg.Gameatn) (res []*pb.UserAssets) {
 	return
 }
 
+// 去重
 func RemoveDuplicate(arr []int32) []int32 {
 	visited := make(map[int32]bool)
 	result := []int32{}