From 82328ed7f36c5ec00536fc78eeaf4dd06f13b5f4 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 25 Oct 2022 16:51:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=B4=97=E7=BB=83=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=88=B0=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/arena/api_challengereward.go | 77 +++-- pb/arena_msg.pb.go | 62 ++-- pb/errorcode.pb.go | 32 +- pb/hero_db.pb.go | 147 +++++++-- pb/hero_msg.pb.go | 454 +++++++++++++++++++++++++-- pb/userexpand.pb.go | 24 +- 6 files changed, 681 insertions(+), 115 deletions(-) diff --git a/modules/arena/api_challengereward.go b/modules/arena/api_challengereward.go index 9a6783e9b..8a6f0d2a3 100644 --- a/modules/arena/api_challengereward.go +++ b/modules/arena/api_challengereward.go @@ -17,8 +17,10 @@ func (this *apiComp) ChallengeRewardCheck(session comm.IUserSession, req *pb.Are ///挑战奖励领取 func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaChallengeRewardReq) (code pb.ErrorCode, data proto.Message) { var ( - red *pb.DBArenaUser - bule *pb.DBArenaUser + info *pb.DBArenaUser + rival *pb.DBArenaUser + red *pb.ArenaPlayer + bule *pb.ArenaPlayer err error iswin bool ) @@ -34,21 +36,23 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha return } } - if red, err = this.module.modelArena.queryPlayerInfo(req.Report.Info.RedCompId); err != nil { + if info, err = this.module.modelArena.queryPlayerInfo(session.GetUserId()); err != nil { code = pb.ErrorCode_DBError return } - if bule, err = this.module.modelArena.queryPlayerInfo(req.Report.Info.BlueCompId); err != nil { - code = pb.ErrorCode_DBError - return + red = &pb.ArenaPlayer{ + Uid: info.Uid, + Name: info.Name, + Dan: info.Dan, + Integral: info.Integral, + Defend: info.Defend, + Isai: false, } - if len(red.Record) > 10 { - red.Record = red.Record[1:] + + if len(info.Record) > 10 { + info.Record = info.Record[1:] } - if len(bule.Record) > 10 { - bule.Record = bule.Record[1:] - } - red.Record = append(red.Record, &pb.DBArenaBattleRecord{ + info.Record = append(info.Record, &pb.DBArenaBattleRecord{ Bid: req.Report.Info.Id, Time: time.Now().Unix(), Iswin: req.Iswin, @@ -56,22 +60,45 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha Rivalid: bule.Uid, Rivalname: bule.Name, }) - if err = this.module.modelArena.Change(red.Uid, map[string]interface{}{"record": red.Record}); err != nil { - code = pb.ErrorCode_DBError - return - } - bule.Record = append(red.Record, &pb.DBArenaBattleRecord{ - Bid: req.Report.Info.Id, - Time: time.Now().Unix(), - Iswin: !req.Iswin, - Isdefend: true, - Rivalid: red.Uid, - Rivalname: red.Name, - }) - if err = this.module.modelArena.Change(bule.Uid, map[string]interface{}{"record": bule.Record}); err != nil { + if err = this.module.modelArena.Change(red.Uid, map[string]interface{}{"record": info.Record}); err != nil { code = pb.ErrorCode_DBError return } + if !req.Isai { + if rival, err = this.module.modelArena.queryPlayerInfo(req.Report.Info.BlueCompId); err != nil { + code = pb.ErrorCode_DBError + return + } + bule = &pb.ArenaPlayer{ + Uid: rival.Uid, + Name: rival.Name, + Dan: rival.Dan, + Integral: rival.Integral, + Defend: rival.Defend, + Isai: false, + } + if len(rival.Record) > 10 { + rival.Record = rival.Record[1:] + } + rival.Record = append(rival.Record, &pb.DBArenaBattleRecord{ + Bid: req.Report.Info.Id, + Time: time.Now().Unix(), + Iswin: !req.Iswin, + Isdefend: true, + Rivalid: red.Uid, + Rivalname: red.Name, + }) + if err = this.module.modelArena.Change(rival.Uid, map[string]interface{}{"record": rival.Record}); err != nil { + code = pb.ErrorCode_DBError + return + } + } else { + bule = &pb.ArenaPlayer{ + Dan: info.Dan, + Integral: red.Integral, + } + } + return } diff --git a/pb/arena_msg.pb.go b/pb/arena_msg.pb.go index 472ae0a42..fa290ac05 100644 --- a/pb/arena_msg.pb.go +++ b/pb/arena_msg.pb.go @@ -536,8 +536,10 @@ type ArenaChallengeRewardReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Iswin bool `protobuf:"varint,1,opt,name=iswin,proto3" json:"iswin"` //是否胜利 - Report *BattleReport `protobuf:"bytes,2,opt,name=report,proto3" json:"report"` //战报 + Iswin bool `protobuf:"varint,1,opt,name=iswin,proto3" json:"iswin"` //是否胜利 + Isai bool `protobuf:"varint,2,opt,name=isai,proto3" json:"isai"` //对手是否是ai + Aiintegral int32 `protobuf:"varint,3,opt,name=aiintegral,proto3" json:"aiintegral"` // ai 积分 + Report *BattleReport `protobuf:"bytes,4,opt,name=report,proto3" json:"report"` //战报 } func (x *ArenaChallengeRewardReq) Reset() { @@ -579,6 +581,20 @@ func (x *ArenaChallengeRewardReq) GetIswin() bool { return false } +func (x *ArenaChallengeRewardReq) GetIsai() bool { + if x != nil { + return x.Isai + } + return false +} + +func (x *ArenaChallengeRewardReq) GetAiintegral() int32 { + if x != nil { + return x.Aiintegral + } + return 0 +} + func (x *ArenaChallengeRewardReq) GetReport() *BattleReport { if x != nil { return x.Report @@ -860,25 +876,29 @@ var file_arena_arena_msg_proto_rawDesc = []byte{ 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 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, 0x56, 0x0a, 0x17, 0x41, 0x72, - 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x77, 0x61, - 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 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, 0x32, 0x0a, 0x18, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c, - 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, - 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, - 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x0e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, - 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x22, 0x0f, 0x0a, 0x0d, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, - 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x22, 0x25, 0x0a, 0x0b, 0x41, 0x72, 0x65, 0x6e, 0x61, - 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x22, 0x3e, - 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, - 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, - 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x8a, 0x01, 0x0a, 0x17, 0x41, + 0x72, 0x65, 0x6e, 0x61, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x77, + 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x12, 0x12, 0x0a, 0x04, + 0x69, 0x73, 0x61, 0x69, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, + 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x69, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x69, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, + 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, 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, 0x32, 0x0a, 0x18, 0x41, 0x72, 0x65, 0x6e, 0x61, + 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x0e, 0x0a, 0x0c, 0x41, + 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x22, 0x0f, 0x0a, 0x0d, 0x41, + 0x72, 0x65, 0x6e, 0x61, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x22, 0x25, 0x0a, 0x0b, + 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, + 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, + 0x4e, 0x75, 0x6d, 0x22, 0x3e, 0x0a, 0x0c, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x75, 0x79, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x74, + 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x69, 0x63, + 0x6b, 0x65, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index f294aae19..e4b2f13b7 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -197,8 +197,12 @@ const ( ErrorCode_LibraryLvReward ErrorCode = 2805 // 领奖等级没达到 // Battle ErrorCode_BattleValidationFailed ErrorCode = 2901 //战斗校验失败 - // Arena - ErrorCode_ArenaTicketBuyUp ErrorCode = 3001 // 挑战票据到达上限 + // sociaty + ErrorCode_SociatyAdded ErrorCode = 3001 //已在公会里 + ErrorCode_SociatyDiamondNoEnough ErrorCode = 3002 //钻石不足 + ErrorCode_SociatyApply ErrorCode = 3003 //申请失败 + // arena + ErrorCode_ArenaTicketBuyUp ErrorCode = 3101 //票据上限 ) // Enum value maps for ErrorCode. @@ -360,7 +364,10 @@ var ( 2804: "LibraryReward", 2805: "LibraryLvReward", 2901: "BattleValidationFailed", - 3001: "ArenaTicketBuyUp", + 3001: "SociatyAdded", + 3002: "SociatyDiamondNoEnough", + 3003: "SociatyApply", + 3101: "ArenaTicketBuyUp", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -519,7 +526,10 @@ var ( "LibraryReward": 2804, "LibraryLvReward": 2805, "BattleValidationFailed": 2901, - "ArenaTicketBuyUp": 3001, + "SociatyAdded": 3001, + "SociatyDiamondNoEnough": 3002, + "SociatyApply": 3003, + "ArenaTicketBuyUp": 3101, } ) @@ -554,7 +564,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0xad, 0x1b, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xf0, 0x1b, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, @@ -771,10 +781,14 @@ var file_errorcode_proto_rawDesc = []byte{ 0x77, 0x61, 0x72, 0x64, 0x10, 0xf4, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf5, 0x15, 0x12, 0x1b, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, 0x16, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x72, - 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x55, 0x70, 0x10, 0xb9, - 0x17, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, 0x16, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xb9, 0x17, 0x12, 0x1b, 0x0a, + 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e, + 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xba, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x10, 0xbb, 0x17, 0x12, 0x15, 0x0a, + 0x10, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x55, + 0x70, 0x10, 0x9d, 0x18, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go index 1ccf64cab..e9a61120e 100644 --- a/pb/hero_db.pb.go +++ b/pb/hero_db.pb.go @@ -543,6 +543,78 @@ func (x *DBHeroRecord) GetDrawcount() int32 { return 0 } +// 英雄天赋系统 +type DBHeroTalent struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID 主键id + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID + HeroId string `protobuf:"bytes,3,opt,name=heroId,proto3" json:"heroId"` // 英雄ID + Talent map[int32]int32 `protobuf:"bytes,4,rep,name=talent,proto3" json:"talent" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 已经学习过的天赋 +} + +func (x *DBHeroTalent) Reset() { + *x = DBHeroTalent{} + if protoimpl.UnsafeEnabled { + mi := &file_hero_hero_db_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBHeroTalent) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBHeroTalent) ProtoMessage() {} + +func (x *DBHeroTalent) ProtoReflect() protoreflect.Message { + mi := &file_hero_hero_db_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 DBHeroTalent.ProtoReflect.Descriptor instead. +func (*DBHeroTalent) Descriptor() ([]byte, []int) { + return file_hero_hero_db_proto_rawDescGZIP(), []int{4} +} + +func (x *DBHeroTalent) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBHeroTalent) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBHeroTalent) GetHeroId() string { + if x != nil { + return x.HeroId + } + return "" +} + +func (x *DBHeroTalent) GetTalent() map[int32]int32 { + if x != nil { + return x.Talent + } + return nil +} + var File_hero_hero_db_proto protoreflect.FileDescriptor var file_hero_hero_db_proto_rawDesc = []byte{ @@ -645,11 +717,23 @@ var file_hero_hero_db_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2a, - 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, - 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, - 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, + 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, + 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, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, + 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, + 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, + 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 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, 0x2a, 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, + 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, + 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -665,32 +749,35 @@ func file_hero_hero_db_proto_rawDescGZIP() []byte { } var file_hero_hero_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 9) +var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 11) var file_hero_hero_db_proto_goTypes = []interface{}{ (HeroType)(0), // 0: HeroType (*SkillData)(nil), // 1: SkillData (*DBHero)(nil), // 2: DBHero (*Floor)(nil), // 3: Floor (*DBHeroRecord)(nil), // 4: DBHeroRecord - nil, // 5: DBHero.PropertyEntry - nil, // 6: DBHero.AddPropertyEntry - nil, // 7: DBHero.EnergyEntry - nil, // 8: DBHero.EnergyPropertyEntry - nil, // 9: DBHero.JuexPropertyEntry + (*DBHeroTalent)(nil), // 5: DBHeroTalent + nil, // 6: DBHero.PropertyEntry + nil, // 7: DBHero.AddPropertyEntry + nil, // 8: DBHero.EnergyEntry + nil, // 9: DBHero.EnergyPropertyEntry + nil, // 10: DBHero.JuexPropertyEntry + nil, // 11: DBHeroTalent.TalentEntry } var file_hero_hero_db_proto_depIdxs = []int32{ - 1, // 0: DBHero.normalSkill:type_name -> SkillData - 5, // 1: DBHero.property:type_name -> DBHero.PropertyEntry - 6, // 2: DBHero.addProperty:type_name -> DBHero.AddPropertyEntry - 7, // 3: DBHero.energy:type_name -> DBHero.EnergyEntry - 8, // 4: DBHero.energyProperty:type_name -> DBHero.EnergyPropertyEntry - 9, // 5: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry - 0, // 6: DBHero.status:type_name -> HeroType - 7, // [7:7] is the sub-list for method output_type - 7, // [7:7] is the sub-list for method input_type - 7, // [7:7] is the sub-list for extension type_name - 7, // [7:7] is the sub-list for extension extendee - 0, // [0:7] is the sub-list for field type_name + 1, // 0: DBHero.normalSkill:type_name -> SkillData + 6, // 1: DBHero.property:type_name -> DBHero.PropertyEntry + 7, // 2: DBHero.addProperty:type_name -> DBHero.AddPropertyEntry + 8, // 3: DBHero.energy:type_name -> DBHero.EnergyEntry + 9, // 4: DBHero.energyProperty:type_name -> DBHero.EnergyPropertyEntry + 10, // 5: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry + 0, // 6: DBHero.status:type_name -> HeroType + 11, // 7: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry + 8, // [8:8] is the sub-list for method output_type + 8, // [8:8] is the sub-list for method input_type + 8, // [8:8] is the sub-list for extension type_name + 8, // [8:8] is the sub-list for extension extendee + 0, // [0:8] is the sub-list for field type_name } func init() { file_hero_hero_db_proto_init() } @@ -747,6 +834,18 @@ func file_hero_hero_db_proto_init() { return nil } } + file_hero_hero_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBHeroTalent); 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{ @@ -754,7 +853,7 @@ func file_hero_hero_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_hero_hero_db_proto_rawDesc, NumEnums: 1, - NumMessages: 9, + NumMessages: 11, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index 5e5020d09..683f8820f 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -1805,6 +1805,298 @@ func (x *HeroFusionResp) GetHeroid() string { return "" } +// 天赋学习 +type HeroTalentListReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *HeroTalentListReq) Reset() { + *x = HeroTalentListReq{} + if protoimpl.UnsafeEnabled { + mi := &file_hero_hero_msg_proto_msgTypes[34] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *HeroTalentListReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HeroTalentListReq) ProtoMessage() {} + +func (x *HeroTalentListReq) ProtoReflect() protoreflect.Message { + mi := &file_hero_hero_msg_proto_msgTypes[34] + 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 HeroTalentListReq.ProtoReflect.Descriptor instead. +func (*HeroTalentListReq) Descriptor() ([]byte, []int) { + return file_hero_hero_msg_proto_rawDescGZIP(), []int{34} +} + +type HeroTalentListResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Telnet []*DBHeroTalent `protobuf:"bytes,1,rep,name=telnet,proto3" json:"telnet"` +} + +func (x *HeroTalentListResp) Reset() { + *x = HeroTalentListResp{} + if protoimpl.UnsafeEnabled { + mi := &file_hero_hero_msg_proto_msgTypes[35] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *HeroTalentListResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HeroTalentListResp) ProtoMessage() {} + +func (x *HeroTalentListResp) ProtoReflect() protoreflect.Message { + mi := &file_hero_hero_msg_proto_msgTypes[35] + 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 HeroTalentListResp.ProtoReflect.Descriptor instead. +func (*HeroTalentListResp) Descriptor() ([]byte, []int) { + return file_hero_hero_msg_proto_rawDescGZIP(), []int{35} +} + +func (x *HeroTalentListResp) GetTelnet() []*DBHeroTalent { + if x != nil { + return x.Telnet + } + return nil +} + +// 天赋学习 +type HeroTalentLearnReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TalentID int32 `protobuf:"varint,1,opt,name=talentID,proto3" json:"talentID"` // 天赋ID + ObjId string `protobuf:"bytes,2,opt,name=objId,proto3" json:"objId"` // 对象唯一id + Heroid string `protobuf:"bytes,3,opt,name=heroid,proto3" json:"heroid"` //配置表的英雄id +} + +func (x *HeroTalentLearnReq) Reset() { + *x = HeroTalentLearnReq{} + if protoimpl.UnsafeEnabled { + mi := &file_hero_hero_msg_proto_msgTypes[36] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *HeroTalentLearnReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HeroTalentLearnReq) ProtoMessage() {} + +func (x *HeroTalentLearnReq) ProtoReflect() protoreflect.Message { + mi := &file_hero_hero_msg_proto_msgTypes[36] + 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 HeroTalentLearnReq.ProtoReflect.Descriptor instead. +func (*HeroTalentLearnReq) Descriptor() ([]byte, []int) { + return file_hero_hero_msg_proto_rawDescGZIP(), []int{36} +} + +func (x *HeroTalentLearnReq) GetTalentID() int32 { + if x != nil { + return x.TalentID + } + return 0 +} + +func (x *HeroTalentLearnReq) GetObjId() string { + if x != nil { + return x.ObjId + } + return "" +} + +func (x *HeroTalentLearnReq) GetHeroid() string { + if x != nil { + return x.Heroid + } + return "" +} + +type HeroTalentLearnResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Telnet *DBHeroTalent `protobuf:"bytes,1,opt,name=telnet,proto3" json:"telnet"` +} + +func (x *HeroTalentLearnResp) Reset() { + *x = HeroTalentLearnResp{} + if protoimpl.UnsafeEnabled { + mi := &file_hero_hero_msg_proto_msgTypes[37] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *HeroTalentLearnResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HeroTalentLearnResp) ProtoMessage() {} + +func (x *HeroTalentLearnResp) ProtoReflect() protoreflect.Message { + mi := &file_hero_hero_msg_proto_msgTypes[37] + 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 HeroTalentLearnResp.ProtoReflect.Descriptor instead. +func (*HeroTalentLearnResp) Descriptor() ([]byte, []int) { + return file_hero_hero_msg_proto_rawDescGZIP(), []int{37} +} + +func (x *HeroTalentLearnResp) GetTelnet() *DBHeroTalent { + if x != nil { + return x.Telnet + } + return nil +} + +// 重置天赋 +type HeroTalentResetReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ObjId string `protobuf:"bytes,1,opt,name=objId,proto3" json:"objId"` // 对象唯一id +} + +func (x *HeroTalentResetReq) Reset() { + *x = HeroTalentResetReq{} + if protoimpl.UnsafeEnabled { + mi := &file_hero_hero_msg_proto_msgTypes[38] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *HeroTalentResetReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HeroTalentResetReq) ProtoMessage() {} + +func (x *HeroTalentResetReq) ProtoReflect() protoreflect.Message { + mi := &file_hero_hero_msg_proto_msgTypes[38] + 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 HeroTalentResetReq.ProtoReflect.Descriptor instead. +func (*HeroTalentResetReq) Descriptor() ([]byte, []int) { + return file_hero_hero_msg_proto_rawDescGZIP(), []int{38} +} + +func (x *HeroTalentResetReq) GetObjId() string { + if x != nil { + return x.ObjId + } + return "" +} + +type HeroTalentResetResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Telnet *DBHeroTalent `protobuf:"bytes,1,opt,name=telnet,proto3" json:"telnet"` +} + +func (x *HeroTalentResetResp) Reset() { + *x = HeroTalentResetResp{} + if protoimpl.UnsafeEnabled { + mi := &file_hero_hero_msg_proto_msgTypes[39] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *HeroTalentResetResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HeroTalentResetResp) ProtoMessage() {} + +func (x *HeroTalentResetResp) ProtoReflect() protoreflect.Message { + mi := &file_hero_hero_msg_proto_msgTypes[39] + 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 HeroTalentResetResp.ProtoReflect.Descriptor instead. +func (*HeroTalentResetResp) Descriptor() ([]byte, []int) { + return file_hero_hero_msg_proto_rawDescGZIP(), []int{39} +} + +func (x *HeroTalentResetResp) GetTelnet() *DBHeroTalent { + if x != nil { + return x.Telnet + } + return nil +} + var File_hero_hero_msg_proto protoreflect.FileDescriptor var file_hero_hero_msg_proto_rawDesc = []byte{ @@ -1968,8 +2260,30 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x28, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x48, 0x65, + 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, + 0x3b, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73, + 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, + 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x22, 0x5e, 0x0a, 0x12, + 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x52, + 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x12, 0x14, + 0x0a, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, + 0x62, 0x6a, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x3c, 0x0a, 0x13, + 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, + 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x22, 0x2a, 0x0a, 0x12, 0x48, 0x65, + 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 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, 0x3c, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, + 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, + 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, + 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, + 0x6c, 0x6e, 0x65, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1984,7 +2298,7 @@ func file_hero_hero_msg_proto_rawDescGZIP() []byte { return file_hero_hero_msg_proto_rawDescData } -var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 37) +var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 43) var file_hero_hero_msg_proto_goTypes = []interface{}{ (*HeroInfoReq)(nil), // 0: HeroInfoReq (*HeroInfoResp)(nil), // 1: HeroInfoResp @@ -2020,37 +2334,47 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{ (*HeroDrawCardFloorResp)(nil), // 31: HeroDrawCardFloorResp (*HeroFusionReq)(nil), // 32: HeroFusionReq (*HeroFusionResp)(nil), // 33: HeroFusionResp - nil, // 34: HeroPropertyPush.PropertyEntry - nil, // 35: HeroPropertyPush.AddPropertyEntry - nil, // 36: HeroFusionReq.HerosEntry - (*DBHero)(nil), // 37: DBHero + (*HeroTalentListReq)(nil), // 34: HeroTalentListReq + (*HeroTalentListResp)(nil), // 35: HeroTalentListResp + (*HeroTalentLearnReq)(nil), // 36: HeroTalentLearnReq + (*HeroTalentLearnResp)(nil), // 37: HeroTalentLearnResp + (*HeroTalentResetReq)(nil), // 38: HeroTalentResetReq + (*HeroTalentResetResp)(nil), // 39: HeroTalentResetResp + nil, // 40: HeroPropertyPush.PropertyEntry + nil, // 41: HeroPropertyPush.AddPropertyEntry + nil, // 42: HeroFusionReq.HerosEntry + (*DBHero)(nil), // 43: DBHero + (*DBHeroTalent)(nil), // 44: DBHeroTalent } var file_hero_hero_msg_proto_depIdxs = []int32{ - 37, // 0: HeroInfoResp.base:type_name -> DBHero - 37, // 1: HeroListResp.list:type_name -> DBHero + 43, // 0: HeroInfoResp.base:type_name -> DBHero + 43, // 1: HeroListResp.list:type_name -> DBHero 5, // 2: HeroStrengthenUplvReq.expCards:type_name -> MapStringInt32 - 37, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero + 43, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero 8, // 4: HeroStrengthenUpStarReq.hero:type_name -> CostCardData 8, // 5: HeroStrengthenUpStarReq.heroRace:type_name -> CostCardData - 37, // 6: HeroStrengthenUpStarResp.hero:type_name -> DBHero - 37, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero - 37, // 8: HeroResonanceResp.hero:type_name -> DBHero - 37, // 9: HeroResonanceResp.upStarCard:type_name -> DBHero - 37, // 10: HeroResonanceResetResp.hero:type_name -> DBHero + 43, // 6: HeroStrengthenUpStarResp.hero:type_name -> DBHero + 43, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero + 43, // 8: HeroResonanceResp.hero:type_name -> DBHero + 43, // 9: HeroResonanceResp.upStarCard:type_name -> DBHero + 43, // 10: HeroResonanceResetResp.hero:type_name -> DBHero 17, // 11: HeroResonanceUseEnergyReq.energy:type_name -> EnergyData - 37, // 12: HeroResonanceUseEnergyResp.hero:type_name -> DBHero - 37, // 13: HeroAwakenResp.hero:type_name -> DBHero - 34, // 14: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry - 35, // 15: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry - 37, // 16: HeroLockResp.hero:type_name -> DBHero - 37, // 17: HeroGetSpecifiedResp.hero:type_name -> DBHero - 37, // 18: HeroChangePush.list:type_name -> DBHero - 36, // 19: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry - 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 - 20, // [20:20] is the sub-list for extension extendee - 0, // [0:20] is the sub-list for field type_name + 43, // 12: HeroResonanceUseEnergyResp.hero:type_name -> DBHero + 43, // 13: HeroAwakenResp.hero:type_name -> DBHero + 40, // 14: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry + 41, // 15: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry + 43, // 16: HeroLockResp.hero:type_name -> DBHero + 43, // 17: HeroGetSpecifiedResp.hero:type_name -> DBHero + 43, // 18: HeroChangePush.list:type_name -> DBHero + 42, // 19: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry + 44, // 20: HeroTalentListResp.telnet:type_name -> DBHeroTalent + 44, // 21: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent + 44, // 22: HeroTalentResetResp.telnet:type_name -> DBHeroTalent + 23, // [23:23] is the sub-list for method output_type + 23, // [23:23] is the sub-list for method input_type + 23, // [23:23] is the sub-list for extension type_name + 23, // [23:23] is the sub-list for extension extendee + 0, // [0:23] is the sub-list for field type_name } func init() { file_hero_hero_msg_proto_init() } @@ -2468,6 +2792,78 @@ func file_hero_hero_msg_proto_init() { return nil } } + file_hero_hero_msg_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HeroTalentListReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_hero_hero_msg_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HeroTalentListResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_hero_hero_msg_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HeroTalentLearnReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_hero_hero_msg_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HeroTalentLearnResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_hero_hero_msg_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HeroTalentResetReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_hero_hero_msg_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HeroTalentResetResp); 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{ @@ -2475,7 +2871,7 @@ func file_hero_hero_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_hero_hero_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 37, + NumMessages: 43, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go index aebe9c6a0..1453cfa92 100644 --- a/pb/userexpand.pb.go +++ b/pb/userexpand.pb.go @@ -45,6 +45,7 @@ type DBUserExpand struct { CompletePagoda bool `protobuf:"varint,21,opt,name=completePagoda,proto3" json:"completePagoda" bson:"completePagoda"` //通关普通塔 RtaskId int32 `protobuf:"varint,22,opt,name=rtaskId,proto3" json:"rtaskId" bson:"rtaskId"` // 当前完成的随机任务ID TeamHeroIds []string `protobuf:"bytes,23,rep,name=teamHeroIds,proto3" json:"teamHeroIds" bson:"teamHeroIds"` //阵容英雄IDs + SociatyId string `protobuf:"bytes,24,opt,name=sociatyId,proto3" json:"sociatyId"` //@go_tags(`bson:"sociatyId") 公会ID } func (x *DBUserExpand) Reset() { @@ -212,11 +213,18 @@ func (x *DBUserExpand) GetTeamHeroIds() []string { return nil } +func (x *DBUserExpand) GetSociatyId() string { + if x != nil { + return x.SociatyId + } + return "" +} + var File_userexpand_proto protoreflect.FileDescriptor var file_userexpand_proto_rawDesc = []byte{ 0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0xe4, 0x05, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, + 0x74, 0x6f, 0x22, 0x82, 0x06, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 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, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61, @@ -258,12 +266,14 @@ var file_userexpand_proto_rawDesc = []byte{ 0x64, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x16, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x18, 0x17, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x0b, 0x74, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x1a, 0x39, - 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x09, 0x52, 0x0b, 0x74, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x12, 0x1c, + 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x18, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x1a, 0x39, 0x0a, 0x0b, + 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var (