diff --git a/comm/imodule.go b/comm/imodule.go index f84eeb4a3..5f4fab64b 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -591,8 +591,10 @@ type ( } IActivity interface { - GetHdInfoByHdId(hid int32) (result *pb.DBHuodong, err error) // 通过活动id 获取活动信息 - GetAllHdInfo() (result []*pb.DBHuodong, err error) // 获取所有活动信息 + GetHdInfoByHdId(oid string) (result *pb.DBHuodong, err error) // 通过活动id 获取活动信息 + GetAllHdInfo() (result []*pb.DBHuodong, err error) // 获取所有活动信息 + + UpdateActivitySlider(session IUserSession, oid string, val int32) // 修改活动进度 } //每日任务 IDailytask interface { diff --git a/modules/activity/api_gethddata.go b/modules/activity/api_gethddata.go index 3bb8f2845..fc9c97a43 100644 --- a/modules/activity/api_gethddata.go +++ b/modules/activity/api_gethddata.go @@ -13,7 +13,7 @@ func (this *apiComp) GetHdDataCheck(session comm.IUserSession, req *pb.ActivityG func (this *apiComp) GetHdData(session comm.IUserSession, req *pb.ActivityGetHdDataReq) (errdata *pb.ErrorData) { - list, err := this.module.modelhdData.getHddata(session.GetUserId()) + list, err := this.module.modelhdData.getHddata(session.GetUserId(), req.Oid) if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/activity/model_hddata.go b/modules/activity/model_hddata.go index 5d04858cf..40855e768 100644 --- a/modules/activity/model_hddata.go +++ b/modules/activity/model_hddata.go @@ -1,6 +1,7 @@ package activity import ( + "fmt" "go_dreamfactory/comm" "go_dreamfactory/lego/core" "go_dreamfactory/modules" @@ -30,9 +31,10 @@ func (this *modelhdData) Init(service core.IService, module core.IModule, comp c } // 获取用户活动数据 -func (this *modelhdData) getHddata(uid string) (result []*pb.DBActivityData, err error) { +func (this *modelhdData) getHddata(uid string, oid string) (result []*pb.DBActivityData, err error) { + key := fmt.Sprintf("%s:%s-%s", this.TableName, uid, oid) result = make([]*pb.DBActivityData, 0) - if err = this.GetList(uid, &result); err != nil { + if err = this.GetList(key, &result); err != nil { this.module.Errorf("err:%v", err) return } @@ -40,8 +42,8 @@ func (this *modelhdData) getHddata(uid string) (result []*pb.DBActivityData, err } // 新增一条活动数据 -func (this *modelhdData) Insert(uid string, data *pb.DBActivityData) (err error) { - if err = this.AddList(uid, data.Id, data); err != nil { +func (this *modelhdData) Insert(key string, data *pb.DBActivityData) (err error) { + if err = this.AddList(key, data.Id, data); err != nil { this.module.Errorf("err:%v", err) return } diff --git a/modules/activity/model_hdlist.go b/modules/activity/model_hdlist.go index 5ad08810f..7915a348e 100644 --- a/modules/activity/model_hdlist.go +++ b/modules/activity/model_hdlist.go @@ -47,9 +47,9 @@ func (this *modelHdList) getHdInfo() (result []*pb.DBHuodong, err error) { } // 通过活动ID查找 -func (this *modelHdList) getHdInfoByHdId(hid int32) (result *pb.DBHuodong, err error) { +func (this *modelHdList) getHdInfoByHdId(oid string) (result *pb.DBHuodong, err error) { - _data := this.DBModel.DB.FindOne(comm.TableHdInfo, bson.M{"hdid": hid}) + _data := this.DBModel.DB.FindOne(comm.TableHdInfo, bson.M{"_id": oid}) result = &pb.DBHuodong{} if err = _data.Decode(result); err != nil { diff --git a/modules/activity/module.go b/modules/activity/module.go index 8136d65d0..63c564680 100644 --- a/modules/activity/module.go +++ b/modules/activity/module.go @@ -134,7 +134,11 @@ func (this *Activity) GetAllHdInfo() (result []*pb.DBHuodong, err error) { } // 通过活动ID查找 -func (this *Activity) GetHdInfoByHdId(hid int32) (result *pb.DBHuodong, err error) { - result, err = this.modelhdList.getHdInfoByHdId(hid) +func (this *Activity) GetHdInfoByHdId(oid string) (result *pb.DBHuodong, err error) { + result, err = this.modelhdList.getHdInfoByHdId(oid) return } + +func (this *Activity) UpdateActivitySlider(session comm.IUserSession, oid string, val int32) { + +} diff --git a/pb/activity_db.pb.go b/pb/activity_db.pb.go index ed35a5b0c..a24db8d8e 100644 --- a/pb/activity_db.pb.go +++ b/pb/activity_db.pb.go @@ -321,18 +321,18 @@ func (x *DBHuodong) GetData() *ActivityInfo { return nil } -// 玩家活动数据记录 +// 玩家每日登录活动数据 type DBActivityData struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - 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"` - Hdid int32 `protobuf:"varint,3,opt,name=hdid,proto3" json:"hdid"` - Gotarr []int32 `protobuf:"varint,4,rep,packed,name=gotarr,proto3" json:"gotarr"` - Lasttime int64 `protobuf:"varint,5,opt,name=lasttime,proto3" json:"lasttime"` - Val int32 `protobuf:"varint,6,opt,name=val,proto3" json:"val"` + 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"` + Hdoid string `protobuf:"bytes,3,opt,name=hdoid,proto3" json:"hdoid"` // 活动唯一id + Gotarr map[int32]bool `protobuf:"bytes,4,rep,name=gotarr,proto3" json:"gotarr" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` + Lasttime int64 `protobuf:"varint,5,opt,name=lasttime,proto3" json:"lasttime"` + Val int32 `protobuf:"varint,6,opt,name=val,proto3" json:"val"` // 第几天登录 } func (x *DBActivityData) Reset() { @@ -381,14 +381,14 @@ func (x *DBActivityData) GetUid() string { return "" } -func (x *DBActivityData) GetHdid() int32 { +func (x *DBActivityData) GetHdoid() string { if x != nil { - return x.Hdid + return x.Hdoid } - return 0 + return "" } -func (x *DBActivityData) GetGotarr() []int32 { +func (x *DBActivityData) GetGotarr() map[int32]bool { if x != nil { return x.Gotarr } @@ -450,16 +450,22 @@ var file_activity_activity_db_proto_rawDesc = []byte{ 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x68, 0x74, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, - 0x8c, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61, + 0xe6, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61, 0x74, 0x61, 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, 0x68, 0x64, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61, - 0x72, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, - 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, - 0x76, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x64, 0x6f, 0x69, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x05, 0x68, 0x64, 0x6f, 0x69, 0x64, 0x12, 0x33, 0x0a, 0x06, 0x67, 0x6f, + 0x74, 0x61, 0x72, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x41, + 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x6f, 0x74, 0x61, + 0x72, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x12, + 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x76, + 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x1a, 0x39, 0x0a, + 0x0b, 0x47, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -474,23 +480,25 @@ func file_activity_activity_db_proto_rawDescGZIP() []byte { return file_activity_activity_db_proto_rawDescData } -var file_activity_activity_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_activity_activity_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_activity_activity_db_proto_goTypes = []interface{}{ (*Arr)(nil), // 0: Arr (*ActivityInfo)(nil), // 1: ActivityInfo (*DBHuodong)(nil), // 2: DBHuodong (*DBActivityData)(nil), // 3: DBActivityData - (*UserAssets)(nil), // 4: UserAssets + nil, // 4: DBActivityData.GotarrEntry + (*UserAssets)(nil), // 5: UserAssets } var file_activity_activity_db_proto_depIdxs = []int32{ - 4, // 0: Arr.prize:type_name -> UserAssets + 5, // 0: Arr.prize:type_name -> UserAssets 0, // 1: ActivityInfo.prize:type_name -> Arr 1, // 2: DBHuodong.data:type_name -> ActivityInfo - 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 + 4, // 3: DBActivityData.gotarr:type_name -> DBActivityData.GotarrEntry + 4, // [4:4] is the sub-list for method output_type + 4, // [4:4] is the sub-list for method input_type + 4, // [4:4] is the sub-list for extension type_name + 4, // [4:4] is the sub-list for extension extendee + 0, // [0:4] is the sub-list for field type_name } func init() { file_activity_activity_db_proto_init() } @@ -555,7 +563,7 @@ func file_activity_activity_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_activity_activity_db_proto_rawDesc, NumEnums: 0, - NumMessages: 4, + NumMessages: 5, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/activity_msg.pb.go b/pb/activity_msg.pb.go index 97c76e5e4..9834824f8 100644 --- a/pb/activity_msg.pb.go +++ b/pb/activity_msg.pb.go @@ -110,6 +110,8 @@ type ActivityGetHdDataReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + + Oid string `protobuf:"bytes,1,opt,name=oid,proto3" json:"oid"` } func (x *ActivityGetHdDataReq) Reset() { @@ -144,6 +146,13 @@ func (*ActivityGetHdDataReq) Descriptor() ([]byte, []int) { return file_activity_activity_msg_proto_rawDescGZIP(), []int{2} } +func (x *ActivityGetHdDataReq) GetOid() string { + if x != nil { + return x.Oid + } + return "" +} + // 获取活动数据列表 type ActivityGetHdDataResp struct { state protoimpl.MessageState @@ -192,6 +201,110 @@ func (x *ActivityGetHdDataResp) GetData() []*DBActivityData { return nil } +// 领取奖励 +type ActivityGetRewardReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Oid string `protobuf:"bytes,1,opt,name=oid,proto3" json:"oid"` // 活动唯一id + Val int32 `protobuf:"varint,2,opt,name=val,proto3" json:"val"` +} + +func (x *ActivityGetRewardReq) Reset() { + *x = ActivityGetRewardReq{} + if protoimpl.UnsafeEnabled { + mi := &file_activity_activity_msg_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ActivityGetRewardReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ActivityGetRewardReq) ProtoMessage() {} + +func (x *ActivityGetRewardReq) ProtoReflect() protoreflect.Message { + mi := &file_activity_activity_msg_proto_msgTypes[4] + 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 ActivityGetRewardReq.ProtoReflect.Descriptor instead. +func (*ActivityGetRewardReq) Descriptor() ([]byte, []int) { + return file_activity_activity_msg_proto_rawDescGZIP(), []int{4} +} + +func (x *ActivityGetRewardReq) GetOid() string { + if x != nil { + return x.Oid + } + return "" +} + +func (x *ActivityGetRewardReq) GetVal() int32 { + if x != nil { + return x.Val + } + return 0 +} + +// 领取奖励数据返回 +type ActivityGetRewardResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBActivityData `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` +} + +func (x *ActivityGetRewardResp) Reset() { + *x = ActivityGetRewardResp{} + if protoimpl.UnsafeEnabled { + mi := &file_activity_activity_msg_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ActivityGetRewardResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ActivityGetRewardResp) ProtoMessage() {} + +func (x *ActivityGetRewardResp) ProtoReflect() protoreflect.Message { + mi := &file_activity_activity_msg_proto_msgTypes[5] + 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 ActivityGetRewardResp.ProtoReflect.Descriptor instead. +func (*ActivityGetRewardResp) Descriptor() ([]byte, []int) { + return file_activity_activity_msg_proto_rawDescGZIP(), []int{5} +} + +func (x *ActivityGetRewardResp) GetData() *DBActivityData { + if x != nil { + return x.Data + } + return nil +} + var File_activity_activity_msg_proto protoreflect.FileDescriptor var file_activity_activity_msg_proto_rawDesc = []byte{ @@ -203,13 +316,22 @@ var file_activity_activity_msg_proto_rawDesc = []byte{ 0x35, 0x0a, 0x13, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, - 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x16, 0x0a, 0x14, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, - 0x74, 0x79, 0x47, 0x65, 0x74, 0x48, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x22, 0x3c, - 0x0a, 0x15, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x65, 0x74, 0x48, 0x64, 0x44, - 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, - 0x74, 0x79, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x28, 0x0a, 0x14, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, + 0x74, 0x79, 0x47, 0x65, 0x74, 0x48, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x12, 0x10, + 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, + 0x22, 0x3c, 0x0a, 0x15, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x65, 0x74, 0x48, + 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, + 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, + 0x76, 0x69, 0x74, 0x79, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x3a, + 0x0a, 0x14, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, + 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, 0x6c, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x22, 0x3c, 0x0a, 0x15, 0x41, 0x63, + 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61, + 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -224,23 +346,26 @@ func file_activity_activity_msg_proto_rawDescGZIP() []byte { return file_activity_activity_msg_proto_rawDescData } -var file_activity_activity_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_activity_activity_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_activity_activity_msg_proto_goTypes = []interface{}{ (*ActivityGetListReq)(nil), // 0: ActivityGetListReq (*ActivityGetListResp)(nil), // 1: ActivityGetListResp (*ActivityGetHdDataReq)(nil), // 2: ActivityGetHdDataReq (*ActivityGetHdDataResp)(nil), // 3: ActivityGetHdDataResp - (*DBHuodong)(nil), // 4: DBHuodong - (*DBActivityData)(nil), // 5: DBActivityData + (*ActivityGetRewardReq)(nil), // 4: ActivityGetRewardReq + (*ActivityGetRewardResp)(nil), // 5: ActivityGetRewardResp + (*DBHuodong)(nil), // 6: DBHuodong + (*DBActivityData)(nil), // 7: DBActivityData } var file_activity_activity_msg_proto_depIdxs = []int32{ - 4, // 0: ActivityGetListResp.data:type_name -> DBHuodong - 5, // 1: ActivityGetHdDataResp.data:type_name -> DBActivityData - 2, // [2:2] is the sub-list for method output_type - 2, // [2:2] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name + 6, // 0: ActivityGetListResp.data:type_name -> DBHuodong + 7, // 1: ActivityGetHdDataResp.data:type_name -> DBActivityData + 7, // 2: ActivityGetRewardResp.data:type_name -> DBActivityData + 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_activity_activity_msg_proto_init() } @@ -298,6 +423,30 @@ func file_activity_activity_msg_proto_init() { return nil } } + file_activity_activity_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ActivityGetRewardReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_activity_activity_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ActivityGetRewardResp); 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{ @@ -305,7 +454,7 @@ func file_activity_activity_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_activity_activity_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 4, + NumMessages: 6, NumExtensions: 0, NumServices: 0, },