diff --git a/modules/worldtask/api.go b/modules/worldtask/api.go
index 42f50bff1..2c6fa733c 100644
--- a/modules/worldtask/api.go
+++ b/modules/worldtask/api.go
@@ -1,9 +1,13 @@
 package worldtask
 
 import (
+	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/base"
 	"go_dreamfactory/lego/core"
+	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/modules"
+
+	"google.golang.org/protobuf/proto"
 )
 
 const (
@@ -13,6 +17,8 @@ const (
 	WorldtaskNexttaskPush  = "nexttask"
 	WorldtaskBattleStart   = "battlestart"
 	WorldtaskBattleFinish  = "battlefinish"
+	WorldtaskComplete      = "completecondi"
+	WorldtaskChapterReward = "chapterreward"
 )
 
 type apiComp struct {
@@ -27,3 +33,10 @@ func (this *apiComp) Init(service core.IService, module core.IModule, comp core.
 	this.module = module.(*Worldtask)
 	return
 }
+
+func (this *apiComp) sendMsg(session comm.IUserSession, subType string, rsp proto.Message) {
+	if err := session.SendMsg(string(this.module.GetType()), subType, rsp); err != nil {
+		this.module.Error("Worldtask sendMsg err", log.Field{Key: "err", Value: err.Error()})
+		return
+	}
+}
diff --git a/modules/worldtask/api_accept.go b/modules/worldtask/api_accept.go
index 053d9a222..afcc70fb4 100644
--- a/modules/worldtask/api_accept.go
+++ b/modules/worldtask/api_accept.go
@@ -6,6 +6,8 @@ import (
 	"go_dreamfactory/pb"
 )
 
+// 任务接取
+
 func (a *apiComp) AcceptCheck(session comm.IUserSession, req *pb.WorldtaskAcceptReq) (code pb.ErrorCode) {
 	if req.TaskId <= 0 || req.GroupId <= 0 {
 		code = pb.ErrorCode_ReqParameterError
@@ -24,6 +26,7 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
 		return
 	}
 
+	rsp := &pb.WorldtaskAcceptResp{}
 	myWorldtask, err := a.module.modelWorldtask.getWorldtask(uid)
 	if err != nil {
 		a.module.Error("获取玩家世界任务失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
@@ -35,19 +38,25 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
 	curTaskConf, err := a.module.configure.getWorldtaskById(req.TaskId)
 	if err != nil || curTaskConf == nil {
 		code = pb.ErrorCode_ConfigNoFound
+		log.Error("世界任务配置未找到",
+			log.Field{Key: "uid", Value: uid},
+			log.Field{Key: "taskId", Value: req.TaskId},
+		)
 		return
 	}
 
 	// 判断玩家等级要求
 	if user.Lv < curTaskConf.Lock {
-		code = pb.ErrorCode_WorldtaskLvNotEnough
+		rsp.Code = pb.ErrorCode_WorldtaskLvNotEnough
+		a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
 		return
 	}
 
 	// 前置任务ID 只有世界任务才校验前置
 	if !a.module.modelWorldtask.IsPreFinished(req.GroupId, myWorldtask, curTaskConf) {
 		a.module.Debug("前置任务未完成", log.Field{Key: "uid", Value: uid}, log.Field{Key: "preTaskId", Value: curTaskConf.Ontxe}, log.Field{Key: "taskId", Value: curTaskConf.Key})
-		code = pb.ErrorCode_WorldtaskLastUnFinished
+		rsp.Code = pb.ErrorCode_WorldtaskLastUnFinished
+		a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
 		return
 	}
 
@@ -66,13 +75,10 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
 
 	if err := a.module.modelWorldtask.Change(uid, update); err != nil {
 		code = pb.ErrorCode_DBError
+		return
 	}
 
-	rsp := &pb.WorldtaskAcceptResp{
-		Code: code,
-	}
-
-	session.SendMsg(string(a.module.GetType()), "accept", rsp)
+	a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
 
 	//判断是否要结束任务
 	if ((len(curTaskConf.Completetask) == 1 && curTaskConf.Completetask[0] == 0) ||
diff --git a/modules/worldtask/api_battlefinish.go b/modules/worldtask/api_battlefinish.go
index d43937161..2dd23f3d0 100644
--- a/modules/worldtask/api_battlefinish.go
+++ b/modules/worldtask/api_battlefinish.go
@@ -31,6 +31,10 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
 	taskConf, err := this.module.configure.getWorldtaskById(req.TaskId)
 	if err != nil || taskConf == nil {
 		code = pb.ErrorCode_ConfigNoFound
+		log.Error("世界任务配置未找到",
+			log.Field{Key: "uid", Value: uid},
+			log.Field{Key: "taskId", Value: req.TaskId},
+		)
 		return
 	}
 
@@ -41,9 +45,7 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
 		return
 	}
 
-	rsp := &pb.WorldtaskBattleFinishResp{
-		TaskId: req.TaskId,
-	}
+	rsp := &pb.WorldtaskBattleFinishResp{}
 
 	if len(taskConf.Completetask) == 0 {
 		if err := this.module.modelWorldtask.finishTask(taskConf.Group, req.TaskId, userTask); err != nil {
@@ -55,10 +57,8 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
 			return
 		}
 
-		if err := session.SendMsg(string(this.module.GetType()), WorldtaskBattleFinish, rsp); err != nil {
-			code = pb.ErrorCode_SystemError
-			return
-		}
+		this.sendMsg(session, WorldtaskBattleFinish, rsp)
+		return
 	}
 
 	battleModule, err := this.module.service.GetModule(comm.ModuleBattle)
@@ -72,11 +72,12 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
 		if code, isWin = ibattle.CheckBattleReport(session, req.Report); code == pb.ErrorCode_Success {
 			if isWin {
 				if battleConf, ok := this.module.worldBattleConf.GetDataMap()[req.BattleConfId]; ok {
-					if code := this.module.DispenseRes(session, []*cfg.Gameatn{battleConf.Playexp}, true); code != pb.ErrorCode_Success {
+					if code = this.module.DispenseRes(session, []*cfg.Gameatn{battleConf.Playexp}, true); code != pb.ErrorCode_Success {
 						this.module.Error("世界任务战斗玩家经验结算",
 							log.Field{Key: "uid", Value: uid},
 							log.Field{Key: "playerExp", Value: battleConf.Playexp},
 						)
+						return
 					} else {
 						//触发任务
 						go this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype70, 1, req.BattleConfId))
@@ -86,11 +87,11 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
 			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,
 			}
@@ -105,8 +106,12 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
 				TaskId:   req.TaskId,
 				CondiIds: userTask.CurrentTask[req.GroupId].CondiIds,
 			})
-
+		} else {
+			rsp.Code = code
+			this.sendMsg(session, WorldtaskBattleFinish, rsp)
+			return
 		}
+
 		this.module.Debug("校验战报",
 			log.Field{Key: "uid", Value: session.GetUserId()},
 			log.Field{Key: "taskId", Value: req.TaskId},
@@ -123,12 +128,13 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
 					log.Field{Key: "reword", Value: taskConf.Reword},
 					log.Field{Key: "code", Value: code},
 				)
+				return
 			}
 		} else {
 			for _, m := range taskConf.Module {
 				i, err := this.service.GetModule(core.M_Modules(m))
 				if err != nil {
-					this.module.Errorln(err)
+					this.module.Error("GetModule err", log.Field{Key: "err", Value: err.Error()})
 					continue
 				}
 				if ic, ok := i.(comm.ITaskComplete); ok {
@@ -138,8 +144,6 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
 		}
 	}
 
-	if err := session.SendMsg(string(this.module.GetType()), WorldtaskBattleFinish, rsp); err != nil {
-		code = pb.ErrorCode_SystemError
-	}
+	this.sendMsg(session, WorldtaskBattleFinish, rsp)
 	return
 }
diff --git a/modules/worldtask/api_battlestart.go b/modules/worldtask/api_battlestart.go
index e96e65d6d..8ebaae4ab 100644
--- a/modules/worldtask/api_battlestart.go
+++ b/modules/worldtask/api_battlestart.go
@@ -23,6 +23,8 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat
 		return
 	}
 	uid := session.GetUserId()
+	resp := &pb.WorldtaskBattleStartResp{}
+
 	battleConf, err := this.module.configure.getWorldtaskBattleById(req.BattleConfId)
 	if err != nil || battleConf == nil {
 		code = pb.ErrorCode_ConfigNoFound
@@ -42,17 +44,16 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat
 	if b, y := iBattle.(comm.IBattle); y {
 		var (
 			record *pb.DBBattleRecord
-			resp   *pb.WorldtaskBattleStartResp
 		)
 		code, record = b.CreateEveBattle(session, &pb.BattleEVEReq{
-			Ptype:  pb.PlayType_rtask,
-			Format: req.Battle,
-			// Sysformat:    []int32{battleConf.DefaultHero},
-			// Backupformat: []int32{battleConf.AssistTeam},
+			Ptype:      pb.PlayType_rtask,
+			Format:     req.Battle,
 			Buleformat: battleConf.FormatList,
 		})
 
 		if code != pb.ErrorCode_Success {
+			resp.Code = code
+			this.sendMsg(session, WorldtaskBattleStart, resp)
 			return
 		}
 
@@ -70,11 +71,13 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat
 					Tasks:      battleConf.EventList,
 				},
 			}
+		} else {
+			resp.Code = pb.ErrorCode_WorldtaskBattleCreate
+			this.sendMsg(session, WorldtaskBattleStart, resp)
+			return
 		}
 
-		if err := session.SendMsg(string(this.module.GetType()), WorldtaskBattleStart, resp); err != nil {
-			code = pb.ErrorCode_SystemError
-		}
+		this.sendMsg(session, WorldtaskBattleStart, resp)
 	}
 	return
 }
diff --git a/modules/worldtask/api_chapterreward.go b/modules/worldtask/api_chapterreward.go
index 624454eb8..e730af752 100644
--- a/modules/worldtask/api_chapterreward.go
+++ b/modules/worldtask/api_chapterreward.go
@@ -28,11 +28,13 @@ func (this *apiComp) Chapterreward(session comm.IUserSession, req *pb.WorldtaskC
 	}
 
 	if stats, ok := myWorldtask.Chapters[req.GroupId]; !ok {
-		code = pb.ErrorCode_WorldtaskChapterUnFinished
+		rsp.Code = pb.ErrorCode_WorldtaskChapterUnFinished
+		this.sendMsg(session, WorldtaskChapterReward, rsp)
 		return
 	} else {
 		if stats == 2 {
-			code = pb.ErrorCode_WorldtaskChapterReceived
+			rsp.Code = pb.ErrorCode_WorldtaskChapterReceived
+			this.sendMsg(session, WorldtaskChapterReward, rsp)
 			return
 		}
 	}
@@ -51,6 +53,7 @@ func (this *apiComp) Chapterreward(session comm.IUserSession, req *pb.WorldtaskC
 
 	this.module.DispenseRes(session, rewardCnf.Reword, true)
 
-	session.SendMsg(string(this.module.GetType()), "chapterreward", rsp)
+	this.sendMsg(session, WorldtaskChapterReward, rsp)
+
 	return
 }
diff --git a/modules/worldtask/api_completetask.go b/modules/worldtask/api_completetask.go
index dd339c9b0..1ad54b635 100644
--- a/modules/worldtask/api_completetask.go
+++ b/modules/worldtask/api_completetask.go
@@ -30,13 +30,13 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
 	}
 	if (len(curTaskConf.Completetask) == 1 && curTaskConf.Completetask[0] == 0) ||
 		len(curTaskConf.Completetask) == 0 {
-		code = pb.ErrorCode_WorldtaskNoProcess
+		rsp.Code = pb.ErrorCode_WorldtaskNoProcess
+		this.sendMsg(session, WorldtaskComplete, rsp)
 		return
 	}
 
 	myWorldtask, err := this.module.modelWorldtask.getWorldtask(uid)
 	if err != nil {
-		this.module.Error("获取玩家世界任务失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
 		code = pb.ErrorCode_DBError
 		return
 	}
@@ -55,6 +55,7 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
 					log.Field{Key: "taskId", Value: req.TaskId},
 					log.Field{Key: "condiId", Value: req.CondiId},
 				)
+				this.sendMsg(session, WorldtaskComplete, rsp)
 				return
 			}
 			if wt == nil {
@@ -76,7 +77,7 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
 		return
 	}
 
-	session.SendMsg(string(this.module.GetType()), "completecondi", rsp)
+	this.sendMsg(session, WorldtaskComplete, rsp)
 
 	//结束任务
 	if curTaskConf.DeliverNpc == 0 {
diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go
index 6e293d4b7..5038b0582 100644
--- a/modules/worldtask/api_finish.go
+++ b/modules/worldtask/api_finish.go
@@ -41,18 +41,21 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
 	}
 
 	if curTaskConf.Group != req.GroupId {
-		code = pb.ErrorCode_WorldtaskGroupIdNosame
+		rsp.Code = pb.ErrorCode_WorldtaskGroupIdNosame
+		this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
 		return
 	}
 
 	if curTaskConf.DeliverNpc == 0 {
-		code = pb.ErrorCode_WorldtaskNoProcess
+		rsp.Code = pb.ErrorCode_WorldtaskNoProcess
+		this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
 		return
 	}
 
 	// 判断玩家等级要求
 	if user.Lv < curTaskConf.Lock {
-		code = pb.ErrorCode_WorldtaskLvNotEnough
+		rsp.Code = pb.ErrorCode_WorldtaskLvNotEnough
+		this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
 		return
 	}
 
@@ -69,7 +72,8 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
 	// 前置任务ID 只有世界任务才校验前置
 	if !this.module.modelWorldtask.IsPreFinished(req.GroupId, userTask, curTaskConf) {
 		this.module.Debug("前置任务未完成", log.Field{Key: "uid", Value: uid}, log.Field{Key: "preTaskId", Value: curTaskConf.Ontxe}, log.Field{Key: "taskId", Value: curTaskConf.Key})
-		code = pb.ErrorCode_WorldtaskLastUnFinished
+		rsp.Code = pb.ErrorCode_WorldtaskLastUnFinished
+		this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
 		return
 	}
 
@@ -174,13 +178,6 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
 			return
 		}
 
-		// this.module.modelWorldtask.updateRandomTask(session.GetUserId(),userTask)
-		// for k,v:=range userTask.CurrentTask{
-		// 	nextTask[k] = &pb.Worldtask{
-		// 		TaskId: v.TaskId,
-		// 	}
-		// }
-
 		if curTaskConf.IdAfter != 0 {
 			// 任务完成推送
 			if err := session.SendMsg(string(this.module.GetType()), WorldtaskNexttaskPush, &pb.WorldtaskNexttaskPush{
@@ -236,10 +233,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
 		rsp.Code = pb.ErrorCode_RtaskCondiNoReach
 		rsp.CondiId = condiId
 		rsp.TaskId = req.TaskId
-		if err := session.SendMsg(string(this.module.GetType()), WorldtaskSubtypeFinish, rsp); err != nil {
-			code = pb.ErrorCode_SystemError
-			return
-		}
+		this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
 		return
 	}
 
diff --git a/modules/worldtask/api_mine.go b/modules/worldtask/api_mine.go
index 2c5074634..f306fedc0 100644
--- a/modules/worldtask/api_mine.go
+++ b/modules/worldtask/api_mine.go
@@ -42,8 +42,6 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.WorldtaskMineReq) (
 		Task: myWorldtask,
 	}
 
-	if err := session.SendMsg(string(this.module.GetType()), WorldtaskSubtypeMine, rsp); err != nil {
-		code = pb.ErrorCode_SystemError
-	}
+	this.sendMsg(session, WorldtaskSubtypeMine, rsp)
 	return
 }
diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go
index 88540549c..1a424f5da 100644
--- a/modules/worldtask/module.go
+++ b/modules/worldtask/module.go
@@ -84,6 +84,9 @@ func (this *Worldtask) TaskCondFinishNotify(session comm.IUserSession, condId in
 	}
 
 	if len(finishedTaskIds) == 0 {
+		this.Debug("未找到通知的世界任务",
+			log.Field{Key: "uid", Value: uid},
+			log.Field{Key: "finishedTaskIds", Value: finishedTaskIds})
 		return nil
 	}
 
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index 933160c6d..5068988f9 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -335,6 +335,7 @@ const (
 	ErrorCode_WorldtaskChapterUnFinished ErrorCode = 3808 //章节任务未完成
 	ErrorCode_WorldtaskChapterReceived   ErrorCode = 3809 //章节奖励已领取
 	ErrorCode_WorldtaskNoProcess         ErrorCode = 3810 //无需处理
+	ErrorCode_WorldtaskBattleCreate      ErrorCode = 3811 //战斗创建失败
 	// academy
 	ErrorCode_AcademyTaskNoCompleteTask ErrorCode = 3901 //未完成任务
 	// AutoBattle
@@ -675,6 +676,7 @@ var (
 		3808: "WorldtaskChapterUnFinished",
 		3809: "WorldtaskChapterReceived",
 		3810: "WorldtaskNoProcess",
+		3811: "WorldtaskBattleCreate",
 		3901: "AcademyTaskNoCompleteTask",
 		4001: "AutoBattleNoData",
 		4002: "AutoBattleStatesErr",
@@ -1004,6 +1006,7 @@ var (
 		"WorldtaskChapterUnFinished":  3808,
 		"WorldtaskChapterReceived":    3809,
 		"WorldtaskNoProcess":          3810,
+		"WorldtaskBattleCreate":       3811,
 		"AcademyTaskNoCompleteTask":   3901,
 		"AutoBattleNoData":            4001,
 		"AutoBattleStatesErr":         4002,
@@ -1082,7 +1085,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
 
 var file_errorcode_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2a, 0xf4, 0x3b, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0x90, 0x3c, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
 	0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10,
 	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e,
 	0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
@@ -1490,79 +1493,81 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52,
 	0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xe1, 0x1d, 0x12, 0x17, 0x0a, 0x12, 0x57, 0x6f,
 	0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73,
-	0x10, 0xe2, 0x1d, 0x12, 0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x54, 0x61,
-	0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b,
-	0x10, 0xbd, 0x1e, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c,
-	0x65, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xa1, 0x1f, 0x12, 0x18, 0x0a, 0x13, 0x41, 0x75,
-	0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x45, 0x72,
-	0x72, 0x10, 0xa2, 0x1f, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f,
-	0x52, 0x65, 0x65, 0x6c, 0x10, 0x85, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68,
-	0x79, 0x4e, 0x6f, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x86,
-	0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65,
-	0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x87, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74,
-	0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10,
-	0x88, 0x20, 0x12, 0x20, 0x0a, 0x1b, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74,
-	0x6f, 0x6d, 0x65, 0x72, 0x45, 0x71, 0x75, 0x69, 0x70, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67,
-	0x68, 0x10, 0x89, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4d, 0x61,
-	0x78, 0x54, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x8a, 0x20, 0x12,
-	0x13, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x61, 0x76,
-	0x61, 0x10, 0x8b, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74,
-	0x6c, 0x61, 0x73, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x8c, 0x20, 0x12, 0x16, 0x0a, 0x11, 0x53,
-	0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x76,
-	0x10, 0x8d, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73,
-	0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x8e, 0x20, 0x12, 0x17,
-	0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65,
-	0x69, 0x76, 0x65, 0x64, 0x10, 0x8f, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68,
-	0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x10, 0x90, 0x20,
-	0x12, 0x1a, 0x0a, 0x15, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x41, 0x63, 0x74, 0x69,
-	0x76, 0x61, 0x74, 0x65, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x10, 0x91, 0x20, 0x12, 0x18, 0x0a, 0x13,
-	0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x46, 0x61, 0x69,
-	0x6c, 0x65, 0x64, 0x10, 0x92, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79,
-	0x4c, 0x76, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x50, 0x72, 0x65, 0x10, 0x93, 0x20, 0x12, 0x17, 0x0a,
-	0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x54, 0x79, 0x70, 0x65,
-	0x45, 0x72, 0x72, 0x10, 0x94, 0x20, 0x12, 0x1a, 0x0a, 0x15, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74,
-	0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10,
-	0xe9, 0x20, 0x12, 0x13, 0x0a, 0x0e, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x6f,
-	0x46, 0x72, 0x65, 0x65, 0x10, 0xea, 0x20, 0x12, 0x1b, 0x0a, 0x16, 0x44, 0x69, 0x73, 0x70, 0x61,
-	0x74, 0x63, 0x68, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67,
-	0x68, 0x10, 0xeb, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68,
-	0x48, 0x65, 0x72, 0x6f, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xec, 0x20, 0x12,
-	0x18, 0x0a, 0x13, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, 0x45,
-	0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0xed, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x44, 0x69, 0x73,
-	0x70, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4d, 0x61, 0x78, 0x10,
-	0xee, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x6f,
-	0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xef, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x44,
-	0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f,
-	0x75, 0x67, 0x68, 0x10, 0xf0, 0x20, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69,
-	0x63, 0x65, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xcd, 0x21, 0x12, 0x11,
-	0x0a, 0x0c, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x53, 0x65, 0x6e, 0x74, 0x10, 0xce,
-	0x21, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x76,
-	0x69, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x4f, 0x75, 0x74, 0x10, 0xcf, 0x21, 0x12, 0x18, 0x0a,
-	0x13, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x4d,
-	0x61, 0x78, 0x4c, 0x76, 0x10, 0xd0, 0x21, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74,
-	0x69, 0x63, 0x65, 0x59, 0x6f, 0x75, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10,
-	0xd1, 0x21, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x54, 0x61,
-	0x72, 0x67, 0x65, 0x74, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xd2, 0x21,
-	0x12, 0x16, 0x0a, 0x11, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4d, 0x65, 0x6d, 0x62, 0x65,
-	0x72, 0x46, 0x75, 0x6c, 0x6c, 0x10, 0xb1, 0x22, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x61, 0x72, 0x6b,
-	0x6f, 0x75, 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x64, 0x75, 0x65,
-	0x10, 0xb2, 0x22, 0x12, 0x1f, 0x0a, 0x1a, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e,
-	0x76, 0x69, 0x74, 0x65, 0x4e, 0x6f, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x10, 0xb3, 0x22, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x54,
-	0x61, 0x72, 0x67, 0x65, 0x74, 0x54, 0x65, 0x61, 0x6d, 0x65, 0x64, 0x10, 0xb4, 0x22, 0x12, 0x19,
-	0x0a, 0x14, 0x52, 0x65, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x6c, 0x65,
-	0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x10, 0x95, 0x23, 0x12, 0x1a, 0x0a, 0x15, 0x52, 0x65, 0x70,
-	0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x6f, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x64, 0x65,
-	0x4c, 0x76, 0x10, 0x96, 0x23, 0x12, 0x15, 0x0a, 0x10, 0x4f, 0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65,
-	0x73, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xf9, 0x23, 0x12, 0x15, 0x0a, 0x10,
-	0x4f, 0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64,
-	0x10, 0xfa, 0x23, 0x12, 0x16, 0x0a, 0x11, 0x4f, 0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x4c,
-	0x65, 0x76, 0x65, 0x6c, 0x4f, 0x76, 0x65, 0x72, 0x10, 0xfb, 0x23, 0x12, 0x1f, 0x0a, 0x1a, 0x4f,
-	0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x50, 0x72, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x4e,
-	0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xfc, 0x23, 0x12, 0x1a, 0x0a, 0x15,
-	0x4f, 0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x4e, 0x6f, 0x41, 0x6c, 0x6c, 0x46, 0x69, 0x6e,
-	0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xfd, 0x23, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x10, 0xe2, 0x1d, 0x12, 0x1a, 0x0a, 0x15, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b,
+	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x10, 0xe3, 0x1d, 0x12,
+	0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f,
+	0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x10, 0xbd, 0x1e, 0x12,
+	0x15, 0x0a, 0x10, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x44,
+	0x61, 0x74, 0x61, 0x10, 0xa1, 0x1f, 0x12, 0x18, 0x0a, 0x13, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61,
+	0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x45, 0x72, 0x72, 0x10, 0xa2, 0x1f,
+	0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x52, 0x65, 0x65, 0x6c,
+	0x10, 0x85, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x54,
+	0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x86, 0x20, 0x12, 0x15, 0x0a,
+	0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x74, 0x6f, 0x76, 0x65, 0x4d, 0x61, 0x78, 0x4c,
+	0x76, 0x10, 0x87, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75,
+	0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0x88, 0x20, 0x12, 0x20,
+	0x0a, 0x1b, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72,
+	0x45, 0x71, 0x75, 0x69, 0x70, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x89, 0x20,
+	0x12, 0x19, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4d, 0x61, 0x78, 0x54, 0x65, 0x6d,
+	0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x10, 0x8a, 0x20, 0x12, 0x13, 0x0a, 0x0e, 0x53,
+	0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x61, 0x76, 0x61, 0x10, 0x8b, 0x20,
+	0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4d,
+	0x61, 0x78, 0x4c, 0x76, 0x10, 0x8c, 0x20, 0x12, 0x16, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68,
+	0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x4c, 0x61, 0x63, 0x6b, 0x4c, 0x76, 0x10, 0x8d, 0x20, 0x12,
+	0x19, 0x0a, 0x14, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46,
+	0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x8e, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d,
+	0x69, 0x74, 0x68, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64,
+	0x10, 0x8f, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x46,
+	0x6f, 0x75, 0x6e, 0x64, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x10, 0x90, 0x20, 0x12, 0x1a, 0x0a, 0x15,
+	0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4e, 0x6f, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65,
+	0x41, 0x74, 0x6c, 0x61, 0x73, 0x10, 0x91, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6d, 0x69, 0x74,
+	0x68, 0x79, 0x4c, 0x76, 0x54, 0x6f, 0x6f, 0x6c, 0x73, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10,
+	0x92, 0x20, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x4c, 0x76, 0x54, 0x6f,
+	0x6f, 0x6c, 0x73, 0x50, 0x72, 0x65, 0x10, 0x93, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6d, 0x69,
+	0x74, 0x68, 0x79, 0x41, 0x74, 0x6c, 0x61, 0x73, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10,
+	0x94, 0x20, 0x12, 0x1a, 0x0a, 0x15, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65,
+	0x72, 0x6f, 0x4e, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xe9, 0x20, 0x12, 0x13,
+	0x0a, 0x0e, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x72, 0x65, 0x65,
+	0x10, 0xea, 0x20, 0x12, 0x1b, 0x0a, 0x16, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54,
+	0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xeb, 0x20,
+	0x12, 0x19, 0x0a, 0x14, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f,
+	0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xec, 0x20, 0x12, 0x18, 0x0a, 0x13, 0x44,
+	0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x78, 0x70, 0x69, 0x72,
+	0x65, 0x64, 0x10, 0xed, 0x20, 0x12, 0x17, 0x0a, 0x12, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63,
+	0x68, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4d, 0x61, 0x78, 0x10, 0xee, 0x20, 0x12, 0x17,
+	0x0a, 0x12, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69,
+	0x73, 0x68, 0x65, 0x64, 0x10, 0xef, 0x20, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x69, 0x73, 0x70, 0x61,
+	0x74, 0x63, 0x68, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10,
+	0xf0, 0x20, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x51, 0x69,
+	0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xcd, 0x21, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x72,
+	0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x53, 0x65, 0x6e, 0x74, 0x10, 0xce, 0x21, 0x12, 0x1a, 0x0a,
+	0x15, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x54,
+	0x69, 0x6d, 0x65, 0x4f, 0x75, 0x74, 0x10, 0xcf, 0x21, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x72, 0x61,
+	0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x4d, 0x61, 0x78, 0x4c, 0x76,
+	0x10, 0xd0, 0x21, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x59,
+	0x6f, 0x75, 0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xd1, 0x21, 0x12, 0x1c,
+	0x0a, 0x17, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74,
+	0x51, 0x69, 0x65, 0x63, 0x75, 0x6f, 0x69, 0x6e, 0x67, 0x10, 0xd2, 0x21, 0x12, 0x16, 0x0a, 0x11,
+	0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x46, 0x75, 0x6c,
+	0x6c, 0x10, 0xb1, 0x22, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49,
+	0x6e, 0x76, 0x69, 0x74, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x64, 0x75, 0x65, 0x10, 0xb2, 0x22, 0x12,
+	0x1f, 0x0a, 0x1a, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65,
+	0x4e, 0x6f, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x10, 0xb3, 0x22,
+	0x12, 0x18, 0x0a, 0x13, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x54, 0x61, 0x72, 0x67, 0x65,
+	0x74, 0x54, 0x65, 0x61, 0x6d, 0x65, 0x64, 0x10, 0xb4, 0x22, 0x12, 0x19, 0x0a, 0x14, 0x52, 0x65,
+	0x70, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x46, 0x75,
+	0x6c, 0x6c, 0x10, 0x95, 0x23, 0x12, 0x1a, 0x0a, 0x15, 0x52, 0x65, 0x70, 0x75, 0x74, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x4e, 0x6f, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x4c, 0x76, 0x10, 0x96,
+	0x23, 0x12, 0x15, 0x0a, 0x10, 0x4f, 0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x52, 0x65, 0x63,
+	0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xf9, 0x23, 0x12, 0x15, 0x0a, 0x10, 0x4f, 0x6c, 0x64, 0x74,
+	0x69, 0x6d, 0x65, 0x73, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xfa, 0x23, 0x12,
+	0x16, 0x0a, 0x11, 0x4f, 0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x4c, 0x65, 0x76, 0x65, 0x6c,
+	0x4f, 0x76, 0x65, 0x72, 0x10, 0xfb, 0x23, 0x12, 0x1f, 0x0a, 0x1a, 0x4f, 0x6c, 0x64, 0x74, 0x69,
+	0x6d, 0x65, 0x73, 0x50, 0x72, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x4e, 0x6f, 0x46, 0x69, 0x6e,
+	0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xfc, 0x23, 0x12, 0x1a, 0x0a, 0x15, 0x4f, 0x6c, 0x64, 0x74,
+	0x69, 0x6d, 0x65, 0x73, 0x4e, 0x6f, 0x41, 0x6c, 0x6c, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65,
+	0x64, 0x10, 0xfd, 0x23, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/pb/worldtask_msg.pb.go b/pb/worldtask_msg.pb.go
index 4dda209e5..6224d12c4 100644
--- a/pb/worldtask_msg.pb.go
+++ b/pb/worldtask_msg.pb.go
@@ -167,7 +167,7 @@ type WorldtaskAcceptResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Code ErrorCode `protobuf:"varint,1,opt,name=Code,proto3,enum=ErrorCode" json:"Code"`
+	Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"`
 }
 
 func (x *WorldtaskAcceptResp) Reset() {
@@ -637,7 +637,7 @@ type WorldtaskBattleStartResp struct {
 	unknownFields protoimpl.UnknownFields
 
 	Info *BattleInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` //战斗信息
-	Code ErrorCode   `protobuf:"varint,2,opt,name=Code,proto3,enum=ErrorCode" json:"Code"`
+	Code ErrorCode   `protobuf:"varint,2,opt,name=code,proto3,enum=ErrorCode" json:"code"`
 }
 
 func (x *WorldtaskBattleStartResp) Reset() {
@@ -984,8 +984,8 @@ var file_worldtask_worldtask_msg_proto_rawDesc = []byte{
 	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, 0x35, 0x0a, 0x13, 0x57, 0x6f,
 	0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x1e, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x43, 0x6f, 0x64,
+	0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
+	0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64,
 	0x65, 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,
@@ -1041,8 +1041,8 @@ var file_worldtask_worldtask_msg_proto_rawDesc = []byte{
 	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, 0x12, 0x1e, 0x0a,
-	0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72,
-	0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x22, 0xb1, 0x01,
+	0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72,
+	0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 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,
@@ -1115,13 +1115,13 @@ var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{
 }
 var file_worldtask_worldtask_msg_proto_depIdxs = []int32{
 	18, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask
-	19, // 1: WorldtaskAcceptResp.Code:type_name -> ErrorCode
+	19, // 1: WorldtaskAcceptResp.code:type_name -> ErrorCode
 	19, // 2: WorldtaskCompleteCondiResp.code:type_name -> ErrorCode
 	19, // 3: WorldtaskFinishResp.code:type_name -> ErrorCode
 	17, // 4: WorldtaskNexttaskPush.nextTask:type_name -> WorldtaskNexttaskPush.NextTaskEntry
 	20, // 5: WorldtaskBattleStartReq.battle:type_name -> BattleFormation
 	21, // 6: WorldtaskBattleStartResp.info:type_name -> BattleInfo
-	19, // 7: WorldtaskBattleStartResp.Code:type_name -> ErrorCode
+	19, // 7: WorldtaskBattleStartResp.code:type_name -> ErrorCode
 	22, // 8: WorldtaskBattleFinishReq.report:type_name -> BattleReport
 	19, // 9: WorldtaskBattleFinishResp.code:type_name -> ErrorCode
 	23, // 10: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask