diff --git a/modules/wtask/module.go b/modules/wtask/module.go index 6389489f9..e1d7b3f80 100644 --- a/modules/wtask/module.go +++ b/modules/wtask/module.go @@ -344,19 +344,21 @@ func (this *WTask) ResetDailytaskTask(session comm.IUserSession, dailytaskid int wtask.Dailytaskgroup = dailytaskid wtask.Exchange = make(map[int32]int32) wtask.Events = make(map[int32]int32) - if len(condiIds) > 0 { - // if err = this.ModuleBuried.ActiveCondition(session.GetUserId(), condiIds...); err != nil { - // errdata = &pb.ErrorData{ - // Code: pb.ErrorCode_ExternalModule, - // Title: pb.ErrorCode_ExternalModule.ToString(), - // Message: fmt.Sprintf("ModuleBuried.ActiveCondition uid:%s condiIds:%v", session.GetUserId(), condiIds), - // } - // return - // } - } + // if len(condiIds) > 0 { + // if err = this.ModuleBuried.ActiveCondition(session.GetUserId(), condiIds...); err != nil { + // errdata = &pb.ErrorData{ + // Code: pb.ErrorCode_ExternalModule, + // Title: pb.ErrorCode_ExternalModule.ToString(), + // Message: fmt.Sprintf("ModuleBuried.ActiveCondition uid:%s condiIds:%v", session.GetUserId(), condiIds), + // } + // return + // } + // } //有新任务接取 - this.pushtaskprogress(session, wtask, true) + // this.pushtaskprogress(session, wtask, true) + //推送日常任务信息 + session.SendMsg(string(this.GetType()), "dailytaskchange", &pb.WTaskDailytaskChangePush{Dailytaskgroup: wtask.Dailytaskgroup, Activations: wtask.Activations}) if boxchange { session.SendMsg(string(this.GetType()), "boxchange", &pb.WTaskBoxChangePush{Boxs: wtask.Boxs}) } diff --git a/pb/wtask_msg.pb.go b/pb/wtask_msg.pb.go index 18869c692..5eccb5df8 100644 --- a/pb/wtask_msg.pb.go +++ b/pb/wtask_msg.pb.go @@ -1523,6 +1523,62 @@ func (x *WTaskEventCompleteResp) GetAward() []*UserAtno { return nil } +//日常任务信息推送 +type WTaskDailytaskChangePush struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Dailytaskgroup int32 `protobuf:"varint,1,opt,name=dailytaskgroup,proto3" json:"dailytaskgroup"` //日常任务组id + Activations []int32 `protobuf:"varint,2,rep,packed,name=activations,proto3" json:"activations"` //可接取任务列表 +} + +func (x *WTaskDailytaskChangePush) Reset() { + *x = WTaskDailytaskChangePush{} + if protoimpl.UnsafeEnabled { + mi := &file_wtask_wtask_msg_proto_msgTypes[27] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WTaskDailytaskChangePush) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WTaskDailytaskChangePush) ProtoMessage() {} + +func (x *WTaskDailytaskChangePush) ProtoReflect() protoreflect.Message { + mi := &file_wtask_wtask_msg_proto_msgTypes[27] + 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 WTaskDailytaskChangePush.ProtoReflect.Descriptor instead. +func (*WTaskDailytaskChangePush) Descriptor() ([]byte, []int) { + return file_wtask_wtask_msg_proto_rawDescGZIP(), []int{27} +} + +func (x *WTaskDailytaskChangePush) GetDailytaskgroup() int32 { + if x != nil { + return x.Dailytaskgroup + } + return 0 +} + +func (x *WTaskDailytaskChangePush) GetActivations() []int32 { + if x != nil { + return x.Activations + } + return nil +} + var File_wtask_wtask_msg_proto protoreflect.FileDescriptor var file_wtask_wtask_msg_proto_rawDesc = []byte{ @@ -1673,8 +1729,15 @@ var file_wtask_wtask_msg_proto_rawDesc = []byte{ 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, - 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, + 0x64, 0x0a, 0x18, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, + 0x6b, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x0e, 0x64, + 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x0e, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x67, 0x72, + 0x6f, 0x75, 0x70, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1689,7 +1752,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, 29) +var file_wtask_wtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 30) var file_wtask_wtask_msg_proto_goTypes = []interface{}{ (*WTaskInfoReq)(nil), // 0: WTaskInfoReq (*WTaskInfoResp)(nil), // 1: WTaskInfoResp @@ -1718,38 +1781,39 @@ var file_wtask_wtask_msg_proto_goTypes = []interface{}{ (*WTaskBattleEventResp)(nil), // 24: WTaskBattleEventResp (*WTaskEventCompleteReq)(nil), // 25: WTaskEventCompleteReq (*WTaskEventCompleteResp)(nil), // 26: WTaskEventCompleteResp - nil, // 27: WTaskFinishResp.GroupsEntry - nil, // 28: WTaskBoxChangePush.BoxsEntry - (*DBWTask)(nil), // 29: DBWTask - (*DBWTaskItem)(nil), // 30: DBWTaskItem - (*UserAtno)(nil), // 31: UserAtno - (*BattleFormation)(nil), // 32: BattleFormation - (*BattleInfo)(nil), // 33: BattleInfo - (*BattleReport)(nil), // 34: BattleReport - (*UserAssets)(nil), // 35: UserAssets - (*DBWTaskBox)(nil), // 36: DBWTaskBox + (*WTaskDailytaskChangePush)(nil), // 27: WTaskDailytaskChangePush + nil, // 28: WTaskFinishResp.GroupsEntry + nil, // 29: WTaskBoxChangePush.BoxsEntry + (*DBWTask)(nil), // 30: DBWTask + (*DBWTaskItem)(nil), // 31: DBWTaskItem + (*UserAtno)(nil), // 32: UserAtno + (*BattleFormation)(nil), // 33: BattleFormation + (*BattleInfo)(nil), // 34: BattleInfo + (*BattleReport)(nil), // 35: BattleReport + (*UserAssets)(nil), // 36: UserAssets + (*DBWTaskBox)(nil), // 37: DBWTaskBox } var file_wtask_wtask_msg_proto_depIdxs = []int32{ - 29, // 0: WTaskInfoResp.info:type_name -> DBWTask - 30, // 1: WTaskInfoResp.accepts:type_name -> DBWTaskItem - 30, // 2: WTaskAcceptResp.accepts:type_name -> DBWTaskItem - 30, // 3: WTaskCompleteCondiResp.progress:type_name -> DBWTaskItem - 31, // 4: WTaskFinishResp.award:type_name -> UserAtno - 27, // 5: WTaskFinishResp.groups:type_name -> WTaskFinishResp.GroupsEntry - 31, // 6: WTaskChapterRewardResp.award:type_name -> UserAtno - 30, // 7: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem - 32, // 8: WTaskBattleStartReq.battle:type_name -> BattleFormation - 33, // 9: WTaskBattleStartResp.info:type_name -> BattleInfo - 34, // 10: WTaskBattleFinishReq.report:type_name -> BattleReport - 35, // 11: WTaskBattleFinishResp.award:type_name -> UserAssets - 28, // 12: WTaskBoxChangePush.boxs:type_name -> WTaskBoxChangePush.BoxsEntry - 31, // 13: WTaskBoxReceiveResp.award:type_name -> UserAtno - 31, // 14: WTaskExchangeResp.award:type_name -> UserAtno - 32, // 15: WTaskBattleEventReq.battle:type_name -> BattleFormation - 33, // 16: WTaskBattleEventResp.info:type_name -> BattleInfo - 34, // 17: WTaskEventCompleteReq.report:type_name -> BattleReport - 31, // 18: WTaskEventCompleteResp.award:type_name -> UserAtno - 36, // 19: WTaskBoxChangePush.BoxsEntry.value:type_name -> DBWTaskBox + 30, // 0: WTaskInfoResp.info:type_name -> DBWTask + 31, // 1: WTaskInfoResp.accepts:type_name -> DBWTaskItem + 31, // 2: WTaskAcceptResp.accepts:type_name -> DBWTaskItem + 31, // 3: WTaskCompleteCondiResp.progress:type_name -> DBWTaskItem + 32, // 4: WTaskFinishResp.award:type_name -> UserAtno + 28, // 5: WTaskFinishResp.groups:type_name -> WTaskFinishResp.GroupsEntry + 32, // 6: WTaskChapterRewardResp.award:type_name -> UserAtno + 31, // 7: WTaskAcceptChangePush.accepts:type_name -> DBWTaskItem + 33, // 8: WTaskBattleStartReq.battle:type_name -> BattleFormation + 34, // 9: WTaskBattleStartResp.info:type_name -> BattleInfo + 35, // 10: WTaskBattleFinishReq.report:type_name -> BattleReport + 36, // 11: WTaskBattleFinishResp.award:type_name -> UserAssets + 29, // 12: WTaskBoxChangePush.boxs:type_name -> WTaskBoxChangePush.BoxsEntry + 32, // 13: WTaskBoxReceiveResp.award:type_name -> UserAtno + 32, // 14: WTaskExchangeResp.award:type_name -> UserAtno + 33, // 15: WTaskBattleEventReq.battle:type_name -> BattleFormation + 34, // 16: WTaskBattleEventResp.info:type_name -> BattleInfo + 35, // 17: WTaskEventCompleteReq.report:type_name -> BattleReport + 32, // 18: WTaskEventCompleteResp.award:type_name -> UserAtno + 37, // 19: WTaskBoxChangePush.BoxsEntry.value:type_name -> DBWTaskBox 20, // [20:20] is the sub-list for method output_type 20, // [20:20] is the sub-list for method input_type 20, // [20:20] is the sub-list for extension type_name @@ -2090,6 +2154,18 @@ func file_wtask_wtask_msg_proto_init() { return nil } } + file_wtask_wtask_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*WTaskDailytaskChangePush); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -2097,7 +2173,7 @@ func file_wtask_wtask_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_wtask_wtask_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 29, + NumMessages: 30, NumExtensions: 0, NumServices: 0, },