diff --git a/modules/hero/api_appointhero.go b/modules/hero/api_appointhero.go index 530fd2a3d..b6c297689 100644 --- a/modules/hero/api_appointhero.go +++ b/modules/hero/api_appointhero.go @@ -39,7 +39,8 @@ func (this *apiComp) AppointHero(session comm.IUserSession, req *pb.HeroAppointH } session.SendMsg(string(this.module.GetType()), HeroAppointHeroResp, &pb.HeroAppointHeroResp{ - Heroid: req.Heroid, + DrawType: req.DrawType, + Heroid: req.Heroid, }) return } diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go index 330b08590..8cceede4d 100644 --- a/pb/hero_db.pb.go +++ b/pb/hero_db.pb.go @@ -341,9 +341,9 @@ type DBHeroRecord struct { Count map[int32]int32 `protobuf:"bytes,14,rep,name=count,proto3" json:"count" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 抽卡次数 key 阵营类型 value count Peach map[int32]bool `protobuf:"bytes,15,rep,name=peach,proto3" json:"peach" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 记录圣桃结实已领取的奖励 Limit map[string]int64 `protobuf:"bytes,16,rep,name=limit,proto3" json:"limit" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 限定抽卡 key:英雄id value 冷却结束时间 - LimitHero string `protobuf:"bytes,17,opt,name=limitHero,proto3" json:"limitHero"` - Wish map[string]int64 `protobuf:"bytes,18,rep,name=wish,proto3" json:"wish" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 许愿招募 key:英雄id value 冷却结束时间 - WishHero string `protobuf:"bytes,19,opt,name=wishHero,proto3" json:"wishHero"` // 当前许愿英雄 + LimitHero string `protobuf:"bytes,17,opt,name=limitHero,proto3" json:"limitHero"` // 默认值为0 需客户端 查表读取默认字段 + Wish map[string]int64 `protobuf:"bytes,18,rep,name=wish,proto3" json:"wish" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 许愿招募 key:英雄id value 冷却结束时间 + WishHero string `protobuf:"bytes,19,opt,name=wishHero,proto3" json:"wishHero"` // 当前许愿英雄 (默认值为0 需客户端 查表读取默认字段) } func (x *DBHeroRecord) Reset() { diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index c8a31d7c1..39fc387a0 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -1988,7 +1988,8 @@ type HeroAppointHeroResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Heroid string `protobuf:"bytes,1,opt,name=heroid,proto3" json:"heroid"` // 更换招募获得的英雄 + DrawType int32 `protobuf:"varint,1,opt,name=drawType,proto3" json:"drawType"` // 招募类型 0 限定招募 1 许愿招募 + Heroid string `protobuf:"bytes,2,opt,name=heroid,proto3" json:"heroid"` // 更换招募获得的英雄 } func (x *HeroAppointHeroResp) Reset() { @@ -2023,6 +2024,13 @@ func (*HeroAppointHeroResp) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{38} } +func (x *HeroAppointHeroResp) GetDrawType() int32 { + if x != nil { + return x.DrawType + } + return 0 +} + func (x *HeroAppointHeroResp) GetHeroid() string { if x != nil { return x.Heroid @@ -2216,10 +2224,12 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, - 0x2d, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x70, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x48, 0x65, - 0x72, 0x6f, 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, + 0x49, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x70, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x48, 0x65, + 0x72, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, + 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, + 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x02, 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, } var (