From d77cf70284deead6f238f5939db70fe5f7fea74e Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 11 Oct 2022 09:58:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=8B=B1=E9=9B=84=E7=BE=81?= =?UTF-8?q?=E7=BB=8A=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/library/api.go | 13 +- modules/library/api_getfetterlist.go | 28 +++ pb/library_db.pb.go | 50 ++-- pb/library_msg.pb.go | 357 +++++++++++++++++++++++---- 4 files changed, 381 insertions(+), 67 deletions(-) create mode 100644 modules/library/api_getfetterlist.go diff --git a/modules/library/api.go b/modules/library/api.go index ab2710e6a..5744673be 100644 --- a/modules/library/api.go +++ b/modules/library/api.go @@ -6,12 +6,13 @@ import ( ) const ( - LibraryGetListResp = "getlist" - LibraryChallengeResp = "challenge" - LibrarySkillLvResp = "skilllv" - LibraryGetRewardResp = "getreward" - LibraryBuyResp = "buy" - LibraryRankListResp = "ranklist" + LibraryGetListResp = "getlist" + LibraryGetFetterListResp = "getfetterlist" + LibraryChallengeResp = "challenge" + LibrarySkillLvResp = "skilllv" + LibraryGetRewardResp = "getreward" + LibraryBuyResp = "buy" + LibraryRankListResp = "ranklist" ) type apiComp struct { diff --git a/modules/library/api_getfetterlist.go b/modules/library/api_getfetterlist.go new file mode 100644 index 000000000..5e6bcd37f --- /dev/null +++ b/modules/library/api_getfetterlist.go @@ -0,0 +1,28 @@ +package library + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + + "google.golang.org/protobuf/proto" +) + +//参数校验 +func (this *apiComp) GetFetterListCheck(session comm.IUserSession, req *pb.LibraryGetFetterListReq) (code pb.ErrorCode) { + + return +} + +func (this *apiComp) GetFetterList(session comm.IUserSession, req *pb.LibraryGetFetterListReq) (code pb.ErrorCode, data proto.Message) { + + code = this.GetFetterListCheck(session, req) + if code != pb.ErrorCode_Success { + return // 参数校验失败直接返回 + } + rsp := &pb.LibraryGetFetterListResp{} + + rsp.Data = this.module.GetHeroFetterList(session.GetUserId()) + session.SendMsg(string(this.module.GetType()), LibraryGetListResp, rsp) + + return +} diff --git a/pb/library_db.pb.go b/pb/library_db.pb.go index ad850e6dc..b582eebb4 100644 --- a/pb/library_db.pb.go +++ b/pb/library_db.pb.go @@ -25,13 +25,14 @@ type DBLibrary struct { 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" bson:"uid"` //用户ID - Fid int32 `protobuf:"varint,3,opt,name=fid,proto3" json:"fid"` // 配置表id 羁绊id - Hero map[string]int32 `protobuf:"bytes,4,rep,name=hero,proto3" json:"hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key: hid value: favorlv - Prize map[int32]int32 `protobuf:"bytes,5,rep,name=prize,proto3" json:"prize" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //是否领奖 key 好感度等级 - Fetterlv int32 `protobuf:"varint,6,opt,name=fetterlv,proto3" json:"fetterlv"` // 当前羁绊等级 - Storyid int32 `protobuf:"varint,7,opt,name=storyid,proto3" json:"storyid"` // 故事id 用来判断是否领奖 + 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 + Fid int32 `protobuf:"varint,3,opt,name=fid,proto3" json:"fid"` // 配置表id 羁绊id + Hero map[string]int32 `protobuf:"bytes,4,rep,name=hero,proto3" json:"hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key: hid value: favorlv + Prize map[int32]int32 `protobuf:"bytes,5,rep,name=prize,proto3" json:"prize" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //是否领奖 key 好感度等级 + Fetterlv int32 `protobuf:"varint,6,opt,name=fetterlv,proto3" json:"fetterlv"` // 当前羁绊等级 + Storyid int32 `protobuf:"varint,7,opt,name=storyid,proto3" json:"storyid"` // 故事id 用来判断是否领奖 + Activation bool `protobuf:"varint,8,opt,name=activation,proto3" json:"activation"` // 是否激活 } func (x *DBLibrary) Reset() { @@ -115,6 +116,13 @@ func (x *DBLibrary) GetStoryid() int32 { return 0 } +func (x *DBLibrary) GetActivation() bool { + if x != nil { + return x.Activation + } + return false +} + // 羁绊英雄数据 type DBHeroFetter struct { state protoimpl.MessageState @@ -126,7 +134,8 @@ type DBHeroFetter struct { Heroid string `protobuf:"bytes,3,opt,name=heroid,proto3" json:"heroid"` // 英雄配置表id History []int32 `protobuf:"varint,4,rep,packed,name=history,proto3" json:"history"` // 传记往事ID Favorlv int32 `protobuf:"varint,5,opt,name=favorlv,proto3" json:"favorlv"` // 好感度等级 - Stroyprize int32 `protobuf:"varint,6,opt,name=stroyprize,proto3" json:"stroyprize"` // 剧情奖励 + Favorexp int32 `protobuf:"varint,6,opt,name=favorexp,proto3" json:"favorexp"` // 好感度经验 + Stroyprize int32 `protobuf:"varint,7,opt,name=stroyprize,proto3" json:"stroyprize"` // 剧情奖励 } func (x *DBHeroFetter) Reset() { @@ -196,6 +205,13 @@ func (x *DBHeroFetter) GetFavorlv() int32 { return 0 } +func (x *DBHeroFetter) GetFavorexp() int32 { + if x != nil { + return x.Favorexp + } + return 0 +} + func (x *DBHeroFetter) GetStroyprize() int32 { if x != nil { return x.Stroyprize @@ -207,7 +223,7 @@ var File_library_library_db_proto protoreflect.FileDescriptor var file_library_library_db_proto_rawDesc = []byte{ 0x0a, 0x18, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x2f, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, - 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xbf, 0x02, 0x0a, 0x09, 0x44, + 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdf, 0x02, 0x0a, 0x09, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 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, 0x10, 0x0a, 0x03, 0x66, 0x69, @@ -220,14 +236,16 @@ var file_library_library_db_proto_rawDesc = []byte{ 0x69, 0x7a, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x6c, 0x76, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x69, 0x64, 0x1a, 0x37, 0x0a, 0x09, 0x48, 0x65, 0x72, + 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, + 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x61, + 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x37, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x7a, 0x65, 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, - 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x9c, 0x01, 0x0a, + 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb8, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 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, @@ -235,10 +253,12 @@ var file_library_library_db_proto_rawDesc = []byte{ 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x07, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x6c, 0x76, 0x12, 0x1e, 0x0a, 0x0a, 0x73, - 0x74, 0x72, 0x6f, 0x79, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x0a, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x28, 0x05, 0x52, 0x07, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x6c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x66, + 0x61, 0x76, 0x6f, 0x72, 0x65, 0x78, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, + 0x61, 0x76, 0x6f, 0x72, 0x65, 0x78, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x74, 0x72, 0x6f, 0x79, + 0x70, 0x72, 0x69, 0x7a, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x72, + 0x6f, 0x79, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/library_msg.pb.go b/pb/library_msg.pb.go index 95f30cbc2..a66c6d480 100644 --- a/pb/library_msg.pb.go +++ b/pb/library_msg.pb.go @@ -106,6 +106,92 @@ func (x *LibraryGetListResp) GetData() []*DBLibrary { return nil } +// 获取英雄详细羁绊数据 +type LibraryGetFetterListReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *LibraryGetFetterListReq) Reset() { + *x = LibraryGetFetterListReq{} + if protoimpl.UnsafeEnabled { + mi := &file_library_library_msg_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *LibraryGetFetterListReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*LibraryGetFetterListReq) ProtoMessage() {} + +func (x *LibraryGetFetterListReq) ProtoReflect() protoreflect.Message { + mi := &file_library_library_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 LibraryGetFetterListReq.ProtoReflect.Descriptor instead. +func (*LibraryGetFetterListReq) Descriptor() ([]byte, []int) { + return file_library_library_msg_proto_rawDescGZIP(), []int{2} +} + +type LibraryGetFetterListResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data []*DBHeroFetter `protobuf:"bytes,1,rep,name=data,proto3" json:"data"` +} + +func (x *LibraryGetFetterListResp) Reset() { + *x = LibraryGetFetterListResp{} + if protoimpl.UnsafeEnabled { + mi := &file_library_library_msg_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *LibraryGetFetterListResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*LibraryGetFetterListResp) ProtoMessage() {} + +func (x *LibraryGetFetterListResp) ProtoReflect() protoreflect.Message { + mi := &file_library_library_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 LibraryGetFetterListResp.ProtoReflect.Descriptor instead. +func (*LibraryGetFetterListResp) Descriptor() ([]byte, []int) { + return file_library_library_msg_proto_rawDescGZIP(), []int{3} +} + +func (x *LibraryGetFetterListResp) GetData() []*DBHeroFetter { + if x != nil { + return x.Data + } + return nil +} + // 领取奖励 type LibraryGetRewardReq struct { state protoimpl.MessageState @@ -118,7 +204,7 @@ type LibraryGetRewardReq struct { func (x *LibraryGetRewardReq) Reset() { *x = LibraryGetRewardReq{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[2] + mi := &file_library_library_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -131,7 +217,7 @@ func (x *LibraryGetRewardReq) String() string { func (*LibraryGetRewardReq) ProtoMessage() {} func (x *LibraryGetRewardReq) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[2] + mi := &file_library_library_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -144,7 +230,7 @@ func (x *LibraryGetRewardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryGetRewardReq.ProtoReflect.Descriptor instead. func (*LibraryGetRewardReq) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{2} + return file_library_library_msg_proto_rawDescGZIP(), []int{4} } func (x *LibraryGetRewardReq) GetObjId() string { @@ -165,7 +251,7 @@ type LibraryGetRewardResp struct { func (x *LibraryGetRewardResp) Reset() { *x = LibraryGetRewardResp{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[3] + mi := &file_library_library_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -178,7 +264,7 @@ func (x *LibraryGetRewardResp) String() string { func (*LibraryGetRewardResp) ProtoMessage() {} func (x *LibraryGetRewardResp) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[3] + mi := &file_library_library_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -191,7 +277,7 @@ func (x *LibraryGetRewardResp) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryGetRewardResp.ProtoReflect.Descriptor instead. func (*LibraryGetRewardResp) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{3} + return file_library_library_msg_proto_rawDescGZIP(), []int{5} } func (x *LibraryGetRewardResp) GetData() *DBLibrary { @@ -215,7 +301,7 @@ type LibraryGetStoryRewardReq struct { func (x *LibraryGetStoryRewardReq) Reset() { *x = LibraryGetStoryRewardReq{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[4] + mi := &file_library_library_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -228,7 +314,7 @@ func (x *LibraryGetStoryRewardReq) String() string { func (*LibraryGetStoryRewardReq) ProtoMessage() {} func (x *LibraryGetStoryRewardReq) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[4] + mi := &file_library_library_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -241,7 +327,7 @@ func (x *LibraryGetStoryRewardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryGetStoryRewardReq.ProtoReflect.Descriptor instead. func (*LibraryGetStoryRewardReq) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{4} + return file_library_library_msg_proto_rawDescGZIP(), []int{6} } func (x *LibraryGetStoryRewardReq) GetHid() string { @@ -276,7 +362,7 @@ type LibraryGetStoryRewardResp struct { func (x *LibraryGetStoryRewardResp) Reset() { *x = LibraryGetStoryRewardResp{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[5] + mi := &file_library_library_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -289,7 +375,7 @@ func (x *LibraryGetStoryRewardResp) String() string { func (*LibraryGetStoryRewardResp) ProtoMessage() {} func (x *LibraryGetStoryRewardResp) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[5] + mi := &file_library_library_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -302,7 +388,7 @@ func (x *LibraryGetStoryRewardResp) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryGetStoryRewardResp.ProtoReflect.Descriptor instead. func (*LibraryGetStoryRewardResp) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{5} + return file_library_library_msg_proto_rawDescGZIP(), []int{7} } func (x *LibraryGetStoryRewardResp) GetData() *DBLibrary { @@ -312,6 +398,109 @@ func (x *LibraryGetStoryRewardResp) GetData() *DBLibrary { return nil } +// 给英雄赠送礼物 +type LibraryUseGiftReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Heroid string `protobuf:"bytes,1,opt,name=heroid,proto3" json:"heroid"` // 英雄id + Items map[string]int32 `protobuf:"bytes,2,rep,name=items,proto3" json:"items" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 道具ID value 数量 +} + +func (x *LibraryUseGiftReq) Reset() { + *x = LibraryUseGiftReq{} + if protoimpl.UnsafeEnabled { + mi := &file_library_library_msg_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *LibraryUseGiftReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*LibraryUseGiftReq) ProtoMessage() {} + +func (x *LibraryUseGiftReq) ProtoReflect() protoreflect.Message { + mi := &file_library_library_msg_proto_msgTypes[8] + 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 LibraryUseGiftReq.ProtoReflect.Descriptor instead. +func (*LibraryUseGiftReq) Descriptor() ([]byte, []int) { + return file_library_library_msg_proto_rawDescGZIP(), []int{8} +} + +func (x *LibraryUseGiftReq) GetHeroid() string { + if x != nil { + return x.Heroid + } + return "" +} + +func (x *LibraryUseGiftReq) GetItems() map[string]int32 { + if x != nil { + return x.Items + } + return nil +} + +type LibraryUseGiftResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBHeroFetter `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` +} + +func (x *LibraryUseGiftResp) Reset() { + *x = LibraryUseGiftResp{} + if protoimpl.UnsafeEnabled { + mi := &file_library_library_msg_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *LibraryUseGiftResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*LibraryUseGiftResp) ProtoMessage() {} + +func (x *LibraryUseGiftResp) ProtoReflect() protoreflect.Message { + mi := &file_library_library_msg_proto_msgTypes[9] + 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 LibraryUseGiftResp.ProtoReflect.Descriptor instead. +func (*LibraryUseGiftResp) Descriptor() ([]byte, []int) { + return file_library_library_msg_proto_rawDescGZIP(), []int{9} +} + +func (x *LibraryUseGiftResp) GetData() *DBHeroFetter { + if x != nil { + return x.Data + } + return nil +} + var File_library_library_msg_proto protoreflect.FileDescriptor var file_library_library_msg_proto_rawDesc = []byte{ @@ -323,22 +512,41 @@ var file_library_library_msg_proto_rawDesc = []byte{ 0x62, 0x72, 0x61, 0x72, 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, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, - 0x22, 0x2b, 0x0a, 0x13, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, - 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x22, 0x36, 0x0a, - 0x14, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, - 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, - 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x62, 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, - 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, - 0x71, 0x12, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x68, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x1a, 0x0a, - 0x08, 0x72, 0x69, 0x67, 0x68, 0x74, 0x65, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x08, 0x72, 0x69, 0x67, 0x68, 0x74, 0x65, 0x6e, 0x64, 0x22, 0x3b, 0x0a, 0x19, 0x4c, 0x69, 0x62, - 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, - 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, + 0x22, 0x19, 0x0a, 0x17, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x46, 0x65, + 0x74, 0x74, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x3d, 0x0a, 0x18, 0x4c, + 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x4c, + 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, + 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2b, 0x0a, 0x13, 0x4c, 0x69, + 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, + 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x22, 0x36, 0x0a, 0x14, 0x4c, 0x69, 0x62, 0x72, 0x61, + 0x72, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, + 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, + 0x62, 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, + 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x68, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x68, 0x69, 0x64, 0x12, 0x18, 0x0a, + 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, + 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x69, 0x67, 0x68, 0x74, + 0x65, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x69, 0x67, 0x68, 0x74, + 0x65, 0x6e, 0x64, 0x22, 0x3b, 0x0a, 0x19, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, + 0x74, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, + 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, + 0x22, 0x9a, 0x01, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x65, 0x47, + 0x69, 0x66, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x12, 0x33, + 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, + 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x65, 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, + 0x71, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, + 0x65, 0x6d, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x37, 0x0a, + 0x12, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x65, 0x47, 0x69, 0x66, 0x74, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } @@ -355,25 +563,34 @@ func file_library_library_msg_proto_rawDescGZIP() []byte { return file_library_library_msg_proto_rawDescData } -var file_library_library_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6) +var file_library_library_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 11) var file_library_library_msg_proto_goTypes = []interface{}{ (*LibraryGetListReq)(nil), // 0: LibraryGetListReq (*LibraryGetListResp)(nil), // 1: LibraryGetListResp - (*LibraryGetRewardReq)(nil), // 2: LibraryGetRewardReq - (*LibraryGetRewardResp)(nil), // 3: LibraryGetRewardResp - (*LibraryGetStoryRewardReq)(nil), // 4: LibraryGetStoryRewardReq - (*LibraryGetStoryRewardResp)(nil), // 5: LibraryGetStoryRewardResp - (*DBLibrary)(nil), // 6: DBLibrary + (*LibraryGetFetterListReq)(nil), // 2: LibraryGetFetterListReq + (*LibraryGetFetterListResp)(nil), // 3: LibraryGetFetterListResp + (*LibraryGetRewardReq)(nil), // 4: LibraryGetRewardReq + (*LibraryGetRewardResp)(nil), // 5: LibraryGetRewardResp + (*LibraryGetStoryRewardReq)(nil), // 6: LibraryGetStoryRewardReq + (*LibraryGetStoryRewardResp)(nil), // 7: LibraryGetStoryRewardResp + (*LibraryUseGiftReq)(nil), // 8: LibraryUseGiftReq + (*LibraryUseGiftResp)(nil), // 9: LibraryUseGiftResp + nil, // 10: LibraryUseGiftReq.ItemsEntry + (*DBLibrary)(nil), // 11: DBLibrary + (*DBHeroFetter)(nil), // 12: DBHeroFetter } var file_library_library_msg_proto_depIdxs = []int32{ - 6, // 0: LibraryGetListResp.data:type_name -> DBLibrary - 6, // 1: LibraryGetRewardResp.data:type_name -> DBLibrary - 6, // 2: LibraryGetStoryRewardResp.data:type_name -> DBLibrary - 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 + 11, // 0: LibraryGetListResp.data:type_name -> DBLibrary + 12, // 1: LibraryGetFetterListResp.data:type_name -> DBHeroFetter + 11, // 2: LibraryGetRewardResp.data:type_name -> DBLibrary + 11, // 3: LibraryGetStoryRewardResp.data:type_name -> DBLibrary + 10, // 4: LibraryUseGiftReq.items:type_name -> LibraryUseGiftReq.ItemsEntry + 12, // 5: LibraryUseGiftResp.data:type_name -> DBHeroFetter + 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_library_library_msg_proto_init() } @@ -408,7 +625,7 @@ func file_library_library_msg_proto_init() { } } file_library_library_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LibraryGetRewardReq); i { + switch v := v.(*LibraryGetFetterListReq); i { case 0: return &v.state case 1: @@ -420,7 +637,7 @@ func file_library_library_msg_proto_init() { } } file_library_library_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LibraryGetRewardResp); i { + switch v := v.(*LibraryGetFetterListResp); i { case 0: return &v.state case 1: @@ -432,7 +649,7 @@ func file_library_library_msg_proto_init() { } } file_library_library_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LibraryGetStoryRewardReq); i { + switch v := v.(*LibraryGetRewardReq); i { case 0: return &v.state case 1: @@ -444,6 +661,30 @@ func file_library_library_msg_proto_init() { } } file_library_library_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*LibraryGetRewardResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_library_library_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*LibraryGetStoryRewardReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_library_library_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryGetStoryRewardResp); i { case 0: return &v.state @@ -455,6 +696,30 @@ func file_library_library_msg_proto_init() { return nil } } + file_library_library_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*LibraryUseGiftReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_library_library_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*LibraryUseGiftResp); 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{ @@ -462,7 +727,7 @@ func file_library_library_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_library_library_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 6, + NumMessages: 11, NumExtensions: 0, NumServices: 0, },