update

protocol/gamehall/game.pb.go

@@ -284,8 +284,6 @@ const (
 	GameHallPacketID_PACKET_CS_PLAYER_SWITCHFLAG           GameHallPacketID = 8008
 	GameHallPacketID_PACKET_CSRoomEvent                    GameHallPacketID = 8009 // 房间事件
 	GameHallPacketID_PACKET_SCRoomEvent                    GameHallPacketID = 8010 // 房间事件
-	GameHallPacketID_PACKET_CSExchangeChannel              GameHallPacketID = 8011 // 开启兑换的渠道
-	GameHallPacketID_PACKET_SCExchangeChannel              GameHallPacketID = 8012 // 开启兑换的渠道
 )
 
 // Enum value maps for GameHallPacketID.
@@ -392,8 +390,6 @@ var (
 		8008: "PACKET_CS_PLAYER_SWITCHFLAG",
 		8009: "PACKET_CSRoomEvent",
 		8010: "PACKET_SCRoomEvent",
-		8011: "PACKET_CSExchangeChannel",
-		8012: "PACKET_SCExchangeChannel",
 	}
 	GameHallPacketID_value = map[string]int32{
 		"PACKET_GameHall_ZERO":                  0,
@@ -497,8 +493,6 @@ var (
 		"PACKET_CS_PLAYER_SWITCHFLAG":           8008,
 		"PACKET_CSRoomEvent":                    8009,
 		"PACKET_SCRoomEvent":                    8010,
-		"PACKET_CSExchangeChannel":              8011,
-		"PACKET_SCExchangeChannel":              8012,
 	}
 )
 
@@ -7188,93 +7182,6 @@ func (x *SCRoomEvent) GetTs() int64 {
 	return 0
 }
 
-// PACKET_CSExchangeChannel
-type CSExchangeChannel struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *CSExchangeChannel) Reset() {
-	*x = CSExchangeChannel{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_game_proto_msgTypes[102]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CSExchangeChannel) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CSExchangeChannel) ProtoMessage() {}
-
-func (x *CSExchangeChannel) ProtoReflect() protoreflect.Message {
-	mi := &file_game_proto_msgTypes[102]
-	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 CSExchangeChannel.ProtoReflect.Descriptor instead.
-func (*CSExchangeChannel) Descriptor() ([]byte, []int) {
-	return file_game_proto_rawDescGZIP(), []int{102}
-}
-
-// PACKET_SCExchangeChannel
-type SCExchangeChannel struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	OnChannelName []string `protobuf:"bytes,1,rep,name=OnChannelName,proto3" json:"OnChannelName,omitempty"` // 开启渠道
-}
-
-func (x *SCExchangeChannel) Reset() {
-	*x = SCExchangeChannel{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_game_proto_msgTypes[103]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SCExchangeChannel) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SCExchangeChannel) ProtoMessage() {}
-
-func (x *SCExchangeChannel) ProtoReflect() protoreflect.Message {
-	mi := &file_game_proto_msgTypes[103]
-	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 SCExchangeChannel.ProtoReflect.Descriptor instead.
-func (*SCExchangeChannel) Descriptor() ([]byte, []int) {
-	return file_game_proto_rawDescGZIP(), []int{103}
-}
-
-func (x *SCExchangeChannel) GetOnChannelName() []string {
-	if x != nil {
-		return x.OnChannelName
-	}
-	return nil
-}
-
 var File_game_proto protoreflect.FileDescriptor
 
 var file_game_proto_rawDesc = []byte{
@@ -8006,12 +7913,7 @@ var file_game_proto_rawDesc = []byte{
 	0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x43,
 	0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x18,
 	0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x0e, 0x0a, 0x02,
-	0x54, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x54, 0x73, 0x22, 0x13, 0x0a, 0x11,
+	0x54, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x54, 0x73, 0x2a, 0xe6, 0x09, 0x0a,
-	0x43, 0x53, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65,
-	0x6c, 0x22, 0x39, 0x0a, 0x11, 0x53, 0x43, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43,
-	0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x24, 0x0a, 0x0d, 0x4f, 0x6e, 0x43, 0x68, 0x61, 0x6e,
-	0x6e, 0x65, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x4f,
-	0x6e, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x2a, 0xe6, 0x09, 0x0a,
 	0x11, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x5f, 0x47, 0x61,
 	0x6d, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x53, 0x75, 0x63, 0x65, 0x73,
 	0x73, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x4f, 0x50, 0x52, 0x43,
@@ -8090,7 +7992,7 @@ var file_game_proto_rawDesc = []byte{
 	0x5f, 0x51, 0x75, 0x6f, 0x74, 0x61, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x5f,
 	0x47, 0x61, 0x6d, 0x65, 0x10, 0xab, 0x46, 0x12, 0x1c, 0x0a, 0x17, 0x4f, 0x50, 0x52, 0x43, 0x5f,
 	0x54, 0x68, 0x72, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x47, 0x61,
-	0x6d, 0x65, 0x10, 0xb2, 0x46, 0x2a, 0x8e, 0x18, 0x0a, 0x10, 0x47, 0x61, 0x6d, 0x65, 0x48, 0x61,
+	0x6d, 0x65, 0x10, 0xb2, 0x46, 0x2a, 0xd0, 0x17, 0x0a, 0x10, 0x47, 0x61, 0x6d, 0x65, 0x48, 0x61,
 	0x6c, 0x6c, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x14, 0x50, 0x41,
 	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x48, 0x61, 0x6c, 0x6c, 0x5f, 0x5a, 0x45,
 	0x52, 0x4f, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43,
@@ -8279,14 +8181,10 @@ var file_game_proto_rawDesc = []byte{
 	0x4c, 0x41, 0x47, 0x10, 0xc8, 0x3e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
 	0x5f, 0x43, 0x53, 0x52, 0x6f, 0x6f, 0x6d, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x10, 0xc9, 0x3e, 0x12,
 	0x17, 0x0a, 0x12, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x52, 0x6f, 0x6f, 0x6d,
-	0x45, 0x76, 0x65, 0x6e, 0x74, 0x10, 0xca, 0x3e, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b,
+	0x45, 0x76, 0x65, 0x6e, 0x74, 0x10, 0xca, 0x3e, 0x42, 0x28, 0x5a, 0x26, 0x6d, 0x6f, 0x6e, 0x67,
-	0x45, 0x54, 0x5f, 0x43, 0x53, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x68, 0x61,
+	0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65,
-	0x6e, 0x6e, 0x65, 0x6c, 0x10, 0xcb, 0x3e, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x68, 0x61,
-	0x54, 0x5f, 0x53, 0x43, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x68, 0x61, 0x6e,
+	0x6c, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x6e, 0x65, 0x6c, 0x10, 0xcc, 0x3e, 0x42, 0x28, 0x5a, 0x26, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e,
-	0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x68, 0x61, 0x6c, 0x6c,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -8302,7 +8200,7 @@ func file_game_proto_rawDescGZIP() []byte {
 }
 
 var file_game_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_game_proto_msgTypes = make([]protoimpl.MessageInfo, 104)
+var file_game_proto_msgTypes = make([]protoimpl.MessageInfo, 102)
 var file_game_proto_goTypes = []interface{}{
 	(OpResultCode_Game)(0),                // 0: gamehall.OpResultCode_Game
 	(GameHallPacketID)(0),                 // 1: gamehall.GameHallPacketID
@@ -8408,8 +8306,6 @@ var file_game_proto_goTypes = []interface{}{
 	(*SCNoticeChange)(nil),                // 101: gamehall.SCNoticeChange
 	(*CSRoomEvent)(nil),                   // 102: gamehall.CSRoomEvent
 	(*SCRoomEvent)(nil),                   // 103: gamehall.SCRoomEvent
-	(*CSExchangeChannel)(nil),             // 104: gamehall.CSExchangeChannel
-	(*SCExchangeChannel)(nil),             // 105: gamehall.SCExchangeChannel
 }
 var file_game_proto_depIdxs = []int32{
 	0,  // 0: gamehall.SCEnterHall.OpRetCode:type_name -> gamehall.OpResultCode_Game
@@ -9698,30 +9594,6 @@ func file_game_proto_init() {
 				return nil
 			}
 		}
-		file_game_proto_msgTypes[102].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CSExchangeChannel); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_game_proto_msgTypes[103].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SCExchangeChannel); 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{
@@ -9729,7 +9601,7 @@ func file_game_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_game_proto_rawDesc,
 			NumEnums:      2,
-			NumMessages:   104,
+			NumMessages:   102,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

protocol/gamehall/game.proto

@@ -159,8 +159,6 @@ enum GameHallPacketID {
   PACKET_CS_PLAYER_SWITCHFLAG = 8008;
   PACKET_CSRoomEvent = 8009; // 房间事件
   PACKET_SCRoomEvent = 8010; // 房间事件
-  PACKET_CSExchangeChannel = 8011; // 开启兑换的渠道
-  PACKET_SCExchangeChannel = 8012; // 开启兑换的渠道
 }
 //进入游戏大厅
 //PACKET_CS_ENTERHALL
@@ -863,11 +861,3 @@ message SCRoomEvent{
   repeated int32 Param= 5; // 参数
   int64 Ts = 6; // 时间戳
 }
-
-// PACKET_CSExchangeChannel
-message CSExchangeChannel{}
-
-// PACKET_SCExchangeChannel
-message SCExchangeChannel{
-  repeated string OnChannelName = 1;  // 开启渠道
-}

protocol/player/player.pb.go

@@ -375,6 +375,8 @@ const (
 	PlayerPacketID_PACKET_SCADV                PlayerPacketID = 2822 // 看广告
 	PlayerPacketID_PACKET_SCGetWeekCardAwary   PlayerPacketID = 2823 //领取周卡每日奖励返回
 	PlayerPacketID_PACKET_SCPigBankCoin        PlayerPacketID = 2824 //存钱罐金币数量
+	PlayerPacketID_PACKET_CSExchangeChannel    PlayerPacketID = 2825 // 开启兑换的渠道
+	PlayerPacketID_PACKET_SCExchangeChannel    PlayerPacketID = 2826 // 开启兑换的渠道
 )
 
 // Enum value maps for PlayerPacketID.
@@ -503,6 +505,8 @@ var (
 		2822: "PACKET_SCADV",
 		2823: "PACKET_SCGetWeekCardAwary",
 		2824: "PACKET_SCPigBankCoin",
+		2825: "PACKET_CSExchangeChannel",
+		2826: "PACKET_SCExchangeChannel",
 	}
 	PlayerPacketID_value = map[string]int32{
 		"PACKET_PLAYERPACKET_ZERO":       0,
@@ -628,6 +632,8 @@ var (
 		"PACKET_SCADV":                   2822,
 		"PACKET_SCGetWeekCardAwary":      2823,
 		"PACKET_SCPigBankCoin":           2824,
+		"PACKET_CSExchangeChannel":       2825,
+		"PACKET_SCExchangeChannel":       2826,
 	}
 )
 
@@ -9397,6 +9403,93 @@ func (x *SCPigBankCoin) GetAddBankCoin() int64 {
 	return 0
 }
 
+// PACKET_CSExchangeChannel
+type CSExchangeChannel struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *CSExchangeChannel) Reset() {
+	*x = CSExchangeChannel{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_player_proto_msgTypes[132]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CSExchangeChannel) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CSExchangeChannel) ProtoMessage() {}
+
+func (x *CSExchangeChannel) ProtoReflect() protoreflect.Message {
+	mi := &file_player_proto_msgTypes[132]
+	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 CSExchangeChannel.ProtoReflect.Descriptor instead.
+func (*CSExchangeChannel) Descriptor() ([]byte, []int) {
+	return file_player_proto_rawDescGZIP(), []int{132}
+}
+
+// PACKET_SCExchangeChannel
+type SCExchangeChannel struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	OnChannelName []string `protobuf:"bytes,1,rep,name=OnChannelName,proto3" json:"OnChannelName,omitempty"` // 开启渠道
+}
+
+func (x *SCExchangeChannel) Reset() {
+	*x = SCExchangeChannel{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_player_proto_msgTypes[133]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SCExchangeChannel) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SCExchangeChannel) ProtoMessage() {}
+
+func (x *SCExchangeChannel) ProtoReflect() protoreflect.Message {
+	mi := &file_player_proto_msgTypes[133]
+	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 SCExchangeChannel.ProtoReflect.Descriptor instead.
+func (*SCExchangeChannel) Descriptor() ([]byte, []int) {
+	return file_player_proto_rawDescGZIP(), []int{133}
+}
+
+func (x *SCExchangeChannel) GetOnChannelName() []string {
+	if x != nil {
+		return x.OnChannelName
+	}
+	return nil
+}
+
 var File_player_proto protoreflect.FileDescriptor
 
 var file_player_proto_rawDesc = []byte{
@@ -10360,7 +10453,12 @@ var file_player_proto_rawDesc = []byte{
 	0x4d, 0x61, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x42, 0x61, 0x6e, 0x6b, 0x43,
 	0x6f, 0x69, 0x6e, 0x4d, 0x61, 0x78, 0x12, 0x20, 0x0a, 0x0b, 0x41, 0x64, 0x64, 0x42, 0x61, 0x6e,
 	0x6b, 0x43, 0x6f, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x41, 0x64, 0x64,
-	0x42, 0x61, 0x6e, 0x6b, 0x43, 0x6f, 0x69, 0x6e, 0x2a, 0xef, 0x0d, 0x0a, 0x0c, 0x4f, 0x70, 0x52,
+	0x42, 0x61, 0x6e, 0x6b, 0x43, 0x6f, 0x69, 0x6e, 0x22, 0x13, 0x0a, 0x11, 0x43, 0x53, 0x45, 0x78,
+	0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x22, 0x39, 0x0a,
+	0x11, 0x53, 0x43, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x6e,
+	0x65, 0x6c, 0x12, 0x24, 0x0a, 0x0d, 0x4f, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x4e,
+	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x4f, 0x6e, 0x43, 0x68, 0x61,
+	0x6e, 0x6e, 0x65, 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x2a, 0xef, 0x0d, 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, 0x15, 0x0a, 0x10, 0x4f, 0x50,
@@ -10471,7 +10569,7 @@ var file_player_proto_rawDesc = []byte{
 	0x74, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x10, 0xd9, 0x36, 0x12,
 	0x29, 0x0a, 0x24, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x48, 0x75, 0x6e, 0x64, 0x72, 0x65, 0x64, 0x5f,
 	0x59, 0x6f, 0x75, 0x48, 0x61, 0x64, 0x42, 0x61, 0x6e, 0x6b, 0x65, 0x72, 0x43, 0x61, 0x6e, 0x6e,
-	0x6f, 0x74, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x10, 0xda, 0x36, 0x2a, 0x88, 0x1c, 0x0a, 0x0e, 0x50,
+	0x6f, 0x74, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x10, 0xda, 0x36, 0x2a, 0xc6, 0x1c, 0x0a, 0x0e, 0x50,
 	0x6c, 0x61, 0x79, 0x65, 0x72, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x1c, 0x0a,
 	0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x50, 0x4c, 0x41, 0x59, 0x45, 0x52, 0x50, 0x41,
 	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x14, 0x50,
@@ -10696,10 +10794,14 @@ var file_player_proto_rawDesc = []byte{
 	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x47, 0x65, 0x74, 0x57, 0x65, 0x65, 0x6b, 0x43, 0x61,
 	0x72, 0x64, 0x41, 0x77, 0x61, 0x72, 0x79, 0x10, 0x87, 0x16, 0x12, 0x19, 0x0a, 0x14, 0x50, 0x41,
 	0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x50, 0x69, 0x67, 0x42, 0x61, 0x6e, 0x6b, 0x43, 0x6f,
-	0x69, 0x6e, 0x10, 0x88, 0x16, 0x42, 0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67,
+	0x69, 0x6e, 0x10, 0x88, 0x16, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
-	0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72,
+	0x43, 0x53, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65,
-	0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x62, 0x06, 0x70,
+	0x6c, 0x10, 0x89, 0x16, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x43, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c,
+	0x10, 0x8a, 0x16, 0x42, 0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d,
+	0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
@@ -10715,7 +10817,7 @@ func file_player_proto_rawDescGZIP() []byte {
 }
 
 var file_player_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_player_proto_msgTypes = make([]protoimpl.MessageInfo, 136)
+var file_player_proto_msgTypes = make([]protoimpl.MessageInfo, 138)
 var file_player_proto_goTypes = []interface{}{
 	(OpResultCode)(0),                 // 0: player.OpResultCode
 	(PlayerPacketID)(0),               // 1: player.PlayerPacketID
@@ -10851,20 +10953,22 @@ var file_player_proto_goTypes = []interface{}{
 	(*SCADV)(nil),                     // 131: player.SCADV
 	(*SCGetWeekCardAwary)(nil),        // 132: player.SCGetWeekCardAwary
 	(*SCPigBankCoin)(nil),             // 133: player.SCPigBankCoin
-	nil,                               // 134: player.PlayerData.RankScoreEntry
+	(*CSExchangeChannel)(nil),         // 134: player.CSExchangeChannel
-	nil,                               // 135: player.SCPlayerDataUpdate.RankScoreEntry
+	(*SCExchangeChannel)(nil),         // 135: player.SCExchangeChannel
-	nil,                               // 136: player.SCGameExDropItems.ItemsEntry
+	nil,                               // 136: player.PlayerData.RankScoreEntry
-	nil,                               // 137: player.SCBindTelInfo.BindTelRewardEntry
+	nil,                               // 137: player.SCPlayerDataUpdate.RankScoreEntry
+	nil,                               // 138: player.SCGameExDropItems.ItemsEntry
+	nil,                               // 139: player.SCBindTelInfo.BindTelRewardEntry
 }
 var file_player_proto_depIdxs = []int32{
 	4,   // 0: player.SCBillList.Items:type_name -> player.BillItem
 	0,   // 1: player.SCSavePlayerInfo.OpRetCode:type_name -> player.OpResultCode
-	134, // 2: player.PlayerData.RankScore:type_name -> player.PlayerData.RankScoreEntry
+	136, // 2: player.PlayerData.RankScore:type_name -> player.PlayerData.RankScoreEntry
 	9,   // 3: player.PlayerData.WeekCard:type_name -> player.WeekInfo
 	0,   // 4: player.SCPlayerData.OpRetCode:type_name -> player.OpResultCode
 	8,   // 5: player.SCPlayerData.Data:type_name -> player.PlayerData
 	10,  // 6: player.SCPlayerData.MiniGameArr:type_name -> player.MiniGameInfo
-	135, // 7: player.SCPlayerDataUpdate.RankScore:type_name -> player.SCPlayerDataUpdate.RankScoreEntry
+	137, // 7: player.SCPlayerDataUpdate.RankScore:type_name -> player.SCPlayerDataUpdate.RankScoreEntry
 	8,   // 8: player.SCThirdPlayerData.Data:type_name -> player.PlayerData
 	0,   // 9: player.SCChangeNick.OpRetCode:type_name -> player.OpResultCode
 	0,   // 10: player.SCChangePassword.OpRetCode:type_name -> player.OpResultCode
@@ -10901,7 +11005,7 @@ var file_player_proto_depIdxs = []int32{
 	93,  // 41: player.JybInfoAward.ItemId:type_name -> player.ItemInfo
 	0,   // 42: player.SCPlayerSetting.OpRetCode:type_name -> player.OpResultCode
 	94,  // 43: player.SCPlayerSetting.GainItem:type_name -> player.JybInfoAward
-	136, // 44: player.SCGameExDropItems.Items:type_name -> player.SCGameExDropItems.ItemsEntry
+	138, // 44: player.SCGameExDropItems.Items:type_name -> player.SCGameExDropItems.ItemsEntry
 	0,   // 45: player.SCVIPBuy.OpRetCode:type_name -> player.OpResultCode
 	0,   // 46: player.SCVIPDraw.OpRetCode:type_name -> player.OpResultCode
 	93,  // 47: player.VIPcfg.Item:type_name -> player.ItemInfo
@@ -10910,7 +11014,7 @@ var file_player_proto_depIdxs = []int32{
 	103, // 50: player.SCVIPInfo.List:type_name -> player.VIPcfg
 	108, // 51: player.SCPayGoodsInfo.Item:type_name -> player.PayItem
 	0,   // 52: player.SCClientLog.OpRetCode:type_name -> player.OpResultCode
-	137, // 53: player.SCBindTelInfo.BindTelReward:type_name -> player.SCBindTelInfo.BindTelRewardEntry
+	139, // 53: player.SCBindTelInfo.BindTelReward:type_name -> player.SCBindTelInfo.BindTelRewardEntry
 	0,   // 54: player.SCPlayerSMSCode.Code:type_name -> player.OpResultCode
 	0,   // 55: player.SCBindTel.Code:type_name -> player.OpResultCode
 	0,   // 56: player.SCHttpPass.OpRetCode:type_name -> player.OpResultCode
@@ -12515,6 +12619,30 @@ func file_player_proto_init() {
 				return nil
 			}
 		}
+		file_player_proto_msgTypes[132].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CSExchangeChannel); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_player_proto_msgTypes[133].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SCExchangeChannel); 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{
@@ -12522,7 +12650,7 @@ func file_player_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_player_proto_rawDesc,
 			NumEnums:      2,
-			NumMessages:   136,
+			NumMessages:   138,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

protocol/player/player.proto

@@ -205,6 +205,8 @@ enum PlayerPacketID {
   PACKET_SCADV = 2822; // 看广告
   PACKET_SCGetWeekCardAwary = 2823;//领取周卡每日奖励返回
   PACKET_SCPigBankCoin = 2824;//存钱罐金币数量
+  PACKET_CSExchangeChannel = 2825; // 开启兑换的渠道
+  PACKET_SCExchangeChannel = 2826; // 开启兑换的渠道
 }
 
 // 账变记录
@@ -1178,3 +1180,11 @@ message SCPigBankCoin {
   int64 BankCoinMax = 2;
   int64 AddBankCoin = 3;
 }
+
+// PACKET_CSExchangeChannel
+message CSExchangeChannel{}
+
+// PACKET_SCExchangeChannel
+message SCExchangeChannel{
+  repeated string OnChannelName = 1;  // 开启渠道
+}

public

@@ -1 +1 @@
-Subproject commit 88e683b711d026b70be3d549be3c0fb64ab44332
+Subproject commit f2cb642621ff9b824620b144e2bb561962f66004

worldsrv/action_game.go

@@ -2226,31 +2226,6 @@ func (this *CSRecordAndNoticeHandler) Process(s *netlib.Session, packetid int, d
 	return nil
 }
 
-func CSExchangeChannel(s *netlib.Session, packetid int, data interface{}, sid int64) error {
-	logger.Logger.Trace("CSExchangeChannel Process recv ", data)
-	_, ok := data.(*gamehall.CSExchangeChannel)
-	if !ok {
-		return nil
-	}
-
-	p := PlayerMgrSington.GetPlayer(sid)
-	if p == nil {
-		logger.Logger.Warn("CSExchangeChannel p == nil")
-		return nil
-	}
-
-	var onChannelName []string
-	conf := PlatformMgrSingleton.GetConfig(p.Platform).ChannelSwitch[common.ChannelSwitchExchange]
-	if conf != nil {
-		onChannelName = conf.OnChannelName
-	}
-
-	p.SendToClient(int(gamehall.GameHallPacketID_PACKET_SCExchangeChannel), &gamehall.SCExchangeChannel{
-		OnChannelName: onChannelName,
-	})
-	return nil
-}
-
 func init() {
 	// 观众进入房间
 	common.RegisterHandler(int(gamehall.GameHallPacketID_PACKET_CS_AUDIENCE_ENTERROOM), &CSAudienceEnterRoomHandler{})
@@ -2303,6 +2278,4 @@ func init() {
 	//我的游戏信息及平台公告
 	common.RegisterHandler(int(gamehall.GameHallPacketID_PACKET_CS_COMNOTICE), &CSRecordAndNoticeHandler{})
 	netlib.RegisterFactory(int(gamehall.GameHallPacketID_PACKET_CS_COMNOTICE), &CSRecordAndNoticePacketFactory{})
-	// 开启兑换的渠道
-	common.Register(int(gamehall.GameHallPacketID_PACKET_CSExchangeChannel), gamehall.CSExchangeChannel{}, CSExchangeChannel)
 }

worldsrv/action_player.go

@@ -1852,6 +1852,33 @@ func init() {
 
 }
 
+func CSExchangeChannel(s *netlib.Session, packetid int, data interface{}, sid int64) error {
+	logger.Logger.Trace("CSExchangeChannel Process recv ", data)
+	_, ok := data.(*player_proto.CSExchangeChannel)
+	if !ok {
+		return nil
+	}
+
+	p := PlayerMgrSington.GetPlayer(sid)
+	if p == nil {
+		logger.Logger.Warn("CSExchangeChannel p == nil")
+		return nil
+	}
+
+	var onChannelName []string
+	conf := PlatformMgrSingleton.GetConfig(p.Platform).ChannelSwitch[common.ChannelSwitchExchange]
+	if conf != nil {
+		onChannelName = conf.OnChannelName
+	}
+
+	pack := &player_proto.SCExchangeChannel{
+		OnChannelName: onChannelName,
+	}
+	p.SendToClient(int(player_proto.PlayerPacketID_PACKET_SCExchangeChannel), pack)
+	logger.Logger.Tracef("SCExchangeChannel %v", pack)
+	return nil
+}
+
 func init() {
 	// 用户信息
 	common.Register(int(player_proto.PlayerPacketID_PACKET_CS_PLAYERDATA), player_proto.CSPlayerData{}, CSPlayerData)
@@ -1875,6 +1902,8 @@ func init() {
 	common.Register(int(player_proto.PlayerPacketID_PACKET_CSBillList), player_proto.CSBillList{}, CSBillList)
 	// 看广告一次
 	common.Register(int(player_proto.PlayerPacketID_PACKET_CSADV), player_proto.CSADV{}, CSADV)
+	// 开启兑换的渠道
+	common.Register(int(player_proto.PlayerPacketID_PACKET_CSExchangeChannel), player_proto.CSExchangeChannel{}, CSExchangeChannel)
 }
 
 func CSPlayerData(s *netlib.Session, packetid int, data interface{}, sid int64) error {

worldsrv/etcd.go

@@ -10,6 +10,7 @@ import (
 	"mongo.games.com/game/common"
 	"mongo.games.com/game/etcd"
 	hallproto "mongo.games.com/game/protocol/gamehall"
+	playerproto "mongo.games.com/game/protocol/player"
 	"mongo.games.com/game/protocol/webapi"
 )
 
@@ -136,10 +137,11 @@ func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, e
 				// 通知变更
 				for _, v := range PlayerMgrSington.playerOfPlatform[config.Platform] {
 					if v != nil && v.IsOnLine() {
-						v.SendToClient(int(hallproto.GameHallPacketID_PACKET_SCExchangeChannel), &hallproto.SCExchangeChannel{})
+						v.SendToClient(int(playerproto.PlayerPacketID_PACKET_SCExchangeChannel), &playerproto.SCExchangeChannel{
+							OnChannelName: config.OnChannelName,
+						})
 					}
 				}
-
 			}
 		}