diff --git a/protocol/welfare/welfare.pb.go b/protocol/welfare/welfare.pb.go index 3516319..648454d 100644 --- a/protocol/welfare/welfare.pb.go +++ b/protocol/welfare/welfare.pb.go @@ -4312,13 +4312,14 @@ type SCLotteryInfo struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Ts int64 `protobuf:"varint,1,opt,name=Ts,proto3" json:"Ts,omitempty"` // 开奖时间 - Code string `protobuf:"bytes,2,opt,name=Code,proto3" json:"Code,omitempty"` // 开奖号码 - SnId int32 `protobuf:"varint,3,opt,name=SnId,proto3" json:"SnId,omitempty"` // 中奖玩家id - Name string `protobuf:"bytes,4,opt,name=Name,proto3" json:"Name,omitempty"` // 中奖玩家名字 - Award []*PropInfo `protobuf:"bytes,5,rep,name=Award,proto3" json:"Award,omitempty"` // 本期奖品 - History []*AwardHistory `protobuf:"bytes,6,rep,name=History,proto3" json:"History,omitempty"` // 开奖历史 - JoinNum int32 `protobuf:"varint,7,opt,name=JoinNum,proto3" json:"JoinNum,omitempty"` // 参与人数 + On bool `protobuf:"varint,1,opt,name=On,proto3" json:"On,omitempty"` // 活动开关 + Ts int64 `protobuf:"varint,2,opt,name=Ts,proto3" json:"Ts,omitempty"` // 开奖时间 + Code string `protobuf:"bytes,3,opt,name=Code,proto3" json:"Code,omitempty"` // 开奖号码 + SnId int32 `protobuf:"varint,4,opt,name=SnId,proto3" json:"SnId,omitempty"` // 中奖玩家id + Name string `protobuf:"bytes,5,opt,name=Name,proto3" json:"Name,omitempty"` // 中奖玩家名字 + Award []*PropInfo `protobuf:"bytes,6,rep,name=Award,proto3" json:"Award,omitempty"` // 本期奖品 + History []*AwardHistory `protobuf:"bytes,7,rep,name=History,proto3" json:"History,omitempty"` // 开奖历史 + JoinNum int32 `protobuf:"varint,8,opt,name=JoinNum,proto3" json:"JoinNum,omitempty"` // 参与人数 } func (x *SCLotteryInfo) Reset() { @@ -4353,6 +4354,13 @@ func (*SCLotteryInfo) Descriptor() ([]byte, []int) { return file_welfare_proto_rawDescGZIP(), []int{63} } +func (x *SCLotteryInfo) GetOn() bool { + if x != nil { + return x.On + } + return false +} + func (x *SCLotteryInfo) GetTs() int64 { if x != nil { return x.Ts @@ -4980,19 +4988,20 @@ var file_welfare_proto_rawDesc = []byte{ 0x09, 0x52, 0x08, 0x56, 0x69, 0x64, 0x65, 0x6f, 0x55, 0x72, 0x6c, 0x22, 0x2e, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x22, 0xcf, 0x01, 0x0a, 0x0d, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x22, 0xdf, 0x01, 0x0a, 0x0d, 0x53, 0x43, 0x4c, 0x6f, 0x74, 0x74, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, - 0x02, 0x54, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x54, 0x73, 0x12, 0x12, 0x0a, - 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x43, 0x6f, 0x64, - 0x65, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x04, 0x53, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, + 0x02, 0x4f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x02, 0x4f, 0x6e, 0x12, 0x0e, 0x0a, + 0x02, 0x54, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x54, 0x73, 0x12, 0x12, 0x0a, + 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x43, 0x6f, 0x64, + 0x65, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x04, 0x53, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x27, 0x0a, 0x05, 0x41, 0x77, 0x61, - 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x77, 0x65, 0x6c, 0x66, 0x61, + 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x77, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x41, 0x77, 0x61, - 0x72, 0x64, 0x12, 0x2f, 0x0a, 0x07, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x06, 0x20, + 0x72, 0x64, 0x12, 0x2f, 0x0a, 0x07, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x77, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x07, 0x48, 0x69, 0x73, 0x74, - 0x6f, 0x72, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x4a, 0x6f, 0x69, 0x6e, 0x4e, 0x75, 0x6d, 0x18, 0x07, + 0x6f, 0x72, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x4a, 0x6f, 0x69, 0x6e, 0x4e, 0x75, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x4a, 0x6f, 0x69, 0x6e, 0x4e, 0x75, 0x6d, 0x22, 0x30, 0x0a, 0x14, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x4c, 0x6f, 0x74, 0x74, 0x65, 0x72, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x4e, 0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x4a, 0x6f, 0x69, 0x6e, 0x4e, 0x75, 0x6d, diff --git a/protocol/welfare/welfare.proto b/protocol/welfare/welfare.proto index 6b3635d..8627fad 100644 --- a/protocol/welfare/welfare.proto +++ b/protocol/welfare/welfare.proto @@ -528,13 +528,14 @@ message TaskCode{ //PACKET_SCLotteryInfo message SCLotteryInfo{ - int64 Ts = 1; // 开奖时间 - string Code = 2; // 开奖号码 - int32 SnId = 3; // 中奖玩家id - string Name = 4; // 中奖玩家名字 - repeated PropInfo Award = 5; // 本期奖品 - repeated AwardHistory History = 6; // 开奖历史 - int32 JoinNum = 7; // 参与人数 + bool On = 1; // 活动开关 + int64 Ts = 2; // 开奖时间 + string Code = 3; // 开奖号码 + int32 SnId = 4; // 中奖玩家id + string Name = 5; // 中奖玩家名字 + repeated PropInfo Award = 6; // 本期奖品 + repeated AwardHistory History = 7; // 开奖历史 + int32 JoinNum = 8; // 参与人数 } // 通知抽奖参与人数