tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

This commit is contained in:
sk 2025-01-02 16:40:23 +08:00
parent f845409979 94e1effc63
commit 53889d6a80
11 changed files with 804 additions and 399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etcd/keyconf.go
View File

@ -52,6 +52,7 @@ const (
ETCDKEY_PigBankDiamond = "/game/pigbank_diamond" //存钱罐消耗获得
ETCDKEY_PigBankProp = "/game/pigbank_prop" //存钱罐属性
ETCDKEY_NianConfig = "/game/activity_nian" //年兽活动配置
ETCDKEY_NianRankConfig = "/game/activity_nian_rank" //年兽排行榜配置
ETCDKEY_REDPACKET = "/game/act_redpacket" //红包配置
)

1
model/config.go
View File

@ -170,6 +170,7 @@ type AllConfig struct {
*webapi.GamePigBankPropConfig
//年兽配置
*webapi.ActivityNianConfig
*webapi.NianRankReward
// 红包配置
*webapi.RedPacketConfig
}

2
model/player.go
View File

@ -695,6 +695,8 @@ type NianData struct {
LittleHurt int32 //小爆竹次数
BigHurt int32 //大爆竹次数
OtherAwardNum map[int32]int32 //奖励掉落数量
AttackMaxHp int64 //单次攻击最大血量
AttackSumHp int64 //攻击总伤害
}
func ConvertPlayerDataToWebData(param *WebPlayerDataParam) *webapi.PlayerData {

569
protocol/activity/nian.pb.go
View File

@ -34,6 +34,8 @@ const (
NianPacketID_PACKET_SCNianAttackData NianPacketID = 2667 //返回攻击年兽信息
NianPacketID_PACKET_CSNianSignAward NianPacketID = 2668 //请求签到
NianPacketID_PACKET_SCNianSignAward NianPacketID = 2669 //签到返回
NianPacketID_PACKET_CSNianChange NianPacketID = 2670 //请求兑换小爆竹
NianPacketID_PACKET_SCNianChange NianPacketID = 2671 //返回兑换道具
)
// Enum value maps for NianPacketID.
@ -50,6 +52,8 @@ var (
2667: "PACKET_SCNianAttackData",
2668: "PACKET_CSNianSignAward",
2669: "PACKET_SCNianSignAward",
2670: "PACKET_CSNianChange",
2671: "PACKET_SCNianChange",
}
NianPacketID_value = map[string]int32{
"PACKET_Nian_ZERO": 0,
@ -63,6 +67,8 @@ var (
"PACKET_SCNianAttackData": 2667,
"PACKET_CSNianSignAward": 2668,
"PACKET_SCNianSignAward": 2669,
"PACKET_CSNianChange": 2670,
"PACKET_SCNianChange": 2671,
}
)
@ -143,12 +149,11 @@ type SCNianData struct {
ActivityEndTime int64 `protobuf:"varint,2,opt,name=ActivityEndTime,proto3" json:"ActivityEndTime,omitempty"` //活动结束时间
BossMaxHp int64 `protobuf:"varint,3,opt,name=BossMaxHp,proto3" json:"BossMaxHp,omitempty"` //Boss最大血量
BossHp int64 `protobuf:"varint,4,opt,name=BossHp,proto3" json:"BossHp,omitempty"` //Boss当前血量
LuckData []*RankData `protobuf:"bytes,5,rep,name=LuckData,proto3" json:"LuckData,omitempty"` //幸运榜
RankData []*NianRankData `protobuf:"bytes,5,rep,name=RankData,proto3" json:"RankData,omitempty"` //排行榜奖励配置
AwardTime int64 `protobuf:"varint,6,opt,name=AwardTime,proto3" json:"AwardTime,omitempty"` //每日签到领取时间
BuffCount int64 `protobuf:"varint,7,opt,name=BuffCount,proto3" json:"BuffCount,omitempty"` //Buff剩余次数
BuffStatus bool `protobuf:"varint,8,opt,name=BuffStatus,proto3" json:"BuffStatus,omitempty"` //Buff领取状态
On int32 `protobuf:"varint,9,opt,name=On,proto3" json:"On,omitempty"` //活动开关 1开启 2关闭
SignAwardTime int64 `protobuf:"varint,10,opt,name=SignAwardTime,proto3" json:"SignAwardTime,omitempty"` //签到领取时间 0-未领取
SignAwardTime int64 `protobuf:"varint,9,opt,name=SignAwardTime,proto3" json:"SignAwardTime,omitempty"` //签到领取时间 0-未领取
}
func (x *SCNianData) Reset() {
@ -211,9 +216,9 @@ func (x *SCNianData) GetBossHp() int64 {
return 0
}
func (x *SCNianData) GetLuckData() []*RankData {
func (x *SCNianData) GetRankData() []*NianRankData {
if x != nil {
return x.LuckData
return x.RankData
}
return nil
}
@ -239,13 +244,6 @@ func (x *SCNianData) GetBuffStatus() bool {
return false
}
func (x *SCNianData) GetOn() int32 {
if x != nil {
return x.On
}
return 0
}
func (x *SCNianData) GetSignAwardTime() int64 {
if x != nil {
return x.SignAwardTime
@ -342,18 +340,17 @@ func (x *SCNianBuff) GetBuffCount() int64 {
return 0
}
//排行榜数据
//PACKET_CSNianRankData
type CSNianRankData struct {
type NianRankData struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
TypeId int32 `protobuf:"varint,1,opt,name=TypeId,proto3" json:"TypeId,omitempty"` //1-幸运榜 2-总伤害榜
TypeId int32 `protobuf:"varint,1,opt,name=TypeId,proto3" json:"TypeId,omitempty"` //1-幸运榜 2-总榜
Data []*NianRankInfo `protobuf:"bytes,2,rep,name=Data,proto3" json:"Data,omitempty"`
}
func (x *CSNianRankData) Reset() {
*x = CSNianRankData{}
func (x *NianRankData) Reset() {
*x = NianRankData{}
if protoimpl.UnsafeEnabled {
mi := &file_protocol_activity_nian_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -361,13 +358,13 @@ func (x *CSNianRankData) Reset() {
}
}
func (x *CSNianRankData) String() string {
func (x *NianRankData) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*CSNianRankData) ProtoMessage() {}
func (*NianRankData) ProtoMessage() {}
func (x *CSNianRankData) ProtoReflect() protoreflect.Message {
func (x *NianRankData) ProtoReflect() protoreflect.Message {
mi := &file_protocol_activity_nian_proto_msgTypes[4]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -379,103 +376,51 @@ func (x *CSNianRankData) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x)
}
// Deprecated: Use CSNianRankData.ProtoReflect.Descriptor instead.
func (*CSNianRankData) Descriptor() ([]byte, []int) {
// Deprecated: Use NianRankData.ProtoReflect.Descriptor instead.
func (*NianRankData) Descriptor() ([]byte, []int) {
return file_protocol_activity_nian_proto_rawDescGZIP(), []int{4}
}
func (x *CSNianRankData) GetTypeId() int32 {
func (x *NianRankData) GetTypeId() int32 {
if x != nil {
return x.TypeId
}
return 0
}
//PACKET_SCNianRankData
type SCNianRankData struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
TypeId int32 `protobuf:"varint,1,opt,name=TypeId,proto3" json:"TypeId,omitempty"`
Data []*RankData `protobuf:"bytes,2,rep,name=Data,proto3" json:"Data,omitempty"`
}
func (x *SCNianRankData) Reset() {
*x = SCNianRankData{}
if protoimpl.UnsafeEnabled {
mi := &file_protocol_activity_nian_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *SCNianRankData) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*SCNianRankData) ProtoMessage() {}
func (x *SCNianRankData) ProtoReflect() protoreflect.Message {
mi := &file_protocol_activity_nian_proto_msgTypes[5]
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 SCNianRankData.ProtoReflect.Descriptor instead.
func (*SCNianRankData) Descriptor() ([]byte, []int) {
return file_protocol_activity_nian_proto_rawDescGZIP(), []int{5}
}
func (x *SCNianRankData) GetTypeId() int32 {
if x != nil {
return x.TypeId
}
return 0
}
func (x *SCNianRankData) GetData() []*RankData {
func (x *NianRankData) GetData() []*NianRankInfo {
if x != nil {
return x.Data
}
return nil
}
type RankData struct {
type NianRankInfo struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
RankId int32 `protobuf:"varint,1,opt,name=RankId,proto3" json:"RankId,omitempty"`
Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
Icon int32 `protobuf:"varint,3,opt,name=Icon,proto3" json:"Icon,omitempty"`
Score int64 `protobuf:"varint,4,opt,name=Score,proto3" json:"Score,omitempty"`
Award []*RankAwardData `protobuf:"bytes,5,rep,name=Award,proto3" json:"Award,omitempty"`
Award []*RankAwardData `protobuf:"bytes,2,rep,name=Award,proto3" json:"Award,omitempty"`
}
func (x *RankData) Reset() {
*x = RankData{}
func (x *NianRankInfo) Reset() {
*x = NianRankInfo{}
if protoimpl.UnsafeEnabled {
mi := &file_protocol_activity_nian_proto_msgTypes[6]
mi := &file_protocol_activity_nian_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *RankData) String() string {
func (x *NianRankInfo) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*RankData) ProtoMessage() {}
func (*NianRankInfo) ProtoMessage() {}
func (x *RankData) ProtoReflect() protoreflect.Message {
mi := &file_protocol_activity_nian_proto_msgTypes[6]
func (x *NianRankInfo) ProtoReflect() protoreflect.Message {
mi := &file_protocol_activity_nian_proto_msgTypes[5]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -486,40 +431,19 @@ func (x *RankData) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x)
}
// Deprecated: Use RankData.ProtoReflect.Descriptor instead.
func (*RankData) Descriptor() ([]byte, []int) {
return file_protocol_activity_nian_proto_rawDescGZIP(), []int{6}
// Deprecated: Use NianRankInfo.ProtoReflect.Descriptor instead.
func (*NianRankInfo) Descriptor() ([]byte, []int) {
return file_protocol_activity_nian_proto_rawDescGZIP(), []int{5}
}
func (x *RankData) GetRankId() int32 {
func (x *NianRankInfo) GetRankId() int32 {
if x != nil {
return x.RankId
}
return 0
}
func (x *RankData) GetName() string {
if x != nil {
return x.Name
}
return ""
}
func (x *RankData) GetIcon() int32 {
if x != nil {
return x.Icon
}
return 0
}
func (x *RankData) GetScore() int64 {
if x != nil {
return x.Score
}
return 0
}
func (x *RankData) GetAward() []*RankAwardData {
func (x *NianRankInfo) GetAward() []*RankAwardData {
if x != nil {
return x.Award
}
@ -538,7 +462,7 @@ type RankAwardData struct {
func (x *RankAwardData) Reset() {
*x = RankAwardData{}
if protoimpl.UnsafeEnabled {
mi := &file_protocol_activity_nian_proto_msgTypes[7]
mi := &file_protocol_activity_nian_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -551,7 +475,7 @@ func (x *RankAwardData) String() string {
func (*RankAwardData) ProtoMessage() {}
func (x *RankAwardData) ProtoReflect() protoreflect.Message {
mi := &file_protocol_activity_nian_proto_msgTypes[7]
mi := &file_protocol_activity_nian_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -564,7 +488,7 @@ func (x *RankAwardData) ProtoReflect() protoreflect.Message {
// Deprecated: Use RankAwardData.ProtoReflect.Descriptor instead.
func (*RankAwardData) Descriptor() ([]byte, []int) {
return file_protocol_activity_nian_proto_rawDescGZIP(), []int{7}
return file_protocol_activity_nian_proto_rawDescGZIP(), []int{6}
}
func (x *RankAwardData) GetItemId() int32 {
@ -594,7 +518,7 @@ type CSNianAttack struct {
func (x *CSNianAttack) Reset() {
*x = CSNianAttack{}
if protoimpl.UnsafeEnabled {
mi := &file_protocol_activity_nian_proto_msgTypes[8]
mi := &file_protocol_activity_nian_proto_msgTypes[7]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -607,7 +531,7 @@ func (x *CSNianAttack) String() string {
func (*CSNianAttack) ProtoMessage() {}
func (x *CSNianAttack) ProtoReflect() protoreflect.Message {
mi := &file_protocol_activity_nian_proto_msgTypes[8]
mi := &file_protocol_activity_nian_proto_msgTypes[7]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -620,7 +544,7 @@ func (x *CSNianAttack) ProtoReflect() protoreflect.Message {
// Deprecated: Use CSNianAttack.ProtoReflect.Descriptor instead.
func (*CSNianAttack) Descriptor() ([]byte, []int) {
return file_protocol_activity_nian_proto_rawDescGZIP(), []int{8}
return file_protocol_activity_nian_proto_rawDescGZIP(), []int{7}
}
func (x *CSNianAttack) GetTypeId() int32 {
@ -650,7 +574,7 @@ type SCNianAttackData struct {
func (x *SCNianAttackData) Reset() {
*x = SCNianAttackData{}
if protoimpl.UnsafeEnabled {
mi := &file_protocol_activity_nian_proto_msgTypes[9]
mi := &file_protocol_activity_nian_proto_msgTypes[8]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -663,7 +587,7 @@ func (x *SCNianAttackData) String() string {
func (*SCNianAttackData) ProtoMessage() {}
func (x *SCNianAttackData) ProtoReflect() protoreflect.Message {
mi := &file_protocol_activity_nian_proto_msgTypes[9]
mi := &file_protocol_activity_nian_proto_msgTypes[8]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -676,7 +600,7 @@ func (x *SCNianAttackData) ProtoReflect() protoreflect.Message {
// Deprecated: Use SCNianAttackData.ProtoReflect.Descriptor instead.
func (*SCNianAttackData) Descriptor() ([]byte, []int) {
return file_protocol_activity_nian_proto_rawDescGZIP(), []int{9}
return file_protocol_activity_nian_proto_rawDescGZIP(), []int{8}
}
func (x *SCNianAttackData) GetTypeId() int32 {
@ -753,7 +677,7 @@ type CSNianSignAward struct {
func (x *CSNianSignAward) Reset() {
*x = CSNianSignAward{}
if protoimpl.UnsafeEnabled {
mi := &file_protocol_activity_nian_proto_msgTypes[10]
mi := &file_protocol_activity_nian_proto_msgTypes[9]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -766,7 +690,7 @@ func (x *CSNianSignAward) String() string {
func (*CSNianSignAward) ProtoMessage() {}
func (x *CSNianSignAward) ProtoReflect() protoreflect.Message {
mi := &file_protocol_activity_nian_proto_msgTypes[10]
mi := &file_protocol_activity_nian_proto_msgTypes[9]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -779,7 +703,7 @@ func (x *CSNianSignAward) ProtoReflect() protoreflect.Message {
// Deprecated: Use CSNianSignAward.ProtoReflect.Descriptor instead.
func (*CSNianSignAward) Descriptor() ([]byte, []int) {
return file_protocol_activity_nian_proto_rawDescGZIP(), []int{10}
return file_protocol_activity_nian_proto_rawDescGZIP(), []int{9}
}
//PACKET_SCNianSignAward
@ -795,7 +719,7 @@ type SCNianSignAward struct {
func (x *SCNianSignAward) Reset() {
*x = SCNianSignAward{}
if protoimpl.UnsafeEnabled {
mi := &file_protocol_activity_nian_proto_msgTypes[11]
mi := &file_protocol_activity_nian_proto_msgTypes[10]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -808,7 +732,7 @@ func (x *SCNianSignAward) String() string {
func (*SCNianSignAward) ProtoMessage() {}
func (x *SCNianSignAward) ProtoReflect() protoreflect.Message {
mi := &file_protocol_activity_nian_proto_msgTypes[11]
mi := &file_protocol_activity_nian_proto_msgTypes[10]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -821,7 +745,7 @@ func (x *SCNianSignAward) ProtoReflect() protoreflect.Message {
// Deprecated: Use SCNianSignAward.ProtoReflect.Descriptor instead.
func (*SCNianSignAward) Descriptor() ([]byte, []int) {
return file_protocol_activity_nian_proto_rawDescGZIP(), []int{11}
return file_protocol_activity_nian_proto_rawDescGZIP(), []int{10}
}
func (x *SCNianSignAward) GetSignAwardTime() int64 {
@ -838,13 +762,118 @@ func (x *SCNianSignAward) GetSignAward() []*RankAwardData {
return nil
}
//兑换
//PACKET_CSNianChange
type CSNianChange struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Num int32 `protobuf:"varint,1,opt,name=Num,proto3" json:"Num,omitempty"`
}
func (x *CSNianChange) Reset() {
*x = CSNianChange{}
if protoimpl.UnsafeEnabled {
mi := &file_protocol_activity_nian_proto_msgTypes[11]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *CSNianChange) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*CSNianChange) ProtoMessage() {}
func (x *CSNianChange) ProtoReflect() protoreflect.Message {
mi := &file_protocol_activity_nian_proto_msgTypes[11]
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 CSNianChange.ProtoReflect.Descriptor instead.
func (*CSNianChange) Descriptor() ([]byte, []int) {
return file_protocol_activity_nian_proto_rawDescGZIP(), []int{11}
}
func (x *CSNianChange) GetNum() int32 {
if x != nil {
return x.Num
}
return 0
}
//PACKET_SCNianChange
type SCNianChange struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Num int32 `protobuf:"varint,1,opt,name=Num,proto3" json:"Num,omitempty"`
Award []*RankAwardData `protobuf:"bytes,2,rep,name=Award,proto3" json:"Award,omitempty"`
}
func (x *SCNianChange) Reset() {
*x = SCNianChange{}
if protoimpl.UnsafeEnabled {
mi := &file_protocol_activity_nian_proto_msgTypes[12]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *SCNianChange) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*SCNianChange) ProtoMessage() {}
func (x *SCNianChange) ProtoReflect() protoreflect.Message {
mi := &file_protocol_activity_nian_proto_msgTypes[12]
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 SCNianChange.ProtoReflect.Descriptor instead.
func (*SCNianChange) Descriptor() ([]byte, []int) {
return file_protocol_activity_nian_proto_rawDescGZIP(), []int{12}
}
func (x *SCNianChange) GetNum() int32 {
if x != nil {
return x.Num
}
return 0
}
func (x *SCNianChange) GetAward() []*RankAwardData {
if x != nil {
return x.Award
}
return nil
}
var File_protocol_activity_nian_proto protoreflect.FileDescriptor
var file_protocol_activity_nian_proto_rawDesc = []byte{
0x0a, 0x1c, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76,
0x69, 0x74, 0x79, 0x2f, 0x6e, 0x69, 0x61, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08,
0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x22, 0x0c, 0x0a, 0x0a, 0x43, 0x53, 0x4e, 0x69,
0x61, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x22, 0xdc, 0x02, 0x0a, 0x0a, 0x53, 0x43, 0x4e, 0x69, 0x61,
0x61, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x22, 0xd0, 0x02, 0x0a, 0x0a, 0x53, 0x43, 0x4e, 0x69, 0x61,
0x6e, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2c, 0x0a, 0x11, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74,
0x79, 0x53, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
0x52, 0x11, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x53, 0x74, 0x61, 0x72, 0x74, 0x54,
@ -854,99 +883,103 @@ var file_protocol_activity_nian_proto_rawDesc = []byte{
0x09, 0x42, 0x6f, 0x73, 0x73, 0x4d, 0x61, 0x78, 0x48, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03,
0x52, 0x09, 0x42, 0x6f, 0x73, 0x73, 0x4d, 0x61, 0x78, 0x48, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x42,
0x6f, 0x73, 0x73, 0x48, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x42, 0x6f, 0x73,
0x73, 0x48, 0x70, 0x12, 0x2e, 0x0a, 0x08, 0x4c, 0x75, 0x63, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x18,
0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x52, 0x08, 0x4c, 0x75, 0x63, 0x6b, 0x44,
0x61, 0x74, 0x61, 0x12, 0x1c, 0x0a, 0x09, 0x41, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65,
0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x41, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d,
0x65, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x75, 0x66, 0x66, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07,
0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x42, 0x75, 0x66, 0x66, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12,
0x1e, 0x0a, 0x0a, 0x42, 0x75, 0x66, 0x66, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x08, 0x20,
0x01, 0x28, 0x08, 0x52, 0x0a, 0x42, 0x75, 0x66, 0x66, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12,
0x0e, 0x0a, 0x02, 0x4f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x4f, 0x6e, 0x12,
0x24, 0x0a, 0x0d, 0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65,
0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72,
0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x0c, 0x0a, 0x0a, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x42,
0x75, 0x66, 0x66, 0x22, 0x2a, 0x0a, 0x0a, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x42, 0x75, 0x66,
0x66, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x75, 0x66, 0x66, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01,
0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x42, 0x75, 0x66, 0x66, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22,
0x28, 0x0a, 0x0e, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74,
0x61, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x22, 0x50, 0x0a, 0x0e, 0x53, 0x43, 0x4e,
0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x54,
0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x79, 0x70,
0x65, 0x49, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x12, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e,
0x6b, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x8f, 0x01, 0x0a, 0x08,
0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x61, 0x6e, 0x6b,
0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x64,
0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x49, 0x63, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01,
0x28, 0x05, 0x52, 0x04, 0x49, 0x63, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x63, 0x6f, 0x72,
0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x2d,
0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e,
0x73, 0x48, 0x70, 0x12, 0x32, 0x0a, 0x08, 0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x18,
0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
0x2e, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x52, 0x08, 0x52,
0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1c, 0x0a, 0x09, 0x41, 0x77, 0x61, 0x72, 0x64,
0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x41, 0x77, 0x61, 0x72,
0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x75, 0x66, 0x66, 0x43, 0x6f, 0x75,
0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x42, 0x75, 0x66, 0x66, 0x43, 0x6f,
0x75, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x42, 0x75, 0x66, 0x66, 0x53, 0x74, 0x61, 0x74, 0x75,
0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x42, 0x75, 0x66, 0x66, 0x53, 0x74, 0x61,
0x74, 0x75, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64,
0x54, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x53, 0x69, 0x67, 0x6e,
0x41, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x0c, 0x0a, 0x0a, 0x43, 0x53, 0x4e,
0x69, 0x61, 0x6e, 0x42, 0x75, 0x66, 0x66, 0x22, 0x2a, 0x0a, 0x0a, 0x53, 0x43, 0x4e, 0x69, 0x61,
0x6e, 0x42, 0x75, 0x66, 0x66, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x75, 0x66, 0x66, 0x43, 0x6f, 0x75,
0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x42, 0x75, 0x66, 0x66, 0x43, 0x6f,
0x75, 0x6e, 0x74, 0x22, 0x52, 0x0a, 0x0c, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x44,
0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x04, 0x44,
0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x61, 0x63, 0x74, 0x69,
0x76, 0x69, 0x74, 0x79, 0x2e, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66,
0x6f, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x55, 0x0a, 0x0c, 0x4e, 0x69, 0x61, 0x6e, 0x52,
0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x61, 0x6e, 0x6b, 0x49,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x64, 0x12,
0x2d, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17,
0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77,
0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x22, 0x41,
0x0a, 0x0d, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12,
0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e,
0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75,
0x6d, 0x22, 0x26, 0x0a, 0x0c, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x41, 0x74, 0x74, 0x61, 0x63,
0x6b, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x22, 0xe8, 0x02, 0x0a, 0x10, 0x53, 0x43,
0x4e, 0x69, 0x61, 0x6e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16,
0x0a, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x42, 0x6f, 0x73, 0x73, 0x48, 0x70,
0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x42, 0x6f, 0x73, 0x73, 0x48, 0x70, 0x12, 0x2d,
0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e,
0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61,
0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x22, 0x41, 0x0a,
0x0d, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16,
0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75,
0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d,
0x22, 0x26, 0x0a, 0x0c, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b,
0x12, 0x16, 0x0a, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x52, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x22, 0xe8, 0x02, 0x0a, 0x10, 0x53, 0x43, 0x4e,
0x69, 0x61, 0x6e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a,
0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54,
0x79, 0x70, 0x65, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x42, 0x6f, 0x73, 0x73, 0x48, 0x70, 0x18,
0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x42, 0x6f, 0x73, 0x73, 0x48, 0x70, 0x12, 0x2d, 0x0a,
0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61,
0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72,
0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1a, 0x0a, 0x08,
0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x48, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08,
0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x48, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x73, 0x44, 0x69,
0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x49, 0x73, 0x44, 0x69, 0x65, 0x12, 0x33,
0x0a, 0x08, 0x44, 0x69, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b,
0x32, 0x17, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e, 0x6b,
0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x08, 0x44, 0x69, 0x65, 0x41, 0x77,
0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x75, 0x66, 0x66, 0x43, 0x6f, 0x75, 0x6e, 0x74,
0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x42, 0x75, 0x66, 0x66, 0x43, 0x6f, 0x75, 0x6e,
0x74, 0x12, 0x35, 0x0a, 0x09, 0x45, 0x78, 0x74, 0x72, 0x61, 0x44, 0x72, 0x6f, 0x70, 0x18, 0x08,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e,
0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x45,
0x78, 0x74, 0x72, 0x61, 0x44, 0x72, 0x6f, 0x70, 0x12, 0x39, 0x0a, 0x0b, 0x46, 0x6c, 0x6f, 0x6f,
0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e,
0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61,
0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x77,
0x61, 0x72, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x53, 0x69, 0x67,
0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x22, 0x6e, 0x0a, 0x0f, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e,
0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x69, 0x67,
0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
0x52, 0x0d, 0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12,
0x35, 0x0a, 0x09, 0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03,
0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61,
0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x53, 0x69, 0x67,
0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x2a, 0xae, 0x02, 0x0a, 0x0c, 0x4e, 0x69, 0x61, 0x6e, 0x50,
0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x41, 0x43, 0x4b, 0x45,
0x54, 0x5f, 0x4e, 0x69, 0x61, 0x6e, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x16, 0x0a,
0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x44, 0x61,
0x74, 0x61, 0x10, 0xe4, 0x14, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x10, 0xe5, 0x14, 0x12, 0x16, 0x0a,
0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x42, 0x75,
0x66, 0x66, 0x10, 0xe6, 0x14, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x42, 0x75, 0x66, 0x66, 0x10, 0xe7, 0x14, 0x12, 0x1a, 0x0a,
0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x61,
0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x10, 0xe8, 0x14, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41, 0x43,
0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61,
0x74, 0x61, 0x10, 0xe9, 0x14, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x10, 0xea, 0x14, 0x12,
0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e,
0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x10, 0xeb, 0x14, 0x12, 0x1b, 0x0a,
0x16, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x53, 0x69,
0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x10, 0xec, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x50, 0x41,
0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x53, 0x69, 0x67, 0x6e, 0x41,
0x77, 0x61, 0x72, 0x64, 0x10, 0xed, 0x14, 0x42, 0x28, 0x5a, 0x26, 0x6d, 0x6f, 0x6e, 0x67, 0x6f,
0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74,
0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1a, 0x0a,
0x08, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x48, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52,
0x08, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x48, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x73, 0x44,
0x69, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x49, 0x73, 0x44, 0x69, 0x65, 0x12,
0x33, 0x0a, 0x08, 0x44, 0x69, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x17, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e,
0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x08, 0x44, 0x69, 0x65, 0x41,
0x77, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x75, 0x66, 0x66, 0x43, 0x6f, 0x75, 0x6e,
0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x42, 0x75, 0x66, 0x66, 0x43, 0x6f, 0x75,
0x6e, 0x74, 0x12, 0x35, 0x0a, 0x09, 0x45, 0x78, 0x74, 0x72, 0x61, 0x44, 0x72, 0x6f, 0x70, 0x18,
0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09,
0x45, 0x78, 0x74, 0x72, 0x61, 0x44, 0x72, 0x6f, 0x70, 0x12, 0x39, 0x0a, 0x0b, 0x46, 0x6c, 0x6f,
0x6f, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17,
0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77,
0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x65,
0x77, 0x61, 0x72, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x53, 0x69,
0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x22, 0x6e, 0x0a, 0x0f, 0x53, 0x43, 0x4e, 0x69, 0x61,
0x6e, 0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x53, 0x69,
0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
0x03, 0x52, 0x0d, 0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65,
0x12, 0x35, 0x0a, 0x09, 0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20,
0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52,
0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x53, 0x69,
0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x22, 0x20, 0x0a, 0x0c, 0x43, 0x53, 0x4e, 0x69, 0x61,
0x6e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0x4f, 0x0a, 0x0c, 0x53, 0x43, 0x4e,
0x69, 0x61, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x12, 0x2d, 0x0a, 0x05, 0x41,
0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x61, 0x63, 0x74,
0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x44,
0x61, 0x74, 0x61, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x2a, 0xe2, 0x02, 0x0a, 0x0c, 0x4e,
0x69, 0x61, 0x6e, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x10, 0x50,
0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x4e, 0x69, 0x61, 0x6e, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10,
0x00, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4e, 0x69,
0x61, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x10, 0xe4, 0x14, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41, 0x43,
0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x10, 0xe5,
0x14, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4e, 0x69,
0x61, 0x6e, 0x42, 0x75, 0x66, 0x66, 0x10, 0xe6, 0x14, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41, 0x43,
0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x42, 0x75, 0x66, 0x66, 0x10, 0xe7,
0x14, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4e, 0x69,
0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x10, 0xe8, 0x14, 0x12, 0x1a, 0x0a,
0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x61,
0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x10, 0xe9, 0x14, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43,
0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b,
0x10, 0xea, 0x14, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43,
0x4e, 0x69, 0x61, 0x6e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x10, 0xeb,
0x14, 0x12, 0x1b, 0x0a, 0x16, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4e, 0x69,
0x61, 0x6e, 0x53, 0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x10, 0xec, 0x14, 0x12, 0x1b,
0x0a, 0x16, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x53,
0x69, 0x67, 0x6e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x10, 0xed, 0x14, 0x12, 0x18, 0x0a, 0x13, 0x50,
0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x4e, 0x69, 0x61, 0x6e, 0x43, 0x68, 0x61, 0x6e,
0x67, 0x65, 0x10, 0xee, 0x14, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
0x53, 0x43, 0x4e, 0x69, 0x61, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x10, 0xef, 0x14, 0x42,
0x28, 0x5a, 0x26, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63,
0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c,
0x2f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x33,
}
var (
@ -962,36 +995,38 @@ func file_protocol_activity_nian_proto_rawDescGZIP() []byte {
}
var file_protocol_activity_nian_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_protocol_activity_nian_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
var file_protocol_activity_nian_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
var file_protocol_activity_nian_proto_goTypes = []interface{}{
(NianPacketID)(0), // 0: activity.NianPacketID
(*CSNianData)(nil), // 1: activity.CSNianData
(*SCNianData)(nil), // 2: activity.SCNianData
(*CSNianBuff)(nil), // 3: activity.CSNianBuff
(*SCNianBuff)(nil), // 4: activity.SCNianBuff
(*CSNianRankData)(nil), // 5: activity.CSNianRankData
(*SCNianRankData)(nil), // 6: activity.SCNianRankData
(*RankData)(nil), // 7: activity.RankData
(*RankAwardData)(nil), // 8: activity.RankAwardData
(*CSNianAttack)(nil), // 9: activity.CSNianAttack
(*SCNianAttackData)(nil), // 10: activity.SCNianAttackData
(*CSNianSignAward)(nil), // 11: activity.CSNianSignAward
(*SCNianSignAward)(nil), // 12: activity.SCNianSignAward
(*NianRankData)(nil), // 5: activity.NianRankData
(*NianRankInfo)(nil), // 6: activity.NianRankInfo
(*RankAwardData)(nil), // 7: activity.RankAwardData
(*CSNianAttack)(nil), // 8: activity.CSNianAttack
(*SCNianAttackData)(nil), // 9: activity.SCNianAttackData
(*CSNianSignAward)(nil), // 10: activity.CSNianSignAward
(*SCNianSignAward)(nil), // 11: activity.SCNianSignAward
(*CSNianChange)(nil), // 12: activity.CSNianChange
(*SCNianChange)(nil), // 13: activity.SCNianChange
}
var file_protocol_activity_nian_proto_depIdxs = []int32{
7, // 0: activity.SCNianData.LuckData:type_name -> activity.RankData
7, // 1: activity.SCNianRankData.Data:type_name -> activity.RankData
8, // 2: activity.RankData.Award:type_name -> activity.RankAwardData
8, // 3: activity.SCNianAttackData.Award:type_name -> activity.RankAwardData
8, // 4: activity.SCNianAttackData.DieAward:type_name -> activity.RankAwardData
8, // 5: activity.SCNianAttackData.ExtraDrop:type_name -> activity.RankAwardData
8, // 6: activity.SCNianAttackData.FloorReward:type_name -> activity.RankAwardData
8, // 7: activity.SCNianSignAward.SignAward:type_name -> activity.RankAwardData
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
5, // 0: activity.SCNianData.RankData:type_name -> activity.NianRankData
6, // 1: activity.NianRankData.Data:type_name -> activity.NianRankInfo
7, // 2: activity.NianRankInfo.Award:type_name -> activity.RankAwardData
7, // 3: activity.SCNianAttackData.Award:type_name -> activity.RankAwardData
7, // 4: activity.SCNianAttackData.DieAward:type_name -> activity.RankAwardData
7, // 5: activity.SCNianAttackData.ExtraDrop:type_name -> activity.RankAwardData
7, // 6: activity.SCNianAttackData.FloorReward:type_name -> activity.RankAwardData
7, // 7: activity.SCNianSignAward.SignAward:type_name -> activity.RankAwardData
7, // 8: activity.SCNianChange.Award:type_name -> activity.RankAwardData
9, // [9:9] is the sub-list for method output_type
9, // [9:9] is the sub-list for method input_type
9, // [9:9] is the sub-list for extension type_name
9, // [9:9] is the sub-list for extension extendee
0, // [0:9] is the sub-list for field type_name
}
func init() { file_protocol_activity_nian_proto_init() }
@ -1049,7 +1084,7 @@ func file_protocol_activity_nian_proto_init() {
}
}
file_protocol_activity_nian_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*CSNianRankData); i {
switch v := v.(*NianRankData); i {
case 0:
return &v.state
case 1:
@ -1061,7 +1096,7 @@ func file_protocol_activity_nian_proto_init() {
}
}
file_protocol_activity_nian_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SCNianRankData); i {
switch v := v.(*NianRankInfo); i {
case 0:
return &v.state
case 1:
@ -1073,18 +1108,6 @@ func file_protocol_activity_nian_proto_init() {
}
}
file_protocol_activity_nian_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RankData); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_protocol_activity_nian_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RankAwardData); i {
case 0:
return &v.state
@ -1096,7 +1119,7 @@ func file_protocol_activity_nian_proto_init() {
return nil
}
}
file_protocol_activity_nian_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
file_protocol_activity_nian_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*CSNianAttack); i {
case 0:
return &v.state
@ -1108,7 +1131,7 @@ func file_protocol_activity_nian_proto_init() {
return nil
}
}
file_protocol_activity_nian_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
file_protocol_activity_nian_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SCNianAttackData); i {
case 0:
return &v.state
@ -1120,7 +1143,7 @@ func file_protocol_activity_nian_proto_init() {
return nil
}
}
file_protocol_activity_nian_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
file_protocol_activity_nian_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*CSNianSignAward); i {
case 0:
return &v.state
@ -1132,7 +1155,7 @@ func file_protocol_activity_nian_proto_init() {
return nil
}
}
file_protocol_activity_nian_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
file_protocol_activity_nian_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SCNianSignAward); i {
case 0:
return &v.state
@ -1144,6 +1167,30 @@ func file_protocol_activity_nian_proto_init() {
return nil
}
}
file_protocol_activity_nian_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*CSNianChange); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_protocol_activity_nian_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SCNianChange); 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{
@ -1151,7 +1198,7 @@ func file_protocol_activity_nian_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_protocol_activity_nian_proto_rawDesc,
NumEnums: 1,
NumMessages: 12,
NumMessages: 13,
NumExtensions: 0,
NumServices: 0,
},

37
protocol/activity/nian.proto
View File

@ -14,6 +14,8 @@ enum NianPacketID {
PACKET_SCNianAttackData = 2667; //返回攻击年兽信息
PACKET_CSNianSignAward = 2668; //请求签到
PACKET_SCNianSignAward = 2669; //签到返回
PACKET_CSNianChange = 2670;//请求兑换小爆竹
PACKET_SCNianChange = 2671;//返回兑换道具
}
//获取年兽活动信息
@ -26,12 +28,11 @@ message SCNianData{
int64 ActivityEndTime = 2; //活动结束时间
int64 BossMaxHp = 3; //Boss最大血量
int64 BossHp = 4; //Boss当前血量
repeated RankData LuckData = 5;//幸运榜
repeated NianRankData RankData = 5;//排行榜奖励配置
int64 AwardTime = 6;//每日签到领取时间
int64 BuffCount = 7;//Buff剩余次数
bool BuffStatus = 8;//Buff领取状态
int32 On = 9;//活动开关 1开启 2关闭
int64 SignAwardTime = 10;//签到领取时间 0-未领取
int64 SignAwardTime = 9;//签到领取时间 0-未领取
}
//贺春
@ -43,22 +44,14 @@ message CSNianBuff{
message SCNianBuff{
int64 BuffCount = 1; //BUFF剩余次数
}
//排行榜数据
//PACKET_CSNianRankData
message CSNianRankData{
int32 TypeId = 1;//1-幸运榜 2-总伤害榜
message NianRankData{
int32 TypeId = 1; //1-幸运榜 2-总榜
repeated NianRankInfo Data = 2;
}
//PACKET_SCNianRankData
message SCNianRankData{
int32 TypeId = 1;
repeated RankData Data = 2;
}
message RankData{
message NianRankInfo{
int32 RankId =1;
string Name = 2;
int32 Icon = 3;
int64 Score = 4;
repeated RankAwardData Award = 5;
repeated RankAwardData Award = 2;
}
message RankAwardData{
@ -91,3 +84,13 @@ message SCNianSignAward{
int64 SignAwardTime = 1;
repeated RankAwardData SignAward = 2;//签到奖励
}
//兑换
//PACKET_CSNianChange
message CSNianChange{
int32 Num = 1;
}
//PACKET_SCNianChange
message SCNianChange{
int32 Num = 1;
repeated RankAwardData Award =2;
}

387
protocol/webapi/common.pb.go
View File

@ -10098,6 +10098,173 @@ func (x *NianDropInfo) GetDropUp() int32 {
return 0
}
//年兽排行榜奖励
//etcd /game/activity_nian_rank
type NianRankReward struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Platform string `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"` // 平台
RankData []*NianRankData `protobuf:"bytes,2,rep,name=RankData,proto3" json:"RankData,omitempty"`
}
func (x *NianRankReward) Reset() {
*x = NianRankReward{}
if protoimpl.UnsafeEnabled {
mi := &file_protocol_webapi_common_proto_msgTypes[107]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *NianRankReward) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*NianRankReward) ProtoMessage() {}
func (x *NianRankReward) ProtoReflect() protoreflect.Message {
mi := &file_protocol_webapi_common_proto_msgTypes[107]
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 NianRankReward.ProtoReflect.Descriptor instead.
func (*NianRankReward) Descriptor() ([]byte, []int) {
return file_protocol_webapi_common_proto_rawDescGZIP(), []int{107}
}
func (x *NianRankReward) GetPlatform() string {
if x != nil {
return x.Platform
}
return ""
}
func (x *NianRankReward) GetRankData() []*NianRankData {
if x != nil {
return x.RankData
}
return nil
}
type NianRankData struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
TypeId int32 `protobuf:"varint,1,opt,name=TypeId,proto3" json:"TypeId,omitempty"` //1-幸运榜 2-伤害榜
RankInfo []*NianRankAwardInfo `protobuf:"bytes,2,rep,name=RankInfo,proto3" json:"RankInfo,omitempty"`
}
func (x *NianRankData) Reset() {
*x = NianRankData{}
if protoimpl.UnsafeEnabled {
mi := &file_protocol_webapi_common_proto_msgTypes[108]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *NianRankData) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*NianRankData) ProtoMessage() {}
func (x *NianRankData) ProtoReflect() protoreflect.Message {
mi := &file_protocol_webapi_common_proto_msgTypes[108]
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 NianRankData.ProtoReflect.Descriptor instead.
func (*NianRankData) Descriptor() ([]byte, []int) {
return file_protocol_webapi_common_proto_rawDescGZIP(), []int{108}
}
func (x *NianRankData) GetTypeId() int32 {
if x != nil {
return x.TypeId
}
return 0
}
func (x *NianRankData) GetRankInfo() []*NianRankAwardInfo {
if x != nil {
return x.RankInfo
}
return nil
}
type NianRankAwardInfo struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
RankId int32 `protobuf:"varint,1,opt,name=RankId,proto3" json:"RankId,omitempty"` //排名
Award []*ItemInfo `protobuf:"bytes,2,rep,name=Award,proto3" json:"Award,omitempty"` //奖励
}
func (x *NianRankAwardInfo) Reset() {
*x = NianRankAwardInfo{}
if protoimpl.UnsafeEnabled {
mi := &file_protocol_webapi_common_proto_msgTypes[109]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *NianRankAwardInfo) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*NianRankAwardInfo) ProtoMessage() {}
func (x *NianRankAwardInfo) ProtoReflect() protoreflect.Message {
mi := &file_protocol_webapi_common_proto_msgTypes[109]
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 NianRankAwardInfo.ProtoReflect.Descriptor instead.
func (*NianRankAwardInfo) Descriptor() ([]byte, []int) {
return file_protocol_webapi_common_proto_rawDescGZIP(), []int{109}
}
func (x *NianRankAwardInfo) GetRankId() int32 {
if x != nil {
return x.RankId
}
return 0
}
func (x *NianRankAwardInfo) GetAward() []*ItemInfo {
if x != nil {
return x.Award
}
return nil
}
// etcd /game/act_redpacket
type RedPacketConfig struct {
state protoimpl.MessageState
@ -10112,7 +10279,7 @@ type RedPacketConfig struct {
func (x *RedPacketConfig) Reset() {
*x = RedPacketConfig{}
if protoimpl.UnsafeEnabled {
mi := &file_protocol_webapi_common_proto_msgTypes[107]
mi := &file_protocol_webapi_common_proto_msgTypes[110]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -10125,7 +10292,7 @@ func (x *RedPacketConfig) String() string {
func (*RedPacketConfig) ProtoMessage() {}
func (x *RedPacketConfig) ProtoReflect() protoreflect.Message {
mi := &file_protocol_webapi_common_proto_msgTypes[107]
mi := &file_protocol_webapi_common_proto_msgTypes[110]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -10138,7 +10305,7 @@ func (x *RedPacketConfig) ProtoReflect() protoreflect.Message {
// Deprecated: Use RedPacketConfig.ProtoReflect.Descriptor instead.
func (*RedPacketConfig) Descriptor() ([]byte, []int) {
return file_protocol_webapi_common_proto_rawDescGZIP(), []int{107}
return file_protocol_webapi_common_proto_rawDescGZIP(), []int{110}
}
func (x *RedPacketConfig) GetPlatform() string {
@ -10182,7 +10349,7 @@ type RedPacketInfo struct {
func (x *RedPacketInfo) Reset() {
*x = RedPacketInfo{}
if protoimpl.UnsafeEnabled {
mi := &file_protocol_webapi_common_proto_msgTypes[108]
mi := &file_protocol_webapi_common_proto_msgTypes[111]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -10195,7 +10362,7 @@ func (x *RedPacketInfo) String() string {
func (*RedPacketInfo) ProtoMessage() {}
func (x *RedPacketInfo) ProtoReflect() protoreflect.Message {
mi := &file_protocol_webapi_common_proto_msgTypes[108]
mi := &file_protocol_webapi_common_proto_msgTypes[111]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -10208,7 +10375,7 @@ func (x *RedPacketInfo) ProtoReflect() protoreflect.Message {
// Deprecated: Use RedPacketInfo.ProtoReflect.Descriptor instead.
func (*RedPacketInfo) Descriptor() ([]byte, []int) {
return file_protocol_webapi_common_proto_rawDescGZIP(), []int{108}
return file_protocol_webapi_common_proto_rawDescGZIP(), []int{111}
}
func (x *RedPacketInfo) GetId() int64 {
@ -10293,7 +10460,7 @@ type RedInfo struct {
func (x *RedInfo) Reset() {
*x = RedInfo{}
if protoimpl.UnsafeEnabled {
mi := &file_protocol_webapi_common_proto_msgTypes[109]
mi := &file_protocol_webapi_common_proto_msgTypes[112]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -10306,7 +10473,7 @@ func (x *RedInfo) String() string {
func (*RedInfo) ProtoMessage() {}
func (x *RedInfo) ProtoReflect() protoreflect.Message {
mi := &file_protocol_webapi_common_proto_msgTypes[109]
mi := &file_protocol_webapi_common_proto_msgTypes[112]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -10319,7 +10486,7 @@ func (x *RedInfo) ProtoReflect() protoreflect.Message {
// Deprecated: Use RedInfo.ProtoReflect.Descriptor instead.
func (*RedInfo) Descriptor() ([]byte, []int) {
return file_protocol_webapi_common_proto_rawDescGZIP(), []int{109}
return file_protocol_webapi_common_proto_rawDescGZIP(), []int{112}
}
func (x *RedInfo) GetNum() int64 {
@ -11899,38 +12066,56 @@ var file_protocol_webapi_common_proto_rawDesc = []byte{
0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x44, 0x72, 0x6f, 0x70, 0x52,
0x61, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x44, 0x72, 0x6f, 0x70, 0x52,
0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x44, 0x72, 0x6f, 0x70, 0x55, 0x70, 0x18, 0x05, 0x20,
0x01, 0x28, 0x05, 0x52, 0x06, 0x44, 0x72, 0x6f, 0x70, 0x55, 0x70, 0x22, 0x7a, 0x0a, 0x0f, 0x52,
0x65, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a,
0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x29, 0x0a, 0x04, 0x4c, 0x69,
0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70,
0x69, 0x2e, 0x52, 0x65, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52,
0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4c,
0x69, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x50, 0x6c, 0x61, 0x79,
0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x22, 0x94, 0x02, 0x0a, 0x0d, 0x52, 0x65, 0x64, 0x50,
0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18,
0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x4f, 0x6e, 0x18,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x4f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x74, 0x61,
0x72, 0x74, 0x48, 0x4d, 0x53, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x53, 0x74, 0x61,
0x72, 0x74, 0x48, 0x4d, 0x53, 0x12, 0x16, 0x0a, 0x06, 0x45, 0x6e, 0x64, 0x48, 0x4d, 0x53, 0x18,
0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x45, 0x6e, 0x64, 0x48, 0x4d, 0x53, 0x12, 0x16, 0x0a,
0x06, 0x53, 0x74, 0x61, 0x79, 0x54, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x53,
0x74, 0x61, 0x79, 0x54, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e,
0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e,
0x74, 0x12, 0x1c, 0x0a, 0x09, 0x4c, 0x65, 0x73, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07,
0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x4c, 0x65, 0x73, 0x73, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12,
0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52,
0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x54, 0x6f, 0x74, 0x61, 0x6c,
0x4e, 0x75, 0x6d, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x54, 0x6f, 0x74, 0x61, 0x6c,
0x4e, 0x75, 0x6d, 0x12, 0x29, 0x0a, 0x07, 0x52, 0x65, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x0a,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x52, 0x65,
0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x07, 0x52, 0x65, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x2f,
0x0a, 0x07, 0x52, 0x65, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d,
0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x52,
0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x52, 0x61, 0x74, 0x65, 0x42,
0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63,
0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c,
0x2f, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x01, 0x28, 0x05, 0x52, 0x06, 0x44, 0x72, 0x6f, 0x70, 0x55, 0x70, 0x22, 0x5e, 0x0a, 0x0e, 0x4e,
0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1a, 0x0a,
0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x30, 0x0a, 0x08, 0x52, 0x61, 0x6e,
0x6b, 0x44, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x77, 0x65,
0x62, 0x61, 0x70, 0x69, 0x2e, 0x4e, 0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74,
0x61, 0x52, 0x08, 0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x22, 0x5d, 0x0a, 0x0c, 0x4e,
0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x54,
0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x79, 0x70,
0x65, 0x49, 0x64, 0x12, 0x35, 0x0a, 0x08, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x18,
0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x4e,
0x69, 0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f,
0x52, 0x08, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x53, 0x0a, 0x11, 0x4e, 0x69,
0x61, 0x6e, 0x52, 0x61, 0x6e, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12,
0x16, 0x0a, 0x06, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x06, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x64, 0x12, 0x26, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64,
0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e,
0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x22,
0x7a, 0x0a, 0x0f, 0x52, 0x65, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66,
0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x29,
0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x77,
0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x52, 0x65, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49,
0x6e, 0x66, 0x6f, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x50, 0x6c, 0x61,
0x79, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b,
0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x22, 0x94, 0x02, 0x0a, 0x0d,
0x52, 0x65, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a,
0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x49, 0x64, 0x12, 0x0e, 0x0a,
0x02, 0x4f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x4f, 0x6e, 0x12, 0x1a, 0x0a,
0x08, 0x53, 0x74, 0x61, 0x72, 0x74, 0x48, 0x4d, 0x53, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52,
0x08, 0x53, 0x74, 0x61, 0x72, 0x74, 0x48, 0x4d, 0x53, 0x12, 0x16, 0x0a, 0x06, 0x45, 0x6e, 0x64,
0x48, 0x4d, 0x53, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x45, 0x6e, 0x64, 0x48, 0x4d,
0x53, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x79, 0x54, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28,
0x03, 0x52, 0x06, 0x53, 0x74, 0x61, 0x79, 0x54, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x78,
0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x4d, 0x61, 0x78,
0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x4c, 0x65, 0x73, 0x73, 0x43, 0x6f, 0x75,
0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x4c, 0x65, 0x73, 0x73, 0x43, 0x6f,
0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x08, 0x20,
0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x54,
0x6f, 0x74, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x54,
0x6f, 0x74, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x12, 0x29, 0x0a, 0x07, 0x52, 0x65, 0x64, 0x4c, 0x69,
0x73, 0x74, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70,
0x69, 0x2e, 0x52, 0x65, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x07, 0x52, 0x65, 0x64, 0x4c, 0x69,
0x73, 0x74, 0x22, 0x2f, 0x0a, 0x07, 0x52, 0x65, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a,
0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x12,
0x12, 0x0a, 0x04, 0x52, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x52,
0x61, 0x74, 0x65, 0x42, 0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d,
0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x33,
}
var (
@ -11945,7 +12130,7 @@ func file_protocol_webapi_common_proto_rawDescGZIP() []byte {
return file_protocol_webapi_common_proto_rawDescData
}
var file_protocol_webapi_common_proto_msgTypes = make([]protoimpl.MessageInfo, 120)
var file_protocol_webapi_common_proto_msgTypes = make([]protoimpl.MessageInfo, 123)
var file_protocol_webapi_common_proto_goTypes = []interface{}{
(*MysqlDbSetting)(nil), // 0: webapi.MysqlDbSetting
(*MongoDbSetting)(nil), // 1: webapi.MongoDbSetting
@ -12054,35 +12239,38 @@ var file_protocol_webapi_common_proto_goTypes = []interface{}{
(*ActivityNianConfig)(nil), // 104: webapi.ActivityNianConfig
(*NianInfo)(nil), // 105: webapi.NianInfo
(*NianDropInfo)(nil), // 106: webapi.NianDropInfo
(*RedPacketConfig)(nil), // 107: webapi.RedPacketConfig
(*RedPacketInfo)(nil), // 108: webapi.RedPacketInfo
(*RedInfo)(nil), // 109: webapi.RedInfo
nil, // 110: webapi.Platform.BindTelRewardEntry
nil, // 111: webapi.PlayerData.RankScoreEntry
nil, // 112: webapi.ItemShop.AwardEntry
nil, // 113: webapi.VIPcfg.AwardEntry
nil, // 114: webapi.VIPcfg.Privilege1Entry
nil, // 115: webapi.VIPcfg.Privilege7Entry
nil, // 116: webapi.VIPcfg.Privilege9Entry
nil, // 117: webapi.ActInviteConfig.PayScoreEntry
nil, // 118: webapi.SkinLevel.UpItemEntry
nil, // 119: webapi.SkinItem.UnlockParamEntry
(*server.DB_GameFree)(nil), // 120: server.DB_GameFree
(*server.DB_GameItem)(nil), // 121: server.DB_GameItem
(*NianRankReward)(nil), // 107: webapi.NianRankReward
(*NianRankData)(nil), // 108: webapi.NianRankData
(*NianRankAwardInfo)(nil), // 109: webapi.NianRankAwardInfo
(*RedPacketConfig)(nil), // 110: webapi.RedPacketConfig
(*RedPacketInfo)(nil), // 111: webapi.RedPacketInfo
(*RedInfo)(nil), // 112: webapi.RedInfo
nil, // 113: webapi.Platform.BindTelRewardEntry
nil, // 114: webapi.PlayerData.RankScoreEntry
nil, // 115: webapi.ItemShop.AwardEntry
nil, // 116: webapi.VIPcfg.AwardEntry
nil, // 117: webapi.VIPcfg.Privilege1Entry
nil, // 118: webapi.VIPcfg.Privilege7Entry
nil, // 119: webapi.VIPcfg.Privilege9Entry
nil, // 120: webapi.ActInviteConfig.PayScoreEntry
nil, // 121: webapi.SkinLevel.UpItemEntry
nil, // 122: webapi.SkinItem.UnlockParamEntry
(*server.DB_GameFree)(nil), // 123: server.DB_GameFree
(*server.DB_GameItem)(nil), // 124: server.DB_GameItem
}
var file_protocol_webapi_common_proto_depIdxs = []int32{
2, // 0: webapi.Platform.Leaderboard:type_name -> webapi.RankSwitch
3, // 1: webapi.Platform.ClubConfig:type_name -> webapi.ClubConfig
4, // 2: webapi.Platform.ThirdGameMerchant:type_name -> webapi.ThirdGame
110, // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry
113, // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry
6, // 4: webapi.GameConfigGlobal.GameStatus:type_name -> webapi.GameStatus
120, // 5: webapi.GameFree.DbGameFree:type_name -> server.DB_GameFree
123, // 5: webapi.GameFree.DbGameFree:type_name -> server.DB_GameFree
8, // 6: webapi.PlatformGameConfig.DbGameFrees:type_name -> webapi.GameFree
0, // 7: webapi.PlatformDbConfig.Mysql:type_name -> webapi.MysqlDbSetting
1, // 8: webapi.PlatformDbConfig.MongoDb:type_name -> webapi.MongoDbSetting
1, // 9: webapi.PlatformDbConfig.MongoDbLog:type_name -> webapi.MongoDbSetting
120, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree
111, // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry
123, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree
114, // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry
32, // 12: webapi.PlayerData.Items:type_name -> webapi.ItemInfo
14, // 13: webapi.PlayerData.RoleUnlockList:type_name -> webapi.ModInfo
14, // 14: webapi.PlayerData.PetUnlockList:type_name -> webapi.ModInfo
@ -12095,7 +12283,7 @@ var file_protocol_webapi_common_proto_depIdxs = []int32{
32, // 21: webapi.ExchangeShop.Items:type_name -> webapi.ItemInfo
25, // 22: webapi.ExchangeShopList.List:type_name -> webapi.ExchangeShop
29, // 23: webapi.ExchangeShopList.Weight:type_name -> webapi.ShopWeight
112, // 24: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry
115, // 24: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry
30, // 25: webapi.ItemShopList.List:type_name -> webapi.ItemShop
32, // 26: webapi.MatchInfoAward.ItemId:type_name -> webapi.ItemInfo
33, // 27: webapi.GameMatchDate.Award:type_name -> webapi.MatchInfoAward
@ -12116,14 +12304,14 @@ var file_protocol_webapi_common_proto_depIdxs = []int32{
38, // 42: webapi.WelfareSpree.Item:type_name -> webapi.WelfareDate
48, // 43: webapi.WelfareFirstPayDataList.List:type_name -> webapi.WelfareSpree
48, // 44: webapi.WelfareContinuousPayDataList.List:type_name -> webapi.WelfareSpree
113, // 45: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry
114, // 46: webapi.VIPcfg.Privilege1:type_name -> webapi.VIPcfg.Privilege1Entry
115, // 47: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry
116, // 48: webapi.VIPcfg.Privilege9:type_name -> webapi.VIPcfg.Privilege9Entry
116, // 45: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry
117, // 46: webapi.VIPcfg.Privilege1:type_name -> webapi.VIPcfg.Privilege1Entry
118, // 47: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry
119, // 48: webapi.VIPcfg.Privilege9:type_name -> webapi.VIPcfg.Privilege9Entry
51, // 49: webapi.VIPcfgDataList.List:type_name -> webapi.VIPcfg
38, // 50: webapi.ChessRankConfig.Item:type_name -> webapi.WelfareDate
55, // 51: webapi.ChessRankcfgData.Datas:type_name -> webapi.ChessRankConfig
117, // 52: webapi.ActInviteConfig.PayScore:type_name -> webapi.ActInviteConfig.PayScoreEntry
120, // 52: webapi.ActInviteConfig.PayScore:type_name -> webapi.ActInviteConfig.PayScoreEntry
62, // 53: webapi.ActInviteConfig.Awards1:type_name -> webapi.RankAward
62, // 54: webapi.ActInviteConfig.Awards2:type_name -> webapi.RankAward
62, // 55: webapi.ActInviteConfig.Awards3:type_name -> webapi.RankAward
@ -12140,12 +12328,12 @@ var file_protocol_webapi_common_proto_depIdxs = []int32{
69, // 66: webapi.DiamondLotteryData.Info:type_name -> webapi.DiamondLotteryInfo
70, // 67: webapi.DiamondLotteryData.Players:type_name -> webapi.DiamondLotteryPlayers
72, // 68: webapi.DiamondLotteryConfig.LotteryData:type_name -> webapi.DiamondLotteryData
121, // 69: webapi.ItemConfig.Items:type_name -> server.DB_GameItem
124, // 69: webapi.ItemConfig.Items:type_name -> server.DB_GameItem
32, // 70: webapi.RankAwardInfo.Item:type_name -> webapi.ItemInfo
75, // 71: webapi.RankTypeInfo.Award:type_name -> webapi.RankAwardInfo
76, // 72: webapi.RankTypeConfig.Info:type_name -> webapi.RankTypeInfo
118, // 73: webapi.SkinLevel.UpItem:type_name -> webapi.SkinLevel.UpItemEntry
119, // 74: webapi.SkinItem.UnlockParam:type_name -> webapi.SkinItem.UnlockParamEntry
121, // 73: webapi.SkinLevel.UpItem:type_name -> webapi.SkinLevel.UpItemEntry
122, // 74: webapi.SkinItem.UnlockParam:type_name -> webapi.SkinItem.UnlockParamEntry
78, // 75: webapi.SkinItem.Levels:type_name -> webapi.SkinLevel
79, // 76: webapi.SkinConfig.Items:type_name -> webapi.SkinItem
82, // 77: webapi.AwardLogConfig.AwardLog:type_name -> webapi.AwardLogData
@ -12168,13 +12356,16 @@ var file_protocol_webapi_common_proto_depIdxs = []int32{
32, // 94: webapi.NianInfo.SignReward:type_name -> webapi.ItemInfo
32, // 95: webapi.NianInfo.BossDieReward:type_name -> webapi.ItemInfo
106, // 96: webapi.NianInfo.BossDieOtherReward:type_name -> webapi.NianDropInfo
108, // 97: webapi.RedPacketConfig.List:type_name -> webapi.RedPacketInfo
109, // 98: webapi.RedPacketInfo.RedList:type_name -> webapi.RedInfo
99, // [99:99] is the sub-list for method output_type
99, // [99:99] is the sub-list for method input_type
99, // [99:99] is the sub-list for extension type_name
99, // [99:99] is the sub-list for extension extendee
0, // [0:99] is the sub-list for field type_name
108, // 97: webapi.NianRankReward.RankData:type_name -> webapi.NianRankData
109, // 98: webapi.NianRankData.RankInfo:type_name -> webapi.NianRankAwardInfo
32, // 99: webapi.NianRankAwardInfo.Award:type_name -> webapi.ItemInfo
111, // 100: webapi.RedPacketConfig.List:type_name -> webapi.RedPacketInfo
112, // 101: webapi.RedPacketInfo.RedList:type_name -> webapi.RedInfo
102, // [102:102] is the sub-list for method output_type
102, // [102:102] is the sub-list for method input_type
102, // [102:102] is the sub-list for extension type_name
102, // [102:102] is the sub-list for extension extendee
0, // [0:102] is the sub-list for field type_name
}
func init() { file_protocol_webapi_common_proto_init() }
@ -13468,7 +13659,7 @@ func file_protocol_webapi_common_proto_init() {
}
}
file_protocol_webapi_common_proto_msgTypes[107].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RedPacketConfig); i {
switch v := v.(*NianRankReward); i {
case 0:
return &v.state
case 1:
@ -13480,7 +13671,7 @@ func file_protocol_webapi_common_proto_init() {
}
}
file_protocol_webapi_common_proto_msgTypes[108].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RedPacketInfo); i {
switch v := v.(*NianRankData); i {
case 0:
return &v.state
case 1:
@ -13492,6 +13683,42 @@ func file_protocol_webapi_common_proto_init() {
}
}
file_protocol_webapi_common_proto_msgTypes[109].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*NianRankAwardInfo); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_protocol_webapi_common_proto_msgTypes[110].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RedPacketConfig); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_protocol_webapi_common_proto_msgTypes[111].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RedPacketInfo); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_protocol_webapi_common_proto_msgTypes[112].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RedInfo); i {
case 0:
return &v.state
@ -13510,7 +13737,7 @@ func file_protocol_webapi_common_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_protocol_webapi_common_proto_rawDesc,
NumEnums: 0,
NumMessages: 120,
NumMessages: 123,
NumExtensions: 0,
NumServices: 0,
},

14
protocol/webapi/common.proto
View File

@ -1120,6 +1120,20 @@ message NianDropInfo{
int32 DropRate = 4;//掉落概率
int32 DropUp = 5;//掉落上限
}
//年兽排行榜奖励
//etcd /game/activity_nian_rank
message NianRankReward{
string Platform = 1; // 平台
repeated NianRankData RankData = 2;
}
message NianRankData{
int32 TypeId = 1; //1-幸运榜 2-伤害榜
repeated NianRankAwardInfo RankInfo = 2;
}
message NianRankAwardInfo{
int32 RankId =1;//排名
repeated ItemInfo Award = 2; //奖励
}
// etcd /game/act_redpacket
message RedPacketConfig{

120
worldsrv/action_nian.go
View File

@ -58,17 +58,38 @@ func CSNianData(s *netlib.Session, packetid int, data interface{}, sid int64) er
if p.WelfData.NianData.BossHp == 0 {
p.WelfData.NianData.BossHp = BossMaxHp
}
//排行榜配置
rankData := PlatformMgrSingleton.GetConfig(p.Platform).NianRankReward
if rankData == nil {
return nil
}
pack := &activity.SCNianData{}
for _, info := range rankData.RankData {
rankInfo := &activity.NianRankData{}
rankInfo.TypeId = info.TypeId
for _, awardInfo := range info.RankInfo {
rank := &activity.NianRankInfo{}
rank.RankId = awardInfo.RankId
for _, itemInfo := range awardInfo.Award {
rankAwardData := &activity.RankAwardData{
ItemId: itemInfo.ItemId,
ItemNum: itemInfo.ItemNum,
}
rank.Award = append(rank.Award, rankAwardData)
}
rankInfo.Data = append(rankInfo.Data, rank)
}
pack.RankData = append(pack.RankData, rankInfo)
}
pack.BossHp = p.WelfData.NianData.BossHp
pack.BossMaxHp = BossMaxHp
// pack.ActivityStartTime = timestamp
//pack.ActivityEndTime = endTimestamp
pack.ActivityStartTime = 0
pack.ActivityEndTime = 0
pack.ActivityStartTime = timestamp
pack.ActivityEndTime = endTimestamp
pack.AwardTime = p.WelfData.NianData.SignAwardTime
pack.BuffCount = p.WelfData.NianData.BuffCount
pack.BuffStatus = p.WelfData.NianData.BuffStatus
pack.LuckData = nil
pack.RankData = nil
pack.SignAwardTime = p.WelfData.NianData.SignAwardTime
logger.Logger.Trace("请求年兽活动信息 ", pack)
p.SendToClient(int(activity.NianPacketID_PACKET_SCNianData), pack)
@ -154,6 +175,20 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
}
//本次攻击总血量
AttackHp := int64(0)
LuckyRankNeed := int64(0)
RankNeed := int64(0)
for _, value := range sData {
if value.Id == 7 {
LuckyRankNeed, _ = strconv.ParseInt(value.PropValue, 10, 64)
break
}
}
for _, value := range sData {
if value.Id == 8 {
RankNeed, _ = strconv.ParseInt(value.PropValue, 10, 64)
break
}
}
//伤害范围
var intSlice []int
if typeId == 1 || typeId == 2 {
@ -216,6 +251,13 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
randomValue = randomValue + randomValue/2
p.WelfData.NianData.BuffCount -= 1
}
if p.WelfData.NianData.AttackMaxHp < randomValue {
p.WelfData.NianData.AttackMaxHp = randomValue
if randomValue >= LuckyRankNeed {
//更新幸运榜
}
}
AttackHp += randomValue
if typeId == 3 {
p.WelfData.NianData.BigHurt += 1
@ -295,10 +337,15 @@ func CSNianAttack(s *netlib.Session, packetid int, data interface{}, sid int64)
}
}
}
//上榜 幸运榜 总榜
}
p.WelfData.NianData.BossHp -= AttackHp
p.WelfData.NianData.AttackSumHp += AttackHp
if p.WelfData.NianData.AttackSumHp >= RankNeed {
//更新总榜
}
//更新伤害总榜
isDie := false //是否死亡
//判断Boss是否死亡
var bossDieAward []*model.Item
@ -497,9 +544,68 @@ func CSNianSignAward(s *netlib.Session, packetid int, data interface{}, sid int6
return nil
}
func CSNianChange(s *netlib.Session, packetid int, data interface{}, sid int64) error {
if msg, ok := data.(*activity.CSNianChange); ok {
num := msg.Num
if num <= 0 || num > 99 {
return nil
}
p := PlayerMgrSington.GetOnlinePlayer(sid)
logger.Logger.Trace("客户端请求请求年兽兑换 snid = ", p.SnId)
if p == nil {
return nil
}
sData := srvdata.PBDB_NewYearActivityMgr.Datas.GetArr()
itemNum := 0
coin := 0
diamond := 0
for _, value := range sData {
if value.Id == 21 {
strSlice := strings.Split(value.PropValue, ",")
diamond, _ = strconv.Atoi(strSlice[0])
itemNum, _ = strconv.Atoi(strSlice[1])
coin, _ = strconv.Atoi(strSlice[2])
break
}
}
if p.Diamond < int64(diamond*int(num)) {
return nil
}
p.AddDiamond(int64(-diamond*int(num)), 0, common.GainWayNianCost, "sys", "年兽活动兑换道具")
var items []*model.Item
items = append(items, &model.Item{
ItemId: common.ItemIDCoin,
ItemNum: int64(coin * int(num)),
})
items = append(items, &model.Item{
ItemId: common.ItemIDLittleGuaranteed,
ItemNum: int64(itemNum * int(num)),
})
BagMgrSingleton.AddItems(&model.AddItemParam{
Platform: p.Platform,
SnId: p.SnId,
Change: items,
GainWay: common.GainWayNianGain,
Operator: "system",
Remark: "年兽活动-兑换",
})
pack := &activity.SCNianChange{}
pack.Num = num
for _, item := range items {
info := &activity.RankAwardData{
ItemId: item.ItemId,
ItemNum: item.ItemNum,
}
pack.Award = append(pack.Award, info)
}
p.SendToClient(int(activity.NianPacketID_PACKET_SCNianChange), pack)
}
return nil
}
func init() {
common.Register(int(activity.NianPacketID_PACKET_CSNianData), activity.CSNianData{}, CSNianData)
common.Register(int(activity.NianPacketID_PACKET_CSNianAttack), activity.CSNianAttack{}, CSNianAttack)
common.Register(int(activity.NianPacketID_PACKET_CSNianBuff), activity.CSNianBuff{}, CSNianBuff)
common.Register(int(activity.NianPacketID_PACKET_CSNianSignAward), activity.CSNianSignAward{}, CSNianSignAward)
common.Register(int(activity.NianPacketID_PACKET_CSNianChange), activity.CSNianChange{}, CSNianChange)
}

3
worldsrv/etcd.go
View File

@ -112,6 +112,7 @@ func init() {
etcd.Register(etcd.ETCDKEY_PigBankProp, webapi.GamePigBankPropConfig{}, platformConfigEvent)
//年兽配置
etcd.Register(etcd.ETCDKEY_NianConfig, webapi.ActivityNianConfig{}, platformConfigEvent)
etcd.Register(etcd.ETCDKEY_NianRankConfig, webapi.NianRankReward{}, platformConfigEvent)
// 红包配置
etcd.Register(etcd.ETCDKEY_REDPACKET, webapi.RedPacketConfig{}, platformConfigEvent)
@ -512,6 +513,8 @@ func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, e
PlatformMgrSingleton.GetConfig(config.Platform).GamePigBankPropConfig = config
case *webapi.ActivityNianConfig:
WelfareMgrSington.UpdateActivityNianStatus(config)
case *webapi.NianRankReward:
PlatformMgrSingleton.GetConfig(config.Platform).NianRankReward = config
case *webapi.RedPacketConfig:
WelfareMgrSington.UpdateRedPacket(config, isInit)
default:

1
worldsrv/welfmgr.go
View File

@ -2215,6 +2215,7 @@ func (this *WelfareMgr) DayReserNian(p *Player) {
p.WelfData.NianData.BuffCount = 0
p.WelfData.NianData.SignAwardTime = 0
p.WelfData.NianData.OtherAwardNum = make(map[int32]int32)
p.WelfData.NianData.AttackMaxHp = 0
}
}

BIN
xlsx/DB_NewYearActivity.xlsx
View File

Binary file not shown.