update

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;//返回弹窗配置
 
 }
 
@@ -1273,12 +1275,17 @@ message CS_AwardLog{
 //PACKET_SCAwardLog
 message SCAwardLog{
   int32 typeId = 1; //1-话费 2-实物
-  repeated AwardLogInfo AwardLog =2;
+  AwardLogData AwardLog =2;
   repeated AnnouncerLogInfo AnnouncerLog = 3;
 }
+message AwardLogData{
+ int32 SortId = 1;	//排序類型   1-数量 2-序号
+ repeated AwardLogInfo AwardLog =2;
+}
 message AwardLogInfo{
   int32 ItemId = 1; //道具ID
   int64 Num  = 2;   //数量
+  int32 Order = 3;//序号
 }
 //实时播报
 message AnnouncerLogInfo{
@@ -1287,4 +1294,20 @@ message AnnouncerLogInfo{
   string Phone = 3;  //电话
   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/common.pb.go

@@ -7779,6 +7779,284 @@ func (x *SkinConfig) GetItems() []*SkinItem {
 	return nil
 }
 
+// etcd /game/awardlog_config
+type AwardLogConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Platform     string              `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"` // 平台
+	AwardLog     []*AwardLogData     `protobuf:"bytes,2,rep,name=AwardLog,proto3" json:"AwardLog,omitempty"`
+	AnnouncerLog []*AnnouncerLogInfo `protobuf:"bytes,3,rep,name=AnnouncerLog,proto3" json:"AnnouncerLog,omitempty"`
+}
+
+func (x *AwardLogConfig) Reset() {
+	*x = AwardLogConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[81]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AwardLogConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AwardLogConfig) ProtoMessage() {}
+
+func (x *AwardLogConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[81]
+	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 AwardLogConfig.ProtoReflect.Descriptor instead.
+func (*AwardLogConfig) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{81}
+}
+
+func (x *AwardLogConfig) GetPlatform() string {
+	if x != nil {
+		return x.Platform
+	}
+	return ""
+}
+
+func (x *AwardLogConfig) GetAwardLog() []*AwardLogData {
+	if x != nil {
+		return x.AwardLog
+	}
+	return nil
+}
+
+func (x *AwardLogConfig) GetAnnouncerLog() []*AnnouncerLogInfo {
+	if x != nil {
+		return x.AnnouncerLog
+	}
+	return nil
+}
+
+type AwardLogData struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	TypeId   int32           `protobuf:"varint,1,opt,name=TypeId,proto3" json:"TypeId,omitempty"` //1话费 2实物
+	SortId   int32           `protobuf:"varint,2,opt,name=SortId,proto3" json:"SortId,omitempty"` //排序類型   1-数量 2-序号
+	AwardLog []*AwardLogInfo `protobuf:"bytes,3,rep,name=AwardLog,proto3" json:"AwardLog,omitempty"`
+}
+
+func (x *AwardLogData) Reset() {
+	*x = AwardLogData{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[82]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AwardLogData) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AwardLogData) ProtoMessage() {}
+
+func (x *AwardLogData) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[82]
+	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 AwardLogData.ProtoReflect.Descriptor instead.
+func (*AwardLogData) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{82}
+}
+
+func (x *AwardLogData) GetTypeId() int32 {
+	if x != nil {
+		return x.TypeId
+	}
+	return 0
+}
+
+func (x *AwardLogData) GetSortId() int32 {
+	if x != nil {
+		return x.SortId
+	}
+	return 0
+}
+
+func (x *AwardLogData) GetAwardLog() []*AwardLogInfo {
+	if x != nil {
+		return x.AwardLog
+	}
+	return nil
+}
+
+type AwardLogInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ItemId int32  `protobuf:"varint,2,opt,name=ItemId,proto3" json:"ItemId,omitempty"` //道具ID
+	Num    int64  `protobuf:"varint,4,opt,name=Num,proto3" json:"Num,omitempty"`       //数量
+	Url    string `protobuf:"bytes,5,opt,name=Url,proto3" json:"Url,omitempty"`        //话费icon
+	Order  int32  `protobuf:"varint,6,opt,name=Order,proto3" json:"Order,omitempty"`   //序号
+}
+
+func (x *AwardLogInfo) Reset() {
+	*x = AwardLogInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[83]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AwardLogInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AwardLogInfo) ProtoMessage() {}
+
+func (x *AwardLogInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[83]
+	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 AwardLogInfo.ProtoReflect.Descriptor instead.
+func (*AwardLogInfo) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{83}
+}
+
+func (x *AwardLogInfo) GetItemId() int32 {
+	if x != nil {
+		return x.ItemId
+	}
+	return 0
+}
+
+func (x *AwardLogInfo) GetNum() int64 {
+	if x != nil {
+		return x.Num
+	}
+	return 0
+}
+
+func (x *AwardLogInfo) GetUrl() string {
+	if x != nil {
+		return x.Url
+	}
+	return ""
+}
+
+func (x *AwardLogInfo) GetOrder() int32 {
+	if x != nil {
+		return x.Order
+	}
+	return 0
+}
+
+//实时播报
+type AnnouncerLogInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Snid   int32  `protobuf:"varint,1,opt,name=Snid,proto3" json:"Snid,omitempty"`     //玩家ID
+	Name   string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`      //玩家名字
+	Phone  string `protobuf:"bytes,3,opt,name=Phone,proto3" json:"Phone,omitempty"`    //电话
+	ItemId int32  `protobuf:"varint,4,opt,name=ItemId,proto3" json:"ItemId,omitempty"` //获得物品ID
+	TypeId int32  `protobuf:"varint,5,opt,name=TypeId,proto3" json:"TypeId,omitempty"` //1-话费 2-实物
+}
+
+func (x *AnnouncerLogInfo) Reset() {
+	*x = AnnouncerLogInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[84]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AnnouncerLogInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AnnouncerLogInfo) ProtoMessage() {}
+
+func (x *AnnouncerLogInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[84]
+	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 AnnouncerLogInfo.ProtoReflect.Descriptor instead.
+func (*AnnouncerLogInfo) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{84}
+}
+
+func (x *AnnouncerLogInfo) GetSnid() int32 {
+	if x != nil {
+		return x.Snid
+	}
+	return 0
+}
+
+func (x *AnnouncerLogInfo) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *AnnouncerLogInfo) GetPhone() string {
+	if x != nil {
+		return x.Phone
+	}
+	return ""
+}
+
+func (x *AnnouncerLogInfo) GetItemId() int32 {
+	if x != nil {
+		return x.ItemId
+	}
+	return 0
+}
+
+func (x *AnnouncerLogInfo) GetTypeId() int32 {
+	if x != nil {
+		return x.TypeId
+	}
+	return 0
+}
+
 var File_common_proto protoreflect.FileDescriptor
 
 var file_common_proto_rawDesc = []byte{
@@ -9010,10 +9288,41 @@ var file_common_proto_rawDesc = []byte{
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d,
 	0x12, 0x26, 0x0a, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
 	0x10, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x53, 0x6b, 0x69, 0x6e, 0x49, 0x74, 0x65,
-	0x6d, 0x52, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x42, 0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67,
+	0x6d, 0x52, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x9c, 0x01, 0x0a, 0x0e, 0x41, 0x77, 0x61,
-	0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65,
+	0x72, 0x64, 0x4c, 0x6f, 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69,
+	0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x30, 0x0a, 0x08, 0x41, 0x77, 0x61, 0x72, 0x64,
+	0x4c, 0x6f, 0x67, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x77, 0x65, 0x62, 0x61,
+	0x70, 0x69, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x4c, 0x6f, 0x67, 0x44, 0x61, 0x74, 0x61, 0x52,
+	0x08, 0x41, 0x77, 0x61, 0x72, 0x64, 0x4c, 0x6f, 0x67, 0x12, 0x3c, 0x0a, 0x0c, 0x41, 0x6e, 0x6e,
+	0x6f, 0x75, 0x6e, 0x63, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x18, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x41, 0x6e, 0x6e, 0x6f, 0x75, 0x6e, 0x63,
+	0x65, 0x72, 0x4c, 0x6f, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0c, 0x41, 0x6e, 0x6e, 0x6f, 0x75,
+	0x6e, 0x63, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x22, 0x70, 0x0a, 0x0c, 0x41, 0x77, 0x61, 0x72, 0x64,
+	0x4c, 0x6f, 0x67, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x12,
+	0x16, 0x0a, 0x06, 0x53, 0x6f, 0x72, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x06, 0x53, 0x6f, 0x72, 0x74, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x08, 0x41, 0x77, 0x61, 0x72, 0x64,
+	0x4c, 0x6f, 0x67, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x77, 0x65, 0x62, 0x61,
+	0x70, 0x69, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x4c, 0x6f, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x08, 0x41, 0x77, 0x61, 0x72, 0x64, 0x4c, 0x6f, 0x67, 0x22, 0x60, 0x0a, 0x0c, 0x41, 0x77, 0x61,
+	0x72, 0x64, 0x4c, 0x6f, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65,
+	0x6d, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49,
+	0x64, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03,
+	0x4e, 0x75, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x72, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x55, 0x72, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x06,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x80, 0x01, 0x0a, 0x10,
+	0x41, 0x6e, 0x6e, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x49, 0x6e, 0x66, 0x6f,
+	0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
+	0x53, 0x6e, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x50, 0x68, 0x6f, 0x6e,
+	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x50, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x16,
+	0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
+	0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 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 (
@@ -9028,7 +9337,7 @@ func file_common_proto_rawDescGZIP() []byte {
 	return file_common_proto_rawDescData
 }
 
-var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 89)
+var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 93)
 var file_common_proto_goTypes = []interface{}{
 	(*MysqlDbSetting)(nil),               // 0: webapi.MysqlDbSetting
 	(*MongoDbSetting)(nil),               // 1: webapi.MongoDbSetting
@@ -9111,30 +9420,34 @@ var file_common_proto_goTypes = []interface{}{
 	(*SkinLevel)(nil),                    // 78: webapi.SkinLevel
 	(*SkinItem)(nil),                     // 79: webapi.SkinItem
 	(*SkinConfig)(nil),                   // 80: webapi.SkinConfig
-	nil,                                  // 81: webapi.Platform.BindTelRewardEntry
+	(*AwardLogConfig)(nil),               // 81: webapi.AwardLogConfig
-	nil,                                  // 82: webapi.PlayerData.RankScoreEntry
+	(*AwardLogData)(nil),                 // 82: webapi.AwardLogData
-	nil,                                  // 83: webapi.ItemShop.AwardEntry
+	(*AwardLogInfo)(nil),                 // 83: webapi.AwardLogInfo
-	nil,                                  // 84: webapi.VIPcfg.AwardEntry
+	(*AnnouncerLogInfo)(nil),             // 84: webapi.AnnouncerLogInfo
-	nil,                                  // 85: webapi.VIPcfg.Privilege7Entry
+	nil,                                  // 85: webapi.Platform.BindTelRewardEntry
-	nil,                                  // 86: webapi.ActInviteConfig.PayScoreEntry
+	nil,                                  // 86: webapi.PlayerData.RankScoreEntry
-	nil,                                  // 87: webapi.SkinLevel.UpItemEntry
+	nil,                                  // 87: webapi.ItemShop.AwardEntry
-	nil,                                  // 88: webapi.SkinItem.UnlockParamEntry
+	nil,                                  // 88: webapi.VIPcfg.AwardEntry
-	(*server.DB_GameFree)(nil),           // 89: server.DB_GameFree
+	nil,                                  // 89: webapi.VIPcfg.Privilege7Entry
-	(*server.DB_GameItem)(nil),           // 90: server.DB_GameItem
+	nil,                                  // 90: webapi.ActInviteConfig.PayScoreEntry
+	nil,                                  // 91: webapi.SkinLevel.UpItemEntry
+	nil,                                  // 92: webapi.SkinItem.UnlockParamEntry
+	(*server.DB_GameFree)(nil),           // 93: server.DB_GameFree
+	(*server.DB_GameItem)(nil),           // 94: server.DB_GameItem
 }
 var file_common_proto_depIdxs = []int32{
 	2,  // 0: webapi.Platform.Leaderboard:type_name -> webapi.RankSwitch
 	3,  // 1: webapi.Platform.ClubConfig:type_name -> webapi.ClubConfig
 	4,  // 2: webapi.Platform.ThirdGameMerchant:type_name -> webapi.ThirdGame
-	81, // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry
+	85, // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry
 	6,  // 4: webapi.GameConfigGlobal.GameStatus:type_name -> webapi.GameStatus
-	89, // 5: webapi.GameFree.DbGameFree:type_name -> server.DB_GameFree
+	93, // 5: webapi.GameFree.DbGameFree:type_name -> server.DB_GameFree
 	8,  // 6: webapi.PlatformGameConfig.DbGameFrees:type_name -> webapi.GameFree
 	0,  // 7: webapi.PlatformDbConfig.Mysql:type_name -> webapi.MysqlDbSetting
 	1,  // 8: webapi.PlatformDbConfig.MongoDb:type_name -> webapi.MongoDbSetting
 	1,  // 9: webapi.PlatformDbConfig.MongoDbLog:type_name -> webapi.MongoDbSetting
-	89, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree
+	93, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree
-	82, // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry
+	86, // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry
 	32, // 12: webapi.PlayerData.Items:type_name -> webapi.ItemInfo
 	14, // 13: webapi.PlayerData.RoleUnlockList:type_name -> webapi.ModInfo
 	14, // 14: webapi.PlayerData.PetUnlockList:type_name -> webapi.ModInfo
@@ -9146,7 +9459,7 @@ var file_common_proto_depIdxs = []int32{
 	26, // 20: webapi.ExchangeShop.TelData:type_name -> webapi.TelChargeData
 	25, // 21: webapi.ExchangeShopList.List:type_name -> webapi.ExchangeShop
 	29, // 22: webapi.ExchangeShopList.Weight:type_name -> webapi.ShopWeight
-	83, // 23: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry
+	87, // 23: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry
 	30, // 24: webapi.ItemShopList.List:type_name -> webapi.ItemShop
 	32, // 25: webapi.MatchInfoAward.ItemId:type_name -> webapi.ItemInfo
 	33, // 26: webapi.GameMatchDate.Award:type_name -> webapi.MatchInfoAward
@@ -9167,12 +9480,12 @@ var file_common_proto_depIdxs = []int32{
 	38, // 41: webapi.WelfareSpree.Item:type_name -> webapi.WelfareDate
 	48, // 42: webapi.WelfareFirstPayDataList.List:type_name -> webapi.WelfareSpree
 	48, // 43: webapi.WelfareContinuousPayDataList.List:type_name -> webapi.WelfareSpree
-	84, // 44: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry
+	88, // 44: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry
-	85, // 45: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry
+	89, // 45: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry
 	51, // 46: webapi.VIPcfgDataList.List:type_name -> webapi.VIPcfg
 	38, // 47: webapi.ChessRankConfig.Item:type_name -> webapi.WelfareDate
 	55, // 48: webapi.ChessRankcfgData.Datas:type_name -> webapi.ChessRankConfig
-	86, // 49: webapi.ActInviteConfig.PayScore:type_name -> webapi.ActInviteConfig.PayScoreEntry
+	90, // 49: webapi.ActInviteConfig.PayScore:type_name -> webapi.ActInviteConfig.PayScoreEntry
 	62, // 50: webapi.ActInviteConfig.Awards1:type_name -> webapi.RankAward
 	62, // 51: webapi.ActInviteConfig.Awards2:type_name -> webapi.RankAward
 	62, // 52: webapi.ActInviteConfig.Awards3:type_name -> webapi.RankAward
@@ -9189,19 +9502,22 @@ var file_common_proto_depIdxs = []int32{
 	69, // 63: webapi.DiamondLotteryData.Info:type_name -> webapi.DiamondLotteryInfo
 	70, // 64: webapi.DiamondLotteryData.Players:type_name -> webapi.DiamondLotteryPlayers
 	72, // 65: webapi.DiamondLotteryConfig.LotteryData:type_name -> webapi.DiamondLotteryData
-	90, // 66: webapi.ItemConfig.Items:type_name -> server.DB_GameItem
+	94, // 66: webapi.ItemConfig.Items:type_name -> server.DB_GameItem
 	32, // 67: webapi.RankAwardInfo.Item:type_name -> webapi.ItemInfo
 	75, // 68: webapi.RankTypeInfo.Award:type_name -> webapi.RankAwardInfo
 	76, // 69: webapi.RankTypeConfig.Info:type_name -> webapi.RankTypeInfo
-	87, // 70: webapi.SkinLevel.UpItem:type_name -> webapi.SkinLevel.UpItemEntry
+	91, // 70: webapi.SkinLevel.UpItem:type_name -> webapi.SkinLevel.UpItemEntry
-	88, // 71: webapi.SkinItem.UnlockParam:type_name -> webapi.SkinItem.UnlockParamEntry
+	92, // 71: webapi.SkinItem.UnlockParam:type_name -> webapi.SkinItem.UnlockParamEntry
 	78, // 72: webapi.SkinItem.Levels:type_name -> webapi.SkinLevel
 	79, // 73: webapi.SkinConfig.Items:type_name -> webapi.SkinItem
-	74, // [74:74] is the sub-list for method output_type
+	82, // 74: webapi.AwardLogConfig.AwardLog:type_name -> webapi.AwardLogData
-	74, // [74:74] is the sub-list for method input_type
+	84, // 75: webapi.AwardLogConfig.AnnouncerLog:type_name -> webapi.AnnouncerLogInfo
-	74, // [74:74] is the sub-list for extension type_name
+	83, // 76: webapi.AwardLogData.AwardLog:type_name -> webapi.AwardLogInfo
-	74, // [74:74] is the sub-list for extension extendee
+	77, // [77:77] is the sub-list for method output_type
-	0,  // [0:74] is the sub-list for field type_name
+	77, // [77:77] is the sub-list for method input_type
+	77, // [77:77] is the sub-list for extension type_name
+	77, // [77:77] is the sub-list for extension extendee
+	0,  // [0:77] is the sub-list for field type_name
 }
 
 func init() { file_common_proto_init() }
@@ -10182,6 +10498,54 @@ func file_common_proto_init() {
 				return nil
 			}
 		}
+		file_common_proto_msgTypes[81].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AwardLogConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_common_proto_msgTypes[82].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AwardLogData); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_common_proto_msgTypes[83].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AwardLogInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_common_proto_msgTypes[84].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AnnouncerLogInfo); 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{
@@ -10189,7 +10553,7 @@ func file_common_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_common_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   89,
+			NumMessages:   93,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

protocol/webapi/common.proto

@@ -853,3 +853,31 @@ message SkinConfig {
    string Platform = 1; // 平台
    repeated SkinItem Items = 2; // 皮肤列表
 }
+
+// etcd /game/awardlog_config
+message AwardLogConfig{
+	string Platform = 1; // 平台
+	repeated AwardLogData AwardLog =2;
+	repeated AnnouncerLogInfo AnnouncerLog = 3;
+	
+}
+message AwardLogData{
+	int32 TypeId = 1; //1话费 2实物
+	int32 SortId = 2;	//排序類型   1-数量 2-序号
+	repeated AwardLogInfo AwardLog =3;
+}
+message AwardLogInfo{
+  int32 ItemId = 2; //道具ID
+  int64 Num  = 4;   //数量
+  string Url = 5;	//话费icon
+  int32 Order = 6;	//序号
+}
+
+//实时播报
+message AnnouncerLogInfo{
+  int32 Snid = 1; //玩家ID
+  string Name = 2; //玩家名字
+  string Phone = 3;  //电话
+  int32 ItemId = 4; //获得物品ID
+  int32 TypeId = 5;	//1-话费 2-实物
+}

protocol/webapi/webapi.pb.go

@@ -8939,19 +8939,18 @@ func (x *ASAwardLog) GetSnId() int32 {
 	return 0
 }
 
-type SAAwardLog struct {
+//获取弹窗配置[/get_PopupWindowsConfig]
+type ASPopUpWindowsConfig struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	AwardLog     []*AwardLogInfo     `protobuf:"bytes,1,rep,name=AwardLog,proto3" json:"AwardLog,omitempty"`
+	Platform string `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"` // 平台id
-	AnnouncerLog []*AnnouncerLogInfo `protobuf:"bytes,2,rep,name=AnnouncerLog,proto3" json:"AnnouncerLog,omitempty"`
+	SnId     int32  `protobuf:"varint,2,opt,name=SnId,proto3" json:"SnId,omitempty"`        // 玩家id
-	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 *SAAwardLog) Reset() {
+func (x *ASPopUpWindowsConfig) Reset() {
-	*x = SAAwardLog{}
+	*x = ASPopUpWindowsConfig{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_webapi_proto_msgTypes[131]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -8959,13 +8958,13 @@ func (x *SAAwardLog) Reset() {
 	}
 }
 
-func (x *SAAwardLog) String() string {
+func (x *ASPopUpWindowsConfig) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*SAAwardLog) ProtoMessage() {}
+func (*ASPopUpWindowsConfig) ProtoMessage() {}
 
-func (x *SAAwardLog) ProtoReflect() protoreflect.Message {
+func (x *ASPopUpWindowsConfig) ProtoReflect() protoreflect.Message {
 	mi := &file_webapi_proto_msgTypes[131]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -8977,51 +8976,39 @@ func (x *SAAwardLog) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use SAAwardLog.ProtoReflect.Descriptor instead.
+// Deprecated: Use ASPopUpWindowsConfig.ProtoReflect.Descriptor instead.
-func (*SAAwardLog) Descriptor() ([]byte, []int) {
+func (*ASPopUpWindowsConfig) Descriptor() ([]byte, []int) {
 	return file_webapi_proto_rawDescGZIP(), []int{131}
 }
 
-func (x *SAAwardLog) GetAwardLog() []*AwardLogInfo {
+func (x *ASPopUpWindowsConfig) GetPlatform() string {
 	if x != nil {
-		return x.AwardLog
+		return x.Platform
-	}
-	return nil
-}
-
-func (x *SAAwardLog) GetAnnouncerLog() []*AnnouncerLogInfo {
-	if x != nil {
-		return x.AnnouncerLog
-	}
-	return nil
-}
-
-func (x *SAAwardLog) GetTag() TagCode {
-	if x != nil {
-		return x.Tag
-	}
-	return TagCode_UNKNOWN
-}
-
-func (x *SAAwardLog) GetMsg() string {
-	if x != nil {
-		return x.Msg
 	}
 	return ""
 }
 
-type AwardLogInfo struct {
+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
 
-	TypeId int32 `protobuf:"varint,1,opt,name=TypeId,proto3" json:"TypeId,omitempty"` //1话费 2实物
+	Platform string         `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"` // 平台id
-	ItemId int32 `protobuf:"varint,2,opt,name=ItemId,proto3" json:"ItemId,omitempty"` //道具ID
+	SnId     int32          `protobuf:"varint,2,opt,name=SnId,proto3" json:"SnId,omitempty"`        // 玩家id
-	Num    int64 `protobuf:"varint,4,opt,name=Num,proto3" json:"Num,omitempty"`       //数量
+	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 *AwardLogInfo) Reset() {
+func (x *SAPopUpWindowsConfig) Reset() {
-	*x = AwardLogInfo{}
+	*x = SAPopUpWindowsConfig{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_webapi_proto_msgTypes[132]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -9029,13 +9016,13 @@ func (x *AwardLogInfo) Reset() {
 	}
 }
 
-func (x *AwardLogInfo) String() string {
+func (x *SAPopUpWindowsConfig) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*AwardLogInfo) ProtoMessage() {}
+func (*SAPopUpWindowsConfig) ProtoMessage() {}
 
-func (x *AwardLogInfo) ProtoReflect() protoreflect.Message {
+func (x *SAPopUpWindowsConfig) ProtoReflect() protoreflect.Message {
 	mi := &file_webapi_proto_msgTypes[132]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -9047,47 +9034,60 @@ func (x *AwardLogInfo) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use AwardLogInfo.ProtoReflect.Descriptor instead.
+// Deprecated: Use SAPopUpWindowsConfig.ProtoReflect.Descriptor instead.
-func (*AwardLogInfo) Descriptor() ([]byte, []int) {
+func (*SAPopUpWindowsConfig) Descriptor() ([]byte, []int) {
 	return file_webapi_proto_rawDescGZIP(), []int{132}
 }
 
-func (x *AwardLogInfo) GetTypeId() int32 {
+func (x *SAPopUpWindowsConfig) GetPlatform() string {
 	if x != nil {
-		return x.TypeId
+		return x.Platform
+	}
+	return ""
+}
+
+func (x *SAPopUpWindowsConfig) GetSnId() int32 {
+	if x != nil {
+		return x.SnId
 	}
 	return 0
 }
 
-func (x *AwardLogInfo) GetItemId() int32 {
+func (x *SAPopUpWindowsConfig) GetInfo() []*WindowsInfo {
 	if x != nil {
-		return x.ItemId
+		return x.Info
 	}
-	return 0
+	return nil
 }
 
-func (x *AwardLogInfo) GetNum() int64 {
+func (x *SAPopUpWindowsConfig) GetTag() TagCode {
 	if x != nil {
-		return x.Num
+		return x.Tag
 	}
-	return 0
+	return TagCode_UNKNOWN
 }
 
-//实时播报
+func (x *SAPopUpWindowsConfig) GetMsg() string {
-type AnnouncerLogInfo struct {
+	if x != nil {
+		return x.Msg
+	}
+	return ""
+}
+
+type WindowsInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Snid   int32  `protobuf:"varint,1,opt,name=Snid,proto3" json:"Snid,omitempty"`     //玩家ID
+	ItemName string `protobuf:"bytes,1,opt,name=ItemName,proto3" json:"ItemName,omitempty"` //名字
-	Name   string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`      //玩家名字
+	Url      string `protobuf:"bytes,2,opt,name=Url,proto3" json:"Url,omitempty"`           //图片地址
-	Phone  int32  `protobuf:"varint,3,opt,name=Phone,proto3" json:"Phone,omitempty"`   //电话
+	Sort     int32  `protobuf:"varint,3,opt,name=Sort,proto3" json:"Sort,omitempty"`        //排序
-	ItemId int32  `protobuf:"varint,4,opt,name=ItemId,proto3" json:"ItemId,omitempty"` //获得物品ID
+	PartNum  int32  `protobuf:"varint,4,opt,name=PartNum,proto3" json:"PartNum,omitempty"`  //参与人数
-	TypeId int32  `protobuf:"varint,5,opt,name=TypeId,proto3" json:"TypeId,omitempty"` //1-话费 2-实物
+	GainNum  int32  `protobuf:"varint,5,opt,name=GainNum,proto3" json:"GainNum,omitempty"`  //领取人数
 }
 
-func (x *AnnouncerLogInfo) Reset() {
+func (x *WindowsInfo) Reset() {
-	*x = AnnouncerLogInfo{}
+	*x = WindowsInfo{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_webapi_proto_msgTypes[133]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -9095,13 +9095,13 @@ func (x *AnnouncerLogInfo) Reset() {
 	}
 }
 
-func (x *AnnouncerLogInfo) String() string {
+func (x *WindowsInfo) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*AnnouncerLogInfo) ProtoMessage() {}
+func (*WindowsInfo) ProtoMessage() {}
 
-func (x *AnnouncerLogInfo) ProtoReflect() protoreflect.Message {
+func (x *WindowsInfo) ProtoReflect() protoreflect.Message {
 	mi := &file_webapi_proto_msgTypes[133]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -9113,42 +9113,42 @@ func (x *AnnouncerLogInfo) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use AnnouncerLogInfo.ProtoReflect.Descriptor instead.
+// Deprecated: Use WindowsInfo.ProtoReflect.Descriptor instead.
-func (*AnnouncerLogInfo) Descriptor() ([]byte, []int) {
+func (*WindowsInfo) Descriptor() ([]byte, []int) {
 	return file_webapi_proto_rawDescGZIP(), []int{133}
 }
 
-func (x *AnnouncerLogInfo) GetSnid() int32 {
+func (x *WindowsInfo) GetItemName() string {
 	if x != nil {
-		return x.Snid
+		return x.ItemName
-	}
-	return 0
-}
-
-func (x *AnnouncerLogInfo) GetName() string {
-	if x != nil {
-		return x.Name
 	}
 	return ""
 }
 
-func (x *AnnouncerLogInfo) GetPhone() int32 {
+func (x *WindowsInfo) GetUrl() string {
 	if x != nil {
-		return x.Phone
+		return x.Url
+	}
+	return ""
+}
+
+func (x *WindowsInfo) GetSort() int32 {
+	if x != nil {
+		return x.Sort
 	}
 	return 0
 }
 
-func (x *AnnouncerLogInfo) GetItemId() int32 {
+func (x *WindowsInfo) GetPartNum() int32 {
 	if x != nil {
-		return x.ItemId
+		return x.PartNum
 	}
 	return 0
 }
 
-func (x *AnnouncerLogInfo) GetTypeId() int32 {
+func (x *WindowsInfo) GetGainNum() int32 {
 	if x != nil {
-		return x.TypeId
+		return x.GainNum
 	}
 	return 0
 }
@@ -10118,48 +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, 0x22, 0xb1, 0x01, 0x0a, 0x0a, 0x53, 0x41, 0x41, 0x77,
+	0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x22, 0x46, 0x0a, 0x14, 0x41, 0x53, 0x50, 0x6f, 0x70,
-	0x61, 0x72, 0x64, 0x4c, 0x6f, 0x67, 0x12, 0x30, 0x0a, 0x08, 0x41, 0x77, 0x61, 0x72, 0x64, 0x4c,
+	0x55, 0x70, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
-	0x6f, 0x67, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70,
+	0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x69, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x4c, 0x6f, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08,
+	0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x53,
-	0x41, 0x77, 0x61, 0x72, 0x64, 0x4c, 0x6f, 0x67, 0x12, 0x3c, 0x0a, 0x0c, 0x41, 0x6e, 0x6e, 0x6f,
+	0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x22,
-	0x75, 0x6e, 0x63, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18,
+	0xa4, 0x01, 0x0a, 0x14, 0x53, 0x41, 0x50, 0x6f, 0x70, 0x55, 0x70, 0x57, 0x69, 0x6e, 0x64, 0x6f,
-	0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x41, 0x6e, 0x6e, 0x6f, 0x75, 0x6e, 0x63, 0x65,
+	0x77, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x74,
-	0x72, 0x4c, 0x6f, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0c, 0x41, 0x6e, 0x6e, 0x6f, 0x75, 0x6e,
+	0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c, 0x61, 0x74,
-	0x63, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x12, 0x21, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20,
+	0x66, 0x6f, 0x72, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67,
+	0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x12, 0x27, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f,
-	0x43, 0x6f, 0x64, 0x65, 0x52, 0x03, 0x54, 0x61, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67,
+	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x22, 0x50, 0x0a, 0x0c, 0x41,
+	0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x49, 0x6e, 0x66,
-	0x77, 0x61, 0x72, 0x64, 0x4c, 0x6f, 0x67, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x54,
+	0x6f, 0x12, 0x21, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f,
-	0x79, 0x70, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x79, 0x70,
+	0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52,
-	0x65, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20,
+	0x03, 0x54, 0x61, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x4e,
+	0x09, 0x52, 0x03, 0x4d, 0x73, 0x67, 0x22, 0x83, 0x01, 0x0a, 0x0b, 0x57, 0x69, 0x6e, 0x64, 0x6f,
-	0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0x80, 0x01,
+	0x77, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x61,
-	0x0a, 0x10, 0x41, 0x6e, 0x6e, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x49, 0x6e,
+	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x61,
-	0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x52, 0x04, 0x53, 0x6e, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02,
+	0x03, 0x55, 0x72, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x50, 0x68,
+	0x28, 0x05, 0x52, 0x04, 0x53, 0x6f, 0x72, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x50, 0x61, 0x72, 0x74,
-	0x6f, 0x6e, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x50, 0x68, 0x6f, 0x6e, 0x65,
+	0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x50, 0x61, 0x72, 0x74, 0x4e,
-	0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
+	0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x61, 0x69, 0x6e, 0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20,
-	0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x54, 0x79, 0x70, 0x65,
+	0x01, 0x28, 0x05, 0x52, 0x07, 0x47, 0x61, 0x69, 0x6e, 0x4e, 0x75, 0x6d, 0x2a, 0xce, 0x01, 0x0a,
-	0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64,
+	0x07, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e,
-	0x2a, 0xce, 0x01, 0x0a, 0x07, 0x54, 0x61, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07,
+	0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55, 0x43, 0x43, 0x45, 0x53, 0x53,
-	0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55, 0x43,
+	0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x02, 0x12, 0x0e,
-	0x43, 0x45, 0x53, 0x53, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44,
+	0x0a, 0x0a, 0x53, 0x49, 0x47, 0x4e, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x03, 0x12, 0x14,
-	0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x53, 0x49, 0x47, 0x4e, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52,
+	0x0a, 0x10, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x45, 0x52, 0x52,
-	0x10, 0x03, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x52, 0x4f, 0x54, 0x4f, 0x5f, 0x44, 0x41, 0x54, 0x41,
+	0x4f, 0x52, 0x10, 0x04, 0x12, 0x12, 0x0a, 0x0e, 0x4a, 0x59, 0x42, 0x5f, 0x44, 0x41, 0x54, 0x41,
-	0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x04, 0x12, 0x12, 0x0a, 0x0e, 0x4a, 0x59, 0x42, 0x5f,
+	0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x05, 0x12, 0x12, 0x0a, 0x0e, 0x4a, 0x59, 0x42, 0x5f,
-	0x44, 0x41, 0x54, 0x41, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x05, 0x12, 0x12, 0x0a, 0x0e,
+	0x43, 0x4f, 0x44, 0x45, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x10, 0x06, 0x12, 0x11, 0x0a, 0x0d,
-	0x4a, 0x59, 0x42, 0x5f, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x10, 0x06,
+	0x50, 0x6c, 0x61, 0x79, 0x5f, 0x4e, 0x6f, 0x74, 0x45, 0x58, 0x49, 0x53, 0x54, 0x10, 0x07, 0x12,
-	0x12, 0x11, 0x0a, 0x0d, 0x50, 0x6c, 0x61, 0x79, 0x5f, 0x4e, 0x6f, 0x74, 0x45, 0x58, 0x49, 0x53,
+	0x09, 0x0a, 0x05, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0x08, 0x12, 0x0c, 0x0a, 0x08, 0x54, 0x65,
-	0x54, 0x10, 0x07, 0x12, 0x09, 0x0a, 0x05, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0x08, 0x12, 0x0c,
+	0x6c, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0x09, 0x12, 0x13, 0x0a, 0x0f, 0x41, 0x63, 0x63, 0x6f,
-	0x0a, 0x08, 0x54, 0x65, 0x6c, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0x09, 0x12, 0x13, 0x0a, 0x0f,
+	0x75, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x0a, 0x12, 0x0e, 0x0a,
-	0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10,
+	0x0a, 0x54, 0x65, 0x6c, 0x4e, 0x6f, 0x74, 0x42, 0x69, 0x6e, 0x64, 0x10, 0x0b, 0x42, 0x26, 0x5a,
-	0x0a, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x65, 0x6c, 0x4e, 0x6f, 0x74, 0x42, 0x69, 0x6e, 0x64, 0x10,
+	0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d,
-	0x0b, 0x42, 0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73,
+	0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63,
+	0x65, 0x62, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x6f, 0x6c, 0x2f, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
 }
 
 var (
@@ -10309,9 +10307,9 @@ var file_webapi_proto_goTypes = []interface{}{
 	(*SASMSConfig)(nil),               // 129: webapi.SASMSConfig
 	(*SMSInfo)(nil),                   // 130: webapi.SMSInfo
 	(*ASAwardLog)(nil),                // 131: webapi.ASAwardLog
-	(*SAAwardLog)(nil),                // 132: webapi.SAAwardLog
+	(*ASPopUpWindowsConfig)(nil),      // 132: webapi.ASPopUpWindowsConfig
-	(*AwardLogInfo)(nil),              // 133: webapi.AwardLogInfo
+	(*SAPopUpWindowsConfig)(nil),      // 133: webapi.SAPopUpWindowsConfig
-	(*AnnouncerLogInfo)(nil),          // 134: webapi.AnnouncerLogInfo
+	(*WindowsInfo)(nil),               // 134: webapi.WindowsInfo
 	(*Platform)(nil),                  // 135: webapi.Platform
 	(*PlatformGameConfig)(nil),        // 136: webapi.PlatformGameConfig
 	(*GameConfigGroup)(nil),           // 137: webapi.GameConfigGroup
@@ -10426,14 +10424,13 @@ var file_webapi_proto_depIdxs = []int32{
 	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
-	133, // 96: webapi.SAAwardLog.AwardLog:type_name -> webapi.AwardLogInfo
+	134, // 96: webapi.SAPopUpWindowsConfig.Info:type_name -> webapi.WindowsInfo
-	134, // 97: webapi.SAAwardLog.AnnouncerLog:type_name -> webapi.AnnouncerLogInfo
+	0,   // 97: webapi.SAPopUpWindowsConfig.Tag:type_name -> webapi.TagCode
-	0,   // 98: webapi.SAAwardLog.Tag:type_name -> webapi.TagCode
+	98,  // [98:98] is the sub-list for method output_type
-	99,  // [99:99] is the sub-list for method output_type
+	98,  // [98:98] is the sub-list for method input_type
-	99,  // [99:99] is the sub-list for method input_type
+	98,  // [98:98] is the sub-list for extension type_name
-	99,  // [99:99] is the sub-list for extension type_name
+	98,  // [98:98] is the sub-list for extension extendee
-	99,  // [99:99] is the sub-list for extension extendee
+	0,   // [0:98] is the sub-list for field type_name
-	0,   // [0:99] is the sub-list for field type_name
 }
 
 func init() { file_webapi_proto_init() }
@@ -12016,7 +12013,7 @@ func file_webapi_proto_init() {
 			}
 		}
 		file_webapi_proto_msgTypes[131].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SAAwardLog); i {
+			switch v := v.(*ASPopUpWindowsConfig); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -12028,7 +12025,7 @@ func file_webapi_proto_init() {
 			}
 		}
 		file_webapi_proto_msgTypes[132].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AwardLogInfo); i {
+			switch v := v.(*SAPopUpWindowsConfig); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -12040,7 +12037,7 @@ func file_webapi_proto_init() {
 			}
 		}
 		file_webapi_proto_msgTypes[133].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AnnouncerLogInfo); i {
+			switch v := v.(*WindowsInfo); i {
 			case 0:
 				return &v.state
 			case 1:

protocol/webapi/webapi.proto

@@ -950,23 +950,22 @@ message ASAwardLog{
   string Platform = 1; // 平台id
   int32 SnId = 2; // 玩家id
 }
-
+//获取弹窗配置[/get_PopupWindowsConfig]
-message SAAwardLog{
+message ASPopUpWindowsConfig{
-  repeated AwardLogInfo AwardLog =1;
+	string Platform = 1; // 平台id
-  repeated AnnouncerLogInfo AnnouncerLog = 2;
+	int32 SnId = 2; // 玩家id
-  TagCode Tag = 4; //错误码
-  string Msg = 5;  //错误信息(选填)
 }
-message AwardLogInfo{
+message SAPopUpWindowsConfig{
-  int32 TypeId = 1; //1话费 2实物
+	string Platform = 1; // 平台id
-  int32 ItemId = 2; //道具ID
+	int32 SnId = 2; // 玩家id
-  int64 Num  = 4;   //数量
+	repeated WindowsInfo Info = 3;
+	TagCode Tag = 4; //错误码
+	string Msg = 5;  //错误信息(选填)
 }
-//实时播报
+message WindowsInfo{
-message AnnouncerLogInfo{
+	string ItemName = 1;//名字
-  int32 Snid = 1; //玩家ID
+	string Url = 2;	//图片地址
-  string Name = 2; //玩家名字
+	int32 Sort = 3;//排序
-  int32 Phone = 3;  //电话
+	int32 PartNum = 4;//参与人数
-  int32 ItemId = 4; //获得物品ID
+	int32 GainNum = 5;//领取人数
-  int32 TypeId = 5;	//1-话费 2-实物
 }