no message

etcd/keyconf.go

@@ -30,20 +30,21 @@ const (
 	ETCDKEY_PLAYERPOOL          = "/game/plt/playerpool/"  // 个人水池调控配置
 	ETCDKEY_GAME_CONFIG         = "/game/plt/gameconfig/"  // 游戏管理/全局配置
 	ETCDKEY_ACT_PHONELOTTERY    = "/game/act_phoneLottery"
-	ETCDKEY_ChannelSwitch       = "/game/channel/switch"  // 渠道开关
+	ETCDKEY_ChannelSwitch       = "/game/channel/switch"    // 渠道开关
-	ETCDKEY_ACT_Invite          = "/game/act_invite"      // 邀请活动配置
+	ETCDKEY_ACT_Invite          = "/game/act_invite"        // 邀请活动配置
-	ETCDKEY_ACT_Permit          = "/game/act_permit"      // 赛季通行证配置
+	ETCDKEY_ACT_Permit          = "/game/act_permit"        // 赛季通行证配置
-	ETCDKEY_DIAMOND_LOTTERY     = "/game/diamond_lottery" // 钻石抽奖配置
+	ETCDKEY_DIAMOND_LOTTERY     = "/game/diamond_lottery"   // 钻石抽奖配置
-	ETCDKEY_Item                = "/game/item"            // 道具列表
+	ETCDKEY_Item                = "/game/item"              // 道具列表
-	ETCDKEY_SKin                = "/game/skin_config"     // 皮肤配置
+	ETCDKEY_SKin                = "/game/skin_config"       // 皮肤配置
-	ETCDKEY_RANK_TYPE           = "/game/RankType"        // 排行榜奖励配置
+	ETCDKEY_RANK_TYPE           = "/game/RankType"          // 排行榜奖励配置
-	ETCDKEY_AWARD_CONFIG        = "/game/awardlog_config" //获奖记录
+	ETCDKEY_AWARD_CONFIG        = "/game/awardlog_config"   //获奖记录
-	ETCDKEY_GUIDE               = "/game/guide_config"    //新手引导配置
+	ETCDKEY_GUIDE               = "/game/guide_config"      //新手引导配置
-	ETCDKEY_MACHINE             = "/game/machine_config"  //娃娃机配置
+	ETCDKEY_MACHINE             = "/game/machine_config"    //娃娃机配置
-	ETCDKEY_MatchAudience       = "/game/match_audience"  //比赛观众
+	ETCDKEY_MatchAudience       = "/game/match_audience"    //比赛观众
-	ETCDKEY_Spirit              = "/game/spirit"          // 小精灵配置
+	ETCDKEY_Spirit              = "/game/spirit"            // 小精灵配置
-	ETCDKEY_RoomType            = "/game/room_type"       // 房间类型配置
+	ETCDKEY_RoomType            = "/game/room_type"         // 房间类型配置
-	ETCDKEY_RoomConfig          = "/game/room_config"     // 房间配置
+	ETCDKEY_RoomConfig          = "/game/room_config"       // 房间配置
-	ETCDKEY_RoomConfigSystem    = "/game/room_system"     // 系统房间配置
+	ETCDKEY_RoomConfigSystem    = "/game/room_system"       // 系统房间配置
-	ETCDKEY_ClientUpgrade = "/game/client_upgrade"        // 客户端升级奖励配置
+	ETCDKEY_ClientUpgrade       = "/game/client_upgrade"    // 客户端升级奖励配置
+	ETCDKEY_PopUpWindow         = "/game/PopUpWindowConfig" //弹窗配置
 )

gamerule/tienlen/cardAi.go

@@ -631,7 +631,7 @@ func GetPressCards(cards, lastCards []int32, data *tienlenApi.PredictRequest, po
 	})
 	isWin := data.IsWin
 	//测试代码
-	//isWin = false
+	isWin = true
 	logger.Logger.Trace("压牌 调控输赢 isWin = ", isWin)
 	outCards := []int32{}
 	//压牌测试代码
@@ -1734,7 +1734,7 @@ func GetOutCards(cards []int32, data *tienlenApi.PredictRequest, pos int32) []in
 	})
 	isWin := data.IsWin
 	//测试代码
-	//isWin = false
+	isWin = true
 	logger.Logger.Trace("出牌 调控输赢 isWin = ", isWin)
 	//测试代码
 	//cards = []int32{51, 4, 5}

gamesrv/clawdoll/scene_clawdoll.go

@@ -512,7 +512,7 @@ func ZegoRTCStreamAction(Action string, machineInfo *webapi.MachineInfo) rule.Ze
 	timestamp := time.Now().Unix()
 	queryParams := url.Values{}
 
-	queryParams.Set("StreamId", "test")
+	queryParams.Set("StreamId", machineInfo.StreamId)
 	queryParams.Set("Sequence", fmt.Sprintf("%d", timestamp))
 
 	// 生成16进制随机字符串(16位)

machine/machinedoll/machinemgr.go

@@ -151,7 +151,7 @@ func (this *MachineManager) UpdateToGameServer(conn *Conn, status int32) {
 }
 
 func SendToGameServer(pid int, msg interface{}) {
-	GameConn = srvlib.ServerSessionMgrSington.GetSession(1, 7, 777)
+	GameConn = srvlib.ServerSessionMgrSington.GetSession(1, 7, 706)
 	if GameConn != nil {
 		GameConn.Send(pid, msg)
 	} else {

model/config.go

@@ -155,6 +155,8 @@ type AllConfig struct {
 	RoomConfigSystem map[int32]*webapi.RoomConfigSystem
 	// 客户端升级奖励配置
 	*webapi.ClientUpgrade
+	//弹窗配置
+	*webapi.PopUpWindowConfig
 }
 
 type GlobalConfig struct {

protocol/player/player.proto

@@ -236,6 +236,8 @@ enum PlayerPacketID {
   PACKET_SCClawdollItemLog = 2845;//返回娃娃卡道具记录
   PACKET_CSDollConfig = 2846;	//获取娃娃机配置信息
   PACKET_SCDollConfig = 2847;	//返回娃娃机配置信息
+  PACKET_CSPopUpWindowConfig = 2848;  //获取弹窗配置
+  PACKET_SCPopUpWindowConfig = 2849;  //返回弹窗配置
 }
 
 // 账变记录
@@ -1408,3 +1410,19 @@ message MachineInfo{
   int32 MachineId = 5;
   string Name = 6;
 }
+//获取活动弹窗配置
+//PACKET_CSPopUpWindowConfig
+message CSPopUpWindowConfig{
+}
+//返回活动弹窗配置
+//PACKET_SCPopUpWindowConfig
+message SCPopUpWindowConfig{
+  repeated PopUpWindowInfo Info = 1;
+}
+message PopUpWindowInfo{
+  int32 Id = 1;
+  string Name = 2;
+  string Key = 3;
+  int32 OpenStatus = 4;//1-开启 0-关闭
+  int32 Weight = 5;//弹窗权重
+}

protocol/webapi/common.pb.go

@@ -9009,6 +9009,141 @@ func (x *ClientUpgrade) GetReward() []*ItemInfo {
 	return nil
 }
 
+//etcd /game/PopUpWindowConfig
+type PopUpWindowConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Platform string             `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"` // 平台
+	Info     []*PopUpWindowInfo `protobuf:"bytes,2,rep,name=Info,proto3" json:"Info,omitempty"`
+}
+
+func (x *PopUpWindowConfig) Reset() {
+	*x = PopUpWindowConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[94]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PopUpWindowConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PopUpWindowConfig) ProtoMessage() {}
+
+func (x *PopUpWindowConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[94]
+	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 PopUpWindowConfig.ProtoReflect.Descriptor instead.
+func (*PopUpWindowConfig) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{94}
+}
+
+func (x *PopUpWindowConfig) GetPlatform() string {
+	if x != nil {
+		return x.Platform
+	}
+	return ""
+}
+
+func (x *PopUpWindowConfig) GetInfo() []*PopUpWindowInfo {
+	if x != nil {
+		return x.Info
+	}
+	return nil
+}
+
+type PopUpWindowInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id         int32  `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"`
+	Name       string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
+	Key        string `protobuf:"bytes,3,opt,name=Key,proto3" json:"Key,omitempty"`
+	OpenStatus int32  `protobuf:"varint,4,opt,name=OpenStatus,proto3" json:"OpenStatus,omitempty"` //1-开启 2-关闭
+	Weight     int32  `protobuf:"varint,5,opt,name=Weight,proto3" json:"Weight,omitempty"`         //弹窗权重
+}
+
+func (x *PopUpWindowInfo) Reset() {
+	*x = PopUpWindowInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_common_proto_msgTypes[95]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PopUpWindowInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PopUpWindowInfo) ProtoMessage() {}
+
+func (x *PopUpWindowInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_common_proto_msgTypes[95]
+	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 PopUpWindowInfo.ProtoReflect.Descriptor instead.
+func (*PopUpWindowInfo) Descriptor() ([]byte, []int) {
+	return file_common_proto_rawDescGZIP(), []int{95}
+}
+
+func (x *PopUpWindowInfo) GetId() int32 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *PopUpWindowInfo) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *PopUpWindowInfo) GetKey() string {
+	if x != nil {
+		return x.Key
+	}
+	return ""
+}
+
+func (x *PopUpWindowInfo) GetOpenStatus() int32 {
+	if x != nil {
+		return x.OpenStatus
+	}
+	return 0
+}
+
+func (x *PopUpWindowInfo) GetWeight() int32 {
+	if x != nil {
+		return x.Weight
+	}
+	return 0
+}
+
 var File_common_proto protoreflect.FileDescriptor
 
 var file_common_proto_rawDesc = []byte{
@@ -10420,10 +10555,24 @@ var file_common_proto_rawDesc = []byte{
 	0x28, 0x05, 0x52, 0x07, 0x4f, 0x6e, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x52,
 	0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x77, 0x65,
 	0x62, 0x61, 0x70, 0x69, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x52,
-	0x65, 0x77, 0x61, 0x72, 0x64, 0x42, 0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67,
+	0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x5c, 0x0a, 0x11, 0x50, 0x6f, 0x70, 0x55, 0x70, 0x57, 0x69,
-	0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72,
+	0x6e, 0x64, 0x6f, 0x77, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6c,
-	0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70,
+	0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x6c,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x2b, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x02,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x77, 0x65, 0x62, 0x61, 0x70, 0x69, 0x2e, 0x50, 0x6f,
+	0x70, 0x55, 0x70, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x49,
+	0x6e, 0x66, 0x6f, 0x22, 0x7f, 0x0a, 0x0f, 0x50, 0x6f, 0x70, 0x55, 0x70, 0x57, 0x69, 0x6e, 0x64,
+	0x6f, 0x77, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x65,
+	0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x0a,
+	0x4f, 0x70, 0x65, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x0a, 0x4f, 0x70, 0x65, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x16, 0x0a, 0x06,
+	0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x57, 0x65,
+	0x69, 0x67, 0x68, 0x74, 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 (
@@ -10438,7 +10587,7 @@ func file_common_proto_rawDescGZIP() []byte {
 	return file_common_proto_rawDescData
 }
 
-var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 104)
+var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 106)
 var file_common_proto_goTypes = []interface{}{
 	(*MysqlDbSetting)(nil),               // 0: webapi.MysqlDbSetting
 	(*MongoDbSetting)(nil),               // 1: webapi.MongoDbSetting
@@ -10534,32 +10683,34 @@ var file_common_proto_goTypes = []interface{}{
 	(*RoomConfig)(nil),                   // 91: webapi.RoomConfig
 	(*RoomConfigSystem)(nil),             // 92: webapi.RoomConfigSystem
 	(*ClientUpgrade)(nil),                // 93: webapi.ClientUpgrade
-	nil,                                  // 94: webapi.Platform.BindTelRewardEntry
+	(*PopUpWindowConfig)(nil),            // 94: webapi.PopUpWindowConfig
-	nil,                                  // 95: webapi.PlayerData.RankScoreEntry
+	(*PopUpWindowInfo)(nil),              // 95: webapi.PopUpWindowInfo
-	nil,                                  // 96: webapi.ItemShop.AwardEntry
+	nil,                                  // 96: webapi.Platform.BindTelRewardEntry
-	nil,                                  // 97: webapi.VIPcfg.AwardEntry
+	nil,                                  // 97: webapi.PlayerData.RankScoreEntry
-	nil,                                  // 98: webapi.VIPcfg.Privilege1Entry
+	nil,                                  // 98: webapi.ItemShop.AwardEntry
-	nil,                                  // 99: webapi.VIPcfg.Privilege7Entry
+	nil,                                  // 99: webapi.VIPcfg.AwardEntry
-	nil,                                  // 100: webapi.VIPcfg.Privilege9Entry
+	nil,                                  // 100: webapi.VIPcfg.Privilege1Entry
-	nil,                                  // 101: webapi.ActInviteConfig.PayScoreEntry
+	nil,                                  // 101: webapi.VIPcfg.Privilege7Entry
-	nil,                                  // 102: webapi.SkinLevel.UpItemEntry
+	nil,                                  // 102: webapi.VIPcfg.Privilege9Entry
-	nil,                                  // 103: webapi.SkinItem.UnlockParamEntry
+	nil,                                  // 103: webapi.ActInviteConfig.PayScoreEntry
-	(*server.DB_GameFree)(nil),           // 104: server.DB_GameFree
+	nil,                                  // 104: webapi.SkinLevel.UpItemEntry
-	(*server.DB_GameItem)(nil),           // 105: server.DB_GameItem
+	nil,                                  // 105: webapi.SkinItem.UnlockParamEntry
+	(*server.DB_GameFree)(nil),           // 106: server.DB_GameFree
+	(*server.DB_GameItem)(nil),           // 107: 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
-	94,  // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry
+	96,  // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry
 	6,   // 4: webapi.GameConfigGlobal.GameStatus:type_name -> webapi.GameStatus
-	104, // 5: webapi.GameFree.DbGameFree:type_name -> server.DB_GameFree
+	106, // 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
-	104, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree
+	106, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree
-	95,  // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry
+	97,  // 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
@@ -10572,7 +10723,7 @@ var file_common_proto_depIdxs = []int32{
 	32,  // 21: webapi.ExchangeShop.Items:type_name -> webapi.ItemInfo
 	25,  // 22: webapi.ExchangeShopList.List:type_name -> webapi.ExchangeShop
 	29,  // 23: webapi.ExchangeShopList.Weight:type_name -> webapi.ShopWeight
-	96,  // 24: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry
+	98,  // 24: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry
 	30,  // 25: webapi.ItemShopList.List:type_name -> webapi.ItemShop
 	32,  // 26: webapi.MatchInfoAward.ItemId:type_name -> webapi.ItemInfo
 	33,  // 27: webapi.GameMatchDate.Award:type_name -> webapi.MatchInfoAward
@@ -10593,14 +10744,14 @@ var file_common_proto_depIdxs = []int32{
 	38,  // 42: webapi.WelfareSpree.Item:type_name -> webapi.WelfareDate
 	48,  // 43: webapi.WelfareFirstPayDataList.List:type_name -> webapi.WelfareSpree
 	48,  // 44: webapi.WelfareContinuousPayDataList.List:type_name -> webapi.WelfareSpree
-	97,  // 45: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry
+	99,  // 45: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry
-	98,  // 46: webapi.VIPcfg.Privilege1:type_name -> webapi.VIPcfg.Privilege1Entry
+	100, // 46: webapi.VIPcfg.Privilege1:type_name -> webapi.VIPcfg.Privilege1Entry
-	99,  // 47: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry
+	101, // 47: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry
-	100, // 48: webapi.VIPcfg.Privilege9:type_name -> webapi.VIPcfg.Privilege9Entry
+	102, // 48: webapi.VIPcfg.Privilege9:type_name -> webapi.VIPcfg.Privilege9Entry
 	51,  // 49: webapi.VIPcfgDataList.List:type_name -> webapi.VIPcfg
 	38,  // 50: webapi.ChessRankConfig.Item:type_name -> webapi.WelfareDate
 	55,  // 51: webapi.ChessRankcfgData.Datas:type_name -> webapi.ChessRankConfig
-	101, // 52: webapi.ActInviteConfig.PayScore:type_name -> webapi.ActInviteConfig.PayScoreEntry
+	103, // 52: webapi.ActInviteConfig.PayScore:type_name -> webapi.ActInviteConfig.PayScoreEntry
 	62,  // 53: webapi.ActInviteConfig.Awards1:type_name -> webapi.RankAward
 	62,  // 54: webapi.ActInviteConfig.Awards2:type_name -> webapi.RankAward
 	62,  // 55: webapi.ActInviteConfig.Awards3:type_name -> webapi.RankAward
@@ -10617,12 +10768,12 @@ var file_common_proto_depIdxs = []int32{
 	69,  // 66: webapi.DiamondLotteryData.Info:type_name -> webapi.DiamondLotteryInfo
 	70,  // 67: webapi.DiamondLotteryData.Players:type_name -> webapi.DiamondLotteryPlayers
 	72,  // 68: webapi.DiamondLotteryConfig.LotteryData:type_name -> webapi.DiamondLotteryData
-	105, // 69: webapi.ItemConfig.Items:type_name -> server.DB_GameItem
+	107, // 69: webapi.ItemConfig.Items:type_name -> server.DB_GameItem
 	32,  // 70: webapi.RankAwardInfo.Item:type_name -> webapi.ItemInfo
 	75,  // 71: webapi.RankTypeInfo.Award:type_name -> webapi.RankAwardInfo
 	76,  // 72: webapi.RankTypeConfig.Info:type_name -> webapi.RankTypeInfo
-	102, // 73: webapi.SkinLevel.UpItem:type_name -> webapi.SkinLevel.UpItemEntry
+	104, // 73: webapi.SkinLevel.UpItem:type_name -> webapi.SkinLevel.UpItemEntry
-	103, // 74: webapi.SkinItem.UnlockParam:type_name -> webapi.SkinItem.UnlockParamEntry
+	105, // 74: webapi.SkinItem.UnlockParam:type_name -> webapi.SkinItem.UnlockParamEntry
 	78,  // 75: webapi.SkinItem.Levels:type_name -> webapi.SkinLevel
 	79,  // 76: webapi.SkinConfig.Items:type_name -> webapi.SkinItem
 	82,  // 77: webapi.AwardLogConfig.AwardLog:type_name -> webapi.AwardLogData
@@ -10632,11 +10783,12 @@ var file_common_proto_depIdxs = []int32{
 	32,  // 81: webapi.RoomConfig.Cost:type_name -> webapi.ItemInfo
 	32,  // 82: webapi.RoomConfig.Reward:type_name -> webapi.ItemInfo
 	32,  // 83: webapi.ClientUpgrade.Reward:type_name -> webapi.ItemInfo
-	84,  // [84:84] is the sub-list for method output_type
+	95,  // 84: webapi.PopUpWindowConfig.Info:type_name -> webapi.PopUpWindowInfo
-	84,  // [84:84] is the sub-list for method input_type
+	85,  // [85:85] is the sub-list for method output_type
-	84,  // [84:84] is the sub-list for extension type_name
+	85,  // [85:85] is the sub-list for method input_type
-	84,  // [84:84] is the sub-list for extension extendee
+	85,  // [85:85] is the sub-list for extension type_name
-	0,   // [0:84] is the sub-list for field type_name
+	85,  // [85:85] is the sub-list for extension extendee
+	0,   // [0:85] is the sub-list for field type_name
 }
 
 func init() { file_common_proto_init() }
@@ -11773,6 +11925,30 @@ func file_common_proto_init() {
 				return nil
 			}
 		}
+		file_common_proto_msgTypes[94].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PopUpWindowConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_common_proto_msgTypes[95].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PopUpWindowInfo); 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{
@@ -11780,7 +11956,7 @@ func file_common_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_common_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   104,
+			NumMessages:   106,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

protocol/webapi/common.proto

@@ -990,3 +990,16 @@ message ClientUpgrade{
   int32 OnForce = 3; // 强制升级开关 1开启 2关闭
   repeated ItemInfo Reward = 4; // 奖励
 }
+
+//etcd /game/PopUpWindowConfig
+message PopUpWindowConfig{
+  string Platform = 1; // 平台
+  repeated PopUpWindowInfo Info = 2;
+}
+message PopUpWindowInfo{
+  int32 Id = 1;
+  string Name = 2;
+  string Key = 3;
+  int32 OpenStatus = 4;//1-开启 2-关闭
+  int32 Weight = 5;//弹窗权重
+}

worldsrv/action_player.go

@@ -3273,6 +3273,32 @@ func CSCLAWDOLLConfig(s *netlib.Session, packetId int, data interface{}, sid int
 	}
 	return nil
 }
+
+// 客户端请求弹窗配置
+func CSPopUpWindowConfig(s *netlib.Session, packetId int, data interface{}, sid int64) error {
+	p := PlayerMgrSington.GetPlayer(sid)
+	if p == nil {
+		return nil
+	}
+	config := PlatformMgrSingleton.GetConfig(p.Platform).PopUpWindowConfig
+	if config == nil {
+		return nil
+	}
+	pack := &player_proto.SCPopUpWindowConfig{}
+	for _, value := range config.Info {
+		info := &player_proto.PopUpWindowInfo{
+			Id:         value.Id,
+			Name:       value.Name,
+			Key:        value.Key,
+			OpenStatus: value.OpenStatus,
+			Weight:     value.Weight,
+		}
+		pack.Info = append(pack.Info, info)
+	}
+	p.SendToClient(int(player_proto.PlayerPacketID_PACKET_SCPopUpWindowConfig), pack)
+	return nil
+}
+
 func init() {
 	// 用户信息
 	common.Register(int(player_proto.PlayerPacketID_PACKET_CS_PLAYERDATA), player_proto.CSPlayerData{}, CSPlayerData)
@@ -3310,4 +3336,6 @@ func init() {
 	common.Register(int(player_proto.PlayerPacketID_PACKET_CSClawdollItemLog), player_proto.CSClawdollItemLog{}, CSClawdollItemLog)
 	//客户端请求配置信息
 	common.Register(int(player_proto.PlayerPacketID_PACKET_CSDollConfig), player_proto.CSCLAWDOLLConfig{}, CSCLAWDOLLConfig)
+	//客户端请求弹窗配置信息
+	common.Register(int(player_proto.PlayerPacketID_PACKET_CSPopUpWindowConfig), player_proto.CSPopUpWindowConfig{}, CSPopUpWindowConfig)
 }

worldsrv/etcd.go

@@ -102,6 +102,8 @@ func init() {
 	etcd.Register(etcd.ETCDKEY_MACHINE, webapi.MachineConfig{}, platformConfigEvent)
 	//客户端升级奖励配置
 	etcd.Register(etcd.ETCDKEY_ClientUpgrade, webapi.ClientUpgrade{}, platformConfigEvent)
+	//弹窗活动配置
+	etcd.Register(etcd.ETCDKEY_PopUpWindow, webapi.PopUpWindowConfig{}, platformConfigEvent)
 }
 
 func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, event *clientv3.Event, data interface{}) {
@@ -338,6 +340,8 @@ func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, e
 		}
 	case *webapi.ClientUpgrade:
 		PlatformMgrSingleton.GetConfig(config.Platform).ClientUpgrade = config
+	case *webapi.PopUpWindowConfig:
+		PlatformMgrSingleton.GetConfig(config.Platform).PopUpWindowConfig = config
 	default:
 		logger.Logger.Errorf("etcd completeKey:%s, Not processed", completeKey)
 	}

worldsrv/platform.go

@@ -127,7 +127,7 @@ func (cfg *GameList) GetGameConfig(gameFreeId int32) *webapiproto.GameFree {
 func CompareGameFreeConfigChanged(oldCfg, newCfg *webapiproto.GameFree) bool {
 	if oldCfg.Status != newCfg.Status ||
 		oldCfg.GroupId != newCfg.GroupId ||
-		oldCfg.GetOnCtrl() != newCfg.GetOnCtrl() ||
+		oldCfg.GetCloseCtrl() != newCfg.GetCloseCtrl() ||
 		oldCfg.DbGameFree.GetBot() != newCfg.DbGameFree.GetBot() ||
 		oldCfg.DbGameFree.GetBaseScore() != newCfg.DbGameFree.GetBaseScore() ||
 		oldCfg.DbGameFree.GetLimitCoin() != newCfg.DbGameFree.GetLimitCoin() ||