Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
liwei1dao
commit
ad6fb57f2b
@ -13,8 +13,10 @@ func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.FriendApp
|
||||
|
||||
func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.FriendApplyListReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
self *pb.DBFriend
|
||||
list []*pb.FriendBase
|
||||
self *pb.DBFriend
|
||||
list []*pb.FriendBase
|
||||
bChange bool
|
||||
bUpdate bool
|
||||
)
|
||||
|
||||
self = this.module.modelFriend.GetFriend(session.GetUserId())
|
||||
@ -27,9 +29,34 @@ func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.FriendApplyLis
|
||||
}
|
||||
|
||||
for _, userId := range self.ApplyIds {
|
||||
base := this.setDefaultFriendUserBaseInfo(userId)
|
||||
if base != nil {
|
||||
list = append(list, base)
|
||||
bChange = false
|
||||
// 如果在还好有列表就删除
|
||||
for pos, v := range self.FriendIds {
|
||||
if v == userId { // 找到了
|
||||
self.FriendIds = append(self.FriendIds[:pos], self.FriendIds[pos+1:]...)
|
||||
bChange = true
|
||||
bUpdate = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if !bChange {
|
||||
base := this.setDefaultFriendUserBaseInfo(userId)
|
||||
if base != nil {
|
||||
list = append(list, base)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if bUpdate { // 更新数据
|
||||
if err := this.module.modelFriend.Change(self.Uid, map[string]interface{}{
|
||||
"friendIds": self.FriendIds,
|
||||
}); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Title: pb.ErrorCode_DBError.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -77,17 +77,18 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
|
||||
|
||||
if heroRecord.WishHero == "" { // 如果当前许愿英雄是空 则读取 默认许愿英雄
|
||||
heroRecord.WishHero = conf.InitHero
|
||||
cd = int64(conf.Cond[heroRecord.WishHero].cd)
|
||||
drcount = conf.Cond[heroRecord.WishHero].num
|
||||
|
||||
}
|
||||
cd = int64(conf.Cond[heroRecord.WishHero].cd)
|
||||
drcount = conf.Cond[heroRecord.WishHero].num
|
||||
// 校验该抽卡是否在CD 中
|
||||
if outTime, ok := heroRecord.Wish[heroRecord.WishHero]; ok {
|
||||
if outTime < configure.Now().Unix() {
|
||||
if outTime > configure.Now().Unix() {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_HeroDrawCD,
|
||||
}
|
||||
return
|
||||
} else { // 时间到了
|
||||
heroRecord.Wish[heroRecord.WishHero] = 0 // 时间清0
|
||||
}
|
||||
}
|
||||
costRes = append(costRes, conf.Cond[heroRecord.WishHero].buyCos)
|
||||
|
||||
@ -225,13 +225,26 @@ type DBHuodong struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
|
||||
Rtime int64 `protobuf:"varint,2,opt,name=rtime,proto3" json:"rtime"` // 活动修改时间
|
||||
Itype HdType `protobuf:"varint,3,opt,name=itype,proto3,enum=HdType" json:"itype"`
|
||||
Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name"`
|
||||
Etime int64 `protobuf:"varint,5,opt,name=etime,proto3" json:"etime"` // 1680105599,
|
||||
Stime int64 `protobuf:"varint,6,opt,name=stime,proto3" json:"stime"` // 1679414400,
|
||||
Data *ActivityInfo `protobuf:"bytes,7,opt,name=data,proto3" json:"data"` // 活动详细数据
|
||||
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
|
||||
Hdid int32 `protobuf:"varint,2,opt,name=hdid,proto3" json:"hdid"` // 活动ID 此字段不用
|
||||
Rtime int64 `protobuf:"varint,3,opt,name=rtime,proto3" json:"rtime"` // 客户端显示的时间
|
||||
Itype HdType `protobuf:"varint,4,opt,name=itype,proto3,enum=HdType" json:"itype"`
|
||||
Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name"`
|
||||
Img string `protobuf:"bytes,6,opt,name=img,proto3" json:"img"`
|
||||
Showtime string `protobuf:"bytes,7,opt,name=showtime,proto3" json:"showtime"`
|
||||
PressImg string `protobuf:"bytes,8,opt,name=pressImg,proto3" json:"pressImg"`
|
||||
Intr string `protobuf:"bytes,9,opt,name=intr,proto3" json:"intr"` // "累计充值，限时福利",
|
||||
Etime int64 `protobuf:"varint,10,opt,name=etime,proto3" json:"etime"` // 1680105599,
|
||||
NormalImg string `protobuf:"bytes,11,opt,name=normalImg,proto3" json:"normalImg"` // "huodong_btn4.png",
|
||||
Stime int64 `protobuf:"varint,12,opt,name=stime,proto3" json:"stime"` // 1679414400,
|
||||
Tab int32 `protobuf:"varint,13,opt,name=tab,proto3" json:"tab"`
|
||||
Ttype int32 `protobuf:"varint,14,opt,name=ttype,proto3" json:"ttype"`
|
||||
Icon string `protobuf:"bytes,15,opt,name=icon,proto3" json:"icon"` //"ico_event_yxjl",
|
||||
Open int32 `protobuf:"varint,16,opt,name=open,proto3" json:"open"`
|
||||
Order int32 `protobuf:"varint,17,opt,name=order,proto3" json:"order"`
|
||||
Stype int32 `protobuf:"varint,18,opt,name=stype,proto3" json:"stype"`
|
||||
Htype int32 `protobuf:"varint,19,opt,name=htype,proto3" json:"htype"`
|
||||
Data *ActivityInfo `protobuf:"bytes,20,opt,name=data,proto3" json:"data"` // 活动详细数据
|
||||
}
|
||||
|
||||
func (x *DBHuodong) Reset() {
|
||||
@ -273,6 +286,13 @@ func (x *DBHuodong) GetId() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBHuodong) GetHdid() int32 {
|
||||
if x != nil {
|
||||
return x.Hdid
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBHuodong) GetRtime() int64 {
|
||||
if x != nil {
|
||||
return x.Rtime
|
||||
@ -294,6 +314,34 @@ func (x *DBHuodong) GetName() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBHuodong) GetImg() string {
|
||||
if x != nil {
|
||||
return x.Img
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBHuodong) GetShowtime() string {
|
||||
if x != nil {
|
||||
return x.Showtime
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBHuodong) GetPressImg() string {
|
||||
if x != nil {
|
||||
return x.PressImg
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBHuodong) GetIntr() string {
|
||||
if x != nil {
|
||||
return x.Intr
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBHuodong) GetEtime() int64 {
|
||||
if x != nil {
|
||||
return x.Etime
|
||||
@ -301,6 +349,13 @@ func (x *DBHuodong) GetEtime() int64 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBHuodong) GetNormalImg() string {
|
||||
if x != nil {
|
||||
return x.NormalImg
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBHuodong) GetStime() int64 {
|
||||
if x != nil {
|
||||
return x.Stime
|
||||
@ -308,6 +363,55 @@ func (x *DBHuodong) GetStime() int64 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBHuodong) GetTab() int32 {
|
||||
if x != nil {
|
||||
return x.Tab
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBHuodong) GetTtype() int32 {
|
||||
if x != nil {
|
||||
return x.Ttype
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBHuodong) GetIcon() string {
|
||||
if x != nil {
|
||||
return x.Icon
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBHuodong) GetOpen() int32 {
|
||||
if x != nil {
|
||||
return x.Open
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBHuodong) GetOrder() int32 {
|
||||
if x != nil {
|
||||
return x.Order
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBHuodong) GetStype() int32 {
|
||||
if x != nil {
|
||||
return x.Stype
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBHuodong) GetHtype() int32 {
|
||||
if x != nil {
|
||||
return x.Htype
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBHuodong) GetData() *ActivityInfo {
|
||||
if x != nil {
|
||||
return x.Data
|
||||
@ -415,55 +519,74 @@ var file_activity_activity_db_proto_rawDesc = []byte{
|
||||
0x03, 0x76, 0x61, 0x6c, 0x22, 0x2a, 0x0a, 0x0c, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
|
||||
0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20,
|
||||
0x03, 0x28, 0x0b, 0x32, 0x04, 0x2e, 0x41, 0x72, 0x72, 0x52, 0x05, 0x70, 0x72, 0x69, 0x7a, 0x65,
|
||||
0x22, 0xb3, 0x01, 0x0a, 0x09, 0x44, 0x42, 0x48, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x12, 0x0e,
|
||||
0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14,
|
||||
0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72,
|
||||
0x74, 0x69, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20,
|
||||
0x01, 0x28, 0x0e, 0x32, 0x07, 0x2e, 0x48, 0x64, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x69, 0x74,
|
||||
0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
|
||||
0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65,
|
||||
0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a,
|
||||
0x05, 0x73, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74,
|
||||
0x69, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x07, 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, 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, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a,
|
||||
0xdd, 0x02, 0x0a, 0x06, 0x48, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x0a, 0x48, 0x64,
|
||||
0x54, 0x79, 0x70, 0x65, 0x4e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x64,
|
||||
0x54, 0x79, 0x70, 0x65, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x10, 0x01, 0x12, 0x0d,
|
||||
0x0a, 0x09, 0x48, 0x64, 0x54, 0x79, 0x70, 0x65, 0x50, 0x61, 0x79, 0x10, 0x02, 0x12, 0x0f, 0x0a,
|
||||
0x0b, 0x4b, 0x46, 0x53, 0x65, 0x76, 0x65, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x10, 0x03, 0x12, 0x12,
|
||||
0x0a, 0x0e, 0x58, 0x53, 0x46, 0x75, 0x6e, 0x64, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c,
|
||||
0x10, 0x04, 0x12, 0x11, 0x0a, 0x0d, 0x58, 0x53, 0x46, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x72,
|
||||
0x75, 0x69, 0x74, 0x10, 0x05, 0x12, 0x0d, 0x0a, 0x09, 0x58, 0x53, 0x46, 0x75, 0x6e, 0x64, 0x45,
|
||||
0x78, 0x70, 0x10, 0x06, 0x12, 0x0b, 0x0a, 0x07, 0x48, 0x64, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x10,
|
||||
0x07, 0x12, 0x0e, 0x0a, 0x0a, 0x48, 0x64, 0x54, 0x79, 0x70, 0x65, 0x53, 0x69, 0x67, 0x6e, 0x10,
|
||||
0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x48, 0x64, 0x54, 0x79, 0x70, 0x65, 0x44, 0x72, 0x61, 0x77, 0x10,
|
||||
0x09, 0x12, 0x11, 0x0a, 0x0d, 0x41, 0x64, 0x64, 0x55, 0x70, 0x52, 0x65, 0x63, 0x68, 0x61, 0x72,
|
||||
0x67, 0x65, 0x10, 0x0a, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x68, 0x6f, 0x70, 0x43, 0x65, 0x6e, 0x74,
|
||||
0x65, 0x72, 0x50, 0x61, 0x79, 0x50, 0x61, 0x6b, 0x63, 0x67, 0x65, 0x10, 0x0b, 0x12, 0x12, 0x0a,
|
||||
0x0e, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x57, 0x61, 0x72, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x10,
|
||||
0x0c, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x64, 0x72, 0x65, 0x61, 0x6d, 0x57, 0x61,
|
||||
0x72, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x10, 0x0d, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x64, 0x54, 0x79,
|
||||
0x70, 0x65, 0x54, 0x75, 0x72, 0x6e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x10, 0xe9, 0x07, 0x12, 0x12,
|
||||
0x0a, 0x0d, 0x48, 0x64, 0x43, 0x65, 0x6c, 0x65, 0x62, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10,
|
||||
0xea, 0x07, 0x12, 0x0d, 0x0a, 0x08, 0x48, 0x64, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x10, 0xeb,
|
||||
0x07, 0x12, 0x0e, 0x0a, 0x09, 0x48, 0x64, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65, 0x10, 0xec,
|
||||
0x07, 0x12, 0x0c, 0x0a, 0x07, 0x48, 0x64, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x10, 0xed, 0x07, 0x42,
|
||||
0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x22, 0xd5, 0x03, 0x0a, 0x09, 0x44, 0x42, 0x48, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x12, 0x0e,
|
||||
0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12,
|
||||
0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x68, 0x64,
|
||||
0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
|
||||
0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70,
|
||||
0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x07, 0x2e, 0x48, 0x64, 0x54, 0x79, 0x70, 0x65,
|
||||
0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
|
||||
0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x69,
|
||||
0x6d, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x69, 0x6d, 0x67, 0x12, 0x1a, 0x0a,
|
||||
0x08, 0x73, 0x68, 0x6f, 0x77, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x08, 0x73, 0x68, 0x6f, 0x77, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x65,
|
||||
0x73, 0x73, 0x49, 0x6d, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x65,
|
||||
0x73, 0x73, 0x49, 0x6d, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x6e, 0x74, 0x72, 0x18, 0x09, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x6e, 0x74, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69,
|
||||
0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12,
|
||||
0x1c, 0x0a, 0x09, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x49, 0x6d, 0x67, 0x18, 0x0b, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x09, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x49, 0x6d, 0x67, 0x12, 0x14, 0x0a,
|
||||
0x05, 0x73, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74,
|
||||
0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x61, 0x62, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x03, 0x74, 0x61, 0x62, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0e,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x69,
|
||||
0x63, 0x6f, 0x6e, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12,
|
||||
0x12, 0x0a, 0x04, 0x6f, 0x70, 0x65, 0x6e, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6f,
|
||||
0x70, 0x65, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x11, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x79,
|
||||
0x70, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x79, 0x70, 0x65, 0x12,
|
||||
0x14, 0x0a, 0x05, 0x68, 0x74, 0x79, 0x70, 0x65, 0x18, 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, 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, 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, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
|
||||
0x01, 0x2a, 0xdd, 0x02, 0x0a, 0x06, 0x48, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x0a,
|
||||
0x48, 0x64, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e,
|
||||
0x48, 0x64, 0x54, 0x79, 0x70, 0x65, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x10, 0x01,
|
||||
0x12, 0x0d, 0x0a, 0x09, 0x48, 0x64, 0x54, 0x79, 0x70, 0x65, 0x50, 0x61, 0x79, 0x10, 0x02, 0x12,
|
||||
0x0f, 0x0a, 0x0b, 0x4b, 0x46, 0x53, 0x65, 0x76, 0x65, 0x6e, 0x54, 0x61, 0x73, 0x6b, 0x10, 0x03,
|
||||
0x12, 0x12, 0x0a, 0x0e, 0x58, 0x53, 0x46, 0x75, 0x6e, 0x64, 0x50, 0x68, 0x79, 0x73, 0x69, 0x63,
|
||||
0x61, 0x6c, 0x10, 0x04, 0x12, 0x11, 0x0a, 0x0d, 0x58, 0x53, 0x46, 0x75, 0x6e, 0x64, 0x52, 0x65,
|
||||
0x63, 0x72, 0x75, 0x69, 0x74, 0x10, 0x05, 0x12, 0x0d, 0x0a, 0x09, 0x58, 0x53, 0x46, 0x75, 0x6e,
|
||||
0x64, 0x45, 0x78, 0x70, 0x10, 0x06, 0x12, 0x0b, 0x0a, 0x07, 0x48, 0x64, 0x4c, 0x65, 0x76, 0x65,
|
||||
0x6c, 0x10, 0x07, 0x12, 0x0e, 0x0a, 0x0a, 0x48, 0x64, 0x54, 0x79, 0x70, 0x65, 0x53, 0x69, 0x67,
|
||||
0x6e, 0x10, 0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x48, 0x64, 0x54, 0x79, 0x70, 0x65, 0x44, 0x72, 0x61,
|
||||
0x77, 0x10, 0x09, 0x12, 0x11, 0x0a, 0x0d, 0x41, 0x64, 0x64, 0x55, 0x70, 0x52, 0x65, 0x63, 0x68,
|
||||
0x61, 0x72, 0x67, 0x65, 0x10, 0x0a, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x68, 0x6f, 0x70, 0x43, 0x65,
|
||||
0x6e, 0x74, 0x65, 0x72, 0x50, 0x61, 0x79, 0x50, 0x61, 0x6b, 0x63, 0x67, 0x65, 0x10, 0x0b, 0x12,
|
||||
0x12, 0x0a, 0x0e, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x57, 0x61, 0x72, 0x4f, 0x72, 0x64, 0x65,
|
||||
0x72, 0x10, 0x0c, 0x12, 0x15, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x64, 0x72, 0x65, 0x61, 0x6d,
|
||||
0x57, 0x61, 0x72, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x10, 0x0d, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x64,
|
||||
0x54, 0x79, 0x70, 0x65, 0x54, 0x75, 0x72, 0x6e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x10, 0xe9, 0x07,
|
||||
0x12, 0x12, 0x0a, 0x0d, 0x48, 0x64, 0x43, 0x65, 0x6c, 0x65, 0x62, 0x72, 0x61, 0x74, 0x69, 0x6f,
|
||||
0x6e, 0x10, 0xea, 0x07, 0x12, 0x0d, 0x0a, 0x08, 0x48, 0x64, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65,
|
||||
0x10, 0xeb, 0x07, 0x12, 0x0e, 0x0a, 0x09, 0x48, 0x64, 0x4c, 0x61, 0x74, 0x74, 0x69, 0x63, 0x65,
|
||||
0x10, 0xec, 0x07, 0x12, 0x0c, 0x0a, 0x07, 0x48, 0x64, 0x4d, 0x69, 0x6e, 0x65, 0x72, 0x10, 0xed,
|
||||
0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
|
||||
0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
|
||||
Loading…
Reference in New Issue
Block a user