From 552841d0f00f50ef65da090f9f4c15b4ec57fa90 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Tue, 8 Aug 2023 13:44:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B4=AD=E7=89=A9?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/const.go | 3 +++ modules/shopcenter/modelShop.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/comm/const.go b/comm/const.go index d51d55ca7..6ea376cd4 100644 --- a/comm/const.go +++ b/comm/const.go @@ -334,6 +334,9 @@ const ( //守护者任务 TableHerotask = "herotask" + //购物中心 + TableShopCenter = "shopcenter" + //如梦战令 TablekfDreamwarorder = "dreamwarorder" diff --git a/modules/shopcenter/modelShop.go b/modules/shopcenter/modelShop.go index 5de0b95d3..14be22516 100644 --- a/modules/shopcenter/modelShop.go +++ b/modules/shopcenter/modelShop.go @@ -23,7 +23,7 @@ type ModelShop struct { func (this *ModelShop) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { err = this.MCompModel.Init(service, module, comp, options) - this.TableName = comm.TableHerotask + this.TableName = comm.TableShopCenter this.module = module.(*ShopCenter) this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, From 99b42be7027210321726527200d2b955c616e4b9 Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Tue, 8 Aug 2023 14:25:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B4=AD=E7=89=A9?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/imodule.go | 4 + modules/buried/module.go | 47 ++-- modules/dreamwarorder/api_Info.go | 25 +- modules/dreamwarorder/api_receive.go | 49 ++-- modules/dreamwarorder/model.go | 15 +- modules/shopcenter/api_receive.go | 2 +- pb/dreamwarorder_db.pb.go | 220 ++++++++++++++++ pb/dreamwarorder_msg.pb.go | 360 +++++++++++++++++++++++++++ 8 files changed, 653 insertions(+), 69 deletions(-) create mode 100644 pb/dreamwarorder_db.pb.go create mode 100644 pb/dreamwarorder_msg.pb.go diff --git a/comm/imodule.go b/comm/imodule.go index 501dfbf93..ac35a3373 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -617,4 +617,8 @@ type ( //积分充值 RechargeIntegral(session IUserSession, integral int32) } + //推送礼包 + IPushgiftbag interface { + IBuriedUpdateNotify + } ) diff --git a/modules/buried/module.go b/modules/buried/module.go index 5f304aab9..baf6e0793 100644 --- a/modules/buried/module.go +++ b/modules/buried/module.go @@ -489,9 +489,9 @@ func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedPara change bool changes []*pb.ConIProgress notify map[string][]*pb.ConIProgress - // module core.IModule - // nmodule comm.IBuriedUpdateNotify - err error + module core.IModule + nmodule comm.IBuriedUpdateNotify + err error ) this.Debug("触发埋点!", log.Field{Key: "burieds", Value: burieds}) @@ -580,29 +580,24 @@ func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedPara } } - this.wtask.BuriedsNotify(session, changes) - this.smithy.BuriedsNotify(session, changes) - this.sociaty.BuriedsNotify(session, changes) - // if len(notify) > 0 { - // for k, v := range notify { - // if module, err = this.service.GetModule(core.M_Modules(k)); err != nil { - // this.Error("通知条件变化异常 目标模块未找到!", log.Field{Key: "module", Value: k}, log.Field{Key: "err", Value: err.Error()}) - // continue - // } - // if nmodule, ok = module.(comm.IBuriedUpdateNotify); !ok { - // this.Error("通知条件变化异常 目标模块未实现 IBuriedUpdateNotify 接口 !", log.Field{Key: "module", Value: k}) - // continue - // } - // //异步通知指定模块 - // nmodule.BuriedsNotify(session, v) - // } - // } - - // //通知事件 - // if len(changes) > 0 { - // this.Debug("条件变化通知", log.Field{Key: "ConIds", Value: changes}) - // event.TriggerEvent(comm.EventBuriedComplete, session.GetUserId(), changes) - // } + if len(notify) > 0 { + for k, v := range notify { + if module, err = this.service.GetModule(core.M_Modules(k)); err != nil { + this.Error("通知条件变化异常 目标模块未找到!", log.Field{Key: "module", Value: k}, log.Field{Key: "err", Value: err.Error()}) + continue + } + if nmodule, ok = module.(comm.IBuriedUpdateNotify); !ok { + this.Error("通知条件变化异常 目标模块未实现 IBuriedUpdateNotify 接口 !", log.Field{Key: "module", Value: k}) + continue + } + //异步通知指定模块 + nmodule.BuriedsNotify(session, v) + } + } else { + this.wtask.BuriedsNotify(session, changes) + this.smithy.BuriedsNotify(session, changes) + this.sociaty.BuriedsNotify(session, changes) + } } // 更新并校验完成 diff --git a/modules/dreamwarorder/api_Info.go b/modules/dreamwarorder/api_Info.go index faefbfa3e..8ab1373f2 100644 --- a/modules/dreamwarorder/api_Info.go +++ b/modules/dreamwarorder/api_Info.go @@ -6,16 +6,15 @@ import ( ) // 参数校验 -func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.KFTaskInfoReq) (errdata *pb.ErrorData) { +func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.DreamWarorderInfoReq) (errdata *pb.ErrorData) { return } // /获取自己的排行榜信息 -func (this *apiComp) Info(session comm.IUserSession, req *pb.KFTaskInfoReq) (errdata *pb.ErrorData) { +func (this *apiComp) Info(session comm.IUserSession, req *pb.DreamWarorderInfoReq) (errdata *pb.ErrorData) { var ( - dtask *pb.DBKFTask - tasks map[int32]struct{} + info *pb.DBDreamWarorder condiIds []int32 progress []*pb.ConIProgress err error @@ -24,7 +23,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.KFTaskInfoReq) (err return } - if dtask, err = this.module.model.getUserDTasks(session.GetUserId()); err != nil { + if info, err = this.module.model.getUserDreamwarorder(session.GetUserId()); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), @@ -32,16 +31,20 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.KFTaskInfoReq) (err } return } - tasks = this.module.configure.gettasks() - condiIds = make([]int32, 0, len(tasks)) - for k, _ := range tasks { - condiIds = append(condiIds, k) + condiIds = make([]int32, 0) + for _, v := range info.Daytasks { + condiIds = append(condiIds, v) + } + for _, v := range info.Weektasks { + condiIds = append(condiIds, v) + } + for _, v := range info.Cycletasks { + condiIds = append(condiIds, v) } - if progress, err = this.module.ModuleBuried.CheckCondition(session.GetUserId(), condiIds...); err != nil { return } - session.SendMsg(string(this.module.GetType()), "info", &pb.KFTaskInfoResp{Conlds: progress, Tasks: dtask.Tasks}) + session.SendMsg(string(this.module.GetType()), "info", &pb.DreamWarorderInfoResp{Conlds: progress, Info: info}) return } diff --git a/modules/dreamwarorder/api_receive.go b/modules/dreamwarorder/api_receive.go index 306495477..5b3375991 100644 --- a/modules/dreamwarorder/api_receive.go +++ b/modules/dreamwarorder/api_receive.go @@ -1,7 +1,6 @@ package dreamwarorder import ( - "fmt" "go_dreamfactory/comm" "go_dreamfactory/pb" "go_dreamfactory/sys/configure" @@ -10,15 +9,15 @@ import ( ) // 参数校验 -func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.KFTaskReceiveReq) (errdata *pb.ErrorData) { +func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.DreamWarorderReceiveReq) (errdata *pb.ErrorData) { return } // /获取自己的排行榜信息 -func (this *apiComp) Receive(session comm.IUserSession, req *pb.KFTaskReceiveReq) (errdata *pb.ErrorData) { +func (this *apiComp) Receive(session comm.IUserSession, req *pb.DreamWarorderReceiveReq) (errdata *pb.ErrorData) { var ( - dtask *pb.DBKFTask + // info *pb.DBDreamWarorder conf *cfg.GameVenturegiftsTaskData user *pb.DBUser progress []*pb.ConIProgress @@ -37,23 +36,23 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.KFTaskReceiveReq } return } - if dtask, err = this.module.model.getUserDTasks(session.GetUserId()); err != nil { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_DBError, - Title: pb.ErrorCode_DBError.ToString(), - Message: err.Error(), - } - return - } + // if info, err = this.module.model.getUserDreamwarorder(session.GetUserId()); err != nil { + // errdata = &pb.ErrorData{ + // Code: pb.ErrorCode_DBError, + // Title: pb.ErrorCode_DBError.ToString(), + // Message: err.Error(), + // } + // return + // } - if dtask.Tasks[req.Id] == 1 { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ReqParameterError, - Title: pb.ErrorCode_ReqParameterError.ToString(), - Message: fmt.Sprintf("%d received", req.Id), - } - return - } + // if dtask.Tasks[req.Id] == 1 { + // errdata = &pb.ErrorData{ + // Code: pb.ErrorCode_ReqParameterError, + // Title: pb.ErrorCode_ReqParameterError.ToString(), + // Message: fmt.Sprintf("%d received", req.Id), + // } + // return + // } if user = this.module.ModuleUser.GetUser(session.GetUserId()); user == nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, @@ -98,10 +97,10 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.KFTaskReceiveReq N: v.N, }) } - dtask.Tasks[req.Id] = 1 - this.module.model.Change(session.GetUserId(), map[string]interface{}{ - "tasks": dtask.Tasks, - }) - session.SendMsg(string(this.module.GetType()), "receive", &pb.KFTaskReceiveResp{Id: req.Id, Award: award}) + // dtask.Tasks[req.Id] = 1 + // this.module.model.Change(session.GetUserId(), map[string]interface{}{ + // "tasks": dtask.Tasks, + // }) + session.SendMsg(string(this.module.GetType()), "receive", &pb.DreamWarorderReceiveResp{Id: req.Id, Award: award}) return } diff --git a/modules/dreamwarorder/model.go b/modules/dreamwarorder/model.go index 38d0343f4..0b27c98b0 100644 --- a/modules/dreamwarorder/model.go +++ b/modules/dreamwarorder/model.go @@ -28,17 +28,20 @@ func (this *ModelDreamWarorder) Init(service core.IService, module core.IModule, } // 获取用户全部的埋点数据 -func (this *ModelDreamWarorder) getUserDTasks(uid string) (results *pb.DBKFTask, err error) { - results = &pb.DBKFTask{} +func (this *ModelDreamWarorder) getUserDreamwarorder(uid string) (results *pb.DBDreamWarorder, err error) { + results = &pb.DBDreamWarorder{} if err = this.Get(uid, results); err != nil && err != mgo.MongodbNil { this.module.Errorln(err) return } if err == mgo.MongodbNil { - results = &pb.DBKFTask{ - Id: primitive.NewObjectID().Hex(), - Uid: uid, - Tasks: make(map[int32]int32), + results = &pb.DBDreamWarorder{ + Id: primitive.NewObjectID().Hex(), + Uid: uid, + Daytasks: make([]int32, 0), + Weektasks: make([]int32, 0), + Cycletasks: make([]int32, 0), + Completetasks: make([]int32, 0), } err = this.Add(uid, results) } diff --git a/modules/shopcenter/api_receive.go b/modules/shopcenter/api_receive.go index 4c2c0c1d3..f35b678e6 100644 --- a/modules/shopcenter/api_receive.go +++ b/modules/shopcenter/api_receive.go @@ -166,7 +166,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.ShopCenterReceiv }) } if err = this.module.modelshop.Change(session.GetUserId(), map[string]interface{}{ - "item": item, + "item": info.Item, }); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/pb/dreamwarorder_db.pb.go b/pb/dreamwarorder_db.pb.go new file mode 100644 index 000000000..d35606fba --- /dev/null +++ b/pb/dreamwarorder_db.pb.go @@ -0,0 +1,220 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.28.0 +// protoc v3.20.0 +// source: dreamwarorder/dreamwarorder_db.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +//如梦战令 +type DBDreamWarorder struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` + Vip1 bool `protobuf:"varint,3,opt,name=vip1,proto3" json:"vip1"` + Vip2 bool `protobuf:"varint,4,opt,name=vip2,proto3" json:"vip2"` + Exp int32 `protobuf:"varint,5,opt,name=exp,proto3" json:"exp"` + Daytasks []int32 `protobuf:"varint,6,rep,packed,name=daytasks,proto3" json:"daytasks"` + Weektasks []int32 `protobuf:"varint,7,rep,packed,name=weektasks,proto3" json:"weektasks"` + Cycletasks []int32 `protobuf:"varint,8,rep,packed,name=cycletasks,proto3" json:"cycletasks"` + Completetasks []int32 `protobuf:"varint,9,rep,packed,name=completetasks,proto3" json:"completetasks"` +} + +func (x *DBDreamWarorder) Reset() { + *x = DBDreamWarorder{} + if protoimpl.UnsafeEnabled { + mi := &file_dreamwarorder_dreamwarorder_db_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBDreamWarorder) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBDreamWarorder) ProtoMessage() {} + +func (x *DBDreamWarorder) ProtoReflect() protoreflect.Message { + mi := &file_dreamwarorder_dreamwarorder_db_proto_msgTypes[0] + 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 DBDreamWarorder.ProtoReflect.Descriptor instead. +func (*DBDreamWarorder) Descriptor() ([]byte, []int) { + return file_dreamwarorder_dreamwarorder_db_proto_rawDescGZIP(), []int{0} +} + +func (x *DBDreamWarorder) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBDreamWarorder) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBDreamWarorder) GetVip1() bool { + if x != nil { + return x.Vip1 + } + return false +} + +func (x *DBDreamWarorder) GetVip2() bool { + if x != nil { + return x.Vip2 + } + return false +} + +func (x *DBDreamWarorder) GetExp() int32 { + if x != nil { + return x.Exp + } + return 0 +} + +func (x *DBDreamWarorder) GetDaytasks() []int32 { + if x != nil { + return x.Daytasks + } + return nil +} + +func (x *DBDreamWarorder) GetWeektasks() []int32 { + if x != nil { + return x.Weektasks + } + return nil +} + +func (x *DBDreamWarorder) GetCycletasks() []int32 { + if x != nil { + return x.Cycletasks + } + return nil +} + +func (x *DBDreamWarorder) GetCompletetasks() []int32 { + if x != nil { + return x.Completetasks + } + return nil +} + +var File_dreamwarorder_dreamwarorder_db_proto protoreflect.FileDescriptor + +var file_dreamwarorder_dreamwarorder_db_proto_rawDesc = []byte{ + 0x0a, 0x24, 0x64, 0x72, 0x65, 0x61, 0x6d, 0x77, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2f, + 0x64, 0x72, 0x65, 0x61, 0x6d, 0x77, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x64, 0x62, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xed, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x44, 0x72, 0x65, + 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 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, 0x12, 0x0a, 0x04, + 0x76, 0x69, 0x70, 0x31, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x76, 0x69, 0x70, 0x31, + 0x12, 0x12, 0x0a, 0x04, 0x76, 0x69, 0x70, 0x32, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, + 0x76, 0x69, 0x70, 0x32, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61, 0x79, 0x74, 0x61, 0x73, + 0x6b, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61, 0x79, 0x74, 0x61, 0x73, + 0x6b, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x77, 0x65, 0x65, 0x6b, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, + 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x77, 0x65, 0x65, 0x6b, 0x74, 0x61, 0x73, 0x6b, 0x73, + 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x08, + 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x73, + 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, + 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, + 0x65, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_dreamwarorder_dreamwarorder_db_proto_rawDescOnce sync.Once + file_dreamwarorder_dreamwarorder_db_proto_rawDescData = file_dreamwarorder_dreamwarorder_db_proto_rawDesc +) + +func file_dreamwarorder_dreamwarorder_db_proto_rawDescGZIP() []byte { + file_dreamwarorder_dreamwarorder_db_proto_rawDescOnce.Do(func() { + file_dreamwarorder_dreamwarorder_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_dreamwarorder_dreamwarorder_db_proto_rawDescData) + }) + return file_dreamwarorder_dreamwarorder_db_proto_rawDescData +} + +var file_dreamwarorder_dreamwarorder_db_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_dreamwarorder_dreamwarorder_db_proto_goTypes = []interface{}{ + (*DBDreamWarorder)(nil), // 0: DBDreamWarorder +} +var file_dreamwarorder_dreamwarorder_db_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_dreamwarorder_dreamwarorder_db_proto_init() } +func file_dreamwarorder_dreamwarorder_db_proto_init() { + if File_dreamwarorder_dreamwarorder_db_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_dreamwarorder_dreamwarorder_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBDreamWarorder); 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{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_dreamwarorder_dreamwarorder_db_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_dreamwarorder_dreamwarorder_db_proto_goTypes, + DependencyIndexes: file_dreamwarorder_dreamwarorder_db_proto_depIdxs, + MessageInfos: file_dreamwarorder_dreamwarorder_db_proto_msgTypes, + }.Build() + File_dreamwarorder_dreamwarorder_db_proto = out.File + file_dreamwarorder_dreamwarorder_db_proto_rawDesc = nil + file_dreamwarorder_dreamwarorder_db_proto_goTypes = nil + file_dreamwarorder_dreamwarorder_db_proto_depIdxs = nil +} diff --git a/pb/dreamwarorder_msg.pb.go b/pb/dreamwarorder_msg.pb.go new file mode 100644 index 000000000..c252f1b4a --- /dev/null +++ b/pb/dreamwarorder_msg.pb.go @@ -0,0 +1,360 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.28.0 +// protoc v3.20.0 +// source: dreamwarorder/dreamwarorder_msg.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +//如梦战令 +type DreamWarorderInfoReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *DreamWarorderInfoReq) Reset() { + *x = DreamWarorderInfoReq{} + if protoimpl.UnsafeEnabled { + mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DreamWarorderInfoReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DreamWarorderInfoReq) ProtoMessage() {} + +func (x *DreamWarorderInfoReq) ProtoReflect() protoreflect.Message { + mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[0] + 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 DreamWarorderInfoReq.ProtoReflect.Descriptor instead. +func (*DreamWarorderInfoReq) Descriptor() ([]byte, []int) { + return file_dreamwarorder_dreamwarorder_msg_proto_rawDescGZIP(), []int{0} +} + +//如梦战令 回应 +type DreamWarorderInfoResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Conlds []*ConIProgress `protobuf:"bytes,1,rep,name=conlds,proto3" json:"conlds"` //子任务进度数据 + Info *DBDreamWarorder `protobuf:"bytes,2,opt,name=info,proto3" json:"info"` +} + +func (x *DreamWarorderInfoResp) Reset() { + *x = DreamWarorderInfoResp{} + if protoimpl.UnsafeEnabled { + mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DreamWarorderInfoResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DreamWarorderInfoResp) ProtoMessage() {} + +func (x *DreamWarorderInfoResp) ProtoReflect() protoreflect.Message { + mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[1] + 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 DreamWarorderInfoResp.ProtoReflect.Descriptor instead. +func (*DreamWarorderInfoResp) Descriptor() ([]byte, []int) { + return file_dreamwarorder_dreamwarorder_msg_proto_rawDescGZIP(), []int{1} +} + +func (x *DreamWarorderInfoResp) GetConlds() []*ConIProgress { + if x != nil { + return x.Conlds + } + return nil +} + +func (x *DreamWarorderInfoResp) GetInfo() *DBDreamWarorder { + if x != nil { + return x.Info + } + return nil +} + +//如梦战令 请求 +type DreamWarorderReceiveReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` +} + +func (x *DreamWarorderReceiveReq) Reset() { + *x = DreamWarorderReceiveReq{} + if protoimpl.UnsafeEnabled { + mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DreamWarorderReceiveReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DreamWarorderReceiveReq) ProtoMessage() {} + +func (x *DreamWarorderReceiveReq) ProtoReflect() protoreflect.Message { + mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[2] + 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 DreamWarorderReceiveReq.ProtoReflect.Descriptor instead. +func (*DreamWarorderReceiveReq) Descriptor() ([]byte, []int) { + return file_dreamwarorder_dreamwarorder_msg_proto_rawDescGZIP(), []int{2} +} + +func (x *DreamWarorderReceiveReq) GetId() int32 { + if x != nil { + return x.Id + } + return 0 +} + +//如梦战令 请求 回应 +type DreamWarorderReceiveResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` + Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励 +} + +func (x *DreamWarorderReceiveResp) Reset() { + *x = DreamWarorderReceiveResp{} + if protoimpl.UnsafeEnabled { + mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DreamWarorderReceiveResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DreamWarorderReceiveResp) ProtoMessage() {} + +func (x *DreamWarorderReceiveResp) ProtoReflect() protoreflect.Message { + mi := &file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[3] + 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 DreamWarorderReceiveResp.ProtoReflect.Descriptor instead. +func (*DreamWarorderReceiveResp) Descriptor() ([]byte, []int) { + return file_dreamwarorder_dreamwarorder_msg_proto_rawDescGZIP(), []int{3} +} + +func (x *DreamWarorderReceiveResp) GetId() int32 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *DreamWarorderReceiveResp) GetAward() []*UserAssets { + if x != nil { + return x.Award + } + return nil +} + +var File_dreamwarorder_dreamwarorder_msg_proto protoreflect.FileDescriptor + +var file_dreamwarorder_dreamwarorder_msg_proto_rawDesc = []byte{ + 0x0a, 0x25, 0x64, 0x72, 0x65, 0x61, 0x6d, 0x77, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2f, + 0x64, 0x72, 0x65, 0x61, 0x6d, 0x77, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x73, + 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x24, 0x64, 0x72, 0x65, 0x61, 0x6d, 0x77, 0x61, + 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2f, 0x64, 0x72, 0x65, 0x61, 0x6d, 0x77, 0x61, 0x72, 0x6f, + 0x72, 0x64, 0x65, 0x72, 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, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x22, 0x16, 0x0a, 0x14, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x64, 0x0a, 0x15, 0x44, 0x72, 0x65, + 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x18, 0x01, 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, 0x12, 0x24, 0x0a, 0x04, 0x69, 0x6e, 0x66, + 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x44, 0x72, 0x65, 0x61, + 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, + 0x29, 0x0a, 0x17, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, + 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4d, 0x0a, 0x18, 0x44, 0x72, + 0x65, 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x02, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_dreamwarorder_dreamwarorder_msg_proto_rawDescOnce sync.Once + file_dreamwarorder_dreamwarorder_msg_proto_rawDescData = file_dreamwarorder_dreamwarorder_msg_proto_rawDesc +) + +func file_dreamwarorder_dreamwarorder_msg_proto_rawDescGZIP() []byte { + file_dreamwarorder_dreamwarorder_msg_proto_rawDescOnce.Do(func() { + file_dreamwarorder_dreamwarorder_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_dreamwarorder_dreamwarorder_msg_proto_rawDescData) + }) + return file_dreamwarorder_dreamwarorder_msg_proto_rawDescData +} + +var file_dreamwarorder_dreamwarorder_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_dreamwarorder_dreamwarorder_msg_proto_goTypes = []interface{}{ + (*DreamWarorderInfoReq)(nil), // 0: DreamWarorderInfoReq + (*DreamWarorderInfoResp)(nil), // 1: DreamWarorderInfoResp + (*DreamWarorderReceiveReq)(nil), // 2: DreamWarorderReceiveReq + (*DreamWarorderReceiveResp)(nil), // 3: DreamWarorderReceiveResp + (*ConIProgress)(nil), // 4: ConIProgress + (*DBDreamWarorder)(nil), // 5: DBDreamWarorder + (*UserAssets)(nil), // 6: UserAssets +} +var file_dreamwarorder_dreamwarorder_msg_proto_depIdxs = []int32{ + 4, // 0: DreamWarorderInfoResp.conlds:type_name -> ConIProgress + 5, // 1: DreamWarorderInfoResp.info:type_name -> DBDreamWarorder + 6, // 2: DreamWarorderReceiveResp.award:type_name -> UserAssets + 3, // [3:3] is the sub-list for method output_type + 3, // [3:3] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name +} + +func init() { file_dreamwarorder_dreamwarorder_msg_proto_init() } +func file_dreamwarorder_dreamwarorder_msg_proto_init() { + if File_dreamwarorder_dreamwarorder_msg_proto != nil { + return + } + file_dreamwarorder_dreamwarorder_db_proto_init() + file_buried_buried_db_proto_init() + file_comm_proto_init() + if !protoimpl.UnsafeEnabled { + file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DreamWarorderInfoReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DreamWarorderInfoResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DreamWarorderReceiveReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_dreamwarorder_dreamwarorder_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DreamWarorderReceiveResp); 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{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_dreamwarorder_dreamwarorder_msg_proto_rawDesc, + NumEnums: 0, + NumMessages: 4, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_dreamwarorder_dreamwarorder_msg_proto_goTypes, + DependencyIndexes: file_dreamwarorder_dreamwarorder_msg_proto_depIdxs, + MessageInfos: file_dreamwarorder_dreamwarorder_msg_proto_msgTypes, + }.Build() + File_dreamwarorder_dreamwarorder_msg_proto = out.File + file_dreamwarorder_dreamwarorder_msg_proto_rawDesc = nil + file_dreamwarorder_dreamwarorder_msg_proto_goTypes = nil + file_dreamwarorder_dreamwarorder_msg_proto_depIdxs = nil +}