diff --git a/comm/error.go b/comm/error.go
index 8c806acf6..5a5bb748f 100644
--- a/comm/error.go
+++ b/comm/error.go
@@ -26,10 +26,10 @@ func NewCustomError(code pb.ErrorCode) error {
 
 // 创建配置表错误对象
 func NewNotFoundConfErr(moduleName string, filename string, id interface{}) error {
-	return fmt.Errorf("服务端配置未找到!模块:%s ,配置文件:%s,目标数据:%v", moduleName, filename, id)
+	return fmt.Errorf("NotFoundConf Err module:%s ,file:%s,id:%v", moduleName, filename, id)
 }
 
 // 执行外部模块异常
 func NewExternalModuleErr(moduleName string, methodname string, parameter ...interface{}) error {
-	return fmt.Errorf("执行外部模块错误 模块:%s ,配置文件:%s,目标数据:%v", moduleName, methodname, parameter)
+	return fmt.Errorf("ExternalModule Err module:%s ,file:%s,parameter:%v", moduleName, methodname, parameter)
 }
diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go
index 0cc7c2197..f504a982e 100644
--- a/modules/worldtask/module.go
+++ b/modules/worldtask/module.go
@@ -409,33 +409,33 @@ func (this *Worldtask) JumpTaskByTaskId(session comm.IUserSession, taskId int32)
 
 // 返回任务ID
 func (this *Worldtask) AcceptCaravanTask(session comm.IUserSession, groupId int32) (task *pb.Worldtask, errdata *pb.ErrorData) {
-	uid := session.GetUserId()
-	var (
+	// uid := session.GetUserId()
+	// var (
 	// curTaskConf *cfg.GameWorldTaskData
 	// isfinsh     bool
-	)
-	mytask, err := this.modelWorldtask.getWorldtask(uid)
-	if err != nil {
-		errdata = &pb.ErrorData{
-			Code:    pb.ErrorCode_DBError,
-			Title:   pb.ErrorCode_DBError.String(),
-			Message: "no found task data",
-		}
-		return
-	}
+	// )
+	// mytask, err := this.modelWorldtask.getWorldtask(uid)
+	// if err != nil {
+	// 	errdata = &pb.ErrorData{
+	// 		Code:    pb.ErrorCode_DBError,
+	// 		Title:   pb.ErrorCode_DBError.String(),
+	// 		Message: "no found task data",
+	// 	}
+	// 	return
+	// }
 
 	if gwt, err := this.configure.getWorldtaskCfg(); err == nil {
 		for _, v := range gwt.GetDataList() {
 			if v.Group == groupId && v.Des == 5 {
-				if _, ok := utils.Findx(mytask.TaskList, v.Key); !ok {
-					task = &pb.Worldtask{
-						TaskId:    v.Key,
-						TaskType:  v.Des,
-						NpcStatus: 1,
-					}
-					// curTaskConf = v
-					break
+				// if _, ok := utils.Findx(mytask.TaskList, v.Key); !ok {
+				task = &pb.Worldtask{
+					TaskId:    v.Key,
+					TaskType:  v.Des,
+					NpcStatus: 1,
 				}
+				// curTaskConf = v
+				break
+				// }
 			}
 		}
 	}
diff --git a/modules/wtask/api_finish.go b/modules/wtask/api_finish.go
index 4c74d281c..a9a8fbb55 100644
--- a/modules/wtask/api_finish.go
+++ b/modules/wtask/api_finish.go
@@ -1,8 +1,11 @@
 package wtask
 
 import (
+	"fmt"
 	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
 )
 
 // 参数校验
@@ -14,12 +17,27 @@ func (this *apiComp) FinishCheck(session comm.IUserSession, req *pb.WTaskFinishR
 // /获取系统公告
 func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) (errdata *pb.ErrorData) {
 	var (
-		wtask *pb.DBWTask
-		err   error
+		conf    *cfg.GameWorldTaskData
+		wtask   *pb.DBWTask
+		condis  []*pb.ConIProgress
+		award   []*pb.UserAssets
+		err     error
+		isfinsh bool
+		ok      bool
 	)
 	if errdata = this.FinishCheck(session, req); errdata != nil {
 		return
 	}
+
+	if conf, err = this.module.configure.gettaskconfconfigure(req.Tid); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ConfigNoFound,
+			Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
+
 	if wtask, err = this.module.modelwtask.getUserWTasks(session.GetUserId()); err != nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_DBError,
@@ -28,7 +46,72 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) (
 		}
 		return
 	}
+	ok = false
+	for _, v := range wtask.Accepts {
+		if v == req.Tid {
+			ok = true
+		}
+	}
+	if !ok {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ReqParameterError,
+			Title:   pb.ErrorCode_ReqParameterError.ToString(),
+			Message: fmt.Sprintf("task:%d no in accepttask:%v", req.Tid, wtask.Accepts),
+		}
+		return
+	}
 
-	session.SendMsg(string(this.module.GetType()), "info", &pb.WTaskInfoResp{Activations: wtask.Activations, Completes: wtask.Completes})
+	if len(conf.Completetask) > 0 {
+		if condis, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), conf.Completetask...); err != nil {
+			this.module.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()})
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ExternalModule,
+				Title:   pb.ErrorCode_ExternalModule.ToString(),
+				Message: fmt.Sprintf("Progress:%s", err.Error()),
+			}
+			return
+		}
+	}
+	isfinsh = true
+	for _, v := range condis {
+		if v.State == pb.BuriedItemFinishState_buried_unfinish {
+			isfinsh = false
+		}
+	}
+	if !isfinsh {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_WorldtaskNoComplete,
+			Title:   pb.ErrorCode_WorldtaskNoComplete.ToString(),
+			Message: fmt.Sprintf("ModuleBuried.CheckCondition Error:%+v", condis),
+		}
+		return
+	}
+
+	if len(conf.TaskendRemoveitem) > 0 { //交付物品
+		if errdata = this.module.ConsumeRes(session, conf.TaskendRemoveitem, true); errdata != nil {
+			return
+		}
+	}
+
+	if errdata = this.module.DispenseRes(session, conf.Reword, true); errdata != nil {
+		return
+	}
+	award = make([]*pb.UserAssets, 0)
+	for _, v := range conf.Reword {
+		award = append(award, &pb.UserAssets{
+			A: v.A,
+			T: v.T,
+			N: v.N,
+		})
+	}
+	for i, v := range wtask.Accepts {
+		if v == req.Tid {
+			wtask.Accepts = append(wtask.Accepts[0:i], wtask.Accepts[i+1:]...)
+			break
+		}
+	}
+	wtask.Completes = append(wtask.Completes, req.Tid)
+	session.SendMsg(string(this.module.GetType()), "finish", &pb.WTaskFinishResp{Tid: req.Tid, Award: award})
+	this.module.fishtask(session, wtask)
 	return
 }
diff --git a/modules/wtask/api_info.go b/modules/wtask/api_info.go
index 986ba66cf..8d6c66073 100644
--- a/modules/wtask/api_info.go
+++ b/modules/wtask/api_info.go
@@ -28,7 +28,9 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.WTaskInfoReq) (errd
 		}
 		return
 	}
-
-	session.SendMsg(string(this.module.GetType()), "info", &pb.WTaskInfoResp{Activations: wtask.Activations, Completes: wtask.Completes})
+	if errdata = this.module.pushtaskprogress(session, wtask); errdata != nil {
+		return
+	}
+	session.SendMsg(string(this.module.GetType()), "info", &pb.WTaskInfoResp{Activations: wtask.Activations, Accepttask: wtask.Accepts, Completes: wtask.Completes})
 	return
 }
diff --git a/modules/wtask/module.go b/modules/wtask/module.go
index 6ace7b2a8..fe3473e8f 100644
--- a/modules/wtask/module.go
+++ b/modules/wtask/module.go
@@ -1,6 +1,7 @@
 package wtask
 
 import (
+	"fmt"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/lego/sys/log"
@@ -65,8 +66,6 @@ func (this *WTask) BuriedsNotify(uid string, condis []*pb.ConIProgress) {
 		checkcondlsMap map[int32]struct{}               = make(map[int32]struct{})
 		checkcondls    []int32                          = make([]int32, 0)
 		detailstasks   []*pb.DBWTaskItem                = make([]*pb.DBWTaskItem, 0)
-		finishtasks    []int32                          = make([]int32, 0)
-		award          []*pb.UserAssets                 = make([]*pb.UserAssets, 0)
 		ok             bool
 		needcheck      bool //是否需要校验
 
@@ -82,7 +81,7 @@ func (this *WTask) BuriedsNotify(uid string, condis []*pb.ConIProgress) {
 		condisMap[v.Conid] = v
 	}
 
-	for _, v := range utask.Accepttask {
+	for _, v := range utask.Accepts {
 		accepttaskMap[v] = struct{}{}
 	}
 
@@ -127,26 +126,10 @@ func (this *WTask) BuriedsNotify(uid string, condis []*pb.ConIProgress) {
 			Tid:    k,
 			Conlds: make([]*pb.ConIProgress, len(v.Completetask)),
 		}
-		ok = true
 		for i, v := range v.Completetask {
 			task.Conlds[i] = condisMap[v]
-			if task.Conlds[i].State != pb.BuriedItemFinishState_buried_unfinish {
-				ok = false
-			}
 		}
 		detailstasks = append(detailstasks, task)
-		if ok && v.DeliverNpc == 0 { //自动完成
-			finishtasks = append(finishtasks, k)
-			this.DispenseRes(session, v.Reword, true) //发送奖励
-			for _, v := range v.Reword {
-				award = append(award, &pb.UserAssets{
-					A: v.A,
-					T: v.T,
-					N: v.N,
-				})
-			}
-
-		}
 	}
 
 	session, _ = this.GetUserSession(uid)
@@ -155,12 +138,83 @@ func (this *WTask) BuriedsNotify(uid string, condis []*pb.ConIProgress) {
 		this.PutUserSession(session)
 	}()
 	//发送进度变化消息
-	session.SendMsg(string(this.GetType()), "accepttaskchange", &pb.WTaskAccepttaskChangePush{Accepttask: detailstasks})
+	session.SendMsg(string(this.GetType()), "accepttaskchange", &pb.WTaskAcceptChangePush{Accepts: detailstasks})
+}
 
+// 校验任务进度
+func (this *WTask) pushtaskprogress(session comm.IUserSession, wtask *pb.DBWTask) (errdata *pb.ErrorData) {
+	var (
+		tasks          []*pb.DBWTaskItem  = make([]*pb.DBWTaskItem, 0)
+		checkcondlsMap map[int32]struct{} = make(map[int32]struct{})
+		checkcondls    []int32            = make([]int32, 0)
+		conf           *cfg.GameWorldTaskData
+		condis         []*pb.ConIProgress         = make([]*pb.ConIProgress, 0)
+		condisMap      map[int32]*pb.ConIProgress = make(map[int32]*pb.ConIProgress)
+		err            error
+		ok             bool
+	)
+	if len(wtask.Accepts) == 0 {
+		return
+	}
+
+	for _, v := range wtask.Accepts {
+		if conf, err = this.configure.gettaskconfconfigure(v); err != nil {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ConfigNoFound,
+				Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+				Message: err.Error(),
+			}
+			return
+		}
+		for _, v := range conf.Completetask {
+			if _, ok = checkcondlsMap[v]; !ok {
+				checkcondlsMap[v] = struct{}{}
+				checkcondls = append(checkcondls, v)
+			}
+		}
+	}
+	if len(checkcondls) > 0 {
+		if condis, err = this.ModuleBuried.CheckCondition(session.GetUserId(), checkcondls...); err != nil {
+			this.Error("校验玩家子任务进度数据 失败", log.Field{Key: "err", Value: err.Error()})
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ExternalModule,
+				Title:   pb.ErrorCode_ExternalModule.ToString(),
+				Message: fmt.Sprintf("ModuleBuried.CheckCondition Error:%s", err.Error()),
+			}
+			return
+		}
+		for _, v := range condis {
+			condisMap[v.Conid] = v
+		}
+	}
+
+	for _, v := range wtask.Accepts {
+		if conf, err = this.configure.gettaskconfconfigure(v); err != nil {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ConfigNoFound,
+				Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+				Message: err.Error(),
+			}
+			return
+		}
+		task := &pb.DBWTaskItem{
+			Tid:    v,
+			Conlds: make([]*pb.ConIProgress, len(conf.Completetask)),
+		}
+		ok = true
+		for i, v := range conf.Completetask {
+			task.Conlds[i] = condisMap[v]
+		}
+		tasks = append(tasks, task)
+	}
+
+	session.SendMsg(string(this.GetType()), "info", &pb.WTaskAcceptChangePush{Accepts: tasks})
+
+	return
 }
 
 // 完成任务
-func (this *WTask) fishtask(session comm.IUserSession, wtask *pb.DBWTask, finishtasks []int32) {
+func (this *WTask) fishtask(session comm.IUserSession, wtask *pb.DBWTask) {
 	var (
 		opencmdMap map[string]int32
 		opencmd    []string
@@ -168,10 +222,6 @@ func (this *WTask) fishtask(session comm.IUserSession, wtask *pb.DBWTask, finish
 		errdata    *pb.ErrorData
 	)
 
-	if len(finishtasks) == 0 {
-		return
-	}
-
 	if opencmdMap, errdata = this.modelSys.QueryOpenCondData(session.GetUserId()); errdata != nil {
 		this.Error("查询用户功能是否开启表 失败!", log.Field{Key: "key", Value: errdata})
 		return
@@ -228,13 +278,13 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa
 			wtask.Activations = append(wtask.Activations, v.Key)
 			change = true
 		} else if v.AutoAccept == 1 { //自动接取任务
-			wtask.Accepttask = append(wtask.Accepttask, v.Key)
+			wtask.Accepts = append(wtask.Accepts, v.Key)
 		}
 
 	}
 
 	if change {
-		session.SendMsg(string(this.GetType()), "activations", &pb.WTaskActivationsPush{Activations: wtask.Activations})
+		session.SendMsg(string(this.GetType()), "activations", &pb.WTaskActivationsChangePush{Activations: wtask.Activations})
 	}
 	return
 }
diff --git a/pb/wtask_db.pb.go b/pb/wtask_db.pb.go
index 7d4fcde22..cf5c7591b 100644
--- a/pb/wtask_db.pb.go
+++ b/pb/wtask_db.pb.go
@@ -29,7 +29,7 @@ type DBWTask struct {
 	Id          string  `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`                //唯一ID
 	Uid         string  `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"`              //玩家ID
 	Activations []int32 `protobuf:"varint,3,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表
-	Accepttask  []int32 `protobuf:"varint,4,rep,packed,name=accepttask,proto3" json:"accepttask"`   //已接取任务列表
+	Accepts     []int32 `protobuf:"varint,4,rep,packed,name=accepts,proto3" json:"accepts"`         //已接取任务列表
 	Completes   []int32 `protobuf:"varint,5,rep,packed,name=completes,proto3" json:"completes"`     //完成任务列表
 }
 
@@ -86,9 +86,9 @@ func (x *DBWTask) GetActivations() []int32 {
 	return nil
 }
 
-func (x *DBWTask) GetAccepttask() []int32 {
+func (x *DBWTask) GetAccepts() []int32 {
 	if x != nil {
-		return x.Accepttask
+		return x.Accepts
 	}
 	return nil
 }
@@ -161,22 +161,21 @@ var File_wtask_wtask_db_proto protoreflect.FileDescriptor
 var file_wtask_wtask_db_proto_rawDesc = []byte{
 	0x0a, 0x14, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x77, 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, 0x8b,
+	0x75, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x85,
 	0x01, 0x0a, 0x07, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
 	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b,
 	0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
-	0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e,
-	0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x04, 0x20, 0x03,
-	0x28, 0x05, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x1c,
-	0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28,
-	0x05, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x22, 0x46, 0x0a, 0x0b,
-	0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x74,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x25, 0x0a,
-	0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
-	0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x06, 0x63, 0x6f,
-	0x6e, 0x6c, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x18,
+	0x0a, 0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52,
+	0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70,
+	0x6c, 0x65, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x6d,
+	0x70, 0x6c, 0x65, 0x74, 0x65, 0x73, 0x22, 0x46, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73,
+	0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64,
+	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72,
+	0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x42, 0x06,
+	0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/pb/wtask_msg.pb.go b/pb/wtask_msg.pb.go
index e802af35c..f5e8eb5ba 100644
--- a/pb/wtask_msg.pb.go
+++ b/pb/wtask_msg.pb.go
@@ -65,9 +65,9 @@ type WTaskInfoResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Activations []int32        `protobuf:"varint,1,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表
-	Accepttask  []*DBWTaskItem `protobuf:"bytes,2,rep,name=accepttask,proto3" json:"accepttask"`           //已接取任务列表
-	Completes   []int32        `protobuf:"varint,3,rep,packed,name=completes,proto3" json:"completes"`     //完成任务列表
+	Activations []int32 `protobuf:"varint,1,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表
+	Accepttask  []int32 `protobuf:"varint,2,rep,packed,name=accepttask,proto3" json:"accepttask"`   //已接取任务列表
+	Completes   []int32 `protobuf:"varint,3,rep,packed,name=completes,proto3" json:"completes"`     //完成任务列表
 }
 
 func (x *WTaskInfoResp) Reset() {
@@ -109,7 +109,7 @@ func (x *WTaskInfoResp) GetActivations() []int32 {
 	return nil
 }
 
-func (x *WTaskInfoResp) GetAccepttask() []*DBWTaskItem {
+func (x *WTaskInfoResp) GetAccepttask() []int32 {
 	if x != nil {
 		return x.Accepttask
 	}
@@ -523,7 +523,7 @@ func (x *WTaskFinishResp) GetAward() []*UserAssets {
 }
 
 //可接入任务推送
-type WTaskActivationsPush struct {
+type WTaskActivationsChangePush struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -531,8 +531,8 @@ type WTaskActivationsPush struct {
 	Activations []int32 `protobuf:"varint,1,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表
 }
 
-func (x *WTaskActivationsPush) Reset() {
-	*x = WTaskActivationsPush{}
+func (x *WTaskActivationsChangePush) Reset() {
+	*x = WTaskActivationsChangePush{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_wtask_wtask_msg_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -540,13 +540,13 @@ func (x *WTaskActivationsPush) Reset() {
 	}
 }
 
-func (x *WTaskActivationsPush) String() string {
+func (x *WTaskActivationsChangePush) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*WTaskActivationsPush) ProtoMessage() {}
+func (*WTaskActivationsChangePush) ProtoMessage() {}
 
-func (x *WTaskActivationsPush) ProtoReflect() protoreflect.Message {
+func (x *WTaskActivationsChangePush) ProtoReflect() protoreflect.Message {
 	mi := &file_wtask_wtask_msg_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -558,12 +558,12 @@ func (x *WTaskActivationsPush) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use WTaskActivationsPush.ProtoReflect.Descriptor instead.
-func (*WTaskActivationsPush) Descriptor() ([]byte, []int) {
+// Deprecated: Use WTaskActivationsChangePush.ProtoReflect.Descriptor instead.
+func (*WTaskActivationsChangePush) Descriptor() ([]byte, []int) {
 	return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{10}
 }
 
-func (x *WTaskActivationsPush) GetActivations() []int32 {
+func (x *WTaskActivationsChangePush) GetActivations() []int32 {
 	if x != nil {
 		return x.Activations
 	}
@@ -571,16 +571,18 @@ func (x *WTaskActivationsPush) GetActivations() []int32 {
 }
 
 //已接取任务 进度变化推送
-type WTaskAccepttaskChangePush struct {
+type WTaskAcceptChangePush struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Accepttask []*DBWTaskItem `protobuf:"bytes,1,rep,name=accepttask,proto3" json:"accepttask"` //已接取任务列表
+	Activations []int32        `protobuf:"varint,1,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表
+	Accepts     []*DBWTaskItem `protobuf:"bytes,2,rep,name=accepts,proto3" json:"accepts"`                 //已接取任务列表
+	Completes   []int32        `protobuf:"varint,3,rep,packed,name=completes,proto3" json:"completes"`     //完成任务列表
 }
 
-func (x *WTaskAccepttaskChangePush) Reset() {
-	*x = WTaskAccepttaskChangePush{}
+func (x *WTaskAcceptChangePush) Reset() {
+	*x = WTaskAcceptChangePush{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_wtask_wtask_msg_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -588,13 +590,13 @@ func (x *WTaskAccepttaskChangePush) Reset() {
 	}
 }
 
-func (x *WTaskAccepttaskChangePush) String() string {
+func (x *WTaskAcceptChangePush) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*WTaskAccepttaskChangePush) ProtoMessage() {}
+func (*WTaskAcceptChangePush) ProtoMessage() {}
 
-func (x *WTaskAccepttaskChangePush) ProtoReflect() protoreflect.Message {
+func (x *WTaskAcceptChangePush) ProtoReflect() protoreflect.Message {
 	mi := &file_wtask_wtask_msg_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -606,14 +608,28 @@ func (x *WTaskAccepttaskChangePush) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use WTaskAccepttaskChangePush.ProtoReflect.Descriptor instead.
-func (*WTaskAccepttaskChangePush) Descriptor() ([]byte, []int) {
+// Deprecated: Use WTaskAcceptChangePush.ProtoReflect.Descriptor instead.
+func (*WTaskAcceptChangePush) Descriptor() ([]byte, []int) {
 	return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{11}
 }
 
-func (x *WTaskAccepttaskChangePush) GetAccepttask() []*DBWTaskItem {
+func (x *WTaskAcceptChangePush) GetActivations() []int32 {
 	if x != nil {
-		return x.Accepttask
+		return x.Activations
+	}
+	return nil
+}
+
+func (x *WTaskAcceptChangePush) GetAccepts() []*DBWTaskItem {
+	if x != nil {
+		return x.Accepts
+	}
+	return nil
+}
+
+func (x *WTaskAcceptChangePush) GetCompletes() []int32 {
+	if x != nil {
+		return x.Completes
 	}
 	return nil
 }
@@ -627,54 +643,57 @@ var file_wtask_wtask_msg_proto_rawDesc = []byte{
 	0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x22, 0x0e, 0x0a, 0x0c, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52,
-	0x65, 0x71, 0x22, 0x7d, 0x0a, 0x0d, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x65, 0x71, 0x22, 0x6f, 0x0a, 0x0d, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52,
 	0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f,
 	0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2c, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x74,
-	0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54,
-	0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x74,
-	0x61, 0x73, 0x6b, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x73,
-	0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
-	0x73, 0x22, 0x22, 0x0a, 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74,
-	0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x33, 0x0a, 0x0f, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63,
-	0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b,
-	0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x63, 0x0a, 0x13, 0x57, 0x54,
-	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,
-	0x37, 0x0a, 0x14, 0x57, 0x54, 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, 0x61, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73,
-	0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 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, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02,
-	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, 0x17, 0x0a, 0x15, 0x57,
-	0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68,
-	0x52, 0x65, 0x73, 0x70, 0x22, 0x22, 0x0a, 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e,
-	0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x46, 0x0a, 0x0f, 0x57, 0x54, 0x61, 0x73,
-	0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x74,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x21, 0x0a,
-	0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55,
-	0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64,
-	0x22, 0x38, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69,
-	0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61,
-	0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x49, 0x0a, 0x19, 0x57, 0x54,
-	0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61,
-	0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x2c, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70,
-	0x74, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42,
-	0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70,
-	0x74, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x74,
+	0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70,
+	0x74, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74,
+	0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
+	0x74, 0x65, 0x73, 0x22, 0x22, 0x0a, 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65,
+	0x70, 0x74, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x33, 0x0a, 0x0f, 0x57, 0x54, 0x61, 0x73, 0x6b,
+	0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x61,
+	0x73, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61,
+	0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x63, 0x0a, 0x13,
+	0x57, 0x54, 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, 0x37, 0x0a, 0x14, 0x57, 0x54, 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, 0x61, 0x0a, 0x14, 0x57, 0x54,
+	0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 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, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74,
+	0x18, 0x02, 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, 0x17, 0x0a,
+	0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69,
+	0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x22, 0x22, 0x0a, 0x0e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x46,
+	0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x46, 0x0a, 0x0f, 0x57, 0x54,
+	0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a,
+	0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12,
+	0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
+	0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61,
+	0x72, 0x64, 0x22, 0x3e, 0x0a, 0x1a, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68,
+	0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x22, 0x7f, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70,
+	0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x61,
+	0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05,
+	0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x26, 0x0a,
+	0x07, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c,
+	0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x07, 0x61, 0x63,
+	0x63, 0x65, 0x70, 0x74, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74,
+	0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
+	0x74, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
@@ -691,37 +710,36 @@ func file_wtask_wtask_msg_proto_rawDescGZIP() []byte {
 
 var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
 var file_wtask_wtask_msg_proto_goTypes = []interface{}{
-	(*WTaskInfoReq)(nil),              // 0: WTaskInfoReq
-	(*WTaskInfoResp)(nil),             // 1: WTaskInfoResp
-	(*WTaskAcceptReq)(nil),            // 2: WTaskAcceptReq
-	(*WTaskAcceptResp)(nil),           // 3: WTaskAcceptResp
-	(*WTaskBattleStartReq)(nil),       // 4: WTaskBattleStartReq
-	(*WTaskBattleStartResp)(nil),      // 5: WTaskBattleStartResp
-	(*WTaskBattleFinishReq)(nil),      // 6: WTaskBattleFinishReq
-	(*WTaskBattleFinishResp)(nil),     // 7: WTaskBattleFinishResp
-	(*WTaskFinishReq)(nil),            // 8: WTaskFinishReq
-	(*WTaskFinishResp)(nil),           // 9: WTaskFinishResp
-	(*WTaskActivationsPush)(nil),      // 10: WTaskActivationsPush
-	(*WTaskAccepttaskChangePush)(nil), // 11: WTaskAccepttaskChangePush
-	(*DBWTaskItem)(nil),               // 12: DBWTaskItem
-	(*BattleFormation)(nil),           // 13: BattleFormation
-	(*BattleInfo)(nil),                // 14: BattleInfo
-	(*BattleReport)(nil),              // 15: BattleReport
-	(*UserAssets)(nil),                // 16: UserAssets
+	(*WTaskInfoReq)(nil),               // 0: WTaskInfoReq
+	(*WTaskInfoResp)(nil),              // 1: WTaskInfoResp
+	(*WTaskAcceptReq)(nil),             // 2: WTaskAcceptReq
+	(*WTaskAcceptResp)(nil),            // 3: WTaskAcceptResp
+	(*WTaskBattleStartReq)(nil),        // 4: WTaskBattleStartReq
+	(*WTaskBattleStartResp)(nil),       // 5: WTaskBattleStartResp
+	(*WTaskBattleFinishReq)(nil),       // 6: WTaskBattleFinishReq
+	(*WTaskBattleFinishResp)(nil),      // 7: WTaskBattleFinishResp
+	(*WTaskFinishReq)(nil),             // 8: WTaskFinishReq
+	(*WTaskFinishResp)(nil),            // 9: WTaskFinishResp
+	(*WTaskActivationsChangePush)(nil), // 10: WTaskActivationsChangePush
+	(*WTaskAcceptChangePush)(nil),      // 11: WTaskAcceptChangePush
+	(*DBWTaskItem)(nil),                // 12: DBWTaskItem
+	(*BattleFormation)(nil),            // 13: BattleFormation
+	(*BattleInfo)(nil),                 // 14: BattleInfo
+	(*BattleReport)(nil),               // 15: BattleReport
+	(*UserAssets)(nil),                 // 16: UserAssets
 }
 var file_wtask_wtask_msg_proto_depIdxs = []int32{
-	12, // 0: WTaskInfoResp.accepttask:type_name -> DBWTaskItem
-	12, // 1: WTaskAcceptResp.task:type_name -> DBWTaskItem
-	13, // 2: WTaskBattleStartReq.battle:type_name -> BattleFormation
-	14, // 3: WTaskBattleStartResp.info:type_name -> BattleInfo
-	15, // 4: WTaskBattleFinishReq.report:type_name -> BattleReport
-	16, // 5: WTaskFinishResp.award:type_name -> UserAssets
-	12, // 6: WTaskAccepttaskChangePush.accepttask:type_name -> DBWTaskItem
-	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
+	12, // 0: WTaskAcceptResp.task:type_name -> DBWTaskItem
+	13, // 1: WTaskBattleStartReq.battle:type_name -> BattleFormation
+	14, // 2: WTaskBattleStartResp.info:type_name -> BattleInfo
+	15, // 3: WTaskBattleFinishReq.report:type_name -> BattleReport
+	16, // 4: WTaskFinishResp.award:type_name -> UserAssets
+	12, // 5: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem
+	6,  // [6:6] is the sub-list for method output_type
+	6,  // [6:6] is the sub-list for method input_type
+	6,  // [6:6] is the sub-list for extension type_name
+	6,  // [6:6] is the sub-list for extension extendee
+	0,  // [0:6] is the sub-list for field type_name
 }
 
 func init() { file_wtask_wtask_msg_proto_init() }
@@ -854,7 +872,7 @@ func file_wtask_wtask_msg_proto_init() {
 			}
 		}
 		file_wtask_wtask_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WTaskActivationsPush); i {
+			switch v := v.(*WTaskActivationsChangePush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -866,7 +884,7 @@ func file_wtask_wtask_msg_proto_init() {
 			}
 		}
 		file_wtask_wtask_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WTaskAccepttaskChangePush); i {
+			switch v := v.(*WTaskAcceptChangePush); i {
 			case 0:
 				return &v.state
 			case 1: