弹窗配置

protocol/player/player.proto

@@ -220,6 +220,8 @@ enum PlayerPacketID {
   PACKET_SCItem = 2835; // 返回道具列表
   PACKET_CSAwardLog = 2836;//请求获奖记录
   PACKET_SCAwardLog = 2837;	//返回获奖记录
+  PACKET_CSPopUpWindowsConfig = 2838;//请求弹窗配置
+  PACKET_SCPopUpWindowsConfig = 2839;//返回弹窗配置
 
 }
 
@@ -1293,3 +1295,19 @@ message AnnouncerLogInfo{
   int32 ItemId = 4; //获得物品ID
   int32 TypeId = 5;	//1-话费 2-实物
 }
+
+//弹窗配置
+//PACKET_CSPopUpWindowsConfig
+message CSPopUpWindowsConfig{
+}
+//PACKET_SCPopUpWindowsConfig
+message SCPopUpWindowsConfig{
+	repeated WindowsInfo Info = 1;
+}
+message WindowsInfo{
+	string ItemName = 1;//名字
+	string Url = 2;	//图片地址
+	int32 Sort = 3;//排序
+	int32 PartNum = 4;//参与人数
+	int32 GainNum = 5;//领取人数
+}

protocol/webapi/webapi.pb.go

@@ -8939,6 +8939,220 @@ func (x *ASAwardLog) GetSnId() int32 {
 	return 0
 }
 
+//获取弹窗配置[/get_PopupWindowsConfig]
+type ASPopUpWindowsConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Platform string `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"` // 平台id
+	SnId     int32  `protobuf:"varint,2,opt,name=SnId,proto3" json:"SnId,omitempty"`        // 玩家id
+}
+
+func (x *ASPopUpWindowsConfig) Reset() {
+	*x = ASPopUpWindowsConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_webapi_proto_msgTypes[131]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ASPopUpWindowsConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ASPopUpWindowsConfig) ProtoMessage() {}
+
+func (x *ASPopUpWindowsConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_webapi_proto_msgTypes[131]
+	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 ASPopUpWindowsConfig.ProtoReflect.Descriptor instead.
+func (*ASPopUpWindowsConfig) Descriptor() ([]byte, []int) {
+	return file_webapi_proto_rawDescGZIP(), []int{131}
+}
+
+func (x *ASPopUpWindowsConfig) GetPlatform() string {
+	if x != nil {
+		return x.Platform
+	}
+	return ""
+}
+
+func (x *ASPopUpWindowsConfig) GetSnId() int32 {
+	if x != nil {
+		return x.SnId
+	}
+	return 0
+}
+
+type SAPopUpWindowsConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Platform string         `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"` // 平台id
+	SnId     int32          `protobuf:"varint,2,opt,name=SnId,proto3" json:"SnId,omitempty"`        // 玩家id
+	Info     []*WindowsInfo `protobuf:"bytes,3,rep,name=Info,proto3" json:"Info,omitempty"`
+	Tag      TagCode        `protobuf:"varint,4,opt,name=Tag,proto3,enum=webapi.TagCode" json:"Tag,omitempty"` //错误码
+	Msg      string         `protobuf:"bytes,5,opt,name=Msg,proto3" json:"Msg,omitempty"`                      //错误信息(选填)
+}
+
+func (x *SAPopUpWindowsConfig) Reset() {
+	*x = SAPopUpWindowsConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_webapi_proto_msgTypes[132]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SAPopUpWindowsConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SAPopUpWindowsConfig) ProtoMessage() {}
+
+func (x *SAPopUpWindowsConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_webapi_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 SAPopUpWindowsConfig.ProtoReflect.Descriptor instead.
+func (*SAPopUpWindowsConfig) Descriptor() ([]byte, []int) {
+	return file_webapi_proto_rawDescGZIP(), []int{132}
+}
+
+func (x *SAPopUpWindowsConfig) GetPlatform() string {
+	if x != nil {
+		return x.Platform
+	}
+	return ""
+}
+
+func (x *SAPopUpWindowsConfig) GetSnId() int32 {
+	if x != nil {
+		return x.SnId
+	}
+	return 0
+}
+
+func (x *SAPopUpWindowsConfig) GetInfo() []*WindowsInfo {
+	if x != nil {
+		return x.Info
+	}
+	return nil
+}
+
+func (x *SAPopUpWindowsConfig) GetTag() TagCode {
+	if x != nil {
+		return x.Tag
+	}
+	return TagCode_UNKNOWN
+}
+
+func (x *SAPopUpWindowsConfig) GetMsg() string {
+	if x != nil {
+		return x.Msg
+	}
+	return ""
+}
+
+type WindowsInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ItemName string `protobuf:"bytes,1,opt,name=ItemName,proto3" json:"ItemName,omitempty"` //名字
+	Url      string `protobuf:"bytes,2,opt,name=Url,proto3" json:"Url,omitempty"`           //图片地址
+	Sort     int32  `protobuf:"varint,3,opt,name=Sort,proto3" json:"Sort,omitempty"`        //排序
+	PartNum  int32  `protobuf:"varint,4,opt,name=PartNum,proto3" json:"PartNum,omitempty"`  //参与人数
+	GainNum  int32  `protobuf:"varint,5,opt,name=GainNum,proto3" json:"GainNum,omitempty"`  //领取人数
+}
+
+func (x *WindowsInfo) Reset() {
+	*x = WindowsInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_webapi_proto_msgTypes[133]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *WindowsInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*WindowsInfo) ProtoMessage() {}
+
+func (x *WindowsInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_webapi_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 WindowsInfo.ProtoReflect.Descriptor instead.
+func (*WindowsInfo) Descriptor() ([]byte, []int) {
+	return file_webapi_proto_rawDescGZIP(), []int{133}
+}
+
+func (x *WindowsInfo) GetItemName() string {
+	if x != nil {
+		return x.ItemName
+	}
+	return ""
+}
+
+func (x *WindowsInfo) GetUrl() string {
+	if x != nil {
+		return x.Url
+	}
+	return ""
+}
+
+func (x *WindowsInfo) GetSort() int32 {
+	if x != nil {
+		return x.Sort
+	}
+	return 0
+}
+
+func (x *WindowsInfo) GetPartNum() int32 {
+	if x != nil {
+		return x.PartNum
+	}
+	return 0
+}
+
+func (x *WindowsInfo) GetGainNum() int32 {
+	if x != nil {
+		return x.GainNum
+	}
+	return 0
+}
+
 var File_webapi_proto protoreflect.FileDescriptor
 
 var file_webapi_proto_rawDesc = []byte{
@@ -9904,23 +10118,46 @@ var file_webapi_proto_rawDesc = []byte{
 	0x77, 0x61, 0x72, 0x64, 0x4c, 0x6f, 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, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x2a, 0xce, 0x01, 0x0a, 0x07, 0x54, 0x61, 0x67, 0x43,
+	0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x22, 0x46, 0x0a, 0x14, 0x41, 0x53, 0x50, 0x6f, 0x70,
-	0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00,
+	0x55, 0x70, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
-	0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55, 0x43, 0x43, 0x45, 0x53, 0x53, 0x10, 0x01, 0x12, 0x0a, 0x0a,
+	0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x53, 0x49, 0x47,
+	0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x53,
-	0x4e, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x03, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x52, 0x4f,
+	0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x22,
-	0x54, 0x4f, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x04, 0x12,
+	0xa4, 0x01, 0x0a, 0x14, 0x53, 0x41, 0x50, 0x6f, 0x70, 0x55, 0x70, 0x57, 0x69, 0x6e, 0x64, 0x6f,
-	0x12, 0x0a, 0x0e, 0x4a, 0x59, 0x42, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x45, 0x52, 0x52, 0x4f,
+	0x77, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74,
-	0x52, 0x10, 0x05, 0x12, 0x12, 0x0a, 0x0e, 0x4a, 0x59, 0x42, 0x5f, 0x43, 0x4f, 0x44, 0x45, 0x5f,
+	0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74,
-	0x45, 0x58, 0x49, 0x53, 0x54, 0x10, 0x06, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x79, 0x5f,
+	0x66, 0x6f, 0x72, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x4e, 0x6f, 0x74, 0x45, 0x58, 0x49, 0x53, 0x54, 0x10, 0x07, 0x12, 0x09, 0x0a, 0x05, 0x4c, 0x69,
+	0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x12, 0x27, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f,
-	0x6d, 0x69, 0x74, 0x10, 0x08, 0x12, 0x0c, 0x0a, 0x08, 0x54, 0x65, 0x6c, 0x45, 0x78, 0x69, 0x73,
+	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e,
-	0x74, 0x10, 0x09, 0x12, 0x13, 0x0a, 0x0f, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x4e, 0x6f,
+	0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x49, 0x6e, 0x66,
-	0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x0a, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x65, 0x6c, 0x4e,
+	0x6f, 0x12, 0x21, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f,
-	0x6f, 0x74, 0x42, 0x69, 0x6e, 0x64, 0x10, 0x0b, 0x42, 0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67,
+	0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52,
-	0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65,
+	0x03, 0x54, 0x61, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69,
+	0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x22, 0x83, 0x01, 0x0a, 0x0b, 0x57, 0x69, 0x6e, 0x64, 0x6f,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x77, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x61,
+	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x61,
+	0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x55, 0x72, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x04, 0x53, 0x6f, 0x72, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x50, 0x61, 0x72, 0x74,
+	0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x50, 0x61, 0x72, 0x74, 0x4e,
+	0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x61, 0x69, 0x6e, 0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x07, 0x47, 0x61, 0x69, 0x6e, 0x4e, 0x75, 0x6d, 0x2a, 0xce, 0x01, 0x0a,
+	0x07, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e,
+	0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55, 0x43, 0x43, 0x45, 0x53, 0x53,
+	0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x02, 0x12, 0x0e,
+	0x0a, 0x0a, 0x53, 0x49, 0x47, 0x4e, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x03, 0x12, 0x14,
+	0x0a, 0x10, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x45, 0x52, 0x52,
+	0x4f, 0x52, 0x10, 0x04, 0x12, 0x12, 0x0a, 0x0e, 0x4a, 0x59, 0x42, 0x5f, 0x44, 0x41, 0x54, 0x41,
+	0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x05, 0x12, 0x12, 0x0a, 0x0e, 0x4a, 0x59, 0x42, 0x5f,
+	0x43, 0x4f, 0x44, 0x45, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x10, 0x06, 0x12, 0x11, 0x0a, 0x0d,
+	0x50, 0x6c, 0x61, 0x79, 0x5f, 0x4e, 0x6f, 0x74, 0x45, 0x58, 0x49, 0x53, 0x54, 0x10, 0x07, 0x12,
+	0x09, 0x0a, 0x05, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0x08, 0x12, 0x0c, 0x0a, 0x08, 0x54, 0x65,
+	0x6c, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0x09, 0x12, 0x13, 0x0a, 0x0f, 0x41, 0x63, 0x63, 0x6f,
+	0x75, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x0a, 0x12, 0x0e, 0x0a,
+	0x0a, 0x54, 0x65, 0x6c, 0x4e, 0x6f, 0x74, 0x42, 0x69, 0x6e, 0x64, 0x10, 0x0b, 0x42, 0x26, 0x5a,
+	0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77,
+	0x65, 0x62, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -9936,7 +10173,7 @@ func file_webapi_proto_rawDescGZIP() []byte {
 }
 
 var file_webapi_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_webapi_proto_msgTypes = make([]protoimpl.MessageInfo, 131)
+var file_webapi_proto_msgTypes = make([]protoimpl.MessageInfo, 134)
 var file_webapi_proto_goTypes = []interface{}{
 	(TagCode)(0),                      // 0: webapi.TagCode
 	(*SAPlatformInfo)(nil),            // 1: webapi.SAPlatformInfo
@@ -10070,93 +10307,96 @@ var file_webapi_proto_goTypes = []interface{}{
 	(*SASMSConfig)(nil),               // 129: webapi.SASMSConfig
 	(*SMSInfo)(nil),                   // 130: webapi.SMSInfo
 	(*ASAwardLog)(nil),                // 131: webapi.ASAwardLog
-	(*Platform)(nil),                  // 132: webapi.Platform
+	(*ASPopUpWindowsConfig)(nil),      // 132: webapi.ASPopUpWindowsConfig
-	(*PlatformGameConfig)(nil),        // 133: webapi.PlatformGameConfig
+	(*SAPopUpWindowsConfig)(nil),      // 133: webapi.SAPopUpWindowsConfig
-	(*GameConfigGroup)(nil),           // 134: webapi.GameConfigGroup
+	(*WindowsInfo)(nil),               // 134: webapi.WindowsInfo
-	(*GameConfigGlobal)(nil),          // 135: webapi.GameConfigGlobal
+	(*Platform)(nil),                  // 135: webapi.Platform
-	(*PlatformDbConfig)(nil),          // 136: webapi.PlatformDbConfig
+	(*PlatformGameConfig)(nil),        // 136: webapi.PlatformGameConfig
-	(*CoinPoolSetting)(nil),           // 137: webapi.CoinPoolSetting
+	(*GameConfigGroup)(nil),           // 137: webapi.GameConfigGroup
-	(*RoomInfo)(nil),                  // 138: webapi.RoomInfo
+	(*GameConfigGlobal)(nil),          // 138: webapi.GameConfigGlobal
-	(*PlayerSingleAdjust)(nil),        // 139: webapi.PlayerSingleAdjust
+	(*PlatformDbConfig)(nil),          // 139: webapi.PlatformDbConfig
-	(*PlayerData)(nil),                // 140: webapi.PlayerData
+	(*CoinPoolSetting)(nil),           // 140: webapi.CoinPoolSetting
-	(*HorseRaceLamp)(nil),             // 141: webapi.HorseRaceLamp
+	(*RoomInfo)(nil),                  // 141: webapi.RoomInfo
-	(*MessageInfo)(nil),               // 142: webapi.MessageInfo
+	(*PlayerSingleAdjust)(nil),        // 142: webapi.PlayerSingleAdjust
-	(*ServerInfo)(nil),                // 143: webapi.ServerInfo
+	(*PlayerData)(nil),                // 143: webapi.PlayerData
-	(*OnlineReport)(nil),              // 144: webapi.OnlineReport
+	(*HorseRaceLamp)(nil),             // 144: webapi.HorseRaceLamp
-	(*ItemInfo)(nil),                  // 145: webapi.ItemInfo
+	(*MessageInfo)(nil),               // 145: webapi.MessageInfo
-	(*ExchangeShop)(nil),              // 146: webapi.ExchangeShop
+	(*ServerInfo)(nil),                // 146: webapi.ServerInfo
-	(*ShopWeight)(nil),                // 147: webapi.ShopWeight
+	(*OnlineReport)(nil),              // 147: webapi.OnlineReport
+	(*ItemInfo)(nil),                  // 148: webapi.ItemInfo
+	(*ExchangeShop)(nil),              // 149: webapi.ExchangeShop
+	(*ShopWeight)(nil),                // 150: webapi.ShopWeight
 }
 var file_webapi_proto_depIdxs = []int32{
 	0,   // 0: webapi.ASPlatformInfo.Tag:type_name -> webapi.TagCode
-	132, // 1: webapi.ASPlatformInfo.Platforms:type_name -> webapi.Platform
+	135, // 1: webapi.ASPlatformInfo.Platforms:type_name -> webapi.Platform
 	0,   // 2: webapi.ASGameConfig.Tag:type_name -> webapi.TagCode
-	133, // 3: webapi.ASGameConfig.Configs:type_name -> webapi.PlatformGameConfig
+	136, // 3: webapi.ASGameConfig.Configs:type_name -> webapi.PlatformGameConfig
 	0,   // 4: webapi.ASGameConfigGroup.Tag:type_name -> webapi.TagCode
-	134, // 5: webapi.ASGameConfigGroup.GameConfigGroup:type_name -> webapi.GameConfigGroup
+	137, // 5: webapi.ASGameConfigGroup.GameConfigGroup:type_name -> webapi.GameConfigGroup
 	0,   // 6: webapi.ASGameConfigGlobal.Tag:type_name -> webapi.TagCode
-	135, // 7: webapi.ASGameConfigGlobal.GameStatus:type_name -> webapi.GameConfigGlobal
+	138, // 7: webapi.ASGameConfigGlobal.GameStatus:type_name -> webapi.GameConfigGlobal
 	0,   // 8: webapi.ASDbConfig.Tag:type_name -> webapi.TagCode
-	136, // 9: webapi.ASDbConfig.DbConfigs:type_name -> webapi.PlatformDbConfig
+	139, // 9: webapi.ASDbConfig.DbConfigs:type_name -> webapi.PlatformDbConfig
-	132, // 10: webapi.ASUpdatePlatform.Platforms:type_name -> webapi.Platform
+	135, // 10: webapi.ASUpdatePlatform.Platforms:type_name -> webapi.Platform
 	0,   // 11: webapi.SAUpdatePlatform.Tag:type_name -> webapi.TagCode
-	135, // 12: webapi.ASUpdateGameConfigGlobal.GameStatus:type_name -> webapi.GameConfigGlobal
+	138, // 12: webapi.ASUpdateGameConfigGlobal.GameStatus:type_name -> webapi.GameConfigGlobal
 	0,   // 13: webapi.SAUpdateGameConfigGlobal.Tag:type_name -> webapi.TagCode
-	133, // 14: webapi.ASUpdateGameConfig.Config:type_name -> webapi.PlatformGameConfig
+	136, // 14: webapi.ASUpdateGameConfig.Config:type_name -> webapi.PlatformGameConfig
 	0,   // 15: webapi.SAUpdateGameConfig.Tag:type_name -> webapi.TagCode
-	134, // 16: webapi.ASUpdateGameConfigGroup.GameConfigGroup:type_name -> webapi.GameConfigGroup
+	137, // 16: webapi.ASUpdateGameConfigGroup.GameConfigGroup:type_name -> webapi.GameConfigGroup
 	0,   // 17: webapi.SAUpdateGameConfigGroup.Tag:type_name -> webapi.TagCode
 	0,   // 18: webapi.SAAddCoinById.Tag:type_name -> webapi.TagCode
 	0,   // 19: webapi.SAResetGamePool.Tag:type_name -> webapi.TagCode
-	137, // 20: webapi.ASUpdateGamePool.CoinPoolSetting:type_name -> webapi.CoinPoolSetting
+	140, // 20: webapi.ASUpdateGamePool.CoinPoolSetting:type_name -> webapi.CoinPoolSetting
 	0,   // 21: webapi.SAUpdateGamePool.Tag:type_name -> webapi.TagCode
 	0,   // 22: webapi.SAQueryGamePoolByGameId.Tag:type_name -> webapi.TagCode
-	137, // 23: webapi.SAQueryGamePoolByGameId.CoinPoolSetting:type_name -> webapi.CoinPoolSetting
+	140, // 23: webapi.SAQueryGamePoolByGameId.CoinPoolSetting:type_name -> webapi.CoinPoolSetting
-	137, // 24: webapi.CoinPoolStatesInfo.CoinPoolSetting:type_name -> webapi.CoinPoolSetting
+	140, // 24: webapi.CoinPoolStatesInfo.CoinPoolSetting:type_name -> webapi.CoinPoolSetting
 	0,   // 25: webapi.SAQueryAllGamePool.Tag:type_name -> webapi.TagCode
 	26,  // 26: webapi.SAQueryAllGamePool.CoinPoolStatesInfo:type_name -> webapi.CoinPoolStatesInfo
 	0,   // 27: webapi.SAListRoom.Tag:type_name -> webapi.TagCode
-	138, // 28: webapi.SAListRoom.RoomInfo:type_name -> webapi.RoomInfo
+	141, // 28: webapi.SAListRoom.RoomInfo:type_name -> webapi.RoomInfo
 	0,   // 29: webapi.SAGetRoom.Tag:type_name -> webapi.TagCode
-	138, // 30: webapi.SAGetRoom.RoomInfo:type_name -> webapi.RoomInfo
+	141, // 30: webapi.SAGetRoom.RoomInfo:type_name -> webapi.RoomInfo
 	0,   // 31: webapi.SADestroyRoom.Tag:type_name -> webapi.TagCode
-	139, // 32: webapi.ASSinglePlayerAdjust.PlayerSingleAdjust:type_name -> webapi.PlayerSingleAdjust
+	142, // 32: webapi.ASSinglePlayerAdjust.PlayerSingleAdjust:type_name -> webapi.PlayerSingleAdjust
 	0,   // 33: webapi.SASinglePlayerAdjust.Tag:type_name -> webapi.TagCode
-	139, // 34: webapi.SASinglePlayerAdjust.PlayerSingleAdjust:type_name -> webapi.PlayerSingleAdjust
+	142, // 34: webapi.SASinglePlayerAdjust.PlayerSingleAdjust:type_name -> webapi.PlayerSingleAdjust
 	0,   // 35: webapi.SAGetPlayerData.Tag:type_name -> webapi.TagCode
-	140, // 36: webapi.SAGetPlayerData.PlayerData:type_name -> webapi.PlayerData
+	143, // 36: webapi.SAGetPlayerData.PlayerData:type_name -> webapi.PlayerData
 	0,   // 37: webapi.SAMorePlayerData.Tag:type_name -> webapi.TagCode
-	140, // 38: webapi.SAMorePlayerData.PlayerData:type_name -> webapi.PlayerData
+	143, // 38: webapi.SAMorePlayerData.PlayerData:type_name -> webapi.PlayerData
 	0,   // 39: webapi.SAKickPlayer.Tag:type_name -> webapi.TagCode
 	42,  // 40: webapi.ASUpdatePlayerElement.PlayerEleArgs:type_name -> webapi.PlayerEleArgs
 	0,   // 41: webapi.SAUpdatePlayerElement.Tag:type_name -> webapi.TagCode
 	0,   // 42: webapi.SAWhiteBlackControl.Tag:type_name -> webapi.TagCode
 	0,   // 43: webapi.SAQueryHorseRaceLampList.Tag:type_name -> webapi.TagCode
-	141, // 44: webapi.SAQueryHorseRaceLampList.HorseRaceLamp:type_name -> webapi.HorseRaceLamp
+	144, // 44: webapi.SAQueryHorseRaceLampList.HorseRaceLamp:type_name -> webapi.HorseRaceLamp
 	0,   // 45: webapi.SACreateHorseRaceLamp.Tag:type_name -> webapi.TagCode
 	0,   // 46: webapi.SAGetHorseRaceLampById.Tag:type_name -> webapi.TagCode
-	141, // 47: webapi.SAGetHorseRaceLampById.HorseRaceLamp:type_name -> webapi.HorseRaceLamp
+	144, // 47: webapi.SAGetHorseRaceLampById.HorseRaceLamp:type_name -> webapi.HorseRaceLamp
-	141, // 48: webapi.ASEditHorseRaceLamp.HorseRaceLamp:type_name -> webapi.HorseRaceLamp
+	144, // 48: webapi.ASEditHorseRaceLamp.HorseRaceLamp:type_name -> webapi.HorseRaceLamp
 	0,   // 49: webapi.SAEditHorseRaceLamp.Tag:type_name -> webapi.TagCode
 	0,   // 50: webapi.SARemoveHorseRaceLampById.Tag:type_name -> webapi.TagCode
 	0,   // 51: webapi.SABlackBySnId.Tag:type_name -> webapi.TagCode
 	0,   // 52: webapi.SACreateShortMessage.Tag:type_name -> webapi.TagCode
 	0,   // 53: webapi.SAQueryShortMessageList.Tag:type_name -> webapi.TagCode
-	142, // 54: webapi.SAQueryShortMessageList.MessageInfo:type_name -> webapi.MessageInfo
+	145, // 54: webapi.SAQueryShortMessageList.MessageInfo:type_name -> webapi.MessageInfo
 	0,   // 55: webapi.SADeleteShortMessage.Tag:type_name -> webapi.TagCode
 	0,   // 56: webapi.SAQueryOnlineReportList.Tag:type_name -> webapi.TagCode
-	140, // 57: webapi.SAQueryOnlineReportList.PlayerData:type_name -> webapi.PlayerData
+	143, // 57: webapi.SAQueryOnlineReportList.PlayerData:type_name -> webapi.PlayerData
 	0,   // 58: webapi.SASrvCtrlClose.Tag:type_name -> webapi.TagCode
 	0,   // 59: webapi.SASrvCtrlNotice.Tag:type_name -> webapi.TagCode
 	0,   // 60: webapi.SASrvCtrlStartScript.Tag:type_name -> webapi.TagCode
 	0,   // 61: webapi.SAListServerStates.Tag:type_name -> webapi.TagCode
-	143, // 62: webapi.SAListServerStates.ServerInfo:type_name -> webapi.ServerInfo
+	146, // 62: webapi.SAListServerStates.ServerInfo:type_name -> webapi.ServerInfo
 	0,   // 63: webapi.SAServerStateSwitch.Tag:type_name -> webapi.TagCode
 	0,   // 64: webapi.SAResetEtcdData.Tag:type_name -> webapi.TagCode
 	0,   // 65: webapi.SAOnlineReportTotal.Tag:type_name -> webapi.TagCode
-	144, // 66: webapi.SAOnlineReportTotal.OnlineReport:type_name -> webapi.OnlineReport
+	147, // 66: webapi.SAOnlineReportTotal.OnlineReport:type_name -> webapi.OnlineReport
 	0,   // 67: webapi.SAAddCoinByIdAndPT.Tag:type_name -> webapi.TagCode
-	145, // 68: webapi.JybInfoAward.ItemId:type_name -> webapi.ItemInfo
+	148, // 68: webapi.JybInfoAward.ItemId:type_name -> webapi.ItemInfo
 	83,  // 69: webapi.ASCreateJYB.Award:type_name -> webapi.JybInfoAward
 	0,   // 70: webapi.SACreateJYB.Tag:type_name -> webapi.TagCode
 	0,   // 71: webapi.SAUpdateJYB.Tag:type_name -> webapi.TagCode
@@ -10168,10 +10408,10 @@ var file_webapi_proto_depIdxs = []int32{
 	94,  // 77: webapi.SAGetExchangeOrder.OrderList:type_name -> webapi.ExchangeOrderInfo
 	0,   // 78: webapi.SAUpExchangeStatus.Tag:type_name -> webapi.TagCode
 	0,   // 79: webapi.SAGetExchangeShop.Tag:type_name -> webapi.TagCode
-	146, // 80: webapi.SAGetExchangeShop.List:type_name -> webapi.ExchangeShop
+	149, // 80: webapi.SAGetExchangeShop.List:type_name -> webapi.ExchangeShop
-	147, // 81: webapi.SAGetExchangeShop.Weight:type_name -> webapi.ShopWeight
+	150, // 81: webapi.SAGetExchangeShop.Weight:type_name -> webapi.ShopWeight
 	0,   // 82: webapi.SAThdUpdatePlayerCoin.Tag:type_name -> webapi.TagCode
-	145, // 83: webapi.SACreateOrder.ItemInfo:type_name -> webapi.ItemInfo
+	148, // 83: webapi.SACreateOrder.ItemInfo:type_name -> webapi.ItemInfo
 	0,   // 84: webapi.SACallbackPayment.Tag:type_name -> webapi.TagCode
 	0,   // 85: webapi.SAResource.Tag:type_name -> webapi.TagCode
 	0,   // 86: webapi.SASendSms.Tag:type_name -> webapi.TagCode
@@ -10180,15 +10420,17 @@ var file_webapi_proto_depIdxs = []int32{
 	0,   // 89: webapi.SAGetImgVerify.Tag:type_name -> webapi.TagCode
 	0,   // 90: webapi.SAPlayerDelete.Tag:type_name -> webapi.TagCode
 	0,   // 91: webapi.SAPlayerInviteLink.Tag:type_name -> webapi.TagCode
-	145, // 92: webapi.ASAddItemById.ItemInfo:type_name -> webapi.ItemInfo
+	148, // 92: webapi.ASAddItemById.ItemInfo:type_name -> webapi.ItemInfo
 	0,   // 93: webapi.SAAddItemById.Tag:type_name -> webapi.TagCode
 	130, // 94: webapi.SASMSConfig.Info:type_name -> webapi.SMSInfo
 	0,   // 95: webapi.SASMSConfig.Tag:type_name -> webapi.TagCode
-	96,  // [96:96] is the sub-list for method output_type
+	134, // 96: webapi.SAPopUpWindowsConfig.Info:type_name -> webapi.WindowsInfo
-	96,  // [96:96] is the sub-list for method input_type
+	0,   // 97: webapi.SAPopUpWindowsConfig.Tag:type_name -> webapi.TagCode
-	96,  // [96:96] is the sub-list for extension type_name
+	98,  // [98:98] is the sub-list for method output_type
-	96,  // [96:96] is the sub-list for extension extendee
+	98,  // [98:98] is the sub-list for method input_type
-	0,   // [0:96] is the sub-list for field type_name
+	98,  // [98:98] is the sub-list for extension type_name
+	98,  // [98:98] is the sub-list for extension extendee
+	0,   // [0:98] is the sub-list for field type_name
 }
 
 func init() { file_webapi_proto_init() }
@@ -11770,6 +12012,42 @@ func file_webapi_proto_init() {
 				return nil
 			}
 		}
+		file_webapi_proto_msgTypes[131].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ASPopUpWindowsConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_webapi_proto_msgTypes[132].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SAPopUpWindowsConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_webapi_proto_msgTypes[133].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*WindowsInfo); 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{
@@ -11777,7 +12055,7 @@ func file_webapi_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_webapi_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   131,
+			NumMessages:   134,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

protocol/webapi/webapi.proto

@@ -950,3 +950,22 @@ message ASAwardLog{
   string Platform = 1; // 平台id
   int32 SnId = 2; // 玩家id
 }
+//获取弹窗配置[/get_PopupWindowsConfig]
+message ASPopUpWindowsConfig{
+	string Platform = 1; // 平台id
+	int32 SnId = 2; // 玩家id
+}
+message SAPopUpWindowsConfig{
+	string Platform = 1; // 平台id
+	int32 SnId = 2; // 玩家id
+	repeated WindowsInfo Info = 3;
+	TagCode Tag = 4; //错误码
+	string Msg = 5;  //错误信息(选填)
+}
+message WindowsInfo{
+	string ItemName = 1;//名字
+	string Url = 2;	//图片地址
+	int32 Sort = 3;//排序
+	int32 PartNum = 4;//参与人数
+	int32 GainNum = 5;//领取人数
+}

webapi/deprecated.go

@@ -96,6 +96,11 @@ func ApiAwardLog(appId string, body proto.Message) ([]byte, error) {
 	return postRequest(appId, "/get_AwardLog", nil, body, "http", DEFAULT_TIMEOUT)
 }
 
+// 获取弹窗配置
+func ApiPopupWindowsConfig(appId string, body proto.Message) ([]byte, error) {
+	return postRequest(appId, "/get_PopupWindowsConfig", nil, body, "http", DEFAULT_TIMEOUT)
+}
+
 // 支付订单 商城
 func API_CreateOrder(appId, orderId string, configid, SnId, shopId int32, platform string, packageTag string, os, deviceId, shopname string,
 	amount [3]int32, consumptionamount int32, itemInfo []*webapi.ItemInfo, exchangeOrderId, channel, channelId string) *webapi.ASCreateOrder {

worldsrv/action_player.go

@@ -2970,7 +2970,45 @@ func CSAwardLog(s *netlib.Session, packetId int, data interface{}, sid int64) er
 	p.SendToClient(int(player_proto.PlayerPacketID_PACKET_SCAwardLog), ret)
 	return nil
 }
-
+func CSPopUpWindowsConfig(s *netlib.Session, packetId int, data interface{}, sid int64) error {
+	p := PlayerMgrSington.GetPlayer(sid)
+	if p == nil {
+		return nil
+	}
+	var res []byte
+	var err error
+	task.New(nil, task.CallableWrapper(func(o *basic.Object) interface{} {
+		param := &webapi_proto.ASPopUpWindowsConfig{
+			SnId:     p.SnId,
+			Platform: p.Platform,
+		}
+		res, err = webapi.ApiPopupWindowsConfig(common.GetAppId(), param)
+		return nil
+	}), task.CompleteNotifyWrapper(func(data interface{}, t task.Task) {
+		if err != nil || res == nil {
+			logger.Logger.Errorf("API_SmsConfig err %v", err)
+			return
+		}
+		var info webapi_proto.SAPopUpWindowsConfig
+		proto.Unmarshal(res, &info)
+		if info.Tag == webapi_proto.TagCode_SUCCESS {
+			ret := &player_proto.SCPopUpWindowsConfig{}
+			for _, config := range info.Info {
+				infoData := &player_proto.WindowsInfo{}
+				infoData.ItemName = config.ItemName
+				infoData.Url = config.Url
+				infoData.Sort = config.Sort
+				infoData.PartNum = config.PartNum
+				infoData.GainNum = config.GainNum
+				ret.Info = append(ret.Info, infoData)
+			}
+			p.SendToClient(int(player_proto.PlayerPacketID_PACKET_SCPopUpWindowsConfig), ret)
+		} else {
+			logger.Logger.Errorf("ApiPopupWindowsConfig err %v", info.Msg)
+		}
+	}), "Api_PopupWindowsConfig").Start()
+	return nil
+}
 func init() {
 	// 用户信息
 	common.Register(int(player_proto.PlayerPacketID_PACKET_CS_PLAYERDATA), player_proto.CSPlayerData{}, CSPlayerData)
@@ -3000,4 +3038,6 @@ func init() {
 	common.Register(int(player_proto.PlayerPacketID_PACKET_CSSMSConfig), player_proto.CSSMSConfig{}, CSSMSConfig)
 	//获奖记录
 	common.Register(int(player_proto.PlayerPacketID_PACKET_CSAwardLog), player_proto.CS_AwardLog{}, CSAwardLog)
+	//弹窗配置
+	common.Register(int(player_proto.PlayerPacketID_PACKET_CSPopUpWindowsConfig), player_proto.CSPopUpWindowsConfig{}, CSPopUpWindowsConfig)
 }