From a0a92ffa0ae413f80cf42da7593f97b5518cb3a7 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 3 Nov 2022 15:47:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=98=9F=E5=BA=A7=E5=9B=BEpb?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/horoscope/api_upgrade.go | 2 +- pb/horoscope_db.pb.go | 2 +- pb/horoscope_msg.pb.go | 47 ++++++++++++-------------------- pb/mail_db.pb.go | 14 ++-------- 4 files changed, 22 insertions(+), 43 deletions(-) diff --git a/modules/horoscope/api_upgrade.go b/modules/horoscope/api_upgrade.go index a7ac82608..2ee0d86be 100644 --- a/modules/horoscope/api_upgrade.go +++ b/modules/horoscope/api_upgrade.go @@ -56,6 +56,6 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.HoroscopeUpgrade code = pb.ErrorCode_DBError return } - session.SendMsg(string(this.module.GetType()), "upgrade", &pb.HoroscopeUpgradeResp{}) + session.SendMsg(string(this.module.GetType()), "upgrade", &pb.HoroscopeUpgradeResp{Gid: front.GrowType, Lv: conf.Lv}) return } diff --git a/pb/horoscope_db.pb.go b/pb/horoscope_db.pb.go index e35d2535f..d96fca65f 100644 --- a/pb/horoscope_db.pb.go +++ b/pb/horoscope_db.pb.go @@ -27,7 +27,7 @@ type DBHoroscope struct { unknownFields protoimpl.UnknownFields Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"_id"` - Nodes map[int32]int32 `protobuf:"bytes,2,rep,name=nodes,proto3" json:"nodes" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //节点信息 + Nodes map[int32]int32 `protobuf:"bytes,2,rep,name=nodes,proto3" json:"nodes" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //节点信息 key:是成长线 GrowType value:等级 } func (x *DBHoroscope) Reset() { diff --git a/pb/horoscope_msg.pb.go b/pb/horoscope_msg.pb.go index 9c4f6370f..2a90fc610 100644 --- a/pb/horoscope_msg.pb.go +++ b/pb/horoscope_msg.pb.go @@ -20,13 +20,11 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -//获取评论列表 +//获取用户星座图信息 type HoroscopeInfoReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - - Herocid string `protobuf:"bytes,1,opt,name=herocid,proto3" json:"herocid"` //英雄配置id } func (x *HoroscopeInfoReq) Reset() { @@ -61,14 +59,7 @@ func (*HoroscopeInfoReq) Descriptor() ([]byte, []int) { return file_horoscope_horoscope_msg_proto_rawDescGZIP(), []int{0} } -func (x *HoroscopeInfoReq) GetHerocid() string { - if x != nil { - return x.Herocid - } - return "" -} - -//获取评论回应 +//获取用户星座图信息 回应 type HoroscopeInfoResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -122,7 +113,7 @@ type HoroscopeUpgradeReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Nid int32 `protobuf:"varint,1,opt,name=nid,proto3" json:"nid"` + Nid int32 `protobuf:"varint,1,opt,name=nid,proto3" json:"nid"` //配置文件里的Id 升级的目标数据 } func (x *HoroscopeUpgradeReq) Reset() { @@ -170,7 +161,7 @@ type HoroscopeUpgradeResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Nid int32 `protobuf:"varint,1,opt,name=nid,proto3" json:"nid"` + Gid int32 `protobuf:"varint,1,opt,name=gid,proto3" json:"gid"` //成长线id 配置文件里面的 GrowType 字段 Lv int32 `protobuf:"varint,2,opt,name=lv,proto3" json:"lv"` } @@ -206,9 +197,9 @@ func (*HoroscopeUpgradeResp) Descriptor() ([]byte, []int) { return file_horoscope_horoscope_msg_proto_rawDescGZIP(), []int{3} } -func (x *HoroscopeUpgradeResp) GetNid() int32 { +func (x *HoroscopeUpgradeResp) GetGid() int32 { if x != nil { - return x.Nid + return x.Gid } return 0 } @@ -226,21 +217,19 @@ var file_horoscope_horoscope_msg_proto_rawDesc = []byte{ 0x0a, 0x1d, 0x68, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x2f, 0x68, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x68, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x2f, 0x68, 0x6f, 0x72, 0x6f, 0x73, - 0x63, 0x6f, 0x70, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2c, 0x0a, + 0x63, 0x6f, 0x70, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x12, 0x0a, 0x10, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, - 0x71, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x63, 0x69, 0x64, 0x22, 0x35, 0x0a, 0x11, 0x48, - 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x20, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, - 0x2e, 0x44, 0x42, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x52, 0x04, 0x69, 0x6e, - 0x66, 0x6f, 0x22, 0x27, 0x0a, 0x13, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x55, - 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x69, 0x64, 0x22, 0x38, 0x0a, 0x14, 0x48, - 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x03, 0x6e, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x02, 0x6c, 0x76, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x71, 0x22, 0x35, 0x0a, 0x11, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x49, 0x6e, + 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, + 0x70, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x27, 0x0a, 0x13, 0x48, 0x6f, 0x72, 0x6f, + 0x73, 0x63, 0x6f, 0x70, 0x65, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, + 0x10, 0x0a, 0x03, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x69, + 0x64, 0x22, 0x38, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x55, 0x70, + 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x67, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x67, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, + 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/mail_db.pb.go b/pb/mail_db.pb.go index b1c6071dc..0c640baa8 100644 --- a/pb/mail_db.pb.go +++ b/pb/mail_db.pb.go @@ -34,7 +34,6 @@ type DBMailData struct { Check bool `protobuf:"varint,7,opt,name=Check,proto3" json:"Check"` // 是否查看 Reward bool `protobuf:"varint,8,opt,name=Reward,proto3" json:"Reward"` // 附件领取状态 Items []*UserAssets `protobuf:"bytes,9,rep,name=Items,proto3" json:"Items"` // 附件 - Cid string `protobuf:"bytes,10,opt,name=Cid,proto3" json:"Cid"` // 邮件的配置表ID } func (x *DBMailData) Reset() { @@ -132,19 +131,12 @@ func (x *DBMailData) GetItems() []*UserAssets { return nil } -func (x *DBMailData) GetCid() string { - if x != nil { - return x.Cid - } - return "" -} - var File_mail_mail_db_proto protoreflect.FileDescriptor var file_mail_mail_db_proto_rawDesc = []byte{ 0x0a, 0x12, 0x6d, 0x61, 0x69, 0x6c, 0x2f, 0x6d, 0x61, 0x69, 0x6c, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x22, 0xff, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, + 0x22, 0xed, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x69, 0x74, 0x6c, 0x65, @@ -159,9 +151,7 @@ var file_mail_mail_db_proto_rawDesc = []byte{ 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, - 0x12, 0x10, 0x0a, 0x03, 0x43, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x43, - 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var (