From c429d41900533fd55cdf5b2af58ed61d632b2493 Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Thu, 13 Jun 2024 13:55:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=94=E8=B5=9B=E6=B7=BB=E5=8A=A0=E6=AF=94?=
 =?UTF-8?q?=E8=B5=9B=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protocol/tournament/tournament.pb.go | 316 +++++----
 protocol/tournament/tournament.proto |  11 +-
 protocol/webapi/common.pb.go         | 921 +++++++++++++++------------
 protocol/webapi/common.proto         |  10 +-
 public                               |   2 +-
 worldsrv/tournament.go               |  37 +-
 6 files changed, 754 insertions(+), 543 deletions(-)

diff --git a/protocol/tournament/tournament.pb.go b/protocol/tournament/tournament.pb.go
index 0b32a8c..18c4aa1 100644
--- a/protocol/tournament/tournament.pb.go
+++ b/protocol/tournament/tournament.pb.go
@@ -398,6 +398,7 @@ type TMInfo struct {
 	Rule              string            `protobuf:"bytes,19,opt,name=Rule,proto3" json:"Rule,omitempty"`
 	SortId            int32             `protobuf:"varint,20,opt,name=SortId,proto3" json:"SortId,omitempty"`
 	OnChannelName     []string          `protobuf:"bytes,21,rep,name=OnChannelName,proto3" json:"OnChannelName,omitempty"` //在哪个渠道开启
+	ShowId            int32             `protobuf:"varint,22,opt,name=ShowId,proto3" json:"ShowId,omitempty"`              // 比赛区分
 }
 
 func (x *TMInfo) Reset() {
@@ -579,6 +580,84 @@ func (x *TMInfo) GetOnChannelName() []string {
 	return nil
 }
 
+func (x *TMInfo) GetShowId() int32 {
+	if x != nil {
+		return x.ShowId
+	}
+	return 0
+}
+
+type MatchTypeInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name   string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`      // 名称
+	SortId int32  `protobuf:"varint,2,opt,name=SortId,proto3" json:"SortId,omitempty"` // 排序序号
+	On     bool   `protobuf:"varint,3,opt,name=On,proto3" json:"On,omitempty"`         // 开关
+	Id     int32  `protobuf:"varint,4,opt,name=Id,proto3" json:"Id,omitempty"`         // 类型id
+}
+
+func (x *MatchTypeInfo) Reset() {
+	*x = MatchTypeInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_tournament_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MatchTypeInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MatchTypeInfo) ProtoMessage() {}
+
+func (x *MatchTypeInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_tournament_proto_msgTypes[4]
+	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 MatchTypeInfo.ProtoReflect.Descriptor instead.
+func (*MatchTypeInfo) Descriptor() ([]byte, []int) {
+	return file_tournament_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *MatchTypeInfo) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *MatchTypeInfo) GetSortId() int32 {
+	if x != nil {
+		return x.SortId
+	}
+	return 0
+}
+
+func (x *MatchTypeInfo) GetOn() bool {
+	if x != nil {
+		return x.On
+	}
+	return false
+}
+
+func (x *MatchTypeInfo) GetId() int32 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
 //比赛场场次
 //PACKET_TM_SCTMInfos
 type SCTMInfos struct {
@@ -586,14 +665,14 @@ type SCTMInfos struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	TMInfo   []*TMInfo `protobuf:"bytes,1,rep,name=TMInfo,proto3" json:"TMInfo,omitempty"`             //比赛场场次信息
-	TypeList []int32   `protobuf:"varint,2,rep,packed,name=TypeList,proto3" json:"TypeList,omitempty"` // 所有玩法类型 1.锦标赛 2.实物赛 3.vip比赛 4.话费赛
+	TMInfo   []*TMInfo        `protobuf:"bytes,1,rep,name=TMInfo,proto3" json:"TMInfo,omitempty"`     //比赛场场次信息
+	TypeList []*MatchTypeInfo `protobuf:"bytes,2,rep,name=TypeList,proto3" json:"TypeList,omitempty"` // 比赛类型列表
 }
 
 func (x *SCTMInfos) Reset() {
 	*x = SCTMInfos{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_tournament_proto_msgTypes[4]
+		mi := &file_tournament_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -606,7 +685,7 @@ func (x *SCTMInfos) String() string {
 func (*SCTMInfos) ProtoMessage() {}
 
 func (x *SCTMInfos) ProtoReflect() protoreflect.Message {
-	mi := &file_tournament_proto_msgTypes[4]
+	mi := &file_tournament_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -619,7 +698,7 @@ func (x *SCTMInfos) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SCTMInfos.ProtoReflect.Descriptor instead.
 func (*SCTMInfos) Descriptor() ([]byte, []int) {
-	return file_tournament_proto_rawDescGZIP(), []int{4}
+	return file_tournament_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *SCTMInfos) GetTMInfo() []*TMInfo {
@@ -629,7 +708,7 @@ func (x *SCTMInfos) GetTMInfo() []*TMInfo {
 	return nil
 }
 
-func (x *SCTMInfos) GetTypeList() []int32 {
+func (x *SCTMInfos) GetTypeList() []*MatchTypeInfo {
 	if x != nil {
 		return x.TypeList
 	}
@@ -649,7 +728,7 @@ type CSTMRankList struct {
 func (x *CSTMRankList) Reset() {
 	*x = CSTMRankList{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_tournament_proto_msgTypes[5]
+		mi := &file_tournament_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -662,7 +741,7 @@ func (x *CSTMRankList) String() string {
 func (*CSTMRankList) ProtoMessage() {}
 
 func (x *CSTMRankList) ProtoReflect() protoreflect.Message {
-	mi := &file_tournament_proto_msgTypes[5]
+	mi := &file_tournament_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -675,7 +754,7 @@ func (x *CSTMRankList) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CSTMRankList.ProtoReflect.Descriptor instead.
 func (*CSTMRankList) Descriptor() ([]byte, []int) {
-	return file_tournament_proto_rawDescGZIP(), []int{5}
+	return file_tournament_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *CSTMRankList) GetTMId() int32 {
@@ -698,7 +777,7 @@ type TMRank struct {
 func (x *TMRank) Reset() {
 	*x = TMRank{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_tournament_proto_msgTypes[6]
+		mi := &file_tournament_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -711,7 +790,7 @@ func (x *TMRank) String() string {
 func (*TMRank) ProtoMessage() {}
 
 func (x *TMRank) ProtoReflect() protoreflect.Message {
-	mi := &file_tournament_proto_msgTypes[6]
+	mi := &file_tournament_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -724,7 +803,7 @@ func (x *TMRank) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TMRank.ProtoReflect.Descriptor instead.
 func (*TMRank) Descriptor() ([]byte, []int) {
-	return file_tournament_proto_rawDescGZIP(), []int{6}
+	return file_tournament_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *TMRank) GetRankId() int32 {
@@ -762,7 +841,7 @@ type SCTMRankList struct {
 func (x *SCTMRankList) Reset() {
 	*x = SCTMRankList{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_tournament_proto_msgTypes[7]
+		mi := &file_tournament_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -775,7 +854,7 @@ func (x *SCTMRankList) String() string {
 func (*SCTMRankList) ProtoMessage() {}
 
 func (x *SCTMRankList) ProtoReflect() protoreflect.Message {
-	mi := &file_tournament_proto_msgTypes[7]
+	mi := &file_tournament_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -788,7 +867,7 @@ func (x *SCTMRankList) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SCTMRankList.ProtoReflect.Descriptor instead.
 func (*SCTMRankList) Descriptor() ([]byte, []int) {
-	return file_tournament_proto_rawDescGZIP(), []int{7}
+	return file_tournament_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *SCTMRankList) GetTMId() int32 {
@@ -826,7 +905,7 @@ type CSSignRace struct {
 func (x *CSSignRace) Reset() {
 	*x = CSSignRace{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_tournament_proto_msgTypes[8]
+		mi := &file_tournament_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -839,7 +918,7 @@ func (x *CSSignRace) String() string {
 func (*CSSignRace) ProtoMessage() {}
 
 func (x *CSSignRace) ProtoReflect() protoreflect.Message {
-	mi := &file_tournament_proto_msgTypes[8]
+	mi := &file_tournament_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -852,7 +931,7 @@ func (x *CSSignRace) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CSSignRace.ProtoReflect.Descriptor instead.
 func (*CSSignRace) Descriptor() ([]byte, []int) {
-	return file_tournament_proto_rawDescGZIP(), []int{8}
+	return file_tournament_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *CSSignRace) GetOpCode() int32 {
@@ -883,7 +962,7 @@ type SCSignRace struct {
 func (x *SCSignRace) Reset() {
 	*x = SCSignRace{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_tournament_proto_msgTypes[9]
+		mi := &file_tournament_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -896,7 +975,7 @@ func (x *SCSignRace) String() string {
 func (*SCSignRace) ProtoMessage() {}
 
 func (x *SCSignRace) ProtoReflect() protoreflect.Message {
-	mi := &file_tournament_proto_msgTypes[9]
+	mi := &file_tournament_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -909,7 +988,7 @@ func (x *SCSignRace) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SCSignRace.ProtoReflect.Descriptor instead.
 func (*SCSignRace) Descriptor() ([]byte, []int) {
-	return file_tournament_proto_rawDescGZIP(), []int{9}
+	return file_tournament_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *SCSignRace) GetOpCode() int32 {
@@ -947,7 +1026,7 @@ type SCSyncSignNum struct {
 func (x *SCSyncSignNum) Reset() {
 	*x = SCSyncSignNum{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_tournament_proto_msgTypes[10]
+		mi := &file_tournament_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -960,7 +1039,7 @@ func (x *SCSyncSignNum) String() string {
 func (*SCSyncSignNum) ProtoMessage() {}
 
 func (x *SCSyncSignNum) ProtoReflect() protoreflect.Message {
-	mi := &file_tournament_proto_msgTypes[10]
+	mi := &file_tournament_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -973,7 +1052,7 @@ func (x *SCSyncSignNum) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SCSyncSignNum.ProtoReflect.Descriptor instead.
 func (*SCSyncSignNum) Descriptor() ([]byte, []int) {
-	return file_tournament_proto_rawDescGZIP(), []int{10}
+	return file_tournament_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *SCSyncSignNum) GetSignNum() int32 {
@@ -1003,7 +1082,7 @@ type SCTMStart struct {
 func (x *SCTMStart) Reset() {
 	*x = SCTMStart{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_tournament_proto_msgTypes[11]
+		mi := &file_tournament_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1016,7 +1095,7 @@ func (x *SCTMStart) String() string {
 func (*SCTMStart) ProtoMessage() {}
 
 func (x *SCTMStart) ProtoReflect() protoreflect.Message {
-	mi := &file_tournament_proto_msgTypes[11]
+	mi := &file_tournament_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1029,7 +1108,7 @@ func (x *SCTMStart) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SCTMStart.ProtoReflect.Descriptor instead.
 func (*SCTMStart) Descriptor() ([]byte, []int) {
-	return file_tournament_proto_rawDescGZIP(), []int{11}
+	return file_tournament_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *SCTMStart) GetMatchId() int32 {
@@ -1052,7 +1131,7 @@ type RankAward struct {
 func (x *RankAward) Reset() {
 	*x = RankAward{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_tournament_proto_msgTypes[12]
+		mi := &file_tournament_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1065,7 +1144,7 @@ func (x *RankAward) String() string {
 func (*RankAward) ProtoMessage() {}
 
 func (x *RankAward) ProtoReflect() protoreflect.Message {
-	mi := &file_tournament_proto_msgTypes[12]
+	mi := &file_tournament_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1078,7 +1157,7 @@ func (x *RankAward) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RankAward.ProtoReflect.Descriptor instead.
 func (*RankAward) Descriptor() ([]byte, []int) {
-	return file_tournament_proto_rawDescGZIP(), []int{12}
+	return file_tournament_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *RankAward) GetItemInfo() []*ItemInfo {
@@ -1123,7 +1202,7 @@ type SCPromotionInfo struct {
 func (x *SCPromotionInfo) Reset() {
 	*x = SCPromotionInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_tournament_proto_msgTypes[13]
+		mi := &file_tournament_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1136,7 +1215,7 @@ func (x *SCPromotionInfo) String() string {
 func (*SCPromotionInfo) ProtoMessage() {}
 
 func (x *SCPromotionInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_tournament_proto_msgTypes[13]
+	mi := &file_tournament_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1149,7 +1228,7 @@ func (x *SCPromotionInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SCPromotionInfo.ProtoReflect.Descriptor instead.
 func (*SCPromotionInfo) Descriptor() ([]byte, []int) {
-	return file_tournament_proto_rawDescGZIP(), []int{13}
+	return file_tournament_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *SCPromotionInfo) GetRetCode() int32 {
@@ -1225,7 +1304,7 @@ type CSTMSeasonInfo struct {
 func (x *CSTMSeasonInfo) Reset() {
 	*x = CSTMSeasonInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_tournament_proto_msgTypes[14]
+		mi := &file_tournament_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1238,7 +1317,7 @@ func (x *CSTMSeasonInfo) String() string {
 func (*CSTMSeasonInfo) ProtoMessage() {}
 
 func (x *CSTMSeasonInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_tournament_proto_msgTypes[14]
+	mi := &file_tournament_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1251,7 +1330,7 @@ func (x *CSTMSeasonInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CSTMSeasonInfo.ProtoReflect.Descriptor instead.
 func (*CSTMSeasonInfo) Descriptor() ([]byte, []int) {
-	return file_tournament_proto_rawDescGZIP(), []int{14}
+	return file_tournament_proto_rawDescGZIP(), []int{15}
 }
 
 type SCTMSeasonInfo struct {
@@ -1269,7 +1348,7 @@ type SCTMSeasonInfo struct {
 func (x *SCTMSeasonInfo) Reset() {
 	*x = SCTMSeasonInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_tournament_proto_msgTypes[15]
+		mi := &file_tournament_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1282,7 +1361,7 @@ func (x *SCTMSeasonInfo) String() string {
 func (*SCTMSeasonInfo) ProtoMessage() {}
 
 func (x *SCTMSeasonInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_tournament_proto_msgTypes[15]
+	mi := &file_tournament_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1295,7 +1374,7 @@ func (x *SCTMSeasonInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SCTMSeasonInfo.ProtoReflect.Descriptor instead.
 func (*SCTMSeasonInfo) Descriptor() ([]byte, []int) {
-	return file_tournament_proto_rawDescGZIP(), []int{15}
+	return file_tournament_proto_rawDescGZIP(), []int{16}
 }
 
 func (x *SCTMSeasonInfo) GetId() int32 {
@@ -1348,7 +1427,7 @@ type SeasonRank struct {
 func (x *SeasonRank) Reset() {
 	*x = SeasonRank{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_tournament_proto_msgTypes[16]
+		mi := &file_tournament_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1361,7 +1440,7 @@ func (x *SeasonRank) String() string {
 func (*SeasonRank) ProtoMessage() {}
 
 func (x *SeasonRank) ProtoReflect() protoreflect.Message {
-	mi := &file_tournament_proto_msgTypes[16]
+	mi := &file_tournament_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1374,7 +1453,7 @@ func (x *SeasonRank) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SeasonRank.ProtoReflect.Descriptor instead.
 func (*SeasonRank) Descriptor() ([]byte, []int) {
-	return file_tournament_proto_rawDescGZIP(), []int{16}
+	return file_tournament_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *SeasonRank) GetSnid() int32 {
@@ -1414,7 +1493,7 @@ type CSTMSeasonRank struct {
 func (x *CSTMSeasonRank) Reset() {
 	*x = CSTMSeasonRank{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_tournament_proto_msgTypes[17]
+		mi := &file_tournament_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1427,7 +1506,7 @@ func (x *CSTMSeasonRank) String() string {
 func (*CSTMSeasonRank) ProtoMessage() {}
 
 func (x *CSTMSeasonRank) ProtoReflect() protoreflect.Message {
-	mi := &file_tournament_proto_msgTypes[17]
+	mi := &file_tournament_proto_msgTypes[18]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1440,7 +1519,7 @@ func (x *CSTMSeasonRank) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CSTMSeasonRank.ProtoReflect.Descriptor instead.
 func (*CSTMSeasonRank) Descriptor() ([]byte, []int) {
-	return file_tournament_proto_rawDescGZIP(), []int{17}
+	return file_tournament_proto_rawDescGZIP(), []int{18}
 }
 
 type SCTMSeasonRank struct {
@@ -1454,7 +1533,7 @@ type SCTMSeasonRank struct {
 func (x *SCTMSeasonRank) Reset() {
 	*x = SCTMSeasonRank{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_tournament_proto_msgTypes[18]
+		mi := &file_tournament_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1467,7 +1546,7 @@ func (x *SCTMSeasonRank) String() string {
 func (*SCTMSeasonRank) ProtoMessage() {}
 
 func (x *SCTMSeasonRank) ProtoReflect() protoreflect.Message {
-	mi := &file_tournament_proto_msgTypes[18]
+	mi := &file_tournament_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1480,7 +1559,7 @@ func (x *SCTMSeasonRank) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SCTMSeasonRank.ProtoReflect.Descriptor instead.
 func (*SCTMSeasonRank) Descriptor() ([]byte, []int) {
-	return file_tournament_proto_rawDescGZIP(), []int{18}
+	return file_tournament_proto_rawDescGZIP(), []int{19}
 }
 
 func (x *SCTMSeasonRank) GetReasonRanks() []*SeasonRank {
@@ -1502,7 +1581,7 @@ type CSTMSeasonAward struct {
 func (x *CSTMSeasonAward) Reset() {
 	*x = CSTMSeasonAward{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_tournament_proto_msgTypes[19]
+		mi := &file_tournament_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1515,7 +1594,7 @@ func (x *CSTMSeasonAward) String() string {
 func (*CSTMSeasonAward) ProtoMessage() {}
 
 func (x *CSTMSeasonAward) ProtoReflect() protoreflect.Message {
-	mi := &file_tournament_proto_msgTypes[19]
+	mi := &file_tournament_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1528,7 +1607,7 @@ func (x *CSTMSeasonAward) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CSTMSeasonAward.ProtoReflect.Descriptor instead.
 func (*CSTMSeasonAward) Descriptor() ([]byte, []int) {
-	return file_tournament_proto_rawDescGZIP(), []int{19}
+	return file_tournament_proto_rawDescGZIP(), []int{20}
 }
 
 func (x *CSTMSeasonAward) GetLv() int32 {
@@ -1550,7 +1629,7 @@ type SCTMSeasonAward struct {
 func (x *SCTMSeasonAward) Reset() {
 	*x = SCTMSeasonAward{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_tournament_proto_msgTypes[20]
+		mi := &file_tournament_proto_msgTypes[21]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1563,7 +1642,7 @@ func (x *SCTMSeasonAward) String() string {
 func (*SCTMSeasonAward) ProtoMessage() {}
 
 func (x *SCTMSeasonAward) ProtoReflect() protoreflect.Message {
-	mi := &file_tournament_proto_msgTypes[20]
+	mi := &file_tournament_proto_msgTypes[21]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1576,7 +1655,7 @@ func (x *SCTMSeasonAward) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SCTMSeasonAward.ProtoReflect.Descriptor instead.
 func (*SCTMSeasonAward) Descriptor() ([]byte, []int) {
-	return file_tournament_proto_rawDescGZIP(), []int{20}
+	return file_tournament_proto_rawDescGZIP(), []int{21}
 }
 
 func (x *SCTMSeasonAward) GetLv() int32 {
@@ -1616,7 +1695,7 @@ var file_tournament_proto_rawDesc = []byte{
 	0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x55, 0x70, 0x4c, 0x69, 0x6d, 0x69, 0x74,
 	0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x55, 0x70, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12,
 	0x1c, 0x0a, 0x09, 0x44, 0x6f, 0x77, 0x6e, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x09, 0x44, 0x6f, 0x77, 0x6e, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x22, 0xfe, 0x05,
+	0x28, 0x05, 0x52, 0x09, 0x44, 0x6f, 0x77, 0x6e, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x22, 0x96, 0x06,
 	0x0a, 0x06, 0x54, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x47, 0x61, 0x6d, 0x65,
 	0x46, 0x72, 0x65, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x47, 0x61,
@@ -1664,12 +1743,21 @@ var file_tournament_proto_rawDesc = []byte{
 	0x12, 0x16, 0x0a, 0x06, 0x53, 0x6f, 0x72, 0x74, 0x49, 0x64, 0x18, 0x14, 0x20, 0x01, 0x28, 0x05,
 	0x52, 0x06, 0x53, 0x6f, 0x72, 0x74, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x4f, 0x6e, 0x43, 0x68,
 	0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x15, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x0d, 0x4f, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x53,
-	0x0a, 0x09, 0x53, 0x43, 0x54, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x12, 0x2a, 0x0a, 0x06, 0x54,
-	0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x6f,
-	0x75, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x52,
-	0x06, 0x54, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x54, 0x79, 0x70, 0x65, 0x4c,
-	0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x54, 0x79, 0x70, 0x65, 0x4c,
+	0x0d, 0x4f, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16,
+	0x0a, 0x06, 0x53, 0x68, 0x6f, 0x77, 0x49, 0x64, 0x18, 0x16, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
+	0x53, 0x68, 0x6f, 0x77, 0x49, 0x64, 0x22, 0x5b, 0x0a, 0x0d, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54,
+	0x79, 0x70, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x53,
+	0x6f, 0x72, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x6f, 0x72,
+	0x74, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x4f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x02, 0x4f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x02, 0x49, 0x64, 0x22, 0x6e, 0x0a, 0x09, 0x53, 0x43, 0x54, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x73,
+	0x12, 0x2a, 0x0a, 0x06, 0x54, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x12, 0x2e, 0x74, 0x6f, 0x75, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x4d,
+	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x54, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x35, 0x0a, 0x08,
+	0x54, 0x79, 0x70, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19,
+	0x2e, 0x74, 0x6f, 0x75, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x54, 0x79, 0x70, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x54, 0x79, 0x70, 0x65, 0x4c,
 	0x69, 0x73, 0x74, 0x22, 0x22, 0x0a, 0x0c, 0x43, 0x53, 0x54, 0x4d, 0x52, 0x61, 0x6e, 0x6b, 0x4c,
 	0x69, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x4d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x05, 0x52, 0x04, 0x54, 0x4d, 0x49, 0x64, 0x22, 0x5a, 0x0a, 0x06, 0x54, 0x4d, 0x52, 0x61, 0x6e,
@@ -1819,7 +1907,7 @@ func file_tournament_proto_rawDescGZIP() []byte {
 }
 
 var file_tournament_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_tournament_proto_msgTypes = make([]protoimpl.MessageInfo, 22)
+var file_tournament_proto_msgTypes = make([]protoimpl.MessageInfo, 23)
 var file_tournament_proto_goTypes = []interface{}{
 	(TOURNAMENTID)(0),       // 0: tournament.TOURNAMENTID
 	(SignRaceCode)(0),       // 1: tournament.SignRaceCode
@@ -1827,40 +1915,42 @@ var file_tournament_proto_goTypes = []interface{}{
 	(*ItemInfo)(nil),        // 3: tournament.ItemInfo
 	(*MatchInfoAward)(nil),  // 4: tournament.MatchInfoAward
 	(*TMInfo)(nil),          // 5: tournament.TMInfo
-	(*SCTMInfos)(nil),       // 6: tournament.SCTMInfos
-	(*CSTMRankList)(nil),    // 7: tournament.CSTMRankList
-	(*TMRank)(nil),          // 8: tournament.TMRank
-	(*SCTMRankList)(nil),    // 9: tournament.SCTMRankList
-	(*CSSignRace)(nil),      // 10: tournament.CSSignRace
-	(*SCSignRace)(nil),      // 11: tournament.SCSignRace
-	(*SCSyncSignNum)(nil),   // 12: tournament.SCSyncSignNum
-	(*SCTMStart)(nil),       // 13: tournament.SCTMStart
-	(*RankAward)(nil),       // 14: tournament.RankAward
-	(*SCPromotionInfo)(nil), // 15: tournament.SCPromotionInfo
-	(*CSTMSeasonInfo)(nil),  // 16: tournament.CSTMSeasonInfo
-	(*SCTMSeasonInfo)(nil),  // 17: tournament.SCTMSeasonInfo
-	(*SeasonRank)(nil),      // 18: tournament.SeasonRank
-	(*CSTMSeasonRank)(nil),  // 19: tournament.CSTMSeasonRank
-	(*SCTMSeasonRank)(nil),  // 20: tournament.SCTMSeasonRank
-	(*CSTMSeasonAward)(nil), // 21: tournament.CSTMSeasonAward
-	(*SCTMSeasonAward)(nil), // 22: tournament.SCTMSeasonAward
-	nil,                     // 23: tournament.SCPromotionInfo.RecordEntry
+	(*MatchTypeInfo)(nil),   // 6: tournament.MatchTypeInfo
+	(*SCTMInfos)(nil),       // 7: tournament.SCTMInfos
+	(*CSTMRankList)(nil),    // 8: tournament.CSTMRankList
+	(*TMRank)(nil),          // 9: tournament.TMRank
+	(*SCTMRankList)(nil),    // 10: tournament.SCTMRankList
+	(*CSSignRace)(nil),      // 11: tournament.CSSignRace
+	(*SCSignRace)(nil),      // 12: tournament.SCSignRace
+	(*SCSyncSignNum)(nil),   // 13: tournament.SCSyncSignNum
+	(*SCTMStart)(nil),       // 14: tournament.SCTMStart
+	(*RankAward)(nil),       // 15: tournament.RankAward
+	(*SCPromotionInfo)(nil), // 16: tournament.SCPromotionInfo
+	(*CSTMSeasonInfo)(nil),  // 17: tournament.CSTMSeasonInfo
+	(*SCTMSeasonInfo)(nil),  // 18: tournament.SCTMSeasonInfo
+	(*SeasonRank)(nil),      // 19: tournament.SeasonRank
+	(*CSTMSeasonRank)(nil),  // 20: tournament.CSTMSeasonRank
+	(*SCTMSeasonRank)(nil),  // 21: tournament.SCTMSeasonRank
+	(*CSTMSeasonAward)(nil), // 22: tournament.CSTMSeasonAward
+	(*SCTMSeasonAward)(nil), // 23: tournament.SCTMSeasonAward
+	nil,                     // 24: tournament.SCPromotionInfo.RecordEntry
 }
 var file_tournament_proto_depIdxs = []int32{
 	3,  // 0: tournament.MatchInfoAward.ItemInfo:type_name -> tournament.ItemInfo
 	4,  // 1: tournament.TMInfo.Award:type_name -> tournament.MatchInfoAward
 	3,  // 2: tournament.TMInfo.SignupCostItem:type_name -> tournament.ItemInfo
 	5,  // 3: tournament.SCTMInfos.TMInfo:type_name -> tournament.TMInfo
-	8,  // 4: tournament.SCTMRankList.TMRank:type_name -> tournament.TMRank
-	3,  // 5: tournament.RankAward.ItemInfo:type_name -> tournament.ItemInfo
-	23, // 6: tournament.SCPromotionInfo.Record:type_name -> tournament.SCPromotionInfo.RecordEntry
-	14, // 7: tournament.SCPromotionInfo.RankAward:type_name -> tournament.RankAward
-	18, // 8: tournament.SCTMSeasonRank.ReasonRanks:type_name -> tournament.SeasonRank
-	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
+	6,  // 4: tournament.SCTMInfos.TypeList:type_name -> tournament.MatchTypeInfo
+	9,  // 5: tournament.SCTMRankList.TMRank:type_name -> tournament.TMRank
+	3,  // 6: tournament.RankAward.ItemInfo:type_name -> tournament.ItemInfo
+	24, // 7: tournament.SCPromotionInfo.Record:type_name -> tournament.SCPromotionInfo.RecordEntry
+	15, // 8: tournament.SCPromotionInfo.RankAward:type_name -> tournament.RankAward
+	19, // 9: tournament.SCTMSeasonRank.ReasonRanks:type_name -> tournament.SeasonRank
+	10, // [10:10] is the sub-list for method output_type
+	10, // [10:10] is the sub-list for method input_type
+	10, // [10:10] is the sub-list for extension type_name
+	10, // [10:10] is the sub-list for extension extendee
+	0,  // [0:10] is the sub-list for field type_name
 }
 
 func init() { file_tournament_proto_init() }
@@ -1918,7 +2008,7 @@ func file_tournament_proto_init() {
 			}
 		}
 		file_tournament_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SCTMInfos); i {
+			switch v := v.(*MatchTypeInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1930,7 +2020,7 @@ func file_tournament_proto_init() {
 			}
 		}
 		file_tournament_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CSTMRankList); i {
+			switch v := v.(*SCTMInfos); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1942,7 +2032,7 @@ func file_tournament_proto_init() {
 			}
 		}
 		file_tournament_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TMRank); i {
+			switch v := v.(*CSTMRankList); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1954,7 +2044,7 @@ func file_tournament_proto_init() {
 			}
 		}
 		file_tournament_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SCTMRankList); i {
+			switch v := v.(*TMRank); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1966,7 +2056,7 @@ func file_tournament_proto_init() {
 			}
 		}
 		file_tournament_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CSSignRace); i {
+			switch v := v.(*SCTMRankList); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1978,7 +2068,7 @@ func file_tournament_proto_init() {
 			}
 		}
 		file_tournament_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SCSignRace); i {
+			switch v := v.(*CSSignRace); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1990,7 +2080,7 @@ func file_tournament_proto_init() {
 			}
 		}
 		file_tournament_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SCSyncSignNum); i {
+			switch v := v.(*SCSignRace); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2002,7 +2092,7 @@ func file_tournament_proto_init() {
 			}
 		}
 		file_tournament_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SCTMStart); i {
+			switch v := v.(*SCSyncSignNum); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2014,7 +2104,7 @@ func file_tournament_proto_init() {
 			}
 		}
 		file_tournament_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RankAward); i {
+			switch v := v.(*SCTMStart); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2026,7 +2116,7 @@ func file_tournament_proto_init() {
 			}
 		}
 		file_tournament_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SCPromotionInfo); i {
+			switch v := v.(*RankAward); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2038,7 +2128,7 @@ func file_tournament_proto_init() {
 			}
 		}
 		file_tournament_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CSTMSeasonInfo); i {
+			switch v := v.(*SCPromotionInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2050,7 +2140,7 @@ func file_tournament_proto_init() {
 			}
 		}
 		file_tournament_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SCTMSeasonInfo); i {
+			switch v := v.(*CSTMSeasonInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2062,7 +2152,7 @@ func file_tournament_proto_init() {
 			}
 		}
 		file_tournament_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SeasonRank); i {
+			switch v := v.(*SCTMSeasonInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2074,7 +2164,7 @@ func file_tournament_proto_init() {
 			}
 		}
 		file_tournament_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CSTMSeasonRank); i {
+			switch v := v.(*SeasonRank); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2086,7 +2176,7 @@ func file_tournament_proto_init() {
 			}
 		}
 		file_tournament_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SCTMSeasonRank); i {
+			switch v := v.(*CSTMSeasonRank); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2098,7 +2188,7 @@ func file_tournament_proto_init() {
 			}
 		}
 		file_tournament_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CSTMSeasonAward); i {
+			switch v := v.(*SCTMSeasonRank); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -2110,6 +2200,18 @@ func file_tournament_proto_init() {
 			}
 		}
 		file_tournament_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CSTMSeasonAward); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_tournament_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SCTMSeasonAward); i {
 			case 0:
 				return &v.state
@@ -2128,7 +2230,7 @@ func file_tournament_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_tournament_proto_rawDesc,
 			NumEnums:      2,
-			NumMessages:   22,
+			NumMessages:   23,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/protocol/tournament/tournament.proto b/protocol/tournament/tournament.proto
index 38c2cfa..52d8434 100644
--- a/protocol/tournament/tournament.proto
+++ b/protocol/tournament/tournament.proto
@@ -63,12 +63,21 @@ message TMInfo{
   string Rule = 19;
   int32 SortId = 20;
   repeated string OnChannelName = 21;//在哪个渠道开启
+  int32 ShowId = 22; // 比赛区分
 }
+
+message MatchTypeInfo{
+  string Name = 1; // 名称
+  int32 SortId = 2; // 排序序号
+  bool On = 3; // 开关
+  int32 Id = 4; // 类型id
+}
+
 //比赛场场次
 //PACKET_TM_SCTMInfos
 message SCTMInfos{
   repeated TMInfo TMInfo = 1;//比赛场场次信息
-  repeated int32 TypeList = 2; // 所有玩法类型 1.锦标赛 2.实物赛 3.vip比赛 4.话费赛
+  repeated MatchTypeInfo TypeList = 2; // 比赛类型列表
 }
 //单场次排行榜
 //PACKET_TM_CSTMRankList
diff --git a/protocol/webapi/common.pb.go b/protocol/webapi/common.pb.go
index d62cc1c..a44dde2 100644
--- a/protocol/webapi/common.pb.go
+++ b/protocol/webapi/common.pb.go
@@ -3760,6 +3760,7 @@ type GameMatchDate struct {
 	MatchLevel        int32             `protobuf:"varint,22,opt,name=MatchLevel,proto3" json:"MatchLevel,omitempty"`      // 难度等级
 	OnChannelName     []string          `protobuf:"bytes,23,rep,name=OnChannelName,proto3" json:"OnChannelName,omitempty"` // 开启的渠道名称
 	CardType          int32             `protobuf:"varint,24,opt,name=CardType,proto3" json:"CardType,omitempty"`          // 手机卡类型
+	ShowId            int32             `protobuf:"varint,25,opt,name=ShowId,proto3" json:"ShowId,omitempty"`              // 比赛区分
 }
 
 func (x *GameMatchDate) Reset() {
@@ -3962,6 +3963,13 @@ func (x *GameMatchDate) GetCardType() int32 {
 	return 0
 }
 
+func (x *GameMatchDate) GetShowId() int32 {
+	if x != nil {
+		return x.ShowId
+	}
+	return 0
+}
+
 // etcd /game/game_match
 type GameMatchDateList struct {
 	state         protoimpl.MessageState
@@ -4018,20 +4026,91 @@ func (x *GameMatchDateList) GetPlatform() string {
 	return ""
 }
 
+type MatchTypeInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name   string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`      // 名称
+	SortId int32  `protobuf:"varint,2,opt,name=SortId,proto3" json:"SortId,omitempty"` // 序号
+	On     bool   `protobuf:"varint,3,opt,name=On,proto3" json:"On,omitempty"`         // 开关
+	Id     int32  `protobuf:"varint,4,opt,name=Id,proto3" json:"Id,omitempty"`         // 类型id
+}
+
+func (x *MatchTypeInfo) Reset() {
+	*x = MatchTypeInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[33]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MatchTypeInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MatchTypeInfo) ProtoMessage() {}
+
+func (x *MatchTypeInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[33]
+	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 MatchTypeInfo.ProtoReflect.Descriptor instead.
+func (*MatchTypeInfo) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{33}
+}
+
+func (x *MatchTypeInfo) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *MatchTypeInfo) GetSortId() int32 {
+	if x != nil {
+		return x.SortId
+	}
+	return 0
+}
+
+func (x *MatchTypeInfo) GetOn() bool {
+	if x != nil {
+		return x.On
+	}
+	return false
+}
+
+func (x *MatchTypeInfo) GetId() int32 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
 // etcd /game/match_type
 type GameMatchType struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Platform string  `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"`
-	List     []int32 `protobuf:"varint,2,rep,packed,name=List,proto3" json:"List,omitempty"` // 所有玩法类型 1.锦标赛 2.实物赛 3.vip比赛 4.话费赛
+	Platform string           `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"`
+	List     []*MatchTypeInfo `protobuf:"bytes,2,rep,name=List,proto3" json:"List,omitempty"` // 比赛类型列表
 }
 
 func (x *GameMatchType) Reset() {
 	*x = GameMatchType{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[33]
+		mi := &file_common_proto_msgTypes[34]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4044,7 +4123,7 @@ func (x *GameMatchType) String() string {
 func (*GameMatchType) ProtoMessage() {}
 
 func (x *GameMatchType) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[33]
+	mi := &file_common_proto_msgTypes[34]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4057,7 +4136,7 @@ func (x *GameMatchType) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GameMatchType.ProtoReflect.Descriptor instead.
 func (*GameMatchType) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{33}
+	return file_common_proto_rawDescGZIP(), []int{34}
 }
 
 func (x *GameMatchType) GetPlatform() string {
@@ -4067,7 +4146,7 @@ func (x *GameMatchType) GetPlatform() string {
 	return ""
 }
 
-func (x *GameMatchType) GetList() []int32 {
+func (x *GameMatchType) GetList() []*MatchTypeInfo {
 	if x != nil {
 		return x.List
 	}
@@ -4088,7 +4167,7 @@ type WelfareDate struct {
 func (x *WelfareDate) Reset() {
 	*x = WelfareDate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[34]
+		mi := &file_common_proto_msgTypes[35]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4101,7 +4180,7 @@ func (x *WelfareDate) String() string {
 func (*WelfareDate) ProtoMessage() {}
 
 func (x *WelfareDate) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[34]
+	mi := &file_common_proto_msgTypes[35]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4114,7 +4193,7 @@ func (x *WelfareDate) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WelfareDate.ProtoReflect.Descriptor instead.
 func (*WelfareDate) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{34}
+	return file_common_proto_rawDescGZIP(), []int{35}
 }
 
 func (x *WelfareDate) GetGrade() int32 {
@@ -4157,7 +4236,7 @@ type WelfareTurnplateDate struct {
 func (x *WelfareTurnplateDate) Reset() {
 	*x = WelfareTurnplateDate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[35]
+		mi := &file_common_proto_msgTypes[36]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4170,7 +4249,7 @@ func (x *WelfareTurnplateDate) String() string {
 func (*WelfareTurnplateDate) ProtoMessage() {}
 
 func (x *WelfareTurnplateDate) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[35]
+	mi := &file_common_proto_msgTypes[36]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4183,7 +4262,7 @@ func (x *WelfareTurnplateDate) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WelfareTurnplateDate.ProtoReflect.Descriptor instead.
 func (*WelfareTurnplateDate) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{35}
+	return file_common_proto_rawDescGZIP(), []int{36}
 }
 
 func (x *WelfareTurnplateDate) GetId() int32 {
@@ -4211,7 +4290,7 @@ type WelfareTurnplateRate struct {
 func (x *WelfareTurnplateRate) Reset() {
 	*x = WelfareTurnplateRate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[36]
+		mi := &file_common_proto_msgTypes[37]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4224,7 +4303,7 @@ func (x *WelfareTurnplateRate) String() string {
 func (*WelfareTurnplateRate) ProtoMessage() {}
 
 func (x *WelfareTurnplateRate) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[36]
+	mi := &file_common_proto_msgTypes[37]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4237,7 +4316,7 @@ func (x *WelfareTurnplateRate) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WelfareTurnplateRate.ProtoReflect.Descriptor instead.
 func (*WelfareTurnplateRate) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{36}
+	return file_common_proto_rawDescGZIP(), []int{37}
 }
 
 func (x *WelfareTurnplateRate) GetRate() []int32 {
@@ -4262,7 +4341,7 @@ type WelfareTurnplateDateList struct {
 func (x *WelfareTurnplateDateList) Reset() {
 	*x = WelfareTurnplateDateList{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[37]
+		mi := &file_common_proto_msgTypes[38]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4275,7 +4354,7 @@ func (x *WelfareTurnplateDateList) String() string {
 func (*WelfareTurnplateDateList) ProtoMessage() {}
 
 func (x *WelfareTurnplateDateList) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[37]
+	mi := &file_common_proto_msgTypes[38]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4288,7 +4367,7 @@ func (x *WelfareTurnplateDateList) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WelfareTurnplateDateList.ProtoReflect.Descriptor instead.
 func (*WelfareTurnplateDateList) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{37}
+	return file_common_proto_rawDescGZIP(), []int{38}
 }
 
 func (x *WelfareTurnplateDateList) GetList() []*WelfareTurnplateDate {
@@ -4331,7 +4410,7 @@ type AddUpWelfareDate struct {
 func (x *AddUpWelfareDate) Reset() {
 	*x = AddUpWelfareDate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[38]
+		mi := &file_common_proto_msgTypes[39]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4344,7 +4423,7 @@ func (x *AddUpWelfareDate) String() string {
 func (*AddUpWelfareDate) ProtoMessage() {}
 
 func (x *AddUpWelfareDate) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[38]
+	mi := &file_common_proto_msgTypes[39]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4357,7 +4436,7 @@ func (x *AddUpWelfareDate) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AddUpWelfareDate.ProtoReflect.Descriptor instead.
 func (*AddUpWelfareDate) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{38}
+	return file_common_proto_rawDescGZIP(), []int{39}
 }
 
 func (x *AddUpWelfareDate) GetAddUpDay() int32 {
@@ -4387,7 +4466,7 @@ type Welfare7SignDate struct {
 func (x *Welfare7SignDate) Reset() {
 	*x = Welfare7SignDate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[39]
+		mi := &file_common_proto_msgTypes[40]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4400,7 +4479,7 @@ func (x *Welfare7SignDate) String() string {
 func (*Welfare7SignDate) ProtoMessage() {}
 
 func (x *Welfare7SignDate) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[39]
+	mi := &file_common_proto_msgTypes[40]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4413,7 +4492,7 @@ func (x *Welfare7SignDate) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Welfare7SignDate.ProtoReflect.Descriptor instead.
 func (*Welfare7SignDate) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{39}
+	return file_common_proto_rawDescGZIP(), []int{40}
 }
 
 func (x *Welfare7SignDate) GetDay() int32 {
@@ -4451,7 +4530,7 @@ type Welfare7SignDateList struct {
 func (x *Welfare7SignDateList) Reset() {
 	*x = Welfare7SignDateList{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[40]
+		mi := &file_common_proto_msgTypes[41]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4464,7 +4543,7 @@ func (x *Welfare7SignDateList) String() string {
 func (*Welfare7SignDateList) ProtoMessage() {}
 
 func (x *Welfare7SignDateList) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[40]
+	mi := &file_common_proto_msgTypes[41]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4477,7 +4556,7 @@ func (x *Welfare7SignDateList) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Welfare7SignDateList.ProtoReflect.Descriptor instead.
 func (*Welfare7SignDateList) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{40}
+	return file_common_proto_rawDescGZIP(), []int{41}
 }
 
 func (x *Welfare7SignDateList) GetList() []*Welfare7SignDate {
@@ -4520,7 +4599,7 @@ type BlindBoxData struct {
 func (x *BlindBoxData) Reset() {
 	*x = BlindBoxData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[41]
+		mi := &file_common_proto_msgTypes[42]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4533,7 +4612,7 @@ func (x *BlindBoxData) String() string {
 func (*BlindBoxData) ProtoMessage() {}
 
 func (x *BlindBoxData) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[41]
+	mi := &file_common_proto_msgTypes[42]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4546,7 +4625,7 @@ func (x *BlindBoxData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BlindBoxData.ProtoReflect.Descriptor instead.
 func (*BlindBoxData) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{41}
+	return file_common_proto_rawDescGZIP(), []int{42}
 }
 
 func (x *BlindBoxData) GetId() int32 {
@@ -4628,7 +4707,7 @@ type WelfareBlindBoxDataList struct {
 func (x *WelfareBlindBoxDataList) Reset() {
 	*x = WelfareBlindBoxDataList{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[42]
+		mi := &file_common_proto_msgTypes[43]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4641,7 +4720,7 @@ func (x *WelfareBlindBoxDataList) String() string {
 func (*WelfareBlindBoxDataList) ProtoMessage() {}
 
 func (x *WelfareBlindBoxDataList) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[42]
+	mi := &file_common_proto_msgTypes[43]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4654,7 +4733,7 @@ func (x *WelfareBlindBoxDataList) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WelfareBlindBoxDataList.ProtoReflect.Descriptor instead.
 func (*WelfareBlindBoxDataList) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{42}
+	return file_common_proto_rawDescGZIP(), []int{43}
 }
 
 func (x *WelfareBlindBoxDataList) GetList() []*BlindBoxData {
@@ -4709,7 +4788,7 @@ type WelfareSpree struct {
 func (x *WelfareSpree) Reset() {
 	*x = WelfareSpree{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[43]
+		mi := &file_common_proto_msgTypes[44]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4722,7 +4801,7 @@ func (x *WelfareSpree) String() string {
 func (*WelfareSpree) ProtoMessage() {}
 
 func (x *WelfareSpree) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[43]
+	mi := &file_common_proto_msgTypes[44]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4735,7 +4814,7 @@ func (x *WelfareSpree) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WelfareSpree.ProtoReflect.Descriptor instead.
 func (*WelfareSpree) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{43}
+	return file_common_proto_rawDescGZIP(), []int{44}
 }
 
 func (x *WelfareSpree) GetDay() int32 {
@@ -4802,7 +4881,7 @@ type WelfareFirstPayDataList struct {
 func (x *WelfareFirstPayDataList) Reset() {
 	*x = WelfareFirstPayDataList{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[44]
+		mi := &file_common_proto_msgTypes[45]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4815,7 +4894,7 @@ func (x *WelfareFirstPayDataList) String() string {
 func (*WelfareFirstPayDataList) ProtoMessage() {}
 
 func (x *WelfareFirstPayDataList) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[44]
+	mi := &file_common_proto_msgTypes[45]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4828,7 +4907,7 @@ func (x *WelfareFirstPayDataList) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WelfareFirstPayDataList.ProtoReflect.Descriptor instead.
 func (*WelfareFirstPayDataList) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{44}
+	return file_common_proto_rawDescGZIP(), []int{45}
 }
 
 func (x *WelfareFirstPayDataList) GetList() []*WelfareSpree {
@@ -4875,7 +4954,7 @@ type WelfareContinuousPayDataList struct {
 func (x *WelfareContinuousPayDataList) Reset() {
 	*x = WelfareContinuousPayDataList{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[45]
+		mi := &file_common_proto_msgTypes[46]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4888,7 +4967,7 @@ func (x *WelfareContinuousPayDataList) String() string {
 func (*WelfareContinuousPayDataList) ProtoMessage() {}
 
 func (x *WelfareContinuousPayDataList) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[45]
+	mi := &file_common_proto_msgTypes[46]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4901,7 +4980,7 @@ func (x *WelfareContinuousPayDataList) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WelfareContinuousPayDataList.ProtoReflect.Descriptor instead.
 func (*WelfareContinuousPayDataList) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{45}
+	return file_common_proto_rawDescGZIP(), []int{46}
 }
 
 func (x *WelfareContinuousPayDataList) GetList() []*WelfareSpree {
@@ -4966,7 +5045,7 @@ type VIPcfg struct {
 func (x *VIPcfg) Reset() {
 	*x = VIPcfg{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[46]
+		mi := &file_common_proto_msgTypes[47]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4979,7 +5058,7 @@ func (x *VIPcfg) String() string {
 func (*VIPcfg) ProtoMessage() {}
 
 func (x *VIPcfg) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[46]
+	mi := &file_common_proto_msgTypes[47]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4992,7 +5071,7 @@ func (x *VIPcfg) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use VIPcfg.ProtoReflect.Descriptor instead.
 func (*VIPcfg) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{46}
+	return file_common_proto_rawDescGZIP(), []int{47}
 }
 
 func (x *VIPcfg) GetVipId() int32 {
@@ -5128,7 +5207,7 @@ type VIPcfgDataList struct {
 func (x *VIPcfgDataList) Reset() {
 	*x = VIPcfgDataList{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[47]
+		mi := &file_common_proto_msgTypes[48]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5141,7 +5220,7 @@ func (x *VIPcfgDataList) String() string {
 func (*VIPcfgDataList) ProtoMessage() {}
 
 func (x *VIPcfgDataList) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[47]
+	mi := &file_common_proto_msgTypes[48]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5154,7 +5233,7 @@ func (x *VIPcfgDataList) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use VIPcfgDataList.ProtoReflect.Descriptor instead.
 func (*VIPcfgDataList) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{47}
+	return file_common_proto_rawDescGZIP(), []int{48}
 }
 
 func (x *VIPcfgDataList) GetList() []*VIPcfg {
@@ -5193,7 +5272,7 @@ type WbCtrlCfg struct {
 func (x *WbCtrlCfg) Reset() {
 	*x = WbCtrlCfg{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[48]
+		mi := &file_common_proto_msgTypes[49]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5206,7 +5285,7 @@ func (x *WbCtrlCfg) String() string {
 func (*WbCtrlCfg) ProtoMessage() {}
 
 func (x *WbCtrlCfg) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[48]
+	mi := &file_common_proto_msgTypes[49]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5219,7 +5298,7 @@ func (x *WbCtrlCfg) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WbCtrlCfg.ProtoReflect.Descriptor instead.
 func (*WbCtrlCfg) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{48}
+	return file_common_proto_rawDescGZIP(), []int{49}
 }
 
 func (x *WbCtrlCfg) GetPlatform() string {
@@ -5272,7 +5351,7 @@ type EntrySwitch struct {
 func (x *EntrySwitch) Reset() {
 	*x = EntrySwitch{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[49]
+		mi := &file_common_proto_msgTypes[50]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5285,7 +5364,7 @@ func (x *EntrySwitch) String() string {
 func (*EntrySwitch) ProtoMessage() {}
 
 func (x *EntrySwitch) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[49]
+	mi := &file_common_proto_msgTypes[50]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5298,7 +5377,7 @@ func (x *EntrySwitch) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use EntrySwitch.ProtoReflect.Descriptor instead.
 func (*EntrySwitch) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{49}
+	return file_common_proto_rawDescGZIP(), []int{50}
 }
 
 func (x *EntrySwitch) GetPlatform() string {
@@ -5335,7 +5414,7 @@ type ChessRankConfig struct {
 func (x *ChessRankConfig) Reset() {
 	*x = ChessRankConfig{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[50]
+		mi := &file_common_proto_msgTypes[51]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5348,7 +5427,7 @@ func (x *ChessRankConfig) String() string {
 func (*ChessRankConfig) ProtoMessage() {}
 
 func (x *ChessRankConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[50]
+	mi := &file_common_proto_msgTypes[51]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5361,7 +5440,7 @@ func (x *ChessRankConfig) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChessRankConfig.ProtoReflect.Descriptor instead.
 func (*ChessRankConfig) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{50}
+	return file_common_proto_rawDescGZIP(), []int{51}
 }
 
 func (x *ChessRankConfig) GetName() string {
@@ -5398,7 +5477,7 @@ type ChessRankcfgData struct {
 func (x *ChessRankcfgData) Reset() {
 	*x = ChessRankcfgData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[51]
+		mi := &file_common_proto_msgTypes[52]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5411,7 +5490,7 @@ func (x *ChessRankcfgData) String() string {
 func (*ChessRankcfgData) ProtoMessage() {}
 
 func (x *ChessRankcfgData) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[51]
+	mi := &file_common_proto_msgTypes[52]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5424,7 +5503,7 @@ func (x *ChessRankcfgData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChessRankcfgData.ProtoReflect.Descriptor instead.
 func (*ChessRankcfgData) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{51}
+	return file_common_proto_rawDescGZIP(), []int{52}
 }
 
 func (x *ChessRankcfgData) GetDatas() []*ChessRankConfig {
@@ -5472,7 +5551,7 @@ type PlayerPool struct {
 func (x *PlayerPool) Reset() {
 	*x = PlayerPool{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[52]
+		mi := &file_common_proto_msgTypes[53]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5485,7 +5564,7 @@ func (x *PlayerPool) String() string {
 func (*PlayerPool) ProtoMessage() {}
 
 func (x *PlayerPool) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[52]
+	mi := &file_common_proto_msgTypes[53]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5498,7 +5577,7 @@ func (x *PlayerPool) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PlayerPool.ProtoReflect.Descriptor instead.
 func (*PlayerPool) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{52}
+	return file_common_proto_rawDescGZIP(), []int{53}
 }
 
 func (x *PlayerPool) GetPlatform() string {
@@ -5616,7 +5695,7 @@ type GameConfig struct {
 func (x *GameConfig) Reset() {
 	*x = GameConfig{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[53]
+		mi := &file_common_proto_msgTypes[54]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5629,7 +5708,7 @@ func (x *GameConfig) String() string {
 func (*GameConfig) ProtoMessage() {}
 
 func (x *GameConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[53]
+	mi := &file_common_proto_msgTypes[54]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5642,7 +5721,7 @@ func (x *GameConfig) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GameConfig.ProtoReflect.Descriptor instead.
 func (*GameConfig) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{53}
+	return file_common_proto_rawDescGZIP(), []int{54}
 }
 
 func (x *GameConfig) GetPlatform() string {
@@ -5707,7 +5786,7 @@ type WelfarePhoneLotteryStatus struct {
 func (x *WelfarePhoneLotteryStatus) Reset() {
 	*x = WelfarePhoneLotteryStatus{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[54]
+		mi := &file_common_proto_msgTypes[55]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5720,7 +5799,7 @@ func (x *WelfarePhoneLotteryStatus) String() string {
 func (*WelfarePhoneLotteryStatus) ProtoMessage() {}
 
 func (x *WelfarePhoneLotteryStatus) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[54]
+	mi := &file_common_proto_msgTypes[55]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5733,7 +5812,7 @@ func (x *WelfarePhoneLotteryStatus) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WelfarePhoneLotteryStatus.ProtoReflect.Descriptor instead.
 func (*WelfarePhoneLotteryStatus) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{54}
+	return file_common_proto_rawDescGZIP(), []int{55}
 }
 
 func (x *WelfarePhoneLotteryStatus) GetPlatform() string {
@@ -5763,7 +5842,7 @@ type WelfareCollectConfig struct {
 func (x *WelfareCollectConfig) Reset() {
 	*x = WelfareCollectConfig{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[55]
+		mi := &file_common_proto_msgTypes[56]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5776,7 +5855,7 @@ func (x *WelfareCollectConfig) String() string {
 func (*WelfareCollectConfig) ProtoMessage() {}
 
 func (x *WelfareCollectConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[55]
+	mi := &file_common_proto_msgTypes[56]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5789,7 +5868,7 @@ func (x *WelfareCollectConfig) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WelfareCollectConfig.ProtoReflect.Descriptor instead.
 func (*WelfareCollectConfig) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{55}
+	return file_common_proto_rawDescGZIP(), []int{56}
 }
 
 func (x *WelfareCollectConfig) GetPlatform() string {
@@ -5820,7 +5899,7 @@ type ChannelSwitchConfig struct {
 func (x *ChannelSwitchConfig) Reset() {
 	*x = ChannelSwitchConfig{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_common_proto_msgTypes[56]
+		mi := &file_common_proto_msgTypes[57]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5833,7 +5912,7 @@ func (x *ChannelSwitchConfig) String() string {
 func (*ChannelSwitchConfig) ProtoMessage() {}
 
 func (x *ChannelSwitchConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_common_proto_msgTypes[56]
+	mi := &file_common_proto_msgTypes[57]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5846,7 +5925,7 @@ func (x *ChannelSwitchConfig) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChannelSwitchConfig.ProtoReflect.Descriptor instead.
 func (*ChannelSwitchConfig) Descriptor() ([]byte, []int) {
-	return file_common_proto_rawDescGZIP(), []int{56}
+	return file_common_proto_rawDescGZIP(), []int{57}
 }
 
 func (x *ChannelSwitchConfig) GetTp() int32 {
@@ -6515,7 +6594,7 @@ var file_common_proto_rawDesc = []byte{
 	0x55, 0x70, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x55,
 	0x70, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x44, 0x6f, 0x77, 0x6e, 0x4c, 0x69,
 	0x6d, 0x69, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x44, 0x6f, 0x77, 0x6e, 0x4c,
-	0x69, 0x6d, 0x69, 0x74, 0x22, 0xd5, 0x06, 0x0a, 0x0d, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74,
+	0x69, 0x6d, 0x69, 0x74, 0x22, 0xed, 0x06, 0x0a, 0x0d, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74,
 	0x63, 0x68, 0x44, 0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x47, 0x61, 0x6d, 0x65, 0x46, 0x72,
 	0x65, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x47, 0x61, 0x6d, 0x65,
@@ -6568,262 +6647,270 @@ var file_common_proto_rawDesc = []byte{
 	0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x17, 0x20, 0x03, 0x28,
 	0x09, 0x52, 0x0d, 0x4f, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4e, 0x61, 0x6d, 0x65,
 	0x12, 0x1a, 0x0a, 0x08, 0x43, 0x61, 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, 0x18, 0x18, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x08, 0x43, 0x61, 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, 0x22, 0x5a, 0x0a, 0x11,
-	0x47, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x44, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73,
-	0x74, 0x12, 0x29, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x15, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x44, 0x61, 0x74, 0x65, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08,
-	0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
-	0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x22, 0x3f, 0x0a, 0x0d, 0x47, 0x61, 0x6d, 0x65,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 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, 0x12, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20,
-	0x03, 0x28, 0x05, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x64, 0x0a, 0x0b, 0x57, 0x65, 0x6c,
-	0x66, 0x61, 0x72, 0x65, 0x44, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x47, 0x72, 0x61, 0x64,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x47, 0x72, 0x61, 0x64, 0x65, 0x12, 0x12,
-	0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x54, 0x79,
-	0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x5f, 0x49,
-	0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x22,
-	0x4f, 0x0a, 0x14, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x54, 0x75, 0x72, 0x6e, 0x70, 0x6c,
-	0x61, 0x74, 0x65, 0x44, 0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x27, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x65, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x57,
-	0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x44, 0x61, 0x74, 0x65, 0x52, 0x04, 0x44, 0x61, 0x74, 0x65,
-	0x22, 0x2a, 0x0a, 0x14, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x54, 0x75, 0x72, 0x6e, 0x70,
-	0x6c, 0x61, 0x74, 0x65, 0x52, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x52, 0x61, 0x74, 0x65,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x52, 0x61, 0x74, 0x65, 0x22, 0xba, 0x01, 0x0a,
-	0x18, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x54, 0x75, 0x72, 0x6e, 0x70, 0x6c, 0x61, 0x74,
-	0x65, 0x44, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x30, 0x0a, 0x04, 0x4c, 0x69, 0x73,
-	0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69,
-	0x2e, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x54, 0x75, 0x72, 0x6e, 0x70, 0x6c, 0x61, 0x74,
-	0x65, 0x44, 0x61, 0x74, 0x65, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x08, 0x52,
-	0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e,
-	0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x54, 0x75,
-	0x72, 0x6e, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x61, 0x74, 0x65, 0x52, 0x08, 0x52, 0x61, 0x74,
-	0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72,
-	0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72,
-	0x6d, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x61, 0x0a, 0x10, 0x41, 0x64, 0x64,
-	0x55, 0x70, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x44, 0x61, 0x74, 0x65, 0x12, 0x1a, 0x0a,
-	0x08, 0x41, 0x64, 0x64, 0x55, 0x70, 0x44, 0x61, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x08, 0x41, 0x64, 0x64, 0x55, 0x70, 0x44, 0x61, 0x79, 0x12, 0x31, 0x0a, 0x09, 0x41, 0x64, 0x64,
-	0x55, 0x70, 0x44, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x77,
-	0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x44, 0x61, 0x74,
-	0x65, 0x52, 0x09, 0x41, 0x64, 0x64, 0x55, 0x70, 0x44, 0x61, 0x74, 0x65, 0x22, 0x85, 0x01, 0x0a,
-	0x10, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x37, 0x53, 0x69, 0x67, 0x6e, 0x44, 0x61, 0x74,
-	0x65, 0x12, 0x10, 0x0a, 0x03, 0x44, 0x61, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
-	0x44, 0x61, 0x79, 0x12, 0x27, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x28, 0x05, 0x52, 0x08, 0x43, 0x61, 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06,
+	0x53, 0x68, 0x6f, 0x77, 0x49, 0x64, 0x18, 0x19, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x68,
+	0x6f, 0x77, 0x49, 0x64, 0x22, 0x5a, 0x0a, 0x11, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x44, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x29, 0x0a, 0x04, 0x4c, 0x69, 0x73,
+	0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69,
+	0x2e, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x44, 0x61, 0x74, 0x65, 0x52, 0x04,
+	0x4c, 0x69, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d,
+	0x22, 0x5b, 0x0a, 0x0d, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x49, 0x6e, 0x66,
+	0x6f, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x6f, 0x72, 0x74, 0x49, 0x64, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x6f, 0x72, 0x74, 0x49, 0x64, 0x12, 0x0e, 0x0a,
+	0x02, 0x4f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x02, 0x4f, 0x6e, 0x12, 0x0e, 0x0a,
+	0x02, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x22, 0x56, 0x0a,
+	0x0d, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 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, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x04, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x64, 0x0a, 0x0b, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65,
+	0x44, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x47, 0x72, 0x61, 0x64, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x47, 0x72, 0x61, 0x64, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79,
+	0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12,
+	0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61,
+	0x6d, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x5f, 0x49, 0x64, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x22, 0x4f, 0x0a, 0x14, 0x57,
+	0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x54, 0x75, 0x72, 0x6e, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x44,
+	0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x02, 0x49, 0x64, 0x12, 0x27, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28,
 	0x0b, 0x32, 0x13, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x57, 0x65, 0x6c, 0x66, 0x61,
-	0x72, 0x65, 0x44, 0x61, 0x74, 0x65, 0x52, 0x04, 0x44, 0x61, 0x74, 0x65, 0x12, 0x36, 0x0a, 0x09,
-	0x41, 0x64, 0x64, 0x55, 0x70, 0x44, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x18, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x41, 0x64, 0x64, 0x55, 0x70, 0x57, 0x65,
-	0x6c, 0x66, 0x61, 0x72, 0x65, 0x44, 0x61, 0x74, 0x65, 0x52, 0x09, 0x41, 0x64, 0x64, 0x55, 0x70,
-	0x44, 0x61, 0x74, 0x65, 0x22, 0x78, 0x0a, 0x14, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x37,
-	0x53, 0x69, 0x67, 0x6e, 0x44, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2c, 0x0a, 0x04,
-	0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x77, 0x65, 0x62,
-	0x61, 0x70, 0x69, 0x2e, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x37, 0x53, 0x69, 0x67, 0x6e,
-	0x44, 0x61, 0x74, 0x65, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c,
-	0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c,
-	0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0xdb,
-	0x01, 0x0a, 0x0c, 0x42, 0x6c, 0x69, 0x6e, 0x64, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74, 0x61, 0x12,
-	0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12,
-	0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x54,
-	0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x47, 0x72, 0x61, 0x64, 0x65,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x47, 0x72, 0x61, 0x64, 0x65, 0x12, 0x18, 0x0a,
-	0x07, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x72, 0x69, 0x63, 0x65,
-	0x31, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x70, 0x72, 0x69, 0x63, 0x65, 0x31, 0x12,
-	0x16, 0x0a, 0x06, 0x70, 0x72, 0x69, 0x63, 0x65, 0x32, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x06, 0x70, 0x72, 0x69, 0x63, 0x65, 0x32, 0x12, 0x1a, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x63, 0x6f,
-	0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x01, 0x52, 0x08, 0x44, 0x69, 0x73, 0x63, 0x6f,
-	0x75, 0x6e, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x5f, 0x49, 0x64, 0x18, 0x09,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x22, 0xa3, 0x01, 0x0a,
-	0x17, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x42, 0x6c, 0x69, 0x6e, 0x64, 0x42, 0x6f, 0x78,
-	0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e,
-	0x42, 0x6c, 0x69, 0x6e, 0x64, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x4c, 0x69,
-	0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x16,
-	0x0a, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
-	0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x79, 0x63, 0x6c, 0x65, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x43, 0x79, 0x63, 0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05,
-	0x4d, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x4d, 0x69, 0x6e,
-	0x49, 0x64, 0x22, 0xc5, 0x01, 0x0a, 0x0c, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x53, 0x70,
-	0x72, 0x65, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x44, 0x61, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x03, 0x44, 0x61, 0x79, 0x12, 0x27, 0x0a, 0x04, 0x49, 0x74, 0x65, 0x6d, 0x18, 0x02, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x57, 0x65, 0x6c,
-	0x66, 0x61, 0x72, 0x65, 0x44, 0x61, 0x74, 0x65, 0x52, 0x04, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x14,
-	0x0a, 0x05, 0x56, 0x49, 0x50, 0x45, 0x58, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x56,
-	0x49, 0x50, 0x45, 0x58, 0x12, 0x18, 0x0a, 0x07, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x12, 0x16,
-	0x0a, 0x06, 0x70, 0x72, 0x69, 0x63, 0x65, 0x31, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06,
-	0x70, 0x72, 0x69, 0x63, 0x65, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x72, 0x69, 0x63, 0x65, 0x32,
-	0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x70, 0x72, 0x69, 0x63, 0x65, 0x32, 0x12, 0x1a,
-	0x0a, 0x08, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x01,
-	0x52, 0x08, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x8d, 0x01, 0x0a, 0x17, 0x57,
-	0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x46, 0x69, 0x72, 0x73, 0x74, 0x50, 0x61, 0x79, 0x44, 0x61,
-	0x74, 0x61, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x57, 0x65,
-	0x6c, 0x66, 0x61, 0x72, 0x65, 0x53, 0x70, 0x72, 0x65, 0x65, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74,
-	0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x16, 0x0a, 0x06,
-	0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x77,
-	0x69, 0x74, 0x63, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x79, 0x63, 0x6c, 0x65, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x05, 0x43, 0x79, 0x63, 0x6c, 0x65, 0x22, 0xa8, 0x01, 0x0a, 0x1c, 0x57,
-	0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x6f, 0x75, 0x73,
-	0x50, 0x61, 0x79, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x04, 0x4c,
-	0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x77, 0x65, 0x62, 0x61,
-	0x70, 0x69, 0x2e, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x53, 0x70, 0x72, 0x65, 0x65, 0x52,
-	0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72,
-	0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72,
-	0x6d, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x79, 0x63,
-	0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x43, 0x79, 0x63, 0x6c, 0x65, 0x12,
-	0x14, 0x0a, 0x05, 0x42, 0x72, 0x65, 0x61, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
-	0x42, 0x72, 0x65, 0x61, 0x6b, 0x22, 0xc4, 0x05, 0x0a, 0x06, 0x56, 0x49, 0x50, 0x63, 0x66, 0x67,
-	0x12, 0x14, 0x0a, 0x05, 0x56, 0x69, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x05, 0x56, 0x69, 0x70, 0x49, 0x64, 0x12, 0x2f, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x56,
-	0x49, 0x50, 0x63, 0x66, 0x67, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x69, 0x70, 0x45, 0x78,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x56, 0x69, 0x70, 0x45, 0x78, 0x12, 0x14, 0x0a,
-	0x05, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x50, 0x72,
-	0x69, 0x63, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65,
-	0x31, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65,
-	0x67, 0x65, 0x31, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65,
-	0x32, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65,
-	0x67, 0x65, 0x32, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65,
-	0x33, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65,
-	0x67, 0x65, 0x33, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65,
-	0x34, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65,
-	0x67, 0x65, 0x34, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65,
-	0x35, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65,
-	0x67, 0x65, 0x35, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65,
-	0x36, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65,
-	0x67, 0x65, 0x36, 0x12, 0x3e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65,
-	0x37, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69,
-	0x2e, 0x56, 0x49, 0x50, 0x63, 0x66, 0x67, 0x2e, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67,
-	0x65, 0x37, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65,
-	0x67, 0x65, 0x37, 0x12, 0x28, 0x0a, 0x0f, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65,
-	0x37, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x50, 0x72,
-	0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x1e, 0x0a,
-	0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x38, 0x18, 0x0d, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x38, 0x12, 0x28, 0x0a,
-	0x0f, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44,
-	0x18, 0x0e, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0f, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x4f, 0x75,
-	0x74, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x49,
-	0x64, 0x32, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64,
-	0x32, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x37, 0x18, 0x10, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x37, 0x12, 0x26, 0x0a, 0x0e, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x46, 0x72, 0x65, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x11, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x0e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x46, 0x72, 0x65, 0x65, 0x54, 0x69,
-	0x6d, 0x65, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03,
-	0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3d, 0x0a,
-	0x0f, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6b,
-	0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x70, 0x0a, 0x0e,
-	0x56, 0x49, 0x50, 0x63, 0x66, 0x67, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x22,
-	0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x77,
-	0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x56, 0x49, 0x50, 0x63, 0x66, 0x67, 0x52, 0x04, 0x4c, 0x69,
-	0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x1e,
-	0x0a, 0x0a, 0x4d, 0x6f, 0x6e, 0x65, 0x79, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x01, 0x52, 0x0a, 0x4d, 0x6f, 0x6e, 0x65, 0x79, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x22, 0x95,
-	0x01, 0x0a, 0x09, 0x57, 0x62, 0x43, 0x74, 0x72, 0x6c, 0x43, 0x66, 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, 0x1a, 0x0a, 0x08, 0x52, 0x65, 0x61, 0x6c,
-	0x43, 0x74, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x52, 0x65, 0x61, 0x6c,
-	0x43, 0x74, 0x72, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x4e, 0x6f, 0x76, 0x69, 0x63, 0x65, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x4e, 0x6f, 0x76, 0x69, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07,
-	0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x57,
-	0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x4b, 0x69, 0x6c, 0x6c, 0x50, 0x6f,
-	0x69, 0x6e, 0x74, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x4b, 0x69, 0x6c, 0x6c,
-	0x50, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x22, 0x57, 0x0a, 0x0b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x53,
-	0x77, 0x69, 0x74, 0x63, 0x68, 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, 0x14, 0x0a, 0x05, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x05, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63,
-	0x68, 0x18, 0x03, 0x20, 0x03, 0x28, 0x08, 0x52, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22,
-	0x64, 0x0a, 0x0f, 0x43, 0x68, 0x65, 0x73, 0x73, 0x52, 0x61, 0x6e, 0x6b, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x27, 0x0a, 0x04,
-	0x49, 0x74, 0x65, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x77, 0x65, 0x62,
-	0x61, 0x70, 0x69, 0x2e, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x44, 0x61, 0x74, 0x65, 0x52,
-	0x04, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x75, 0x0a, 0x10, 0x43, 0x68, 0x65, 0x73, 0x73, 0x52, 0x61,
-	0x6e, 0x6b, 0x63, 0x66, 0x67, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2d, 0x0a, 0x05, 0x44, 0x61, 0x74,
-	0x61, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70,
-	0x69, 0x2e, 0x43, 0x68, 0x65, 0x73, 0x73, 0x52, 0x61, 0x6e, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x52, 0x05, 0x44, 0x61, 0x74, 0x61, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74,
-	0x66, 0x6f, 0x72, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74,
-	0x66, 0x6f, 0x72, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x22, 0xb4, 0x03, 0x0a,
-	0x0a, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x50, 0x6f, 0x6f, 0x6c, 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, 0x1e, 0x0a, 0x0a, 0x55, 0x70, 0x70, 0x65, 0x72,
-	0x4c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x55, 0x70, 0x70,
-	0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x4c, 0x6f, 0x77, 0x65, 0x72,
-	0x4c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x4c, 0x6f, 0x77,
-	0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x51, 0x75, 0x44, 0x75, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x51, 0x75, 0x44, 0x75, 0x12, 0x1c, 0x0a, 0x09, 0x55,
-	0x70, 0x70, 0x65, 0x72, 0x4f, 0x64, 0x64, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
-	0x55, 0x70, 0x70, 0x65, 0x72, 0x4f, 0x64, 0x64, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x55, 0x70, 0x70,
-	0x65, 0x72, 0x4f, 0x64, 0x64, 0x73, 0x4d, 0x61, 0x78, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x0c, 0x55, 0x70, 0x70, 0x65, 0x72, 0x4f, 0x64, 0x64, 0x73, 0x4d, 0x61, 0x78, 0x12, 0x1c, 0x0a,
-	0x09, 0x4c, 0x6f, 0x77, 0x65, 0x72, 0x4f, 0x64, 0x64, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x09, 0x4c, 0x6f, 0x77, 0x65, 0x72, 0x4f, 0x64, 0x64, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x4c,
-	0x6f, 0x77, 0x65, 0x72, 0x4f, 0x64, 0x64, 0x73, 0x4d, 0x61, 0x78, 0x18, 0x08, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x0c, 0x4c, 0x6f, 0x77, 0x65, 0x72, 0x4f, 0x64, 0x64, 0x73, 0x4d, 0x61, 0x78, 0x12,
-	0x18, 0x0a, 0x07, 0x46, 0x69, 0x67, 0x68, 0x74, 0x55, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x07, 0x46, 0x69, 0x67, 0x68, 0x74, 0x55, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x46, 0x69, 0x67,
-	0x68, 0x74, 0x44, 0x6f, 0x77, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x46, 0x69,
-	0x67, 0x68, 0x74, 0x44, 0x6f, 0x77, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x50, 0x61, 0x79, 0x55, 0x70,
-	0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x50, 0x61, 0x79, 0x55, 0x70, 0x12, 0x18, 0x0a,
-	0x07, 0x50, 0x61, 0x79, 0x44, 0x6f, 0x77, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
-	0x50, 0x61, 0x79, 0x44, 0x6f, 0x77, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x54, 0x69, 0x61, 0x6e, 0x48,
-	0x75, 0x52, 0x61, 0x74, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x54, 0x69, 0x61,
-	0x6e, 0x48, 0x75, 0x52, 0x61, 0x74, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x50, 0x6c, 0x61, 0x79, 0x65,
-	0x72, 0x50, 0x6f, 0x6f, 0x6c, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x18, 0x0e, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x10, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x50, 0x6f, 0x6f, 0x6c, 0x53, 0x77, 0x69,
-	0x74, 0x63, 0x68, 0x22, 0xc8, 0x01, 0x0a, 0x0a, 0x47, 0x61, 0x6d, 0x65, 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, 0x16,
-	0x0a, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
-	0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x69, 0x61, 0x6e, 0x48, 0x75,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x69, 0x61, 0x6e, 0x48, 0x75, 0x12, 0x14,
-	0x0a, 0x05, 0x50, 0x61, 0x69, 0x4b, 0x75, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x50,
-	0x61, 0x69, 0x4b, 0x75, 0x12, 0x16, 0x0a, 0x06, 0x46, 0x65, 0x6e, 0x43, 0x68, 0x61, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x46, 0x65, 0x6e, 0x43, 0x68, 0x61, 0x12, 0x20, 0x0a, 0x0b,
-	0x46, 0x65, 0x6e, 0x43, 0x68, 0x61, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x0b, 0x46, 0x65, 0x6e, 0x43, 0x68, 0x61, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e,
-	0x0a, 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x46, 0x65, 0x6e, 0x43, 0x68, 0x61, 0x18, 0x07, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x0a, 0x47, 0x6f, 0x6f, 0x64, 0x46, 0x65, 0x6e, 0x43, 0x68, 0x61, 0x22, 0x4f,
-	0x0a, 0x19, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x4c, 0x6f,
-	0x74, 0x74, 0x65, 0x72, 0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 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, 0x16, 0x0a, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63,
-	0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22,
-	0x4a, 0x0a, 0x14, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63,
-	0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66,
+	0x72, 0x65, 0x44, 0x61, 0x74, 0x65, 0x52, 0x04, 0x44, 0x61, 0x74, 0x65, 0x22, 0x2a, 0x0a, 0x14,
+	0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x54, 0x75, 0x72, 0x6e, 0x70, 0x6c, 0x61, 0x74, 0x65,
+	0x52, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x52, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x05, 0x52, 0x04, 0x52, 0x61, 0x74, 0x65, 0x22, 0xba, 0x01, 0x0a, 0x18, 0x57, 0x65, 0x6c,
+	0x66, 0x61, 0x72, 0x65, 0x54, 0x75, 0x72, 0x6e, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x44, 0x61, 0x74,
+	0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x30, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x57, 0x65, 0x6c,
+	0x66, 0x61, 0x72, 0x65, 0x54, 0x75, 0x72, 0x6e, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x44, 0x61, 0x74,
+	0x65, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x08, 0x52, 0x61, 0x74, 0x65, 0x4c,
+	0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x77, 0x65, 0x62, 0x61,
+	0x70, 0x69, 0x2e, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x54, 0x75, 0x72, 0x6e, 0x70, 0x6c,
+	0x61, 0x74, 0x65, 0x52, 0x61, 0x74, 0x65, 0x52, 0x08, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73,
+	0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x16, 0x0a,
+	0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53,
+	0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x61, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x55, 0x70, 0x57, 0x65,
+	0x6c, 0x66, 0x61, 0x72, 0x65, 0x44, 0x61, 0x74, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x41, 0x64, 0x64,
+	0x55, 0x70, 0x44, 0x61, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x41, 0x64, 0x64,
+	0x55, 0x70, 0x44, 0x61, 0x79, 0x12, 0x31, 0x0a, 0x09, 0x41, 0x64, 0x64, 0x55, 0x70, 0x44, 0x61,
+	0x74, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70,
+	0x69, 0x2e, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x44, 0x61, 0x74, 0x65, 0x52, 0x09, 0x41,
+	0x64, 0x64, 0x55, 0x70, 0x44, 0x61, 0x74, 0x65, 0x22, 0x85, 0x01, 0x0a, 0x10, 0x57, 0x65, 0x6c,
+	0x66, 0x61, 0x72, 0x65, 0x37, 0x53, 0x69, 0x67, 0x6e, 0x44, 0x61, 0x74, 0x65, 0x12, 0x10, 0x0a,
+	0x03, 0x44, 0x61, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x44, 0x61, 0x79, 0x12,
+	0x27, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e,
+	0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x44, 0x61,
+	0x74, 0x65, 0x52, 0x04, 0x44, 0x61, 0x74, 0x65, 0x12, 0x36, 0x0a, 0x09, 0x41, 0x64, 0x64, 0x55,
+	0x70, 0x44, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x77, 0x65,
+	0x62, 0x61, 0x70, 0x69, 0x2e, 0x41, 0x64, 0x64, 0x55, 0x70, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72,
+	0x65, 0x44, 0x61, 0x74, 0x65, 0x52, 0x09, 0x41, 0x64, 0x64, 0x55, 0x70, 0x44, 0x61, 0x74, 0x65,
+	0x22, 0x78, 0x0a, 0x14, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x37, 0x53, 0x69, 0x67, 0x6e,
+	0x44, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2c, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e,
+	0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x37, 0x53, 0x69, 0x67, 0x6e, 0x44, 0x61, 0x74, 0x65,
+	0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f,
+	0x72, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f,
+	0x72, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0xdb, 0x01, 0x0a, 0x0c, 0x42,
+	0x6c, 0x69, 0x6e, 0x64, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x49,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x54,
+	0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12,
+	0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e,
+	0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x47, 0x72, 0x61, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x05, 0x47, 0x72, 0x61, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x43, 0x6f, 0x6e,
+	0x73, 0x75, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x43, 0x6f, 0x6e, 0x73,
+	0x75, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x72, 0x69, 0x63, 0x65, 0x31, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x06, 0x70, 0x72, 0x69, 0x63, 0x65, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70,
+	0x72, 0x69, 0x63, 0x65, 0x32, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x70, 0x72, 0x69,
+	0x63, 0x65, 0x32, 0x12, 0x1a, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18,
+	0x08, 0x20, 0x01, 0x28, 0x01, 0x52, 0x08, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12,
+	0x17, 0x0a, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x5f, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x22, 0xa3, 0x01, 0x0a, 0x17, 0x57, 0x65, 0x6c,
+	0x66, 0x61, 0x72, 0x65, 0x42, 0x6c, 0x69, 0x6e, 0x64, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74, 0x61,
+	0x4c, 0x69, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x14, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x42, 0x6c, 0x69, 0x6e,
+	0x64, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1a,
+	0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x77,
+	0x69, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x77, 0x69, 0x74,
+	0x63, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x79, 0x63, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x05, 0x43, 0x79, 0x63, 0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x4d, 0x69, 0x6e, 0x49,
+	0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x4d, 0x69, 0x6e, 0x49, 0x64, 0x22, 0xc5,
+	0x01, 0x0a, 0x0c, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x53, 0x70, 0x72, 0x65, 0x65, 0x12,
+	0x10, 0x0a, 0x03, 0x44, 0x61, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x44, 0x61,
+	0x79, 0x12, 0x27, 0x0a, 0x04, 0x49, 0x74, 0x65, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x13, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65,
+	0x44, 0x61, 0x74, 0x65, 0x52, 0x04, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x49,
+	0x50, 0x45, 0x58, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x56, 0x49, 0x50, 0x45, 0x58,
+	0x12, 0x18, 0x0a, 0x07, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x07, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x72,
+	0x69, 0x63, 0x65, 0x31, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x70, 0x72, 0x69, 0x63,
+	0x65, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x72, 0x69, 0x63, 0x65, 0x32, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x06, 0x70, 0x72, 0x69, 0x63, 0x65, 0x32, 0x12, 0x1a, 0x0a, 0x08, 0x44, 0x69,
+	0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x01, 0x52, 0x08, 0x44, 0x69,
+	0x73, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x8d, 0x01, 0x0a, 0x17, 0x57, 0x65, 0x6c, 0x66, 0x61,
+	0x72, 0x65, 0x46, 0x69, 0x72, 0x73, 0x74, 0x50, 0x61, 0x79, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69,
+	0x73, 0x74, 0x12, 0x28, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x14, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72,
+	0x65, 0x53, 0x70, 0x72, 0x65, 0x65, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08,
+	0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x77, 0x69, 0x74,
+	0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68,
+	0x12, 0x14, 0x0a, 0x05, 0x43, 0x79, 0x63, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x05, 0x43, 0x79, 0x63, 0x6c, 0x65, 0x22, 0xa8, 0x01, 0x0a, 0x1c, 0x57, 0x65, 0x6c, 0x66, 0x61,
+	0x72, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x6f, 0x75, 0x73, 0x50, 0x61, 0x79, 0x44,
+	0x61, 0x74, 0x61, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x57,
+	0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x53, 0x70, 0x72, 0x65, 0x65, 0x52, 0x04, 0x4c, 0x69, 0x73,
+	0x74, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x16, 0x0a,
+	0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53,
+	0x77, 0x69, 0x74, 0x63, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x79, 0x63, 0x6c, 0x65, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x43, 0x79, 0x63, 0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x42,
+	0x72, 0x65, 0x61, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x42, 0x72, 0x65, 0x61,
+	0x6b, 0x22, 0xc4, 0x05, 0x0a, 0x06, 0x56, 0x49, 0x50, 0x63, 0x66, 0x67, 0x12, 0x14, 0x0a, 0x05,
+	0x56, 0x69, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x56, 0x69, 0x70,
+	0x49, 0x64, 0x12, 0x2f, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x19, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x56, 0x49, 0x50, 0x63, 0x66,
+	0x67, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x41, 0x77,
+	0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x69, 0x70, 0x45, 0x78, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x05, 0x56, 0x69, 0x70, 0x45, 0x78, 0x12, 0x14, 0x0a, 0x05, 0x50, 0x72, 0x69,
+	0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12,
+	0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x31, 0x18, 0x05, 0x20,
+	0x03, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x31, 0x12,
+	0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x32, 0x18, 0x06, 0x20,
+	0x03, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x32, 0x12,
+	0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x33, 0x18, 0x07, 0x20,
+	0x03, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x33, 0x12,
+	0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x34, 0x18, 0x08, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x34, 0x12,
+	0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x35, 0x18, 0x09, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x35, 0x12,
+	0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x36, 0x18, 0x0a, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x36, 0x12,
+	0x3e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x18, 0x0b, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x56, 0x49, 0x50,
+	0x63, 0x66, 0x67, 0x2e, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x12,
+	0x28, 0x0a, 0x0f, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x50, 0x72, 0x69,
+	0x63, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c,
+	0x65, 0x67, 0x65, 0x37, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69,
+	0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x38, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x50,
+	0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x38, 0x12, 0x28, 0x0a, 0x0f, 0x52, 0x65, 0x77,
+	0x61, 0x72, 0x64, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x18, 0x0e, 0x20, 0x03,
+	0x28, 0x05, 0x52, 0x0f, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x6e,
+	0x65, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x32, 0x18, 0x0f,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x32, 0x12, 0x18, 0x0a,
+	0x07, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x37, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
+	0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x37, 0x12, 0x26, 0x0a, 0x0e, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x46, 0x72, 0x65, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x46, 0x72, 0x65, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x1a,
+	0x38, 0x0a, 0x0a, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3d, 0x0a, 0x0f, 0x50, 0x72, 0x69,
+	0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
+	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
+	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x70, 0x0a, 0x0e, 0x56, 0x49, 0x50, 0x63,
+	0x66, 0x67, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x04, 0x4c, 0x69,
+	0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70,
+	0x69, 0x2e, 0x56, 0x49, 0x50, 0x63, 0x66, 0x67, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1a,
+	0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x6f,
+	0x6e, 0x65, 0x79, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0a,
+	0x4d, 0x6f, 0x6e, 0x65, 0x79, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x22, 0x95, 0x01, 0x0a, 0x09, 0x57,
+	0x62, 0x43, 0x74, 0x72, 0x6c, 0x43, 0x66, 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, 0x1a, 0x0a, 0x08, 0x52, 0x65, 0x61, 0x6c, 0x43, 0x74, 0x72, 0x6c,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x52, 0x65, 0x61, 0x6c, 0x43, 0x74, 0x72, 0x6c,
+	0x12, 0x16, 0x0a, 0x06, 0x4e, 0x6f, 0x76, 0x69, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x06, 0x4e, 0x6f, 0x76, 0x69, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x57, 0x65, 0x6c, 0x66,
+	0x61, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x57, 0x65, 0x6c, 0x66, 0x61,
+	0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x4b, 0x69, 0x6c, 0x6c, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x73,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x4b, 0x69, 0x6c, 0x6c, 0x50, 0x6f, 0x69, 0x6e,
+	0x74, 0x73, 0x22, 0x57, 0x0a, 0x0b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x53, 0x77, 0x69, 0x74, 0x63,
+	0x68, 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, 0x14, 0x0a,
+	0x05, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x49, 0x6e,
+	0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20,
+	0x03, 0x28, 0x08, 0x52, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x64, 0x0a, 0x0f, 0x43,
+	0x68, 0x65, 0x73, 0x73, 0x52, 0x61, 0x6e, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x12,
+	0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61,
+	0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x27, 0x0a, 0x04, 0x49, 0x74, 0x65, 0x6d,
+	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e,
+	0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x44, 0x61, 0x74, 0x65, 0x52, 0x04, 0x49, 0x74, 0x65,
+	0x6d, 0x22, 0x75, 0x0a, 0x10, 0x43, 0x68, 0x65, 0x73, 0x73, 0x52, 0x61, 0x6e, 0x6b, 0x63, 0x66,
+	0x67, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2d, 0x0a, 0x05, 0x44, 0x61, 0x74, 0x61, 0x73, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x43, 0x68,
+	0x65, 0x73, 0x73, 0x52, 0x61, 0x6e, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x05, 0x44,
+	0x61, 0x74, 0x61, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d,
+	0x12, 0x16, 0x0a, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x22, 0xb4, 0x03, 0x0a, 0x0a, 0x50, 0x6c, 0x61,
+	0x79, 0x65, 0x72, 0x50, 0x6f, 0x6f, 0x6c, 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, 0x1e, 0x0a, 0x0a, 0x55, 0x70, 0x70, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69,
+	0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x55, 0x70, 0x70, 0x65, 0x72, 0x4c, 0x69,
+	0x6d, 0x69, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x4c, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69,
+	0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x4c, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69,
+	0x6d, 0x69, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x51, 0x75, 0x44, 0x75, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x04, 0x51, 0x75, 0x44, 0x75, 0x12, 0x1c, 0x0a, 0x09, 0x55, 0x70, 0x70, 0x65, 0x72,
+	0x4f, 0x64, 0x64, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x55, 0x70, 0x70, 0x65,
+	0x72, 0x4f, 0x64, 0x64, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x55, 0x70, 0x70, 0x65, 0x72, 0x4f, 0x64,
+	0x64, 0x73, 0x4d, 0x61, 0x78, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x55, 0x70, 0x70,
+	0x65, 0x72, 0x4f, 0x64, 0x64, 0x73, 0x4d, 0x61, 0x78, 0x12, 0x1c, 0x0a, 0x09, 0x4c, 0x6f, 0x77,
+	0x65, 0x72, 0x4f, 0x64, 0x64, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x4c, 0x6f,
+	0x77, 0x65, 0x72, 0x4f, 0x64, 0x64, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x4c, 0x6f, 0x77, 0x65, 0x72,
+	0x4f, 0x64, 0x64, 0x73, 0x4d, 0x61, 0x78, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x4c,
+	0x6f, 0x77, 0x65, 0x72, 0x4f, 0x64, 0x64, 0x73, 0x4d, 0x61, 0x78, 0x12, 0x18, 0x0a, 0x07, 0x46,
+	0x69, 0x67, 0x68, 0x74, 0x55, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x46, 0x69,
+	0x67, 0x68, 0x74, 0x55, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x46, 0x69, 0x67, 0x68, 0x74, 0x44, 0x6f,
+	0x77, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x46, 0x69, 0x67, 0x68, 0x74, 0x44,
+	0x6f, 0x77, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x50, 0x61, 0x79, 0x55, 0x70, 0x18, 0x0b, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x05, 0x50, 0x61, 0x79, 0x55, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x50, 0x61, 0x79,
+	0x44, 0x6f, 0x77, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x50, 0x61, 0x79, 0x44,
+	0x6f, 0x77, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x54, 0x69, 0x61, 0x6e, 0x48, 0x75, 0x52, 0x61, 0x74,
+	0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x54, 0x69, 0x61, 0x6e, 0x48, 0x75, 0x52,
+	0x61, 0x74, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x50, 0x6f, 0x6f,
+	0x6c, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x50,
+	0x6c, 0x61, 0x79, 0x65, 0x72, 0x50, 0x6f, 0x6f, 0x6c, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22,
+	0xc8, 0x01, 0x0a, 0x0a, 0x47, 0x61, 0x6d, 0x65, 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, 0x16, 0x0a, 0x06, 0x53, 0x77,
+	0x69, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x53, 0x77, 0x69, 0x74,
+	0x63, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x69, 0x61, 0x6e, 0x48, 0x75, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x06, 0x54, 0x69, 0x61, 0x6e, 0x48, 0x75, 0x12, 0x14, 0x0a, 0x05, 0x50, 0x61,
+	0x69, 0x4b, 0x75, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x50, 0x61, 0x69, 0x4b, 0x75,
+	0x12, 0x16, 0x0a, 0x06, 0x46, 0x65, 0x6e, 0x43, 0x68, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x06, 0x46, 0x65, 0x6e, 0x43, 0x68, 0x61, 0x12, 0x20, 0x0a, 0x0b, 0x46, 0x65, 0x6e, 0x43,
+	0x68, 0x61, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x46,
+	0x65, 0x6e, 0x43, 0x68, 0x61, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x47, 0x6f,
+	0x6f, 0x64, 0x46, 0x65, 0x6e, 0x43, 0x68, 0x61, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
+	0x47, 0x6f, 0x6f, 0x64, 0x46, 0x65, 0x6e, 0x43, 0x68, 0x61, 0x22, 0x4f, 0x0a, 0x19, 0x57, 0x65,
+	0x6c, 0x66, 0x61, 0x72, 0x65, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x4c, 0x6f, 0x74, 0x74, 0x65, 0x72,
+	0x79, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 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, 0x16, 0x0a, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x67, 0x0a, 0x13, 0x43,
-	0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x54, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
-	0x54, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x24,
-	0x0a, 0x0d, 0x4f, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x18,
-	0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x4f, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c,
-	0x4e, 0x61, 0x6d, 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, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x4a, 0x0a, 0x14, 0x57,
+	0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 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,
+	0x16, 0x0a, 0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x06, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x67, 0x0a, 0x13, 0x43, 0x68, 0x61, 0x6e, 0x6e,
+	0x65, 0x6c, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x0e,
+	0x0a, 0x02, 0x54, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x54, 0x70, 0x12, 0x1a,
+	0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x24, 0x0a, 0x0d, 0x4f, 0x6e,
+	0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x0d, 0x4f, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4e, 0x61, 0x6d, 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 (
@@ -6838,7 +6925,7 @@ func file_common_proto_rawDescGZIP() []byte {
 	return file_common_proto_rawDescData
 }
 
-var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 62)
+var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 63)
 var file_common_proto_goTypes = []interface{}{
 	(*MysqlDbSetting)(nil),               // 0: webapi.MysqlDbSetting
 	(*MongoDbSetting)(nil),               // 1: webapi.MongoDbSetting
@@ -6873,82 +6960,84 @@ var file_common_proto_goTypes = []interface{}{
 	(*MatchInfoAward)(nil),               // 30: webapi.MatchInfoAward
 	(*GameMatchDate)(nil),                // 31: webapi.GameMatchDate
 	(*GameMatchDateList)(nil),            // 32: webapi.GameMatchDateList
-	(*GameMatchType)(nil),                // 33: webapi.GameMatchType
-	(*WelfareDate)(nil),                  // 34: webapi.WelfareDate
-	(*WelfareTurnplateDate)(nil),         // 35: webapi.WelfareTurnplateDate
-	(*WelfareTurnplateRate)(nil),         // 36: webapi.WelfareTurnplateRate
-	(*WelfareTurnplateDateList)(nil),     // 37: webapi.WelfareTurnplateDateList
-	(*AddUpWelfareDate)(nil),             // 38: webapi.AddUpWelfareDate
-	(*Welfare7SignDate)(nil),             // 39: webapi.Welfare7SignDate
-	(*Welfare7SignDateList)(nil),         // 40: webapi.Welfare7SignDateList
-	(*BlindBoxData)(nil),                 // 41: webapi.BlindBoxData
-	(*WelfareBlindBoxDataList)(nil),      // 42: webapi.WelfareBlindBoxDataList
-	(*WelfareSpree)(nil),                 // 43: webapi.WelfareSpree
-	(*WelfareFirstPayDataList)(nil),      // 44: webapi.WelfareFirstPayDataList
-	(*WelfareContinuousPayDataList)(nil), // 45: webapi.WelfareContinuousPayDataList
-	(*VIPcfg)(nil),                       // 46: webapi.VIPcfg
-	(*VIPcfgDataList)(nil),               // 47: webapi.VIPcfgDataList
-	(*WbCtrlCfg)(nil),                    // 48: webapi.WbCtrlCfg
-	(*EntrySwitch)(nil),                  // 49: webapi.EntrySwitch
-	(*ChessRankConfig)(nil),              // 50: webapi.ChessRankConfig
-	(*ChessRankcfgData)(nil),             // 51: webapi.ChessRankcfgData
-	(*PlayerPool)(nil),                   // 52: webapi.PlayerPool
-	(*GameConfig)(nil),                   // 53: webapi.GameConfig
-	(*WelfarePhoneLotteryStatus)(nil),    // 54: webapi.WelfarePhoneLotteryStatus
-	(*WelfareCollectConfig)(nil),         // 55: webapi.WelfareCollectConfig
-	(*ChannelSwitchConfig)(nil),          // 56: webapi.ChannelSwitchConfig
-	nil,                                  // 57: webapi.Platform.BindTelRewardEntry
-	nil,                                  // 58: webapi.PlayerData.RankScoreEntry
-	nil,                                  // 59: webapi.ItemShop.AwardEntry
-	nil,                                  // 60: webapi.VIPcfg.AwardEntry
-	nil,                                  // 61: webapi.VIPcfg.Privilege7Entry
-	(*server.DB_GameFree)(nil),           // 62: server.DB_GameFree
+	(*MatchTypeInfo)(nil),                // 33: webapi.MatchTypeInfo
+	(*GameMatchType)(nil),                // 34: webapi.GameMatchType
+	(*WelfareDate)(nil),                  // 35: webapi.WelfareDate
+	(*WelfareTurnplateDate)(nil),         // 36: webapi.WelfareTurnplateDate
+	(*WelfareTurnplateRate)(nil),         // 37: webapi.WelfareTurnplateRate
+	(*WelfareTurnplateDateList)(nil),     // 38: webapi.WelfareTurnplateDateList
+	(*AddUpWelfareDate)(nil),             // 39: webapi.AddUpWelfareDate
+	(*Welfare7SignDate)(nil),             // 40: webapi.Welfare7SignDate
+	(*Welfare7SignDateList)(nil),         // 41: webapi.Welfare7SignDateList
+	(*BlindBoxData)(nil),                 // 42: webapi.BlindBoxData
+	(*WelfareBlindBoxDataList)(nil),      // 43: webapi.WelfareBlindBoxDataList
+	(*WelfareSpree)(nil),                 // 44: webapi.WelfareSpree
+	(*WelfareFirstPayDataList)(nil),      // 45: webapi.WelfareFirstPayDataList
+	(*WelfareContinuousPayDataList)(nil), // 46: webapi.WelfareContinuousPayDataList
+	(*VIPcfg)(nil),                       // 47: webapi.VIPcfg
+	(*VIPcfgDataList)(nil),               // 48: webapi.VIPcfgDataList
+	(*WbCtrlCfg)(nil),                    // 49: webapi.WbCtrlCfg
+	(*EntrySwitch)(nil),                  // 50: webapi.EntrySwitch
+	(*ChessRankConfig)(nil),              // 51: webapi.ChessRankConfig
+	(*ChessRankcfgData)(nil),             // 52: webapi.ChessRankcfgData
+	(*PlayerPool)(nil),                   // 53: webapi.PlayerPool
+	(*GameConfig)(nil),                   // 54: webapi.GameConfig
+	(*WelfarePhoneLotteryStatus)(nil),    // 55: webapi.WelfarePhoneLotteryStatus
+	(*WelfareCollectConfig)(nil),         // 56: webapi.WelfareCollectConfig
+	(*ChannelSwitchConfig)(nil),          // 57: webapi.ChannelSwitchConfig
+	nil,                                  // 58: webapi.Platform.BindTelRewardEntry
+	nil,                                  // 59: webapi.PlayerData.RankScoreEntry
+	nil,                                  // 60: webapi.ItemShop.AwardEntry
+	nil,                                  // 61: webapi.VIPcfg.AwardEntry
+	nil,                                  // 62: webapi.VIPcfg.Privilege7Entry
+	(*server.DB_GameFree)(nil),           // 63: server.DB_GameFree
 }
 var file_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
-	57, // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry
+	58, // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry
 	6,  // 4: webapi.GameConfigGlobal.GameStatus:type_name -> webapi.GameStatus
-	62, // 5: webapi.GameFree.DbGameFree:type_name -> server.DB_GameFree
+	63, // 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
-	62, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree
-	58, // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry
+	63, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree
+	59, // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry
 	29, // 12: webapi.PlayerData.Items:type_name -> webapi.ItemInfo
 	20, // 13: webapi.OnlineReport.GameCount:type_name -> webapi.OnlineGameCnt
 	22, // 14: webapi.CommonNoticeList.List:type_name -> webapi.CommonNotice
 	25, // 15: webapi.ExchangeShop.ExType:type_name -> webapi.ExchangeType
 	24, // 16: webapi.ExchangeShopList.List:type_name -> webapi.ExchangeShop
-	59, // 17: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry
+	60, // 17: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry
 	27, // 18: webapi.ItemShopList.List:type_name -> webapi.ItemShop
 	29, // 19: webapi.MatchInfoAward.ItemId:type_name -> webapi.ItemInfo
 	30, // 20: webapi.GameMatchDate.Award:type_name -> webapi.MatchInfoAward
 	29, // 21: webapi.GameMatchDate.SignupCostItem:type_name -> webapi.ItemInfo
 	31, // 22: webapi.GameMatchDateList.List:type_name -> webapi.GameMatchDate
-	34, // 23: webapi.WelfareTurnplateDate.Date:type_name -> webapi.WelfareDate
-	35, // 24: webapi.WelfareTurnplateDateList.List:type_name -> webapi.WelfareTurnplateDate
-	36, // 25: webapi.WelfareTurnplateDateList.RateList:type_name -> webapi.WelfareTurnplateRate
-	34, // 26: webapi.AddUpWelfareDate.AddUpDate:type_name -> webapi.WelfareDate
-	34, // 27: webapi.Welfare7SignDate.Date:type_name -> webapi.WelfareDate
-	38, // 28: webapi.Welfare7SignDate.AddUpDate:type_name -> webapi.AddUpWelfareDate
-	39, // 29: webapi.Welfare7SignDateList.List:type_name -> webapi.Welfare7SignDate
-	41, // 30: webapi.WelfareBlindBoxDataList.List:type_name -> webapi.BlindBoxData
-	34, // 31: webapi.WelfareSpree.Item:type_name -> webapi.WelfareDate
-	43, // 32: webapi.WelfareFirstPayDataList.List:type_name -> webapi.WelfareSpree
-	43, // 33: webapi.WelfareContinuousPayDataList.List:type_name -> webapi.WelfareSpree
-	60, // 34: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry
-	61, // 35: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry
-	46, // 36: webapi.VIPcfgDataList.List:type_name -> webapi.VIPcfg
-	34, // 37: webapi.ChessRankConfig.Item:type_name -> webapi.WelfareDate
-	50, // 38: webapi.ChessRankcfgData.Datas:type_name -> webapi.ChessRankConfig
-	39, // [39:39] is the sub-list for method output_type
-	39, // [39:39] is the sub-list for method input_type
-	39, // [39:39] is the sub-list for extension type_name
-	39, // [39:39] is the sub-list for extension extendee
-	0,  // [0:39] is the sub-list for field type_name
+	33, // 23: webapi.GameMatchType.List:type_name -> webapi.MatchTypeInfo
+	35, // 24: webapi.WelfareTurnplateDate.Date:type_name -> webapi.WelfareDate
+	36, // 25: webapi.WelfareTurnplateDateList.List:type_name -> webapi.WelfareTurnplateDate
+	37, // 26: webapi.WelfareTurnplateDateList.RateList:type_name -> webapi.WelfareTurnplateRate
+	35, // 27: webapi.AddUpWelfareDate.AddUpDate:type_name -> webapi.WelfareDate
+	35, // 28: webapi.Welfare7SignDate.Date:type_name -> webapi.WelfareDate
+	39, // 29: webapi.Welfare7SignDate.AddUpDate:type_name -> webapi.AddUpWelfareDate
+	40, // 30: webapi.Welfare7SignDateList.List:type_name -> webapi.Welfare7SignDate
+	42, // 31: webapi.WelfareBlindBoxDataList.List:type_name -> webapi.BlindBoxData
+	35, // 32: webapi.WelfareSpree.Item:type_name -> webapi.WelfareDate
+	44, // 33: webapi.WelfareFirstPayDataList.List:type_name -> webapi.WelfareSpree
+	44, // 34: webapi.WelfareContinuousPayDataList.List:type_name -> webapi.WelfareSpree
+	61, // 35: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry
+	62, // 36: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry
+	47, // 37: webapi.VIPcfgDataList.List:type_name -> webapi.VIPcfg
+	35, // 38: webapi.ChessRankConfig.Item:type_name -> webapi.WelfareDate
+	51, // 39: webapi.ChessRankcfgData.Datas:type_name -> webapi.ChessRankConfig
+	40, // [40:40] is the sub-list for method output_type
+	40, // [40:40] is the sub-list for method input_type
+	40, // [40:40] is the sub-list for extension type_name
+	40, // [40:40] is the sub-list for extension extendee
+	0,  // [0:40] is the sub-list for field type_name
 }
 
 func init() { file_common_proto_init() }
@@ -7354,7 +7443,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GameMatchType); i {
+			switch v := v.(*MatchTypeInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7366,7 +7455,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WelfareDate); i {
+			switch v := v.(*GameMatchType); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7378,7 +7467,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WelfareTurnplateDate); i {
+			switch v := v.(*WelfareDate); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7390,7 +7479,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WelfareTurnplateRate); i {
+			switch v := v.(*WelfareTurnplateDate); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7402,7 +7491,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WelfareTurnplateDateList); i {
+			switch v := v.(*WelfareTurnplateRate); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7414,7 +7503,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AddUpWelfareDate); i {
+			switch v := v.(*WelfareTurnplateDateList); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7426,7 +7515,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Welfare7SignDate); i {
+			switch v := v.(*AddUpWelfareDate); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7438,7 +7527,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Welfare7SignDateList); i {
+			switch v := v.(*Welfare7SignDate); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7450,7 +7539,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*BlindBoxData); i {
+			switch v := v.(*Welfare7SignDateList); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7462,7 +7551,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WelfareBlindBoxDataList); i {
+			switch v := v.(*BlindBoxData); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7474,7 +7563,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WelfareSpree); i {
+			switch v := v.(*WelfareBlindBoxDataList); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7486,7 +7575,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WelfareFirstPayDataList); i {
+			switch v := v.(*WelfareSpree); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7498,7 +7587,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WelfareContinuousPayDataList); i {
+			switch v := v.(*WelfareFirstPayDataList); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7510,7 +7599,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*VIPcfg); i {
+			switch v := v.(*WelfareContinuousPayDataList); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7522,7 +7611,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*VIPcfgDataList); i {
+			switch v := v.(*VIPcfg); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7534,7 +7623,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WbCtrlCfg); i {
+			switch v := v.(*VIPcfgDataList); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7546,7 +7635,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EntrySwitch); i {
+			switch v := v.(*WbCtrlCfg); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7558,7 +7647,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[50].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ChessRankConfig); i {
+			switch v := v.(*EntrySwitch); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7570,7 +7659,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[51].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ChessRankcfgData); i {
+			switch v := v.(*ChessRankConfig); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7582,7 +7671,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PlayerPool); i {
+			switch v := v.(*ChessRankcfgData); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7594,7 +7683,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GameConfig); i {
+			switch v := v.(*PlayerPool); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7606,7 +7695,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WelfarePhoneLotteryStatus); i {
+			switch v := v.(*GameConfig); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7618,7 +7707,7 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*WelfareCollectConfig); i {
+			switch v := v.(*WelfarePhoneLotteryStatus); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -7630,6 +7719,18 @@ func file_common_proto_init() {
 			}
 		}
 		file_common_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*WelfareCollectConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_common_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ChannelSwitchConfig); i {
 			case 0:
 				return &v.state
@@ -7648,7 +7749,7 @@ func file_common_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_common_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   62,
+			NumMessages:   63,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/protocol/webapi/common.proto b/protocol/webapi/common.proto
index b4278ee..3a131bd 100644
--- a/protocol/webapi/common.proto
+++ b/protocol/webapi/common.proto
@@ -446,6 +446,7 @@ message GameMatchDate {
   int32 MatchLevel = 22; // 难度等级
   repeated string OnChannelName = 23; // 开启的渠道名称
   int32 CardType = 24; // 手机卡类型
+  int32 ShowId = 25; // 比赛区分
 }
 
 // etcd /game/game_match
@@ -454,10 +455,17 @@ message GameMatchDateList{
   string Platform = 2;
 }
 
+message MatchTypeInfo{
+  string Name = 1; // 名称
+  int32 SortId = 2; // 序号
+  bool On = 3; // 开关
+  int32 Id = 4; // 类型id
+}
+
 // etcd /game/match_type
 message GameMatchType{
   string Platform = 1;
-  repeated int32 List = 2; // 所有玩法类型 1.锦标赛 2.实物赛 3.vip比赛 4.话费赛
+  repeated MatchTypeInfo List = 2; // 比赛类型列表
 }
 
 message WelfareDate {
diff --git a/public b/public
index 38b1c89..e261341 160000
--- a/public
+++ b/public
@@ -1 +1 @@
-Subproject commit 38b1c8928c52249a60d1340372a2d9bd6d2eee01
+Subproject commit e26134143eba5c7ced96afc84bde42705a9297be
diff --git a/worldsrv/tournament.go b/worldsrv/tournament.go
index cd3f249..be514e9 100644
--- a/worldsrv/tournament.go
+++ b/worldsrv/tournament.go
@@ -84,7 +84,7 @@ type PlayerRoundInfo struct {
 
 type Tournament struct {
 	BaseClockSinker
-	TypeList            map[string][]int32                              // 比赛类型列表 平台id：比赛类型
+	TypeList            map[string]*webapiproto.GameMatchType           // 比赛类型列表 平台id：比赛类型列表
 	GameMatchDateList   map[string]map[int32]*webapiproto.GameMatchDate // 比赛配置，platform:比赛场配置id:比赛配置
 	singleSignupPlayers map[int32]*SignupInfo                           // 开启机器人时，报名的玩家，玩家Id:报名信息
 	signupPlayers       map[string]map[int32]*SignInfo                  // 报名的玩家 platform:比赛配置id:报名人
@@ -97,7 +97,7 @@ type Tournament struct {
 
 func NewTournament() *Tournament {
 	ret := &Tournament{
-		TypeList:            make(map[string][]int32),
+		TypeList:            make(map[string]*webapiproto.GameMatchType),
 		GameMatchDateList:   make(map[string]map[int32]*webapiproto.GameMatchDate),
 		singleSignupPlayers: make(map[int32]*SignupInfo),
 		signupPlayers:       make(map[string]map[int32]*SignInfo),
@@ -254,26 +254,7 @@ func (this *Tournament) UpdateTypeList(init bool, data *webapiproto.GameMatchTyp
 	if data.Platform == "0" {
 		return
 	}
-
-	isModify := false
-	d, ok := this.TypeList[data.Platform]
-	if !ok || len(d) != len(data.GetList()) {
-		this.TypeList[data.Platform] = data.GetList()
-		isModify = true
-	} else {
-		for k, v := range data.GetList() {
-			if d[k] != v {
-				this.TypeList[data.Platform] = data.GetList()
-				isModify = true
-				break
-			}
-		}
-	}
-
-	if !isModify {
-		return
-	}
-
+	this.TypeList[data.Platform] = data
 	if !init {
 		//todo 优化
 		for _, v := range PlayerMgrSington.playerOfPlatform[data.Platform] {
@@ -1406,6 +1387,7 @@ func (this *Tournament) GetSCTMInfosPack(platform, channelName string) *tourname
 					Rule:              info.Rule,
 					SortId:            info.SortId,
 					OnChannelName:     info.OnChannelName,
+					ShowId:            info.ShowId,
 				}
 				if info.MatchTimeWeek != nil && len(info.MatchTimeWeek) > 0 {
 					for _, week := range info.MatchTimeWeek {
@@ -1454,7 +1436,16 @@ func (this *Tournament) GetSCTMInfosPack(platform, channelName string) *tourname
 				pack.TMInfo = append(pack.TMInfo, tMInfo)
 			}
 		}
-		pack.TypeList = this.TypeList[platform]
+		if l := this.TypeList[platform]; l != nil {
+			for _, v := range l.GetList() {
+				pack.TypeList = append(pack.TypeList, &tournament.MatchTypeInfo{
+					Name:   v.GetName(),
+					SortId: v.GetSortId(),
+					On:     v.GetOn(),
+					Id:     v.GetId(),
+				})
+			}
+		}
 	}
 	return pack
 }