diff --git a/modules/worldtask/model_worldtask.go b/modules/worldtask/model_worldtask.go index dd201ce95..0463cc930 100644 --- a/modules/worldtask/model_worldtask.go +++ b/modules/worldtask/model_worldtask.go @@ -219,10 +219,12 @@ func (this *ModelWorldtask) taskFinishPush(session comm.IUserSession, userTask * } } } else { - nwt, ok := userTask.CurrentTasks[curTaskConf.Group] - if ok { - // 删除 - delete(nwt.TaskMap, curTaskConf.Key) + if curTaskConf.Des == 5 { + nwt, ok := userTask.CurrentTasks[curTaskConf.Group] + if ok { + // 删除 + delete(nwt.TaskMap, curTaskConf.Key) + } } } diff --git a/modules/wtask/api_completecondi.go b/modules/wtask/api_completecondi.go new file mode 100644 index 000000000..d9013476d --- /dev/null +++ b/modules/wtask/api_completecondi.go @@ -0,0 +1,96 @@ +package wtask + +import ( + "fmt" + "go_dreamfactory/comm" + "go_dreamfactory/lego/sys/log" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +// 参数校验 +func (this *apiComp) CompleteCondiCheck(session comm.IUserSession, req *pb.WTaskCompleteCondiReq) (errdata *pb.ErrorData) { + + return +} + +// 主动完成任务条件 +func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WTaskCompleteCondiReq) (errdata *pb.ErrorData) { + var ( + wtask *pb.DBWTask + conf *cfg.GameWorldTaskData + progress []*pb.ConIProgress + ok bool + err error + ) + if errdata = this.CompleteCondiCheck(session, req); errdata != nil { + return + } + + if conf, err = this.module.configure.gettaskconfconfigure(req.TaskId); 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, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + + ok = false + for _, v := range wtask.Accepts { + if v == req.TaskId { + 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.TaskId, wtask.Accepts), + } + return + } + + ok = false + for _, v := range conf.Completetask { + if v == req.CondiId { + ok = true + } + } + + if !ok { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: fmt.Sprintf("CondiId:%d no in Completetask:%v", req.CondiId, conf.Completetask), + } + return + } + if len(conf.Completetask) > 0 { + if progress, err = this.module.ModuleBuried.FinishConditionAndCheck(session.GetUserId(), []int32{req.CondiId}, 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 + } + } + + session.SendMsg(string(this.module.GetType()), "completecondi", &pb.WTaskCompleteCondiResp{TaskId: req.TaskId, CondiId: req.CondiId, Progress: &pb.DBWTaskItem{ + Tid: req.TaskId, + Conlds: progress, + }}) + return +} diff --git a/pb/wtask_msg.pb.go b/pb/wtask_msg.pb.go index c20eeca96..cd7a478a3 100644 --- a/pb/wtask_msg.pb.go +++ b/pb/wtask_msg.pb.go @@ -339,6 +339,126 @@ func (x *WTaskBattleStartResp) GetInfo() *BattleInfo { return nil } +//完成子任务条件 +type WTaskCompleteCondiReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"` + CondiId int32 `protobuf:"varint,2,opt,name=condiId,proto3" json:"condiId"` +} + +func (x *WTaskCompleteCondiReq) Reset() { + *x = WTaskCompleteCondiReq{} + if protoimpl.UnsafeEnabled { + mi := &file_wtask_wtask_msg_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WTaskCompleteCondiReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WTaskCompleteCondiReq) ProtoMessage() {} + +func (x *WTaskCompleteCondiReq) ProtoReflect() protoreflect.Message { + mi := &file_wtask_wtask_msg_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use WTaskCompleteCondiReq.ProtoReflect.Descriptor instead. +func (*WTaskCompleteCondiReq) Descriptor() ([]byte, []int) { + return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{6} +} + +func (x *WTaskCompleteCondiReq) GetTaskId() int32 { + if x != nil { + return x.TaskId + } + return 0 +} + +func (x *WTaskCompleteCondiReq) GetCondiId() int32 { + if x != nil { + return x.CondiId + } + return 0 +} + +//完成子任务条件 +type WTaskCompleteCondiResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"` + CondiId int32 `protobuf:"varint,2,opt,name=condiId,proto3" json:"condiId"` + Progress *DBWTaskItem `protobuf:"bytes,3,opt,name=progress,proto3" json:"progress"` +} + +func (x *WTaskCompleteCondiResp) Reset() { + *x = WTaskCompleteCondiResp{} + if protoimpl.UnsafeEnabled { + mi := &file_wtask_wtask_msg_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WTaskCompleteCondiResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WTaskCompleteCondiResp) ProtoMessage() {} + +func (x *WTaskCompleteCondiResp) ProtoReflect() protoreflect.Message { + mi := &file_wtask_wtask_msg_proto_msgTypes[7] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use WTaskCompleteCondiResp.ProtoReflect.Descriptor instead. +func (*WTaskCompleteCondiResp) Descriptor() ([]byte, []int) { + return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{7} +} + +func (x *WTaskCompleteCondiResp) GetTaskId() int32 { + if x != nil { + return x.TaskId + } + return 0 +} + +func (x *WTaskCompleteCondiResp) GetCondiId() int32 { + if x != nil { + return x.CondiId + } + return 0 +} + +func (x *WTaskCompleteCondiResp) GetProgress() *DBWTaskItem { + if x != nil { + return x.Progress + } + return nil +} + //任务战斗 完成请求 type WTaskBattleFinishReq struct { state protoimpl.MessageState @@ -352,7 +472,7 @@ type WTaskBattleFinishReq struct { func (x *WTaskBattleFinishReq) Reset() { *x = WTaskBattleFinishReq{} if protoimpl.UnsafeEnabled { - mi := &file_wtask_wtask_msg_proto_msgTypes[6] + mi := &file_wtask_wtask_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -365,7 +485,7 @@ func (x *WTaskBattleFinishReq) String() string { func (*WTaskBattleFinishReq) ProtoMessage() {} func (x *WTaskBattleFinishReq) ProtoReflect() protoreflect.Message { - mi := &file_wtask_wtask_msg_proto_msgTypes[6] + mi := &file_wtask_wtask_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -378,7 +498,7 @@ func (x *WTaskBattleFinishReq) ProtoReflect() protoreflect.Message { // Deprecated: Use WTaskBattleFinishReq.ProtoReflect.Descriptor instead. func (*WTaskBattleFinishReq) Descriptor() ([]byte, []int) { - return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{6} + return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{8} } func (x *WTaskBattleFinishReq) GetBattleConfId() int32 { @@ -407,7 +527,7 @@ type WTaskBattleFinishResp struct { func (x *WTaskBattleFinishResp) Reset() { *x = WTaskBattleFinishResp{} if protoimpl.UnsafeEnabled { - mi := &file_wtask_wtask_msg_proto_msgTypes[7] + mi := &file_wtask_wtask_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -420,7 +540,7 @@ func (x *WTaskBattleFinishResp) String() string { func (*WTaskBattleFinishResp) ProtoMessage() {} func (x *WTaskBattleFinishResp) ProtoReflect() protoreflect.Message { - mi := &file_wtask_wtask_msg_proto_msgTypes[7] + mi := &file_wtask_wtask_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -433,7 +553,7 @@ func (x *WTaskBattleFinishResp) ProtoReflect() protoreflect.Message { // Deprecated: Use WTaskBattleFinishResp.ProtoReflect.Descriptor instead. func (*WTaskBattleFinishResp) Descriptor() ([]byte, []int) { - return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{7} + return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{9} } func (x *WTaskBattleFinishResp) GetBattleConfId() int32 { @@ -455,7 +575,7 @@ type WTaskFinishReq struct { func (x *WTaskFinishReq) Reset() { *x = WTaskFinishReq{} if protoimpl.UnsafeEnabled { - mi := &file_wtask_wtask_msg_proto_msgTypes[8] + mi := &file_wtask_wtask_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -468,7 +588,7 @@ func (x *WTaskFinishReq) String() string { func (*WTaskFinishReq) ProtoMessage() {} func (x *WTaskFinishReq) ProtoReflect() protoreflect.Message { - mi := &file_wtask_wtask_msg_proto_msgTypes[8] + mi := &file_wtask_wtask_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -481,7 +601,7 @@ func (x *WTaskFinishReq) ProtoReflect() protoreflect.Message { // Deprecated: Use WTaskFinishReq.ProtoReflect.Descriptor instead. func (*WTaskFinishReq) Descriptor() ([]byte, []int) { - return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{8} + return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{10} } func (x *WTaskFinishReq) GetTid() int32 { @@ -504,7 +624,7 @@ type WTaskFinishResp struct { func (x *WTaskFinishResp) Reset() { *x = WTaskFinishResp{} if protoimpl.UnsafeEnabled { - mi := &file_wtask_wtask_msg_proto_msgTypes[9] + mi := &file_wtask_wtask_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -517,7 +637,7 @@ func (x *WTaskFinishResp) String() string { func (*WTaskFinishResp) ProtoMessage() {} func (x *WTaskFinishResp) ProtoReflect() protoreflect.Message { - mi := &file_wtask_wtask_msg_proto_msgTypes[9] + mi := &file_wtask_wtask_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -530,7 +650,7 @@ func (x *WTaskFinishResp) ProtoReflect() protoreflect.Message { // Deprecated: Use WTaskFinishResp.ProtoReflect.Descriptor instead. func (*WTaskFinishResp) Descriptor() ([]byte, []int) { - return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{9} + return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{11} } func (x *WTaskFinishResp) GetTid() int32 { @@ -559,7 +679,7 @@ type WTaskChapterRewardReq struct { func (x *WTaskChapterRewardReq) Reset() { *x = WTaskChapterRewardReq{} if protoimpl.UnsafeEnabled { - mi := &file_wtask_wtask_msg_proto_msgTypes[10] + mi := &file_wtask_wtask_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -572,7 +692,7 @@ func (x *WTaskChapterRewardReq) String() string { func (*WTaskChapterRewardReq) ProtoMessage() {} func (x *WTaskChapterRewardReq) ProtoReflect() protoreflect.Message { - mi := &file_wtask_wtask_msg_proto_msgTypes[10] + mi := &file_wtask_wtask_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -585,7 +705,7 @@ func (x *WTaskChapterRewardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use WTaskChapterRewardReq.ProtoReflect.Descriptor instead. func (*WTaskChapterRewardReq) Descriptor() ([]byte, []int) { - return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{10} + return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{12} } func (x *WTaskChapterRewardReq) GetGroup() int32 { @@ -608,7 +728,7 @@ type WTaskChapterRewardResp struct { func (x *WTaskChapterRewardResp) Reset() { *x = WTaskChapterRewardResp{} if protoimpl.UnsafeEnabled { - mi := &file_wtask_wtask_msg_proto_msgTypes[11] + mi := &file_wtask_wtask_msg_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -621,7 +741,7 @@ func (x *WTaskChapterRewardResp) String() string { func (*WTaskChapterRewardResp) ProtoMessage() {} func (x *WTaskChapterRewardResp) ProtoReflect() protoreflect.Message { - mi := &file_wtask_wtask_msg_proto_msgTypes[11] + mi := &file_wtask_wtask_msg_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -634,7 +754,7 @@ func (x *WTaskChapterRewardResp) ProtoReflect() protoreflect.Message { // Deprecated: Use WTaskChapterRewardResp.ProtoReflect.Descriptor instead. func (*WTaskChapterRewardResp) Descriptor() ([]byte, []int) { - return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{11} + return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{13} } func (x *WTaskChapterRewardResp) GetGroup() int32 { @@ -663,7 +783,7 @@ type WTaskActivationsChangePush struct { func (x *WTaskActivationsChangePush) Reset() { *x = WTaskActivationsChangePush{} if protoimpl.UnsafeEnabled { - mi := &file_wtask_wtask_msg_proto_msgTypes[12] + mi := &file_wtask_wtask_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -676,7 +796,7 @@ func (x *WTaskActivationsChangePush) String() string { func (*WTaskActivationsChangePush) ProtoMessage() {} func (x *WTaskActivationsChangePush) ProtoReflect() protoreflect.Message { - mi := &file_wtask_wtask_msg_proto_msgTypes[12] + mi := &file_wtask_wtask_msg_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -689,7 +809,7 @@ func (x *WTaskActivationsChangePush) ProtoReflect() protoreflect.Message { // Deprecated: Use WTaskActivationsChangePush.ProtoReflect.Descriptor instead. func (*WTaskActivationsChangePush) Descriptor() ([]byte, []int) { - return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{12} + return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{14} } func (x *WTaskActivationsChangePush) GetActivations() []int32 { @@ -711,7 +831,7 @@ type WTaskAcceptChangePush struct { func (x *WTaskAcceptChangePush) Reset() { *x = WTaskAcceptChangePush{} if protoimpl.UnsafeEnabled { - mi := &file_wtask_wtask_msg_proto_msgTypes[13] + mi := &file_wtask_wtask_msg_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -724,7 +844,7 @@ func (x *WTaskAcceptChangePush) String() string { func (*WTaskAcceptChangePush) ProtoMessage() {} func (x *WTaskAcceptChangePush) ProtoReflect() protoreflect.Message { - mi := &file_wtask_wtask_msg_proto_msgTypes[13] + mi := &file_wtask_wtask_msg_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -737,7 +857,7 @@ func (x *WTaskAcceptChangePush) ProtoReflect() protoreflect.Message { // Deprecated: Use WTaskAcceptChangePush.ProtoReflect.Descriptor instead. func (*WTaskAcceptChangePush) Descriptor() ([]byte, []int) { - return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{13} + return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{15} } func (x *WTaskAcceptChangePush) GetAccepts() []*DBWTaskItem { @@ -782,41 +902,53 @@ var file_wtask_wtask_msg_proto_rawDesc = []byte{ 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, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 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, 0x3b, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, - 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 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, 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, 0x2d, 0x0a, 0x15, 0x57, 0x54, + 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x49, + 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, + 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, + 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, 0x74, 0x0a, 0x16, 0x57, 0x54, 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, 0x12, 0x28, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, + 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, + 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 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, 0x3b, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 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, 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, 0x2d, 0x0a, 0x15, 0x57, + 0x54, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, + 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x51, 0x0a, 0x16, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, - 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x51, 0x0a, 0x16, 0x57, 0x54, 0x61, - 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 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, 0x3f, 0x0a, 0x15, - 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, - 0x65, 0x50, 0x75, 0x73, 0x68, 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, 0x42, 0x06, 0x5a, - 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 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, 0x3f, 0x0a, + 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x43, 0x68, 0x61, 0x6e, + 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 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, 0x42, 0x06, + 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -831,7 +963,7 @@ func file_wtask_wtask_msg_proto_rawDescGZIP() []byte { return file_wtask_wtask_msg_proto_rawDescData } -var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 14) +var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 16) var file_wtask_wtask_msg_proto_goTypes = []interface{}{ (*WTaskInfoReq)(nil), // 0: WTaskInfoReq (*WTaskInfoResp)(nil), // 1: WTaskInfoResp @@ -839,36 +971,39 @@ var file_wtask_wtask_msg_proto_goTypes = []interface{}{ (*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 - (*WTaskChapterRewardReq)(nil), // 10: WTaskChapterRewardReq - (*WTaskChapterRewardResp)(nil), // 11: WTaskChapterRewardResp - (*WTaskActivationsChangePush)(nil), // 12: WTaskActivationsChangePush - (*WTaskAcceptChangePush)(nil), // 13: WTaskAcceptChangePush - (*DBWTask)(nil), // 14: DBWTask - (*DBWTaskItem)(nil), // 15: DBWTaskItem - (*BattleFormation)(nil), // 16: BattleFormation - (*BattleInfo)(nil), // 17: BattleInfo - (*BattleReport)(nil), // 18: BattleReport - (*UserAssets)(nil), // 19: UserAssets + (*WTaskCompleteCondiReq)(nil), // 6: WTaskCompleteCondiReq + (*WTaskCompleteCondiResp)(nil), // 7: WTaskCompleteCondiResp + (*WTaskBattleFinishReq)(nil), // 8: WTaskBattleFinishReq + (*WTaskBattleFinishResp)(nil), // 9: WTaskBattleFinishResp + (*WTaskFinishReq)(nil), // 10: WTaskFinishReq + (*WTaskFinishResp)(nil), // 11: WTaskFinishResp + (*WTaskChapterRewardReq)(nil), // 12: WTaskChapterRewardReq + (*WTaskChapterRewardResp)(nil), // 13: WTaskChapterRewardResp + (*WTaskActivationsChangePush)(nil), // 14: WTaskActivationsChangePush + (*WTaskAcceptChangePush)(nil), // 15: WTaskAcceptChangePush + (*DBWTask)(nil), // 16: DBWTask + (*DBWTaskItem)(nil), // 17: DBWTaskItem + (*BattleFormation)(nil), // 18: BattleFormation + (*BattleInfo)(nil), // 19: BattleInfo + (*BattleReport)(nil), // 20: BattleReport + (*UserAssets)(nil), // 21: UserAssets } var file_wtask_wtask_msg_proto_depIdxs = []int32{ - 14, // 0: WTaskInfoResp.info:type_name -> DBWTask - 15, // 1: WTaskInfoResp.accepts:type_name -> DBWTaskItem - 15, // 2: WTaskAcceptResp.accepts:type_name -> DBWTaskItem - 16, // 3: WTaskBattleStartReq.battle:type_name -> BattleFormation - 17, // 4: WTaskBattleStartResp.info:type_name -> BattleInfo - 18, // 5: WTaskBattleFinishReq.report:type_name -> BattleReport - 19, // 6: WTaskFinishResp.award:type_name -> UserAssets - 19, // 7: WTaskChapterRewardResp.award:type_name -> UserAssets - 15, // 8: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem - 9, // [9:9] is the sub-list for method output_type - 9, // [9:9] is the sub-list for method input_type - 9, // [9:9] is the sub-list for extension type_name - 9, // [9:9] is the sub-list for extension extendee - 0, // [0:9] is the sub-list for field type_name + 16, // 0: WTaskInfoResp.info:type_name -> DBWTask + 17, // 1: WTaskInfoResp.accepts:type_name -> DBWTaskItem + 17, // 2: WTaskAcceptResp.accepts:type_name -> DBWTaskItem + 18, // 3: WTaskBattleStartReq.battle:type_name -> BattleFormation + 19, // 4: WTaskBattleStartResp.info:type_name -> BattleInfo + 17, // 5: WTaskCompleteCondiResp.progress:type_name -> DBWTaskItem + 20, // 6: WTaskBattleFinishReq.report:type_name -> BattleReport + 21, // 7: WTaskFinishResp.award:type_name -> UserAssets + 21, // 8: WTaskChapterRewardResp.award:type_name -> UserAssets + 17, // 9: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem + 10, // [10:10] is the sub-list for method output_type + 10, // [10:10] is the sub-list for method input_type + 10, // [10:10] is the sub-list for extension type_name + 10, // [10:10] is the sub-list for extension extendee + 0, // [0:10] is the sub-list for field type_name } func init() { file_wtask_wtask_msg_proto_init() } @@ -953,7 +1088,7 @@ func file_wtask_wtask_msg_proto_init() { } } file_wtask_wtask_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*WTaskBattleFinishReq); i { + switch v := v.(*WTaskCompleteCondiReq); i { case 0: return &v.state case 1: @@ -965,7 +1100,7 @@ func file_wtask_wtask_msg_proto_init() { } } file_wtask_wtask_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*WTaskBattleFinishResp); i { + switch v := v.(*WTaskCompleteCondiResp); i { case 0: return &v.state case 1: @@ -977,7 +1112,7 @@ func file_wtask_wtask_msg_proto_init() { } } file_wtask_wtask_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*WTaskFinishReq); i { + switch v := v.(*WTaskBattleFinishReq); i { case 0: return &v.state case 1: @@ -989,7 +1124,7 @@ func file_wtask_wtask_msg_proto_init() { } } file_wtask_wtask_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*WTaskFinishResp); i { + switch v := v.(*WTaskBattleFinishResp); i { case 0: return &v.state case 1: @@ -1001,7 +1136,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.(*WTaskChapterRewardReq); i { + switch v := v.(*WTaskFinishReq); i { case 0: return &v.state case 1: @@ -1013,7 +1148,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.(*WTaskChapterRewardResp); i { + switch v := v.(*WTaskFinishResp); i { case 0: return &v.state case 1: @@ -1025,7 +1160,7 @@ func file_wtask_wtask_msg_proto_init() { } } file_wtask_wtask_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*WTaskActivationsChangePush); i { + switch v := v.(*WTaskChapterRewardReq); i { case 0: return &v.state case 1: @@ -1037,6 +1172,30 @@ func file_wtask_wtask_msg_proto_init() { } } file_wtask_wtask_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*WTaskChapterRewardResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_wtask_wtask_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*WTaskActivationsChangePush); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_wtask_wtask_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*WTaskAcceptChangePush); i { case 0: return &v.state @@ -1055,7 +1214,7 @@ func file_wtask_wtask_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_wtask_wtask_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 14, + NumMessages: 16, NumExtensions: 0, NumServices: 0, },