update

data/DB_GameItem.json

@@ -393,7 +393,7 @@
 				1,
 				0
 			],
-			"Type": 4,
+			"Type": 13,
 			"Effect0": [
 				1,
 				0,

data/DB_PropExchange.dat

@@ -1,5 +1,5 @@
 
-6

с├
т├
у├
ж├
в├
"║█ю└=
+6

т├
у├
ж├
в├
с├
"║█ю└=
-.
ь├
ы├
з├
ш├
"║█ю└=
+.
з├
ш├
ь├
ы├
"║█ю└=
-W
с├
т├
ж├
з├
ш├
у├
в├
ь├
ы├
"	║█─╜Б
+W
с├
в├
ь├
ы├
ш├
т├
у├
ж├
з├
"	║█─╜Б
-]
ж├
ь├
з├
э├
с├
т├
ы├
ш├
у├
в├
"╒█Т
+]
т├
у├
ж├
ы├
з├
э├
с├
в├
ь├
ш├
"╒█Т

data/gameparam.json

@@ -20,7 +20,7 @@
   "MatchSeasonRankMaxNum":50,
   "RobotInviteInitInterval": 1,
   "RobotInviteIntervalMax": 1,
-  "ClosePreCreateRoom": false,
+  "ClosePreCreateRoom": true,
   "AgoraAddress": "http://47.105.78.29:8081",
   "InviteUrl": "http://47.105.78.29:8000/"
 }

protocol/bag/bag.pb.go

@@ -20,7 +20,7 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-//操作结果
+// 操作结果
 type OpResultCode int32
 
 const (
@@ -91,6 +91,9 @@ const (
 	SPacketID_PACKET_ALL_BAG_USE    SPacketID = 2531 //使用背包道具
 	SPacketID_PACKET_SC_SYNCBAGDATA SPacketID = 2532 //背包数据更新
 	SPacketID_PACKET_ALL_BAG_END    SPacketID = 2549 //最大消息号
+	//3000~3099
+	SPacketID_PACKET_PropExchange SPacketID = 3000 // 道具兑换
+	SPacketID_PACKET_ExchangeList SPacketID = 3001 // 兑换列表
 )
 
 // Enum value maps for SPacketID.
@@ -101,6 +104,8 @@ var (
 		2531: "PACKET_ALL_BAG_USE",
 		2532: "PACKET_SC_SYNCBAGDATA",
 		2549: "PACKET_ALL_BAG_END",
+		3000: "PACKET_PropExchange",
+		3001: "PACKET_ExchangeList",
 	}
 	SPacketID_value = map[string]int32{
 		"PACKET_BAG_ZERO":       0,
@@ -108,6 +113,8 @@ var (
 		"PACKET_ALL_BAG_USE":    2531,
 		"PACKET_SC_SYNCBAGDATA": 2532,
 		"PACKET_ALL_BAG_END":    2549,
+		"PACKET_PropExchange":   3000,
+		"PACKET_ExchangeList":   3001,
 	}
 )
 
@@ -138,7 +145,7 @@ func (SPacketID) EnumDescriptor() ([]byte, []int) {
 	return file_bag_proto_rawDescGZIP(), []int{1}
 }
 
-//物品信息 后续精简
+// 物品信息 后续精简
 type ItemInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -216,13 +223,14 @@ func (x *ItemInfo) GetObtainTime() int64 {
 	return 0
 }
 
-//PACKET_ALL_BAG_INFO
+// PACKET_ALL_BAG_INFO
 type CSBagInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
 	NowLocation int32 `protobuf:"varint,1,opt,name=NowLocation,proto3" json:"NowLocation,omitempty"` //0.通用 1.大厅 2.Tienlen 3.捕鱼
+	Tp          int32 `protobuf:"varint,2,opt,name=Tp,proto3" json:"Tp,omitempty"`                   // 道具类型，道具表中的道具类型
 }
 
 func (x *CSBagInfo) Reset() {
@@ -264,7 +272,14 @@ func (x *CSBagInfo) GetNowLocation() int32 {
 	return 0
 }
 
-//PACKET_ALL_BAG_INFO
+func (x *CSBagInfo) GetTp() int32 {
+	if x != nil {
+		return x.Tp
+	}
+	return 0
+}
+
+// PACKET_ALL_BAG_INFO
 type SCBagInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -328,7 +343,7 @@ func (x *SCBagInfo) GetBagNumMax() int32 {
 	return 0
 }
 
-//PACKET_ALL_BAG_USE
+// PACKET_ALL_BAG_USE
 type CSUpBagInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -416,7 +431,7 @@ func (x *CSUpBagInfo) GetShowId() int64 {
 	return 0
 }
 
-//PACKET_ALL_BAG_USE
+// PACKET_ALL_BAG_USE
 type SCUpBagInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -506,7 +521,7 @@ func (x *SCUpBagInfo) GetInfos() []*ItemInfo {
 	return nil
 }
 
-//PACKET_SC_SYNCBAGDATA
+// PACKET_SC_SYNCBAGDATA
 type SCSyncBagData struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -554,6 +569,338 @@ func (x *SCSyncBagData) GetInfos() []*ItemInfo {
 	return nil
 }
 
+type PropInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ItemId  int32 `protobuf:"varint,1,opt,name=ItemId,proto3" json:"ItemId,omitempty"`   //物品ID
+	ItemNum int64 `protobuf:"varint,2,opt,name=ItemNum,proto3" json:"ItemNum,omitempty"` //物品数量
+}
+
+func (x *PropInfo) Reset() {
+	*x = PropInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_bag_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PropInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PropInfo) ProtoMessage() {}
+
+func (x *PropInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_bag_proto_msgTypes[6]
+	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 PropInfo.ProtoReflect.Descriptor instead.
+func (*PropInfo) Descriptor() ([]byte, []int) {
+	return file_bag_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *PropInfo) GetItemId() int32 {
+	if x != nil {
+		return x.ItemId
+	}
+	return 0
+}
+
+func (x *PropInfo) GetItemNum() int64 {
+	if x != nil {
+		return x.ItemNum
+	}
+	return 0
+}
+
+// PACKET_PropExchange
+type CSPropExchange struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"` // 兑换ID
+}
+
+func (x *CSPropExchange) Reset() {
+	*x = CSPropExchange{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_bag_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CSPropExchange) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CSPropExchange) ProtoMessage() {}
+
+func (x *CSPropExchange) ProtoReflect() protoreflect.Message {
+	mi := &file_bag_proto_msgTypes[7]
+	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 CSPropExchange.ProtoReflect.Descriptor instead.
+func (*CSPropExchange) Descriptor() ([]byte, []int) {
+	return file_bag_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *CSPropExchange) GetId() int32 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+type SCPropExchange struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	RetCode     OpResultCode `protobuf:"varint,1,opt,name=RetCode,proto3,enum=bag.OpResultCode" json:"RetCode,omitempty"` // 错误码
+	Items       []*PropInfo  `protobuf:"bytes,2,rep,name=Items,proto3" json:"Items,omitempty"`                            // 获得道具
+	RemainItems []*PropInfo  `protobuf:"bytes,3,rep,name=RemainItems,proto3" json:"RemainItems,omitempty"`                // 被消耗的道具剩余数量
+}
+
+func (x *SCPropExchange) Reset() {
+	*x = SCPropExchange{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_bag_proto_msgTypes[8]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SCPropExchange) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SCPropExchange) ProtoMessage() {}
+
+func (x *SCPropExchange) ProtoReflect() protoreflect.Message {
+	mi := &file_bag_proto_msgTypes[8]
+	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 SCPropExchange.ProtoReflect.Descriptor instead.
+func (*SCPropExchange) Descriptor() ([]byte, []int) {
+	return file_bag_proto_rawDescGZIP(), []int{8}
+}
+
+func (x *SCPropExchange) GetRetCode() OpResultCode {
+	if x != nil {
+		return x.RetCode
+	}
+	return OpResultCode_OPRC_Sucess
+}
+
+func (x *SCPropExchange) GetItems() []*PropInfo {
+	if x != nil {
+		return x.Items
+	}
+	return nil
+}
+
+func (x *SCPropExchange) GetRemainItems() []*PropInfo {
+	if x != nil {
+		return x.RemainItems
+	}
+	return nil
+}
+
+type ExchangeInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id        int32       `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"`              // 兑换ID
+	CostItems []*PropInfo `protobuf:"bytes,2,rep,name=CostItems,proto3" json:"CostItems,omitempty"` // 消耗道具
+	GainItems []*PropInfo `protobuf:"bytes,3,rep,name=GainItems,proto3" json:"GainItems,omitempty"` // 获得道具
+}
+
+func (x *ExchangeInfo) Reset() {
+	*x = ExchangeInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_bag_proto_msgTypes[9]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ExchangeInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ExchangeInfo) ProtoMessage() {}
+
+func (x *ExchangeInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_bag_proto_msgTypes[9]
+	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 ExchangeInfo.ProtoReflect.Descriptor instead.
+func (*ExchangeInfo) Descriptor() ([]byte, []int) {
+	return file_bag_proto_rawDescGZIP(), []int{9}
+}
+
+func (x *ExchangeInfo) GetId() int32 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *ExchangeInfo) GetCostItems() []*PropInfo {
+	if x != nil {
+		return x.CostItems
+	}
+	return nil
+}
+
+func (x *ExchangeInfo) GetGainItems() []*PropInfo {
+	if x != nil {
+		return x.GainItems
+	}
+	return nil
+}
+
+// PACKET_ExchangeList
+type CSExchangeList struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 兑换类型 1集卡活动
+}
+
+func (x *CSExchangeList) Reset() {
+	*x = CSExchangeList{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_bag_proto_msgTypes[10]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CSExchangeList) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CSExchangeList) ProtoMessage() {}
+
+func (x *CSExchangeList) ProtoReflect() protoreflect.Message {
+	mi := &file_bag_proto_msgTypes[10]
+	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 CSExchangeList.ProtoReflect.Descriptor instead.
+func (*CSExchangeList) Descriptor() ([]byte, []int) {
+	return file_bag_proto_rawDescGZIP(), []int{10}
+}
+
+func (x *CSExchangeList) GetTp() int32 {
+	if x != nil {
+		return x.Tp
+	}
+	return 0
+}
+
+type SCExchangeList struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Infos []*ExchangeInfo `protobuf:"bytes,1,rep,name=Infos,proto3" json:"Infos,omitempty"` // 兑换列表
+	Tp    int32           `protobuf:"varint,2,opt,name=Tp,proto3" json:"Tp,omitempty"`      // 兑换类型
+}
+
+func (x *SCExchangeList) Reset() {
+	*x = SCExchangeList{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_bag_proto_msgTypes[11]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SCExchangeList) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SCExchangeList) ProtoMessage() {}
+
+func (x *SCExchangeList) ProtoReflect() protoreflect.Message {
+	mi := &file_bag_proto_msgTypes[11]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SCExchangeList.ProtoReflect.Descriptor instead.
+func (*SCExchangeList) Descriptor() ([]byte, []int) {
+	return file_bag_proto_rawDescGZIP(), []int{11}
+}
+
+func (x *SCExchangeList) GetInfos() []*ExchangeInfo {
+	if x != nil {
+		return x.Infos
+	}
+	return nil
+}
+
+func (x *SCExchangeList) GetTp() int32 {
+	if x != nil {
+		return x.Tp
+	}
+	return 0
+}
+
 var File_bag_proto protoreflect.FileDescriptor
 
 var file_bag_proto_rawDesc = []byte{
@@ -563,10 +910,11 @@ var file_bag_proto_rawDesc = []byte{
 	0x65, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x18,
 	0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x12, 0x1e,
 	0x0a, 0x0a, 0x4f, 0x62, 0x74, 0x61, 0x69, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x0a, 0x4f, 0x62, 0x74, 0x61, 0x69, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x2d,
+	0x28, 0x03, 0x52, 0x0a, 0x4f, 0x62, 0x74, 0x61, 0x69, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x3d,
 	0x0a, 0x09, 0x43, 0x53, 0x42, 0x61, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x4e,
 	0x6f, 0x77, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x0b, 0x4e, 0x6f, 0x77, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x7b, 0x0a,
+	0x52, 0x0b, 0x4e, 0x6f, 0x77, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a,
+	0x02, 0x54, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x54, 0x70, 0x22, 0x7b, 0x0a,
 	0x09, 0x53, 0x43, 0x42, 0x61, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2b, 0x0a, 0x07, 0x52, 0x65,
 	0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x11, 0x2e, 0x62, 0x61,
 	0x67, 0x2e, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x07,
@@ -601,25 +949,58 @@ var file_bag_proto_rawDesc = []byte{
 	0x6f, 0x73, 0x22, 0x34, 0x0a, 0x0d, 0x53, 0x43, 0x53, 0x79, 0x6e, 0x63, 0x42, 0x61, 0x67, 0x44,
 	0x61, 0x74, 0x61, 0x12, 0x23, 0x0a, 0x05, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x03,
 	0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x62, 0x61, 0x67, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66,
-	0x6f, 0x52, 0x05, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x2a, 0x85, 0x01, 0x0a, 0x0c, 0x4f, 0x70, 0x52,
+	0x6f, 0x52, 0x05, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x22, 0x3c, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x70,
-	0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x4f, 0x50, 0x52,
+	0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01,
-	0x43, 0x5f, 0x53, 0x75, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07,
-	0x52, 0x43, 0x5f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50,
+	0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x49,
-	0x52, 0x43, 0x5f, 0x55, 0x73, 0x65, 0x55, 0x70, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50,
+	0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x22, 0x20, 0x0a, 0x0e, 0x43, 0x53, 0x50, 0x72, 0x6f, 0x70,
-	0x52, 0x43, 0x5f, 0x49, 0x64, 0x45, 0x72, 0x72, 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50,
+	0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01,
-	0x52, 0x43, 0x5f, 0x44, 0x62, 0x45, 0x72, 0x72, 0x10, 0x04, 0x12, 0x10, 0x0a, 0x0c, 0x4f, 0x50,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x22, 0x93, 0x01, 0x0a, 0x0e, 0x53, 0x43, 0x50,
-	0x52, 0x43, 0x5f, 0x42, 0x61, 0x67, 0x46, 0x75, 0x6c, 0x6c, 0x10, 0x05, 0x12, 0x12, 0x0a, 0x0e,
+	0x72, 0x6f, 0x70, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x2b, 0x0a, 0x07, 0x52,
-	0x4f, 0x50, 0x52, 0x43, 0x5f, 0x4e, 0x6f, 0x74, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x10, 0x06,
+	0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x11, 0x2e, 0x62,
-	0x2a, 0x88, 0x01, 0x0a, 0x09, 0x53, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x13,
+	0x61, 0x67, 0x2e, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x52,
-	0x0a, 0x0f, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x42, 0x41, 0x47, 0x5f, 0x5a, 0x45, 0x52,
+	0x07, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x23, 0x0a, 0x05, 0x49, 0x74, 0x65, 0x6d,
-	0x4f, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x41, 0x4c,
+	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x62, 0x61, 0x67, 0x2e, 0x50, 0x72,
-	0x4c, 0x5f, 0x42, 0x41, 0x47, 0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0xe2, 0x13, 0x12, 0x17, 0x0a,
+	0x6f, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x2f, 0x0a,
-	0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x41, 0x4c, 0x4c, 0x5f, 0x42, 0x41, 0x47, 0x5f,
+	0x0b, 0x52, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03,
-	0x55, 0x53, 0x45, 0x10, 0xe3, 0x13, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
+	0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x62, 0x61, 0x67, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x49, 0x6e, 0x66,
-	0x5f, 0x53, 0x43, 0x5f, 0x53, 0x59, 0x4e, 0x43, 0x42, 0x41, 0x47, 0x44, 0x41, 0x54, 0x41, 0x10,
+	0x6f, 0x52, 0x0b, 0x52, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x78,
-	0xe4, 0x13, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x41, 0x4c, 0x4c,
+	0x0a, 0x0c, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e,
-	0x5f, 0x42, 0x41, 0x47, 0x5f, 0x45, 0x4e, 0x44, 0x10, 0xf5, 0x13, 0x42, 0x07, 0x5a, 0x05, 0x2e,
+	0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x2b,
-	0x3b, 0x62, 0x61, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x0a, 0x09, 0x43, 0x6f, 0x73, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x0d, 0x2e, 0x62, 0x61, 0x67, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x49, 0x6e, 0x66, 0x6f,
+	0x52, 0x09, 0x43, 0x6f, 0x73, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x2b, 0x0a, 0x09, 0x47,
+	0x61, 0x69, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d,
+	0x2e, 0x62, 0x61, 0x67, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x47,
+	0x61, 0x69, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x20, 0x0a, 0x0e, 0x43, 0x53, 0x45, 0x78,
+	0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x54, 0x70,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x54, 0x70, 0x22, 0x49, 0x0a, 0x0e, 0x53, 0x43,
+	0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x05,
+	0x49, 0x6e, 0x66, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x62, 0x61,
+	0x67, 0x2e, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05,
+	0x49, 0x6e, 0x66, 0x6f, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x54, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x02, 0x54, 0x70, 0x2a, 0x85, 0x01, 0x0a, 0x0c, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75,
+	0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x53,
+	0x75, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50, 0x52, 0x43, 0x5f,
+	0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50, 0x52, 0x43, 0x5f,
+	0x55, 0x73, 0x65, 0x55, 0x70, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50, 0x52, 0x43, 0x5f,
+	0x49, 0x64, 0x45, 0x72, 0x72, 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50, 0x52, 0x43, 0x5f,
+	0x44, 0x62, 0x45, 0x72, 0x72, 0x10, 0x04, 0x12, 0x10, 0x0a, 0x0c, 0x4f, 0x50, 0x52, 0x43, 0x5f,
+	0x42, 0x61, 0x67, 0x46, 0x75, 0x6c, 0x6c, 0x10, 0x05, 0x12, 0x12, 0x0a, 0x0e, 0x4f, 0x50, 0x52,
+	0x43, 0x5f, 0x4e, 0x6f, 0x74, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x10, 0x06, 0x2a, 0xbc, 0x01,
+	0x0a, 0x09, 0x53, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x13, 0x0a, 0x0f, 0x50,
+	0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x42, 0x41, 0x47, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00,
+	0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x41, 0x4c, 0x4c, 0x5f, 0x42,
+	0x41, 0x47, 0x5f, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0xe2, 0x13, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x41,
+	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x41, 0x4c, 0x4c, 0x5f, 0x42, 0x41, 0x47, 0x5f, 0x55, 0x53, 0x45,
+	0x10, 0xe3, 0x13, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43,
+	0x5f, 0x53, 0x59, 0x4e, 0x43, 0x42, 0x41, 0x47, 0x44, 0x41, 0x54, 0x41, 0x10, 0xe4, 0x13, 0x12,
+	0x17, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x41, 0x4c, 0x4c, 0x5f, 0x42, 0x41,
+	0x47, 0x5f, 0x45, 0x4e, 0x44, 0x10, 0xf5, 0x13, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b,
+	0x45, 0x54, 0x5f, 0x50, 0x72, 0x6f, 0x70, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x10,
+	0xb8, 0x17, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x45, 0x78, 0x63,
+	0x68, 0x61, 0x6e, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x10, 0xb9, 0x17, 0x42, 0x07, 0x5a, 0x05,
+	0x2e, 0x3b, 0x62, 0x61, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -635,7 +1016,7 @@ func file_bag_proto_rawDescGZIP() []byte {
 }
 
 var file_bag_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_bag_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_bag_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
 var file_bag_proto_goTypes = []interface{}{
 	(OpResultCode)(0),      // 0: bag.OpResultCode
 	(SPacketID)(0),         // 1: bag.SPacketID
@@ -645,6 +1026,12 @@ var file_bag_proto_goTypes = []interface{}{
 	(*CSUpBagInfo)(nil),    // 5: bag.CSUpBagInfo
 	(*SCUpBagInfo)(nil),    // 6: bag.SCUpBagInfo
 	(*SCSyncBagData)(nil),  // 7: bag.SCSyncBagData
+	(*PropInfo)(nil),       // 8: bag.PropInfo
+	(*CSPropExchange)(nil), // 9: bag.CSPropExchange
+	(*SCPropExchange)(nil), // 10: bag.SCPropExchange
+	(*ExchangeInfo)(nil),   // 11: bag.ExchangeInfo
+	(*CSExchangeList)(nil), // 12: bag.CSExchangeList
+	(*SCExchangeList)(nil), // 13: bag.SCExchangeList
 }
 var file_bag_proto_depIdxs = []int32{
 	0,  // 0: bag.SCBagInfo.RetCode:type_name -> bag.OpResultCode
@@ -652,11 +1039,17 @@ var file_bag_proto_depIdxs = []int32{
 	0,  // 2: bag.SCUpBagInfo.RetCode:type_name -> bag.OpResultCode
 	2,  // 3: bag.SCUpBagInfo.Infos:type_name -> bag.ItemInfo
 	2,  // 4: bag.SCSyncBagData.Infos:type_name -> bag.ItemInfo
-	5, // [5:5] is the sub-list for method output_type
+	0,  // 5: bag.SCPropExchange.RetCode:type_name -> bag.OpResultCode
-	5, // [5:5] is the sub-list for method input_type
+	8,  // 6: bag.SCPropExchange.Items:type_name -> bag.PropInfo
-	5, // [5:5] is the sub-list for extension type_name
+	8,  // 7: bag.SCPropExchange.RemainItems:type_name -> bag.PropInfo
-	5, // [5:5] is the sub-list for extension extendee
+	8,  // 8: bag.ExchangeInfo.CostItems:type_name -> bag.PropInfo
-	0, // [0:5] is the sub-list for field type_name
+	8,  // 9: bag.ExchangeInfo.GainItems:type_name -> bag.PropInfo
+	11, // 10: bag.SCExchangeList.Infos:type_name -> bag.ExchangeInfo
+	11, // [11:11] is the sub-list for method output_type
+	11, // [11:11] is the sub-list for method input_type
+	11, // [11:11] is the sub-list for extension type_name
+	11, // [11:11] is the sub-list for extension extendee
+	0,  // [0:11] is the sub-list for field type_name
 }
 
 func init() { file_bag_proto_init() }
@@ -737,6 +1130,78 @@ func file_bag_proto_init() {
 				return nil
 			}
 		}
+		file_bag_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PropInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_bag_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CSPropExchange); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_bag_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SCPropExchange); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_bag_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExchangeInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_bag_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CSExchangeList); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_bag_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SCExchangeList); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -744,7 +1209,7 @@ func file_bag_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_bag_proto_rawDesc,
 			NumEnums:      2,
-			NumMessages:   6,
+			NumMessages:   12,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

protocol/bag/bag.proto

@@ -18,6 +18,9 @@ enum SPacketID {
   PACKET_ALL_BAG_USE = 2531;  //使用背包道具
   PACKET_SC_SYNCBAGDATA = 2532;//背包数据更新
   PACKET_ALL_BAG_END = 2549;  //最大消息号
+  //3000~3099
+  PACKET_PropExchange = 3000; // 道具兑换
+  PACKET_ExchangeList = 3001; // 兑换列表
 }
 //物品信息 后续精简
 message ItemInfo{
@@ -43,6 +46,7 @@ message ItemInfo{
 //PACKET_ALL_BAG_INFO
 message CSBagInfo {
   int32 NowLocation = 1;//0.通用 1.大厅 2.Tienlen 3.捕鱼
+  int32 Tp = 2;// 道具类型，道具表中的道具类型
 }
 //PACKET_ALL_BAG_INFO
 message SCBagInfo {
@@ -75,3 +79,33 @@ message SCUpBagInfo {
 message SCSyncBagData{
   repeated ItemInfo Infos = 1;// 物品信息
 }
+
+message PropInfo{
+  int32 ItemId = 1;//物品ID
+  int64 ItemNum = 2;//物品数量
+}
+
+// PACKET_PropExchange
+message CSPropExchange{
+  int32 Id = 1; // 兑换ID
+}
+message SCPropExchange{
+  OpResultCode RetCode = 1; // 错误码
+  repeated PropInfo Items = 2; // 获得道具
+  repeated PropInfo RemainItems = 3; // 被消耗的道具剩余数量
+}
+
+message ExchangeInfo{
+  int32 Id = 1; // 兑换ID
+  repeated PropInfo CostItems = 2; // 消耗道具
+  repeated PropInfo GainItems = 3; // 获得道具
+}
+
+// PACKET_ExchangeList
+message CSExchangeList{
+  int32 Tp = 1; // 兑换类型 1集卡活动
+}
+message SCExchangeList{
+  repeated ExchangeInfo Infos = 1; // 兑换列表
+  int32 Tp = 2; // 兑换类型
+}

protocol/doc.md

@@ -47,6 +47,7 @@
 
 #### bag（背包）
 - 2530~2549
+- 3000~3099
 
 #### Pets（人物宠物）
 - 2550~2579

protocol/player/player.pb.go

@@ -20,7 +20,7 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-//操作结果
+// 操作结果
 type OpResultCode int32
 
 const (
@@ -247,7 +247,7 @@ func (OpResultCode) EnumDescriptor() ([]byte, []int) {
 	return file_player_proto_rawDescGZIP(), []int{0}
 }
 
-//获取玩家数据消息id
+// 获取玩家数据消息id
 type PlayerPacketID int32
 
 const (
@@ -1022,8 +1022,8 @@ func (x *SCSavePlayerInfo) GetOpRetCode() OpResultCode {
 	return OpResultCode_OPRC_Sucess
 }
 
-//获取玩家基本信息
+// 获取玩家基本信息
-//PACKET_CS_PLAYERDATA
+// PACKET_CS_PLAYERDATA
 type CSPlayerData struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1566,7 +1566,7 @@ func (x *PlayerData) GetAge() int32 {
 	return 0
 }
 
-//断线重连小游戏中的数据 当前玩家在哪个房间 哪个游戏 对应的LogicId
+// 断线重连小游戏中的数据 当前玩家在哪个房间 哪个游戏 对应的LogicId
 type MiniGameInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1630,7 +1630,7 @@ func (x *MiniGameInfo) GetLogicId() int32 {
 	return 0
 }
 
-//PACKET_SC_PLAYERDATA
+// PACKET_SC_PLAYERDATA
 type SCPlayerData struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1726,7 +1726,7 @@ func (x *SCPlayerData) GetMiniGameArr() []*MiniGameInfo {
 	return nil
 }
 
-//PACKET_SC_PLAYERDATAUPDATE
+// PACKET_SC_PLAYERDATAUPDATE
 type SCPlayerDataUpdate struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1878,8 +1878,8 @@ func (x *SCPlayerDataUpdate) GetInviteScore() int64 {
 	return 0
 }
 
-//获取第三方玩家信息
+// 获取第三方玩家信息
-//PACKET_CS_THIRDPLAYERDATA
+// PACKET_CS_THIRDPLAYERDATA
 type CSThirdPlayerData struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1927,7 +1927,7 @@ func (x *CSThirdPlayerData) GetId() int32 {
 	return 0
 }
 
-//PACKET_SC_THIRDPLAYERDATA
+// PACKET_SC_THIRDPLAYERDATA
 type SCThirdPlayerData struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1975,8 +1975,8 @@ func (x *SCThirdPlayerData) GetData() *PlayerData {
 	return nil
 }
 
-//改昵称
+// 改昵称
-//PACKET_CS_CHANGENICK
+// PACKET_CS_CHANGENICK
 type CSChangeNick struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2024,7 +2024,7 @@ func (x *CSChangeNick) GetNick() string {
 	return ""
 }
 
-//PACKET_SC_CHANGENICK
+// PACKET_SC_CHANGENICK
 type SCChangeNick struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2080,8 +2080,8 @@ func (x *SCChangeNick) GetNick() string {
 	return ""
 }
 
-//改密码
+// 改密码
-//PACKET_CS_CHANGEPASSWORD
+// PACKET_CS_CHANGEPASSWORD
 type CSChangePassword struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2153,7 +2153,7 @@ func (x *CSChangePassword) GetTimeStamp() int64 {
 	return 0
 }
 
-//PACKET_SC_CHANGEPASSWORD
+// PACKET_SC_CHANGEPASSWORD
 type SCChangePassword struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2209,8 +2209,8 @@ func (x *SCChangePassword) GetChangeType() int32 {
 	return 0
 }
 
-//更换头像
+// 更换头像
-//PACKET_CS_CHANGEICON
+// PACKET_CS_CHANGEICON
 type CSPlayerChangeIcon struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2258,7 +2258,7 @@ func (x *CSPlayerChangeIcon) GetIcon() int32 {
 	return 0
 }
 
-//PACKET_SC_CHANGEICON
+// PACKET_SC_CHANGEICON
 type SCPlayerChangeIcon struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2314,8 +2314,8 @@ func (x *SCPlayerChangeIcon) GetIcon() int32 {
 	return 0
 }
 
-//更换头像框
+// 更换头像框
-//PACKET_CS_HEADOUTLINE
+// PACKET_CS_HEADOUTLINE
 type CSPlayerChangeHeadOutLine struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2363,7 +2363,7 @@ func (x *CSPlayerChangeHeadOutLine) GetHeadOutLine() int32 {
 	return 0
 }
 
-//PACKET_SC_HEADOUTLINE
+// PACKET_SC_HEADOUTLINE
 type SCPlayerChangeHeadOutLine struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2419,8 +2419,8 @@ func (x *SCPlayerChangeHeadOutLine) GetHeadOutLine() int32 {
 	return 0
 }
 
-//更换性别
+// 更换性别
-//PACKET_CS_CHANGESEX
+// PACKET_CS_CHANGESEX
 type CSPlayerChangeSex struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2468,7 +2468,7 @@ func (x *CSPlayerChangeSex) GetSex() int32 {
 	return 0
 }
 
-//PACKET_SC_CHANGESEX
+// PACKET_SC_CHANGESEX
 type SCPlayerChangeSex struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2628,8 +2628,8 @@ func (x *SCHeadUrl) GetUrl() string {
 	return ""
 }
 
-//获取验证码
+// 获取验证码
-//PACKET_CS_VERIFICATIONCODE
+// PACKET_CS_VERIFICATIONCODE
 type CSPlayerVerificationCode struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2725,7 +2725,7 @@ func (x *CSPlayerVerificationCode) GetDeviceInfo() string {
 	return ""
 }
 
-//PACKET_SC_VERIFICATIONCODE
+// PACKET_SC_VERIFICATIONCODE
 type SCPlayerVerificationCode struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2781,8 +2781,8 @@ func (x *SCPlayerVerificationCode) GetVerificationCode() int32 {
 	return 0
 }
 
-//注册帐号
+// 注册帐号
-//PACKET_CS_REGISTER
+// PACKET_CS_REGISTER
 type CSRegister struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2974,7 +2974,7 @@ func (x *CSRegister) GetRegistType() int32 {
 	return 0
 }
 
-//PACKET_SC_REGISTER
+// PACKET_SC_REGISTER
 type SCRegister struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3038,8 +3038,8 @@ func (x *SCRegister) GetSrvTs() int64 {
 	return 0
 }
 
-//账号升级，绑定手机，找回密码
+// 账号升级，绑定手机，找回密码
-//PACKET_CS_UPGRADEACCOUNT
+// PACKET_CS_UPGRADEACCOUNT
 type CSUpgradeAccount struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3127,7 +3127,7 @@ func (x *CSUpgradeAccount) GetPlatformTag() string {
 	return ""
 }
 
-//PACKET_SC_UPGRADEACCOUNT
+// PACKET_SC_UPGRADEACCOUNT
 type SCUpgradeAccount struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3191,8 +3191,8 @@ func (x *SCUpgradeAccount) GetChangeType() int32 {
 	return 0
 }
 
-//绑定支付宝账号
+// 绑定支付宝账号
-//PACKET_CS_BINDALIPAY
+// PACKET_CS_BINDALIPAY
 type CSBindAlipay struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3264,7 +3264,7 @@ func (x *CSBindAlipay) GetPassword() string {
 	return ""
 }
 
-//PACKET_SC_BINDALIPAY
+// PACKET_SC_BINDALIPAY
 type SCBindAlipay struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3328,8 +3328,8 @@ func (x *SCBindAlipay) GetAlipayAccName() string {
 	return ""
 }
 
-//绑定银行卡账号
+// 绑定银行卡账号
-//PACKET_CS_BINDBANK
+// PACKET_CS_BINDBANK
 type CSBindBank struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3409,7 +3409,7 @@ func (x *CSBindBank) GetPassword() string {
 	return ""
 }
 
-//PACKET_SC_BINDBANK
+// PACKET_SC_BINDBANK
 type SCBindBank struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3481,8 +3481,8 @@ func (x *SCBindBank) GetBankAccName() string {
 	return ""
 }
 
-//PACKET_SC_PLAYERFLAG
+// PACKET_SC_PLAYERFLAG
-//玩家状态标记同步
+// 玩家状态标记同步
 type SCPlayerFlag struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3538,7 +3538,7 @@ func (x *SCPlayerFlag) GetFlag() int32 {
 	return 0
 }
 
-//PACKET_SC_PLAYERCOINCHANGE
+// PACKET_SC_PLAYERCOINCHANGE
 type SCPlayerCoinChange struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3602,7 +3602,7 @@ func (x *SCPlayerCoinChange) GetRestCoin() int64 {
 	return 0
 }
 
-//PACKET_SC_PLAYERRECHARGEANSWER
+// PACKET_SC_PLAYERRECHARGEANSWER
 type SCPlayerRechargeAnswer struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3674,7 +3674,7 @@ func (x *SCPlayerRechargeAnswer) GetSafeBoxCoin() int64 {
 	return 0
 }
 
-//数据日志
+// 数据日志
 type DataLog struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3754,7 +3754,7 @@ func (x *DataLog) GetRemark() string {
 	return ""
 }
 
-//PACKET_CS_GETDATALOG
+// PACKET_CS_GETDATALOG
 type CSGetDataLog struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3810,7 +3810,7 @@ func (x *CSGetDataLog) GetVer() int32 {
 	return 0
 }
 
-//PACKET_SC_GETDATALOG
+// PACKET_SC_GETDATALOG
 type SCGetDataLog struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3874,7 +3874,7 @@ func (x *SCGetDataLog) GetDatas() []*DataLog {
 	return nil
 }
 
-//游戏金币日志
+// 游戏金币日志
 type GameCoinLog struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3954,7 +3954,7 @@ func (x *GameCoinLog) GetLeaveTs() int64 {
 	return 0
 }
 
-//PACKET_CS_GETGAMECOINLOG
+// PACKET_CS_GETGAMECOINLOG
 type CSGetGameCoinLog struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4002,7 +4002,7 @@ func (x *CSGetGameCoinLog) GetTs() int64 {
 	return 0
 }
 
-//PACKET_SC_GETGAMECOINLOG
+// PACKET_SC_GETGAMECOINLOG
 type SCGetGameCoinLog struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4058,8 +4058,8 @@ func (x *SCGetGameCoinLog) GetLogs() []*GameCoinLog {
 	return nil
 }
 
-//保险箱存取款
+// 保险箱存取款
-//PACKET_CS_PLAYEROPCOIN
+// PACKET_CS_PLAYEROPCOIN
 type CSPlayerOpCoin struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4131,7 +4131,7 @@ func (x *CSPlayerOpCoin) GetTimeStamp() int64 {
 	return 0
 }
 
-//PACKET_SC_PLAYEROPCOIN
+// PACKET_SC_PLAYEROPCOIN
 type SCPlayerOpCoin struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4203,7 +4203,7 @@ func (x *SCPlayerOpCoin) GetSafeBoxCoin() int64 {
 	return 0
 }
 
-//保险箱金币日志
+// 保险箱金币日志
 type SafeBoxCoinLog struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4283,7 +4283,7 @@ func (x *SafeBoxCoinLog) GetTs() int64 {
 	return 0
 }
 
-//PACKET_CS_GETSAFEBOXCOINLOG
+// PACKET_CS_GETSAFEBOXCOINLOG
 type CSGetSafeBoxCoinLog struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4331,7 +4331,7 @@ func (x *CSGetSafeBoxCoinLog) GetTs() int64 {
 	return 0
 }
 
-//PACKET_SC_GETSAFEBOXCOINLOG
+// PACKET_SC_GETSAFEBOXCOINLOG
 type SCGetSafeBoxCoinLog struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4387,8 +4387,8 @@ func (x *SCGetSafeBoxCoinLog) GetLogs() []*SafeBoxCoinLog {
 	return nil
 }
 
-//领取邀请码奖励
+// 领取邀请码奖励
-//PACKET_CS_INVITECODE
+// PACKET_CS_INVITECODE
 type CSPlayerInviteCode struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4436,7 +4436,7 @@ func (x *CSPlayerInviteCode) GetCode() string {
 	return ""
 }
 
-//PACKET_SC_INVITECODE
+// PACKET_SC_INVITECODE
 type SCPlayerInviteCode struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4484,8 +4484,8 @@ func (x *SCPlayerInviteCode) GetOpRetCode() OpResultCode {
 	return OpResultCode_OPRC_Sucess
 }
 
-//玩家API透传
+// 玩家API透传
-//PACKET_CS_WEBAPI_PLAYERPASS
+// PACKET_CS_WEBAPI_PLAYERPASS
 type CSWebAPIPlayerPass struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4549,7 +4549,7 @@ func (x *CSWebAPIPlayerPass) GetCBData() string {
 	return ""
 }
 
-//PACKET_SC_WEBAPI_PLAYERPASS
+// PACKET_SC_WEBAPI_PLAYERPASS
 type SCWebAPIPlayerPass struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4621,8 +4621,8 @@ func (x *SCWebAPIPlayerPass) GetResponse() string {
 	return ""
 }
 
-//系统API透传
+// 系统API透传
-//PACKET_CS_WEBAPI_SYSTEMPASS
+// PACKET_CS_WEBAPI_SYSTEMPASS
 type CSWebAPISystemPass struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4686,7 +4686,7 @@ func (x *CSWebAPISystemPass) GetCBData() string {
 	return ""
 }
 
-//PACKET_SC_WEBAPI_SYSTEMPASS
+// PACKET_SC_WEBAPI_SYSTEMPASS
 type SCWebAPISystemPass struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4758,8 +4758,8 @@ func (x *SCWebAPISystemPass) GetResponse() string {
 	return ""
 }
 
-//绑定推广关系
+// 绑定推广关系
-//PACKET_CS_SPREADBIND
+// PACKET_CS_SPREADBIND
 type CSSpreadBind struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4807,8 +4807,8 @@ func (x *CSSpreadBind) GetParentId() int32 {
 	return 0
 }
 
-//绑定推广关系
+// 绑定推广关系
-//PACKET_SC_SPREADBIND
+// PACKET_SC_SPREADBIND
 type SCSpreadBind struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4864,8 +4864,8 @@ func (x *SCSpreadBind) GetParentId() int32 {
 	return 0
 }
 
-//绑定推广员
+// 绑定推广员
-//PACKET_CS_BINDPROMOTER
+// PACKET_CS_BINDPROMOTER
 type CSBindPromoter struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4913,8 +4913,8 @@ func (x *CSBindPromoter) GetPromoter() string {
 	return ""
 }
 
-//绑定推广员
+// 绑定推广员
-//PACKET_SC_BINDPROMOTER
+// PACKET_SC_BINDPROMOTER
 type SCBindPromoter struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4970,8 +4970,8 @@ func (x *SCBindPromoter) GetPromoter() string {
 	return ""
 }
 
-//通知是否显示推广员绑定信息
+// 通知是否显示推广员绑定信息
-//PACKET_SC_BINDPROMOTERSTATE
+// PACKET_SC_BINDPROMOTERSTATE
 type SCBindPromoterState struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5019,8 +5019,8 @@ func (x *SCBindPromoterState) GetBindState() int32 {
 	return 0
 }
 
-//生成客服会话token
+// 生成客服会话token
-//PACKET_CS_GENCUSTOMTOKEN
+// PACKET_CS_GENCUSTOMTOKEN
 type CSGenCustomerToken struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5059,8 +5059,8 @@ func (*CSGenCustomerToken) Descriptor() ([]byte, []int) {
 	return file_player_proto_rawDescGZIP(), []int{59}
 }
 
-//生成客服会话token
+// 生成客服会话token
-//PACKET_SC_GENCUSTOMTOKEN
+// PACKET_SC_GENCUSTOMTOKEN
 type SCGenCustomerToken struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5163,8 +5163,8 @@ func (x *CustomerMsg) GetData() string {
 	return ""
 }
 
-//客服新消息提醒
+// 客服新消息提醒
-//PACKET_SC_CUSTOMNEWMSG
+// PACKET_SC_CUSTOMNEWMSG
 type SCCustomerNewMsg struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5212,7 +5212,7 @@ func (x *SCCustomerNewMsg) GetData() []*CustomerMsg {
 	return nil
 }
 
-//PACKET_CS_CUSTOMNEWMSGACK
+// PACKET_CS_CUSTOMNEWMSGACK
 type CSCustomerNewMsgAck struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5260,8 +5260,8 @@ func (x *CSCustomerNewMsgAck) GetMsgIds() []string {
 	return nil
 }
 
-//获取图片验证码
+// 获取图片验证码
-//PACKET_CS_GETIMAGEVERIFYCODE
+// PACKET_CS_GETIMAGEVERIFYCODE
 type CSGetImageVerifyCode struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5300,7 +5300,7 @@ func (*CSGetImageVerifyCode) Descriptor() ([]byte, []int) {
 	return file_player_proto_rawDescGZIP(), []int{64}
 }
 
-//PACKET_SC_GETIMAGEVERIFYCODE
+// PACKET_SC_GETIMAGEVERIFYCODE
 type SCGetImageVerifyCode struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5357,7 +5357,7 @@ func (x *SCGetImageVerifyCode) GetImageData() string {
 }
 
 // 验证图片验证码
-//PACKET_CS_ImageVerifyCode
+// PACKET_CS_ImageVerifyCode
 type CSImageVerifyCode struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5405,7 +5405,7 @@ func (x *CSImageVerifyCode) GetCode() string {
 	return ""
 }
 
-//PACKET_SC_ImageVerifyCode
+// PACKET_SC_ImageVerifyCode
 type SCImageVerifyCode struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5453,8 +5453,8 @@ func (x *SCImageVerifyCode) GetOpRetCode() OpResultCode {
 	return OpResultCode_OPRC_Sucess
 }
 
-//玩家托管
+// 玩家托管
-//PACKET_SC_TRUSTEESHIPTIPS
+// PACKET_SC_TRUSTEESHIPTIPS
 type SCTrusteeshipTips struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5526,8 +5526,8 @@ func (x *SCTrusteeshipTips) GetOpParams() []int32 {
 	return nil
 }
 
-//获取滑块验证码
+// 获取滑块验证码
-//PACKET_CS_GETSLIDERVERIFYCODE
+// PACKET_CS_GETSLIDERVERIFYCODE
 type CSGetSliderVerifyCode struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5575,8 +5575,8 @@ func (x *CSGetSliderVerifyCode) GetTel() string {
 	return ""
 }
 
-//获取滑块验证码
+// 获取滑块验证码
-//PACKET_SC_GETSLIDERVERIFYCODE
+// PACKET_SC_GETSLIDERVERIFYCODE
 type SCGetSliderVerifyCode struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5632,8 +5632,8 @@ func (x *SCGetSliderVerifyCode) GetPos() int32 {
 	return 0
 }
 
-//标注ios用户准备升级稳定版本
+// 标注ios用户准备升级稳定版本
-//PACKET_CS_IOSINSTALLSTABLE
+// PACKET_CS_IOSINSTALLSTABLE
 type CSIosInstallStable struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5689,8 +5689,8 @@ func (x *CSIosInstallStable) GetTel() string {
 	return ""
 }
 
-//标注ios用户准备升级稳定版本
+// 标注ios用户准备升级稳定版本
-//PACKET_SC_IOSINSTALLSTABLE
+// PACKET_SC_IOSINSTALLSTABLE
 type SCIosInstallStable struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5793,7 +5793,7 @@ func (x *SrvMsgParam) GetStrParam() string {
 	return ""
 }
 
-//服务端消息提示
+// 服务端消息提示
 type SCSrvMsg struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -6103,7 +6103,7 @@ func (x *SCFishJackpotCoin) GetCoin() int64 {
 	return 0
 }
 
-//PACKET_SC_NICEIDREBIND
+// PACKET_SC_NICEIDREBIND
 type SCNiceIdRebind struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -6159,8 +6159,8 @@ func (x *SCNiceIdRebind) GetNiceId() int32 {
 	return 0
 }
 
-//请求客损功能是否打开
+// 请求客损功能是否打开
-//PACKET_CS_GetSpreadLWIsOpen
+// PACKET_CS_GetSpreadLWIsOpen
 type CSGetSpreadLWIsOpen struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -6199,8 +6199,8 @@ func (*CSGetSpreadLWIsOpen) Descriptor() ([]byte, []int) {
 	return file_player_proto_rawDescGZIP(), []int{81}
 }
 
-//获取滑块验证码
+// 获取滑块验证码
-//PACKET_SC_GETSLIDERVERIFYCODE
+// PACKET_SC_GETSLIDERVERIFYCODE
 type SCGetSpreadLWIsOpen struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -6335,7 +6335,7 @@ func (x *PayActInfo) GetState() int32 {
 	return 0
 }
 
-//PACKET_SC_PayAct_State
+// PACKET_SC_PayAct_State
 type SCPayActState struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -6383,7 +6383,7 @@ func (x *SCPayActState) GetPayState() []*PayActInfo {
 	return nil
 }
 
-//PACKET_CS_QUERYPLAYER
+// PACKET_CS_QUERYPLAYER
 type CSQueryPlayer struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -6494,7 +6494,7 @@ func (x *RoleOrPet) GetName() string {
 	return ""
 }
 
-//PACKET_SC_QUERYPLAYER
+// PACKET_SC_QUERYPLAYER
 type SCQueryPlayer struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -6670,7 +6670,7 @@ func (x *SCQueryPlayer) GetGameID() []int32 {
 	return nil
 }
 
-//PACKET_CS_PMCMD
+// PACKET_CS_PMCMD
 type CSPMCmd struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -6718,8 +6718,8 @@ func (x *CSPMCmd) GetCmd() string {
 	return ""
 }
 
-//PACKET_CS_ROBOTCHGDATA
+// PACKET_CS_ROBOTCHGDATA
-//获取玩家基本信息
+// 获取玩家基本信息
 type CSRobotChgData struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -6767,7 +6767,7 @@ func (x *CSRobotChgData) GetParams() []string {
 	return nil
 }
 
-//物品信息 后续精简
+// 物品信息 后续精简
 type ItemInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -7087,7 +7087,7 @@ func (x *SCPlayerSetting) GetGainItem() *JybInfoAward {
 	return nil
 }
 
-//PACKET_SCGAMEEXDROPITEMS
+// PACKET_SCGAMEEXDROPITEMS
 type SCGameExDropItems struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -7135,8 +7135,8 @@ func (x *SCGameExDropItems) GetItems() map[int32]int32 {
 	return nil
 }
 
-//VIP充值 假充值 后续走三方回调
+// VIP充值 假充值 后续走三方回调
-//PACKET_CS_VIPBUY
+// PACKET_CS_VIPBUY
 type CSVIPBuy struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -7184,8 +7184,8 @@ func (x *CSVIPBuy) GetMoney() int32 {
 	return 0
 }
 
-//VIP充值
+// VIP充值
-//PACKET_SC_VIPBUY
+// PACKET_SC_VIPBUY
 type SCVIPBuy struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -7257,8 +7257,8 @@ func (x *SCVIPBuy) GetTolVipExp() int64 {
 	return 0
 }
 
-//VIP领取
+// VIP领取
-//PACKET_CS_DRAWVIPGIFT
+// PACKET_CS_DRAWVIPGIFT
 type CSVIPDraw struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -7306,8 +7306,8 @@ func (x *CSVIPDraw) GetId() int32 {
 	return 0
 }
 
-//VIP领取
+// VIP领取
-//PACKET_SC_DRAWVIPGIFT
+// PACKET_SC_DRAWVIPGIFT
 type SCVIPDraw struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -7371,8 +7371,8 @@ func (x *SCVIPDraw) GetOpRetCode() OpResultCode {
 	return OpResultCode_OPRC_Sucess
 }
 
-//VIP信息
+// VIP信息
-//PACKET_CS_VIPINFO
+// PACKET_CS_VIPINFO
 type CSVIPInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -7586,8 +7586,8 @@ func (x *VIPcfg) GetBagStatus() []int32 {
 	return nil
 }
 
-//VIP信息
+// VIP信息
-//PACKET_SC_VIPINFO
+// PACKET_SC_VIPINFO
 type SCVIPInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -7683,14 +7683,13 @@ func (x *SCVIPInfo) GetMoneyRatio() int32 {
 	return 0
 }
 
-//
+// PACKET_SC_SWELFAREINFO
-//PACKET_SC_SWELFAREINFO
 type SCEasyWelfaredInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	WelfareSwitch []int32 `protobuf:"varint,1,rep,packed,name=WelfareSwitch,proto3" json:"WelfareSwitch,omitempty"` // 下标 0转盘1盲盒2首冲3连续充值4抽手机活动  1显示 2不显示
+	WelfareSwitch []int32 `protobuf:"varint,1,rep,packed,name=WelfareSwitch,proto3" json:"WelfareSwitch,omitempty"` // 下标 0转盘1盲盒2首冲3连续充值4抽手机活动5集卡活动  1显示 2不显示
 }
 
 func (x *SCEasyWelfaredInfo) Reset() {
@@ -7779,7 +7778,7 @@ func (x *CSVIPPrivilegeInfo) GetCode() int32 {
 	return 0
 }
 
-//PACKET_SC_VIPPrivilegeInfo
+// PACKET_SC_VIPPrivilegeInfo
 type SCVIPPrivilegeInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -7906,8 +7905,8 @@ func (x *PayItem) GetItemNum() int64 {
 	return 0
 }
 
-//支付掉落
+// 支付掉落
-//PACKET_SC_PAYGOODSINFO
+// PACKET_SC_PAYGOODSINFO
 type SCPayGoodsInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -7964,7 +7963,7 @@ func (x *SCPayGoodsInfo) GetItem() []*PayItem {
 }
 
 // 资源更新
-//PACKET_SC_RESOURCE
+// PACKET_SC_RESOURCE
 type SCResource struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -8012,7 +8011,7 @@ func (x *SCResource) GetMsg() string {
 	return ""
 }
 
-//PACKET_CS_CLIENT_LOG
+// PACKET_CS_CLIENT_LOG
 type CSClientLog struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -8060,7 +8059,7 @@ func (x *CSClientLog) GetData() string {
 	return ""
 }
 
-//PACKET_SC_CLIENT_LOG
+// PACKET_SC_CLIENT_LOG
 type SCClientLog struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -8108,8 +8107,8 @@ func (x *SCClientLog) GetOpRetCode() OpResultCode {
 	return OpResultCode_OPRC_Sucess
 }
 
-//捕鱼解锁炮倍
+// 捕鱼解锁炮倍
-//PACKET_SC_PlayerUnPower
+// PACKET_SC_PlayerUnPower
 type SCPlayerUnPower struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -8157,8 +8156,8 @@ func (x *SCPlayerUnPower) GetUnMaxpower() int64 {
 	return 0
 }
 
-//捕鱼解锁炮台
+// 捕鱼解锁炮台
-//PACKET_SC_PlayerUnPowerList
+// PACKET_SC_PlayerUnPowerList
 type SCPlayerUnPowerList struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -8206,8 +8205,8 @@ func (x *SCPlayerUnPowerList) GetUnPowerList() int32 {
 	return 0
 }
 
-//玩家升级
+// 玩家升级
-//PACKET_SC_PlayerUpLevel
+// PACKET_SC_PlayerUpLevel
 type SCPlayerUpLevel struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -8745,8 +8744,8 @@ func (x *SCHttpPass) GetResponse() string {
 	return ""
 }
 
-//抽手机 请求抽奖数据
+// 抽手机 请求抽奖数据
-//PACKET_CS_PhoneLotteryInfo
+// PACKET_CS_PhoneLotteryInfo
 type CSPhoneLotteryInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -8785,8 +8784,8 @@ func (*CSPhoneLotteryInfo) Descriptor() ([]byte, []int) {
 	return file_player_proto_rawDescGZIP(), []int{121}
 }
 
-//抽手机 返回抽奖数据
+// 抽手机 返回抽奖数据
-//PACKET_SC_PhoneLotteryInfo
+// PACKET_SC_PhoneLotteryInfo
 type SCPhoneLotteryInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -8850,8 +8849,8 @@ func (x *SCPhoneLotteryInfo) GetItem() []*LotteryItem {
 	return nil
 }
 
-//请求抽奖
+// 请求抽奖
-//PACKET_CS_PhoneLottery
+// PACKET_CS_PhoneLottery
 type CSPhoneLottery struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -8899,8 +8898,8 @@ func (x *CSPhoneLottery) GetLotteryType() int32 {
 	return 0
 }
 
-//请求抽奖返回
+// 请求抽奖返回
-//PACKET_SC_PhoneLottery
+// PACKET_SC_PhoneLottery
 type SCPhoneLottery struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -9027,8 +9026,8 @@ func (x *LotteryItem) GetItemNum() int64 {
 	return 0
 }
 
-//通知抽奖剩余次数
+// 通知抽奖剩余次数
-//PACKET_SC_PhoneLotteryCount
+// PACKET_SC_PhoneLotteryCount
 type SCPhoneLotteryCount struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache

protocol/player/player.proto

@@ -996,7 +996,7 @@ message SCVIPInfo {
 // 
 //PACKET_SC_SWELFAREINFO
 message SCEasyWelfaredInfo{
-	repeated int32    WelfareSwitch     = 1;     // 下标 0转盘1盲盒2首冲3连续充值4抽手机活动  1显示 2不显示
+	repeated int32    WelfareSwitch     = 1;     // 下标 0转盘1盲盒2首冲3连续充值4抽手机活动5集卡活动  1显示 2不显示
 }
 
 message CSVIPPrivilegeInfo {

protocol/qpapi/qpapi.pb.go

@@ -82,7 +82,7 @@ func (TagCode) EnumDescriptor() ([]byte, []int) {
 	return file_qpapi_proto_rawDescGZIP(), []int{0}
 }
 
-//[action] /api/Member/QPAPIRegisterOrLogin
+// [action] /api/Member/QPAPIRegisterOrLogin
 type ASLogin struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -225,8 +225,8 @@ func (x *SALogin) GetSnid() int32 {
 	return 0
 }
 
-//加币
+// 加币
-// [action] /api/mongo.games.com/game/QPAPIAddSubCoinById
+// [action] /api/game/QPAPIAddSubCoinById
 type ASAddCoinById struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -433,7 +433,7 @@ func (x *PlayerCoinData) GetBank() int64 {
 	return 0
 }
 
-//查用户金币  /api/Member/QPGetMemberGoldById
+// 查用户金币  /api/Member/QPGetMemberGoldById
 type ASMemberGold struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -760,7 +760,7 @@ func (x *PlayerHistoryInfo) GetUserName() string {
 	return ""
 }
 
-//获取用户注单记录游戏记录 /api/Member/QPGetGameHistory
+// 获取用户注单记录游戏记录 /api/Member/QPGetGameHistory
 type SAPlayerHistory struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache

protocol/qpapi/qpapi.proto

@@ -28,7 +28,7 @@ message SALogin{
 }
 
 //加币
-// [action] /api/mongo.games.com/game/QPAPIAddSubCoinById
+// [action] /api/game/QPAPIAddSubCoinById
 message ASAddCoinById{
   string Username = 1;      //用户名  //保证唯一性
   int64 Gold = 2;           //加币金额

protocol/telegramapi/telegramapi.pb.go

@@ -82,7 +82,7 @@ func (TagCode) EnumDescriptor() ([]byte, []int) {
 	return file_telegramapi_proto_rawDescGZIP(), []int{0}
 }
 
-//[action] /api/Member/APIMemberRegisterOrLogin
+// [action] /api/Member/APIMemberRegisterOrLogin
 type ASLogin struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -233,8 +233,8 @@ func (x *SALogin) GetSnid() int32 {
 	return 0
 }
 
-//加币
+// 加币
-// [action] /api/mongo.games.com/game/APIAddCoinById
+// [action] /api/game/APIAddCoinById
 type ASAddCoinById struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -481,7 +481,7 @@ func (x *PlayerCoinData) GetBank() int64 {
 	return 0
 }
 
-//查用户金币  /api/Member/GetMemberGoldById
+// 查用户金币  /api/Member/GetMemberGoldById
 type ASMemberGold struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -600,7 +600,7 @@ func (x *SAMemberGold) GetData() *PlayerCoinData {
 	return nil
 }
 
-//校验碰撞游戏Hash  /api/mongo.games.com/game/CrashVerifier
+// 校验碰撞游戏Hash  /api/game/CrashVerifier
 type ASCrachHash struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -887,7 +887,7 @@ func (x *PlayerHistoryInfo) GetMultiple() int64 {
 	return 0
 }
 
-//获取用户注单记录游戏记录 /api/Member/GetGameHistory
+// 获取用户注单记录游戏记录 /api/Member/GetGameHistory
 type SAPlayerHistory struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -959,7 +959,7 @@ func (x *SAPlayerHistory) GetGameHistory() []*GameHistoryInfo {
 	return nil
 }
 
-//获取用户注单记录游戏记录  /api/Member/GetGameHistory
+// 获取用户注单记录游戏记录  /api/Member/GetGameHistory
 type ASPlayerHistory struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache

protocol/telegramapi/telegramapi.proto

@@ -29,7 +29,7 @@ message SALogin{
 }
 
 //加币
-// [action] /api/mongo.games.com/game/APIAddCoinById
+// [action] /api/game/APIAddCoinById
 message ASAddCoinById{
   int32 ID = 1;//玩家id
   int64 Gold = 2;//加币金额
@@ -66,7 +66,7 @@ message SAMemberGold{
   PlayerCoinData Data = 3; //用户金币
 }
 
-//校验碰撞游戏Hash  /api/mongo.games.com/game/CrashVerifier
+//校验碰撞游戏Hash  /api/game/CrashVerifier
 message ASCrachHash{
   string Hash = 1;//哈希值
   int32 Wheel = 2;//第几轮

protocol/webapi/common.pb.go

@@ -7,9 +7,9 @@
 package webapi
 
 import (
-	"mongo.games.com/game/protocol/server"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	"mongo.games.com/game/protocol/server"
 	reflect "reflect"
 	sync "sync"
 )
@@ -3206,7 +3206,7 @@ func (x *ExchangeType) GetId() int32 {
 	return 0
 }
 
-// etcd /mongo.games.com/game/exchange_shop
+// etcd /game/exchange_shop
 type ExchangeShopList struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3477,7 +3477,7 @@ func (x *ItemShop) GetFirstSwitch() bool {
 	return false
 }
 
-// etcd /mongo.games.com/game/item_shop
+// etcd /game/item_shop
 type ItemShopList struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3900,7 +3900,7 @@ func (x *GameMatchDate) GetOnChannelName() []string {
 	return nil
 }
 
-// etcd /mongo.games.com/game/game_match
+// etcd /game/game_match
 type GameMatchDateList struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4129,7 +4129,7 @@ func (x *WelfareTurnplateRate) GetRate() []int32 {
 	return nil
 }
 
-// etcd /mongo.games.com/game/act_turnplate 转盘
+// etcd /game/act_turnplate 转盘
 type WelfareTurnplateDateList struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4319,7 +4319,7 @@ func (x *Welfare7SignDate) GetAddUpDate() []*AddUpWelfareDate {
 	return nil
 }
 
-// etcd /mongo.games.com/game/act_7sign 7日签到
+// etcd /game/act_7sign 7日签到
 type Welfare7SignDateList struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4494,7 +4494,7 @@ func (x *BlindBoxData) GetItem_Id() int32 {
 	return 0
 }
 
-// etcd /mongo.games.com/game/act_blindbox 盲盒
+// etcd /game/act_blindbox 盲盒
 type WelfareBlindBoxDataList struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4669,7 +4669,7 @@ func (x *WelfareSpree) GetDiscount() float64 {
 	return 0
 }
 
-// etcd /mongo.games.com/game/act_FirstPay 首充
+// etcd /game/act_FirstPay 首充
 type WelfareFirstPayDataList struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4741,7 +4741,7 @@ func (x *WelfareFirstPayDataList) GetCycle() int32 {
 	return 0
 }
 
-// etcd /mongo.games.com/game/act_ContinuousPay 连续充值
+// etcd /game/act_ContinuousPay 连续充值
 type WelfareContinuousPayDataList struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4988,7 +4988,7 @@ func (x *VIPcfg) GetShopId7() int32 {
 	return 0
 }
 
-// etcd /mongo.games.com/game/VIPcfg VIP配置
+// etcd /game/VIPcfg VIP配置
 type VIPcfgDataList struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5559,7 +5559,7 @@ func (x *GameConfig) GetGoodFenCha() int32 {
 	return 0
 }
 
-// etcd mongo.games.com/game/act_phoneLottery
+// etcd /game/act_phoneLottery
 type WelfarePhoneLotteryStatus struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5615,6 +5615,62 @@ func (x *WelfarePhoneLotteryStatus) GetSwitch() int32 {
 	return 0
 }
 
+// etcd /game/act_collect
+type WelfareCollectConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Platform string `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"`
+	Switch   int32  `protobuf:"varint,2,opt,name=Switch,proto3" json:"Switch,omitempty"` // 1.开启 2.关闭
+}
+
+func (x *WelfareCollectConfig) Reset() {
+	*x = WelfareCollectConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[54]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *WelfareCollectConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*WelfareCollectConfig) ProtoMessage() {}
+
+func (x *WelfareCollectConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[54]
+	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 WelfareCollectConfig.ProtoReflect.Descriptor instead.
+func (*WelfareCollectConfig) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{54}
+}
+
+func (x *WelfareCollectConfig) GetPlatform() string {
+	if x != nil {
+		return x.Platform
+	}
+	return ""
+}
+
+func (x *WelfareCollectConfig) GetSwitch() int32 {
+	if x != nil {
+		return x.Switch
+	}
+	return 0
+}
+
 var File_common_proto protoreflect.FileDescriptor
 
 var file_common_proto_rawDesc = []byte{
@@ -6517,8 +6573,12 @@ var file_common_proto_rawDesc = []byte{
 	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,
-	0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x3b, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72,
+	0x22, 0x4a, 0x0a, 0x14, 0x57, 0x65, 0x6c, 0x66, 0x61, 0x72, 0x65, 0x43, 0x6f, 0x6c, 0x6c, 0x65,
-	0x6f, 0x74, 0x6f, 0x33,
+	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, 0x42, 0x0a, 0x5a, 0x08,
+	0x2e, 0x3b, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -6533,7 +6593,7 @@ func file_common_proto_rawDescGZIP() []byte {
 	return file_common_proto_rawDescData
 }
 
-var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 59)
+var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 60)
 var file_common_proto_goTypes = []interface{}{
 	(*MysqlDbSetting)(nil),               // 0: pb.MysqlDbSetting
 	(*MongoDbSetting)(nil),               // 1: pb.MongoDbSetting
@@ -6589,31 +6649,32 @@ var file_common_proto_goTypes = []interface{}{
 	(*PlayerPool)(nil),                   // 51: pb.PlayerPool
 	(*GameConfig)(nil),                   // 52: pb.GameConfig
 	(*WelfarePhoneLotteryStatus)(nil),    // 53: pb.WelfarePhoneLotteryStatus
-	nil,                                  // 54: pb.Platform.BindTelRewardEntry
+	(*WelfareCollectConfig)(nil),         // 54: pb.WelfareCollectConfig
-	nil,                                  // 55: pb.PlayerData.RankScoreEntry
+	nil,                                  // 55: pb.Platform.BindTelRewardEntry
-	nil,                                  // 56: pb.ItemShop.AwardEntry
+	nil,                                  // 56: pb.PlayerData.RankScoreEntry
-	nil,                                  // 57: pb.VIPcfg.AwardEntry
+	nil,                                  // 57: pb.ItemShop.AwardEntry
-	nil,                                  // 58: pb.VIPcfg.Privilege7Entry
+	nil,                                  // 58: pb.VIPcfg.AwardEntry
-	(*server.DB_GameFree)(nil),           // 59: pbdata.DB_GameFree
+	nil,                                  // 59: pb.VIPcfg.Privilege7Entry
+	(*server.DB_GameFree)(nil),           // 60: pbdata.DB_GameFree
 }
 var file_common_proto_depIdxs = []int32{
 	2,  // 0: pb.Platform.Leaderboard:type_name -> pb.RankSwitch
 	3,  // 1: pb.Platform.ClubConfig:type_name -> pb.ClubConfig
 	4,  // 2: pb.Platform.ThirdGameMerchant:type_name -> pb.ThirdGame
-	54, // 3: pb.Platform.BindTelReward:type_name -> pb.Platform.BindTelRewardEntry
+	55, // 3: pb.Platform.BindTelReward:type_name -> pb.Platform.BindTelRewardEntry
 	6,  // 4: pb.GameConfigGlobal.GameStatus:type_name -> pb.GameStatus
-	59, // 5: pb.GameFree.DbGameFree:type_name -> pbdata.DB_GameFree
+	60, // 5: pb.GameFree.DbGameFree:type_name -> pbdata.DB_GameFree
 	8,  // 6: pb.PlatformGameConfig.DbGameFrees:type_name -> pb.GameFree
 	0,  // 7: pb.PlatformDbConfig.Mysql:type_name -> pb.MysqlDbSetting
 	1,  // 8: pb.PlatformDbConfig.MongoDb:type_name -> pb.MongoDbSetting
 	1,  // 9: pb.PlatformDbConfig.MongoDbLog:type_name -> pb.MongoDbSetting
-	59, // 10: pb.GameConfigGroup.DbGameFree:type_name -> pbdata.DB_GameFree
+	60, // 10: pb.GameConfigGroup.DbGameFree:type_name -> pbdata.DB_GameFree
-	55, // 11: pb.PlayerData.RankScore:type_name -> pb.PlayerData.RankScoreEntry
+	56, // 11: pb.PlayerData.RankScore:type_name -> pb.PlayerData.RankScoreEntry
 	20, // 12: pb.OnlineReport.GameCount:type_name -> pb.OnlineGameCnt
 	22, // 13: pb.CommonNoticeList.List:type_name -> pb.CommonNotice
 	25, // 14: pb.ExchangeShop.ExType:type_name -> pb.ExchangeType
 	24, // 15: pb.ExchangeShopList.List:type_name -> pb.ExchangeShop
-	56, // 16: pb.ItemShop.Award:type_name -> pb.ItemShop.AwardEntry
+	57, // 16: pb.ItemShop.Award:type_name -> pb.ItemShop.AwardEntry
 	27, // 17: pb.ItemShopList.List:type_name -> pb.ItemShop
 	29, // 18: pb.MatchInfoAward.ItemId:type_name -> pb.ItemInfo
 	30, // 19: pb.GameMatchDate.Award:type_name -> pb.MatchInfoAward
@@ -6630,8 +6691,8 @@ var file_common_proto_depIdxs = []int32{
 	33, // 30: pb.WelfareSpree.Item:type_name -> pb.WelfareDate
 	42, // 31: pb.WelfareFirstPayDataList.List:type_name -> pb.WelfareSpree
 	42, // 32: pb.WelfareContinuousPayDataList.List:type_name -> pb.WelfareSpree
-	57, // 33: pb.VIPcfg.Award:type_name -> pb.VIPcfg.AwardEntry
+	58, // 33: pb.VIPcfg.Award:type_name -> pb.VIPcfg.AwardEntry
-	58, // 34: pb.VIPcfg.Privilege7:type_name -> pb.VIPcfg.Privilege7Entry
+	59, // 34: pb.VIPcfg.Privilege7:type_name -> pb.VIPcfg.Privilege7Entry
 	45, // 35: pb.VIPcfgDataList.List:type_name -> pb.VIPcfg
 	33, // 36: pb.ChessRankConfig.Item:type_name -> pb.WelfareDate
 	49, // 37: pb.ChessRankcfgData.Datas:type_name -> pb.ChessRankConfig
@@ -7297,6 +7358,18 @@ func file_common_proto_init() {
 				return nil
 			}
 		}
+		file_common_proto_msgTypes[54].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
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -7304,7 +7377,7 @@ func file_common_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_common_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   59,
+			NumMessages:   60,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

protocol/webapi/common.proto

@@ -362,7 +362,7 @@ message ExchangeType{
   int32 Id = 4;           //行数
 }
 
-// etcd /mongo.games.com/game/exchange_shop
+// etcd /game/exchange_shop
 message ExchangeShopList{
   repeated ExchangeShop List = 1;
   string Platform = 2;
@@ -393,7 +393,7 @@ message ItemShop {
   bool FirstSwitch = 22;           //首冲翻倍开关
 }
 
-// etcd /mongo.games.com/game/item_shop
+// etcd /game/item_shop
 message ItemShopList{
   repeated ItemShop List = 1;
   string Platform = 2;
@@ -441,7 +441,7 @@ message GameMatchDate {
   repeated string OnChannelName = 23; // 开启的渠道名称
 }
 
-// etcd /mongo.games.com/game/game_match
+// etcd /game/game_match
 message GameMatchDateList{
   repeated GameMatchDate List = 1;
   string Platform = 2;
@@ -464,7 +464,7 @@ message WelfareTurnplateRate {
   repeated int32 Rate = 1;               // 转盘概率
 }
 
-// etcd /mongo.games.com/game/act_turnplate 转盘
+// etcd /game/act_turnplate 转盘
 message WelfareTurnplateDateList{
   repeated WelfareTurnplateDate List = 1; // 转盘奖励
   repeated WelfareTurnplateRate RateList = 2; // 转盘概率
@@ -484,7 +484,7 @@ message Welfare7SignDate {
 }
 
 
-// etcd /mongo.games.com/game/act_7sign 7日签到
+// etcd /game/act_7sign 7日签到
 message Welfare7SignDateList{
   repeated Welfare7SignDate List = 1; // 七日签到
   string Platform = 2;
@@ -503,7 +503,7 @@ message BlindBoxData {
   int32 Item_Id = 9;              // 道具id
 }
 
-// etcd /mongo.games.com/game/act_blindbox 盲盒
+// etcd /game/act_blindbox 盲盒
 message WelfareBlindBoxDataList{
   repeated BlindBoxData List = 1;     // 盲盒
   string Platform = 2;
@@ -522,7 +522,7 @@ message WelfareSpree  {
   double Discount = 8;            // 折扣
 }
 
-// etcd /mongo.games.com/game/act_FirstPay 首充
+// etcd /game/act_FirstPay 首充
 message WelfareFirstPayDataList{
   repeated WelfareSpree List = 1;
   string   Platform = 2;
@@ -530,7 +530,7 @@ message WelfareFirstPayDataList{
   int32    Cycle = 4;                   // 循环 1.开启 2.关闭
 }
 
-// etcd /mongo.games.com/game/act_ContinuousPay 连续充值
+// etcd /game/act_ContinuousPay 连续充值
 message WelfareContinuousPayDataList{
   repeated WelfareSpree List = 1;     // 连续充值
   string   Platform = 2;
@@ -558,7 +558,7 @@ message VIPcfg  {
   int32 ShopId7 = 16;
 }
 
-// etcd /mongo.games.com/game/VIPcfg VIP配置
+// etcd /game/VIPcfg VIP配置
 message VIPcfgDataList{
   repeated VIPcfg List = 1;     // VIP配置
   string   Platform = 2;
@@ -618,8 +618,14 @@ message GameConfig {
   int32 GoodFenCha = 7; // 好牌分差值
 }
 
-// etcd mongo.games.com/game/act_phoneLottery
+// etcd /game/act_phoneLottery
 message WelfarePhoneLotteryStatus{
   string Platform = 1;
   int32 Switch = 2;                   // 1.开启 2.关闭
 }
+
+// etcd /game/act_collect
+message WelfareCollectConfig{
+  string Platform = 1;
+  int32 Switch = 2;  // 1.开启 2.关闭
+}

protocol/webapi/webapi.pb.go

@@ -1000,7 +1000,7 @@ func (x *SAUpdateGameConfigGroup) GetMsg() string {
 
 // /////////////////////////////////////////////////////////////////////////////////////
 // 加币
-// [action] /api/mongo.games.com/game/AddCoinById
+// [action] /api/game/AddCoinById
 type ASAddCoinById struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1185,7 +1185,7 @@ func (x *SAAddCoinById) GetMsg() string {
 }
 
 // 重置水池
-// [action] /api/mongo.games.com/game/ResetGamePool
+// [action] /api/game/ResetGamePool
 type ASResetGamePool struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1329,7 +1329,7 @@ func (x *SAResetGamePool) GetMsg() string {
 }
 
 // 更新水池
-// [action] /api/mongo.games.com/game/UpdateGamePool
+// [action] /api/game/UpdateGamePool
 type ASUpdateGamePool struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1492,7 +1492,7 @@ func (x *SAUpdateGamePool) GetMsg() string {
 // ResetTime
 // //////////////////////////////////////////////////
 // 查询水池gameid
-// [action] /api/mongo.games.com/game/QueryGamePoolByGameId
+// [action] /api/game/QueryGamePoolByGameId
 type ASQueryGamePoolByGameId struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1628,7 +1628,7 @@ func (x *SAQueryGamePoolByGameId) GetCoinPoolSetting() []*CoinPoolSetting {
 }
 
 // 查询水池
-// [action] /api/mongo.games.com/game/QueryAllGamePool
+// [action] /api/game/QueryAllGamePool
 type ASQueryAllGamePool struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2258,7 +2258,7 @@ func (x *SADestroyRoom) GetMsg() string {
 }
 
 // 单控
-// [action] /api/mongo.games.com/game/SinglePlayerAdjust
+// [action] /api/game/SinglePlayerAdjust
 // PACKET_WG_SINGLEADJUST
 type ASSinglePlayerAdjust struct {
 	state         protoimpl.MessageState
@@ -3861,7 +3861,7 @@ func (x *SABlackBySnId) GetMsg() string {
 }
 
 // 邮件
-// [action] /api/mongo.games.com/game/CreateShortMessage
+// [action] /api/game/CreateShortMessage
 type ASCreateShortMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4036,7 +4036,7 @@ func (x *SACreateShortMessage) GetMsg() string {
 	return ""
 }
 
-// [action] /api/mongo.games.com/game/QueryShortMessageList
+// [action] /api/game/QueryShortMessageList
 type ASQueryShortMessageList struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4203,7 +4203,7 @@ func (x *SAQueryShortMessageList) GetMessageInfo() []*MessageInfo {
 	return nil
 }
 
-// [action] /api/mongo.games.com/game/DeleteShortMessage
+// [action] /api/game/DeleteShortMessage
 type ASDeleteShortMessage struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5290,7 +5290,7 @@ func (x *SAOnlineReportTotal) GetOnlineReport() *OnlineReport {
 
 // /////////////////////////////////////////////////////////////////////////////////////
 // 加币
-// [action] /api/mongo.games.com/game/AddCoinByIdAndPT
+// [action] /api/game/AddCoinByIdAndPT
 type ASAddCoinByIdAndPT struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5522,7 +5522,7 @@ func (x *JybInfoAward) GetDiamond() int64 {
 }
 
 // 生成兑换码
-// [action] /api/mongo.games.com/game/CreateJYB
+// [action] /api/game/CreateJYB
 type ASCreateJYB struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5707,7 +5707,7 @@ func (x *SACreateJYB) GetMsg() string {
 }
 
 // 操作兑换码 删除 修改
-// [action] /api/mongo.games.com/game/UpdateJYB
+// [action] /api/game/UpdateJYB
 type ASUpdateJYB struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -7618,7 +7618,7 @@ func (x *SACallbackPayment) GetMsg() string {
 	return ""
 }
 
-// 资源更新通知 [/api/mongo.games.com/game/resource]
+// 资源更新通知 [/api/game/resource]
 type ASResource struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache

protocol/webapi/webapi.proto

@@ -163,7 +163,7 @@ message SAUpdateGameConfigGroup {
 }
 ///////////////////////////////////////////////////////////////////////////////////////
 //加币
-// [action] /api/mongo.games.com/game/AddCoinById
+// [action] /api/game/AddCoinById
 message ASAddCoinById{
   int32 ID = 1;//玩家id
   int64 Gold = 2;//加币金额
@@ -183,7 +183,7 @@ message SAAddCoinById {
   string Msg = 2;  //错误信息(选填)
 }
 //重置水池
-// [action] /api/mongo.games.com/game/ResetGamePool
+// [action] /api/game/ResetGamePool
 message ASResetGamePool{
   int32 GameFreeId = 1;
   string Platform = 2;
@@ -197,7 +197,7 @@ message SAResetGamePool{
   string Msg = 2;  //错误信息(选填)
 }
 //更新水池
-// [action] /api/mongo.games.com/game/UpdateGamePool
+// [action] /api/game/UpdateGamePool
 message ASUpdateGamePool{
   int32 GameFreeId = 1;
   string Platform = 2;
@@ -237,7 +237,7 @@ message SAUpdateGamePool{
 //ResetTime
 ////////////////////////////////////////////////////
 //查询水池gameid
-// [action] /api/mongo.games.com/game/QueryGamePoolByGameId
+// [action] /api/game/QueryGamePoolByGameId
 message ASQueryGamePoolByGameId{
   int32 GameId = 1;
   int32 GameMode = 2;
@@ -250,7 +250,7 @@ message SAQueryGamePoolByGameId{
   repeated pb.CoinPoolSetting CoinPoolSetting = 3;
 }
 //查询水池
-// [action] /api/mongo.games.com/game/QueryAllGamePool
+// [action] /api/game/QueryAllGamePool
 message ASQueryAllGamePool{
   int32 PageNo = 1;
   int32 PageSize = 2;
@@ -309,7 +309,7 @@ message SADestroyRoom{
   string Msg = 2;  //错误信息(选填)
 }
 //单控
-// [action] /api/mongo.games.com/game/SinglePlayerAdjust
+// [action] /api/game/SinglePlayerAdjust
 //PACKET_WG_SINGLEADJUST
 message ASSinglePlayerAdjust{
   int32 Opration = 1;//1.add 2.edit 3.del 4.查询最新的
@@ -455,7 +455,7 @@ message SABlackBySnId{
   string Msg = 2;  //错误信息(选填)
 }
 //邮件
-// [action] /api/mongo.games.com/game/CreateShortMessage
+// [action] /api/game/CreateShortMessage
 message ASCreateShortMessage{
   string NoticeTitle = 1;
   string NoticeContent = 2;
@@ -472,7 +472,7 @@ message SACreateShortMessage{
   TagCode Tag = 1; //错误码
   string Msg = 2;  //错误信息(选填)
 }
-// [action] /api/mongo.games.com/game/QueryShortMessageList
+// [action] /api/game/QueryShortMessageList
 message ASQueryShortMessageList{
   int64 StartTime = 1;
   int64 EndTime = 2;
@@ -488,7 +488,7 @@ message SAQueryShortMessageList{
   int32 Count = 3;
   repeated pb.MessageInfo MessageInfo = 4;
 }
-// [action] /api/mongo.games.com/game/DeleteShortMessage
+// [action] /api/game/DeleteShortMessage
 message ASDeleteShortMessage{
   string Id = 1;
   string Platform = 2;
@@ -589,7 +589,7 @@ message SAOnlineReportTotal{
 }
 ///////////////////////////////////////////////////////////////////////////////////////
 //加币
-// [action] /api/mongo.games.com/game/AddCoinByIdAndPT
+// [action] /api/game/AddCoinByIdAndPT
 message ASAddCoinByIdAndPT{
   int32 ID = 1;//玩家id
   string Platform = 2;//平台号
@@ -615,7 +615,7 @@ message JybInfoAward {
 }
 
 //生成兑换码
-// [action] /api/mongo.games.com/game/CreateJYB
+// [action] /api/game/CreateJYB
 message ASCreateJYB {
   string           Platform = 1;   // 平台
   string           Name = 2;       // 礼包名称
@@ -636,7 +636,7 @@ message SACreateJYB {
 }
 
 //操作兑换码 删除 修改
-// [action] /api/mongo.games.com/game/UpdateJYB
+// [action] /api/game/UpdateJYB
 message ASUpdateJYB {
   string Platform = 1;    // 平台
   string JYBID = 2;    // 礼包ID
@@ -824,7 +824,7 @@ message SACallbackPayment{
   string Msg = 2;  //错误信息(选填)
 }
 
-//资源更新通知 [/api/mongo.games.com/game/resource]
+//资源更新通知 [/api/game/resource]
 message  ASResource{
   string Msg = 1; //信息
 }

protocol/welfare/welfare.pb.go

@@ -20,7 +20,7 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-//操作结果
+// 操作结果
 type OpResultCode int32
 
 const (
@@ -116,6 +116,7 @@ const (
 	// 2900~2999
 	SPacketID_PACKET_CSWelfRelief SPacketID = 2900 //救济金信息
 	SPacketID_PACKET_SCWelfRelief SPacketID = 2901 //救济金信息
+	// 邀请活动
 	SPacketID_PACKET_CSInviteInfo SPacketID = 2902 //邀请信息
 	SPacketID_PACKET_SCInviteInfo SPacketID = 2903 //邀请信息
 	SPacketID_PACKET_CSBindInvite SPacketID = 2904 //绑定邀请人
@@ -211,8 +212,8 @@ func (SPacketID) EnumDescriptor() ([]byte, []int) {
 	return file_welfare_proto_rawDescGZIP(), []int{1}
 }
 
-//救济金领取
+// 救济金领取
-//PACKET_CS_WELF_GETRELIEFFUND
+// PACKET_CS_WELF_GETRELIEFFUND
 type CSGetReliefFund struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -260,7 +261,7 @@ func (x *CSGetReliefFund) GetIsVideo() bool {
 	return false
 }
 
-//PACKET_SC_WELF_GETRELIEFFUND
+// PACKET_SC_WELF_GETRELIEFFUND
 type SCGetReliefFund struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -395,8 +396,8 @@ func (x *WelfareDate) GetItem_Id() int32 {
 	return 0
 }
 
-//转动转盘
+// 转动转盘
-//PACKET_CS_WELF_GETTURNPLATE
+// PACKET_CS_WELF_GETTURNPLATE
 type CSGetTurnplate struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -444,7 +445,7 @@ func (x *CSGetTurnplate) GetIsVideo() bool {
 	return false
 }
 
-//PACKET_SC_WELF_GETTURNPLATE
+// PACKET_SC_WELF_GETTURNPLATE
 type SCGetTurnplate struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -579,8 +580,8 @@ func (x *AddUpWelfareDate) GetAddUpDate() []*WelfareDate {
 	return nil
 }
 
-//累计签到
+// 累计签到
-//PACKET_CS_WELF_GETADDUPSIGN
+// PACKET_CS_WELF_GETADDUPSIGN
 type CSGetAddupSign struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -628,7 +629,7 @@ func (x *CSGetAddupSign) GetAddUpDay() int32 {
 	return 0
 }
 
-//PACKET_SC_WELF_GETADDUPSIGN
+// PACKET_SC_WELF_GETADDUPSIGN
 type SCGetAddupSign struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -692,8 +693,8 @@ func (x *SCGetAddupSign) GetAddUpSignDay() []int32 {
 	return nil
 }
 
-//福利信息
+// 福利信息
-//PACKET_CS_WELF_WELFAREINFO
+// PACKET_CS_WELF_WELFAREINFO
 type CSWelfaredInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -850,7 +851,7 @@ func (x *Welfare7SignDate) GetAddUpDate() []*AddUpWelfareDate {
 	return nil
 }
 
-//PACKET_SC_WELF_WELFAREINFO
+// PACKET_SC_WELF_WELFAREINFO
 type SCWelfaredInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1057,8 +1058,8 @@ func (x *BlindBoxData) GetItem_Id() int32 {
 	return 0
 }
 
-//查看盲盒
+// 查看盲盒
-//PACKET_CS_WELF_BLINBOXINFO
+// PACKET_CS_WELF_BLINBOXINFO
 type CSBlindBoxInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1106,7 +1107,7 @@ func (x *CSBlindBoxInfo) GetId() int32 {
 	return 0
 }
 
-//PACKET_SC_WELF_BLINBOXINFO
+// PACKET_SC_WELF_BLINBOXINFO
 type SCBlindBoxInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1186,8 +1187,8 @@ func (x *SCBlindBoxInfo) GetCycle() int32 {
 	return 0
 }
 
-//领取盲盒
+// 领取盲盒
-//PACKET_CS_WELF_GETBLINBOX
+// PACKET_CS_WELF_GETBLINBOX
 type CSGetBlindBox struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1235,7 +1236,7 @@ func (x *CSGetBlindBox) GetId() int32 {
 	return 0
 }
 
-//PACKET_SC_WELF_GETBLINBOX
+// PACKET_SC_WELF_GETBLINBOX
 type SCGetBlindBox struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1378,7 +1379,7 @@ func (x *WelfareSpree) GetDiscount() float64 {
 	return 0
 }
 
-//PACKET_CS_WELF_FIRSTPAYINFO
+// PACKET_CS_WELF_FIRSTPAYINFO
 type CSWelfareFirstPayData struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1417,7 +1418,7 @@ func (*CSWelfareFirstPayData) Descriptor() ([]byte, []int) {
 	return file_welfare_proto_rawDescGZIP(), []int{18}
 }
 
-//PACKET_SC_WELF_FIRSTPAYINFO
+// PACKET_SC_WELF_FIRSTPAYINFO
 type SCWelfareFirstPayData struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1497,7 +1498,7 @@ func (x *SCWelfareFirstPayData) GetDraw() int32 {
 	return 0
 }
 
-//PACKET_CS_WELF_FIRSTPAY
+// PACKET_CS_WELF_FIRSTPAY
 type CSWelfareFirstPay struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1536,7 +1537,7 @@ func (*CSWelfareFirstPay) Descriptor() ([]byte, []int) {
 	return file_welfare_proto_rawDescGZIP(), []int{20}
 }
 
-//PACKET_SC_WELF_FIRSTPAY
+// PACKET_SC_WELF_FIRSTPAY
 type SCWelfareFirstPay struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1584,7 +1585,7 @@ func (x *SCWelfareFirstPay) GetOpRetCode() OpResultCode {
 	return OpResultCode_OPRC_Sucess
 }
 
-//PACKET_CS_WELF_CONTINPAYINFO
+// PACKET_CS_WELF_CONTINPAYINFO
 type CSWelfareContinuousPayData struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1623,7 +1624,7 @@ func (*CSWelfareContinuousPayData) Descriptor() ([]byte, []int) {
 	return file_welfare_proto_rawDescGZIP(), []int{22}
 }
 
-//PACKET_SC_WELF_CONTINPAYINFO
+// PACKET_SC_WELF_CONTINPAYINFO
 type SCWelfareContinuousPayData struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1711,7 +1712,7 @@ func (x *SCWelfareContinuousPayData) GetDay() int32 {
 	return 0
 }
 
-//PACKET_CS_WELF_CONTINPAY
+// PACKET_CS_WELF_CONTINPAY
 type CSWelfareContinuousPay struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1750,7 +1751,7 @@ func (*CSWelfareContinuousPay) Descriptor() ([]byte, []int) {
 	return file_welfare_proto_rawDescGZIP(), []int{24}
 }
 
-//PACKET_SC_WELF_CONTINPAY
+// PACKET_SC_WELF_CONTINPAY
 type SCWelfareContinuousPay struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache

protocol/welfare/welfare.proto

@@ -36,9 +36,11 @@ enum SPacketID {
   PACKET_SC_WELF_CONTINPAYINFO = 2597;//连续充值信息
   PACKET_CS_WELF_CONTINPAY = 2598;//领取(购买)连续充值 后期走充值回调
   PACKET_SC_WELF_CONTINPAY = 2599;//领取连续充值
+
   // 2900~2999
   PACKET_CSWelfRelief = 2900;//救济金信息
   PACKET_SCWelfRelief = 2901;//救济金信息
+  // 邀请活动
   PACKET_CSInviteInfo = 2902;//邀请信息
   PACKET_SCInviteInfo = 2903;//邀请信息
   PACKET_CSBindInvite = 2904;//绑定邀请人