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

比赛添加比赛区分

This commit is contained in:
sk 2024-06-13 13:55:00 +08:00
parent 3526ef069f
commit c429d41900
6 changed files with 754 additions and 543 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

316
protocol/tournament/tournament.pb.go
View File

@ -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,
},

11
protocol/tournament/tournament.proto
View File

@ -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

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

File diff suppressed because it is too large Load Diff

10
protocol/webapi/common.proto
View File

@ -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 {

2
public

@ -1 +1 @@
Subproject commit 38b1c8928c52249a60d1340372a2d9bd6d2eee01
Subproject commit e26134143eba5c7ced96afc84bde42705a9297be

37
worldsrv/tournament.go
View File

@ -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
}