小精灵功能
This commit is contained in:
parent
eba92ed00b
commit
e5b80fda16
|
@ -40,4 +40,5 @@ const (
|
||||||
ETCDKEY_AWARD_CONFIG = "/game/awardlog_config" //获奖记录
|
ETCDKEY_AWARD_CONFIG = "/game/awardlog_config" //获奖记录
|
||||||
ETCDKEY_GUIDE = "/game/guide_config" //新手引导配置
|
ETCDKEY_GUIDE = "/game/guide_config" //新手引导配置
|
||||||
ETCDKEY_MatchAudience = "/game/match_audience" //比赛观众
|
ETCDKEY_MatchAudience = "/game/match_audience" //比赛观众
|
||||||
|
ETCDKEY_Spirit = "/game/spirit" // 小精灵配置
|
||||||
)
|
)
|
||||||
|
|
|
@ -136,6 +136,8 @@ type AllConfig struct {
|
||||||
// 新手引导配置
|
// 新手引导配置
|
||||||
*webapi.GuideConfig
|
*webapi.GuideConfig
|
||||||
MatchAudience map[int32]*webapi.MatchAudience // 比赛观众列表
|
MatchAudience map[int32]*webapi.MatchAudience // 比赛观众列表
|
||||||
|
// 小精灵配置
|
||||||
|
*webapi.SpiritConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
type GlobalConfig struct {
|
type GlobalConfig struct {
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -204,7 +204,6 @@ enum PlayerPacketID {
|
||||||
PACKET_SCBillList = 2813; // 账变记录
|
PACKET_SCBillList = 2813; // 账变记录
|
||||||
PACKET_CSSavePlayerInfo = 2814; // 保存个人资料
|
PACKET_CSSavePlayerInfo = 2814; // 保存个人资料
|
||||||
PACKET_SCSavePlayerInfo = 2815; // 保存个人资料
|
PACKET_SCSavePlayerInfo = 2815; // 保存个人资料
|
||||||
|
|
||||||
PACKET_CS_PhoneLotteryInfo = 2816;//请求抽奖信息
|
PACKET_CS_PhoneLotteryInfo = 2816;//请求抽奖信息
|
||||||
PACKET_SC_PhoneLotteryInfo = 2817;//返回抽奖信息
|
PACKET_SC_PhoneLotteryInfo = 2817;//返回抽奖信息
|
||||||
PACKET_CS_PhoneLottery = 2818;//请求抽奖
|
PACKET_CS_PhoneLottery = 2818;//请求抽奖
|
||||||
|
@ -232,6 +231,7 @@ enum PlayerPacketID {
|
||||||
PACKET_CSUpdateAttribute = 2840;//请求更新属性
|
PACKET_CSUpdateAttribute = 2840;//请求更新属性
|
||||||
PACKET_SCUpdateAttribute = 2841;//返回更新属性
|
PACKET_SCUpdateAttribute = 2841;//返回更新属性
|
||||||
PACKET_SCGuideConfig = 2842;//返回引导配置
|
PACKET_SCGuideConfig = 2842;//返回引导配置
|
||||||
|
PACKET_SCDataConfig = 2843;//通知配置更新
|
||||||
}
|
}
|
||||||
|
|
||||||
// 账变记录
|
// 账变记录
|
||||||
|
@ -1347,3 +1347,24 @@ message SCGuideConfig{
|
||||||
int32 On = 2; // 引导开关 1开启 2关闭
|
int32 On = 2; // 引导开关 1开启 2关闭
|
||||||
int32 Skip = 3; // 引导跳过开关 1开启 2关闭
|
int32 Skip = 3; // 引导跳过开关 1开启 2关闭
|
||||||
}
|
}
|
||||||
|
|
||||||
|
message Config{
|
||||||
|
// Tp 类型:
|
||||||
|
// 1:小精灵快捷入口 On开关 Value地址
|
||||||
|
// 2: ...
|
||||||
|
// ...
|
||||||
|
int32 Tp = 1;
|
||||||
|
bool On = 2;
|
||||||
|
string Value = 3;
|
||||||
|
int64 Num = 4;
|
||||||
|
repeated string Values = 5;
|
||||||
|
repeated int64 Nums = 6;
|
||||||
|
repeated bool Ons = 7;
|
||||||
|
map<int64,int64> Map = 8;
|
||||||
|
map<string,string> MapStr = 9;
|
||||||
|
}
|
||||||
|
|
||||||
|
//PACKET_SCDataConfig
|
||||||
|
message SCDataConfig{
|
||||||
|
repeated Config Cfg = 1;
|
||||||
|
}
|
|
@ -8209,6 +8209,70 @@ func (x *MatchAudience) GetTs() int64 {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// etcd /game/spirit
|
||||||
|
type SpiritConfig struct {
|
||||||
|
state protoimpl.MessageState
|
||||||
|
sizeCache protoimpl.SizeCache
|
||||||
|
unknownFields protoimpl.UnknownFields
|
||||||
|
|
||||||
|
Platform string `protobuf:"bytes,1,opt,name=Platform,proto3" json:"Platform,omitempty"` // 平台
|
||||||
|
On int32 `protobuf:"varint,2,opt,name=On,proto3" json:"On,omitempty"` // 精灵开关 1开启 2关闭
|
||||||
|
Url string `protobuf:"bytes,3,opt,name=Url,proto3" json:"Url,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *SpiritConfig) Reset() {
|
||||||
|
*x = SpiritConfig{}
|
||||||
|
if protoimpl.UnsafeEnabled {
|
||||||
|
mi := &file_common_proto_msgTypes[87]
|
||||||
|
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||||
|
ms.StoreMessageInfo(mi)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *SpiritConfig) String() string {
|
||||||
|
return protoimpl.X.MessageStringOf(x)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*SpiritConfig) ProtoMessage() {}
|
||||||
|
|
||||||
|
func (x *SpiritConfig) ProtoReflect() protoreflect.Message {
|
||||||
|
mi := &file_common_proto_msgTypes[87]
|
||||||
|
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 SpiritConfig.ProtoReflect.Descriptor instead.
|
||||||
|
func (*SpiritConfig) Descriptor() ([]byte, []int) {
|
||||||
|
return file_common_proto_rawDescGZIP(), []int{87}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *SpiritConfig) GetPlatform() string {
|
||||||
|
if x != nil {
|
||||||
|
return x.Platform
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *SpiritConfig) GetOn() int32 {
|
||||||
|
if x != nil {
|
||||||
|
return x.On
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *SpiritConfig) GetUrl() string {
|
||||||
|
if x != nil {
|
||||||
|
return x.Url
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
var File_common_proto protoreflect.FileDescriptor
|
var File_common_proto protoreflect.FileDescriptor
|
||||||
|
|
||||||
var file_common_proto_rawDesc = []byte{
|
var file_common_proto_rawDesc = []byte{
|
||||||
|
@ -9500,10 +9564,15 @@ var file_common_proto_rawDesc = []byte{
|
||||||
0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
|
0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
|
||||||
0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x6e, 0x49, 0x64,
|
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, 0x12, 0x0e, 0x0a, 0x02,
|
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x6e, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02,
|
||||||
0x54, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x54, 0x73, 0x42, 0x26, 0x5a, 0x24,
|
0x54, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x54, 0x73, 0x22, 0x4c, 0x0a, 0x0c,
|
||||||
0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
|
0x53, 0x70, 0x69, 0x72, 0x69, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1a, 0x0a, 0x08,
|
||||||
0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x77, 0x65,
|
0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
|
||||||
0x62, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x4f, 0x6e, 0x18, 0x02,
|
||||||
|
0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x4f, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x72, 0x6c, 0x18,
|
||||||
|
0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x72, 0x6c, 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 (
|
var (
|
||||||
|
@ -9518,7 +9587,7 @@ func file_common_proto_rawDescGZIP() []byte {
|
||||||
return file_common_proto_rawDescData
|
return file_common_proto_rawDescData
|
||||||
}
|
}
|
||||||
|
|
||||||
var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 97)
|
var file_common_proto_msgTypes = make([]protoimpl.MessageInfo, 98)
|
||||||
var file_common_proto_goTypes = []interface{}{
|
var file_common_proto_goTypes = []interface{}{
|
||||||
(*MysqlDbSetting)(nil), // 0: webapi.MysqlDbSetting
|
(*MysqlDbSetting)(nil), // 0: webapi.MysqlDbSetting
|
||||||
(*MongoDbSetting)(nil), // 1: webapi.MongoDbSetting
|
(*MongoDbSetting)(nil), // 1: webapi.MongoDbSetting
|
||||||
|
@ -9607,32 +9676,33 @@ var file_common_proto_goTypes = []interface{}{
|
||||||
(*AnnouncerLogInfo)(nil), // 84: webapi.AnnouncerLogInfo
|
(*AnnouncerLogInfo)(nil), // 84: webapi.AnnouncerLogInfo
|
||||||
(*GuideConfig)(nil), // 85: webapi.GuideConfig
|
(*GuideConfig)(nil), // 85: webapi.GuideConfig
|
||||||
(*MatchAudience)(nil), // 86: webapi.MatchAudience
|
(*MatchAudience)(nil), // 86: webapi.MatchAudience
|
||||||
nil, // 87: webapi.Platform.BindTelRewardEntry
|
(*SpiritConfig)(nil), // 87: webapi.SpiritConfig
|
||||||
nil, // 88: webapi.PlayerData.RankScoreEntry
|
nil, // 88: webapi.Platform.BindTelRewardEntry
|
||||||
nil, // 89: webapi.ItemShop.AwardEntry
|
nil, // 89: webapi.PlayerData.RankScoreEntry
|
||||||
nil, // 90: webapi.VIPcfg.AwardEntry
|
nil, // 90: webapi.ItemShop.AwardEntry
|
||||||
nil, // 91: webapi.VIPcfg.Privilege1Entry
|
nil, // 91: webapi.VIPcfg.AwardEntry
|
||||||
nil, // 92: webapi.VIPcfg.Privilege7Entry
|
nil, // 92: webapi.VIPcfg.Privilege1Entry
|
||||||
nil, // 93: webapi.VIPcfg.Privilege9Entry
|
nil, // 93: webapi.VIPcfg.Privilege7Entry
|
||||||
nil, // 94: webapi.ActInviteConfig.PayScoreEntry
|
nil, // 94: webapi.VIPcfg.Privilege9Entry
|
||||||
nil, // 95: webapi.SkinLevel.UpItemEntry
|
nil, // 95: webapi.ActInviteConfig.PayScoreEntry
|
||||||
nil, // 96: webapi.SkinItem.UnlockParamEntry
|
nil, // 96: webapi.SkinLevel.UpItemEntry
|
||||||
(*server.DB_GameFree)(nil), // 97: server.DB_GameFree
|
nil, // 97: webapi.SkinItem.UnlockParamEntry
|
||||||
(*server.DB_GameItem)(nil), // 98: server.DB_GameItem
|
(*server.DB_GameFree)(nil), // 98: server.DB_GameFree
|
||||||
|
(*server.DB_GameItem)(nil), // 99: server.DB_GameItem
|
||||||
}
|
}
|
||||||
var file_common_proto_depIdxs = []int32{
|
var file_common_proto_depIdxs = []int32{
|
||||||
2, // 0: webapi.Platform.Leaderboard:type_name -> webapi.RankSwitch
|
2, // 0: webapi.Platform.Leaderboard:type_name -> webapi.RankSwitch
|
||||||
3, // 1: webapi.Platform.ClubConfig:type_name -> webapi.ClubConfig
|
3, // 1: webapi.Platform.ClubConfig:type_name -> webapi.ClubConfig
|
||||||
4, // 2: webapi.Platform.ThirdGameMerchant:type_name -> webapi.ThirdGame
|
4, // 2: webapi.Platform.ThirdGameMerchant:type_name -> webapi.ThirdGame
|
||||||
87, // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry
|
88, // 3: webapi.Platform.BindTelReward:type_name -> webapi.Platform.BindTelRewardEntry
|
||||||
6, // 4: webapi.GameConfigGlobal.GameStatus:type_name -> webapi.GameStatus
|
6, // 4: webapi.GameConfigGlobal.GameStatus:type_name -> webapi.GameStatus
|
||||||
97, // 5: webapi.GameFree.DbGameFree:type_name -> server.DB_GameFree
|
98, // 5: webapi.GameFree.DbGameFree:type_name -> server.DB_GameFree
|
||||||
8, // 6: webapi.PlatformGameConfig.DbGameFrees:type_name -> webapi.GameFree
|
8, // 6: webapi.PlatformGameConfig.DbGameFrees:type_name -> webapi.GameFree
|
||||||
0, // 7: webapi.PlatformDbConfig.Mysql:type_name -> webapi.MysqlDbSetting
|
0, // 7: webapi.PlatformDbConfig.Mysql:type_name -> webapi.MysqlDbSetting
|
||||||
1, // 8: webapi.PlatformDbConfig.MongoDb:type_name -> webapi.MongoDbSetting
|
1, // 8: webapi.PlatformDbConfig.MongoDb:type_name -> webapi.MongoDbSetting
|
||||||
1, // 9: webapi.PlatformDbConfig.MongoDbLog:type_name -> webapi.MongoDbSetting
|
1, // 9: webapi.PlatformDbConfig.MongoDbLog:type_name -> webapi.MongoDbSetting
|
||||||
97, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree
|
98, // 10: webapi.GameConfigGroup.DbGameFree:type_name -> server.DB_GameFree
|
||||||
88, // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry
|
89, // 11: webapi.PlayerData.RankScore:type_name -> webapi.PlayerData.RankScoreEntry
|
||||||
32, // 12: webapi.PlayerData.Items:type_name -> webapi.ItemInfo
|
32, // 12: webapi.PlayerData.Items:type_name -> webapi.ItemInfo
|
||||||
14, // 13: webapi.PlayerData.RoleUnlockList:type_name -> webapi.ModInfo
|
14, // 13: webapi.PlayerData.RoleUnlockList:type_name -> webapi.ModInfo
|
||||||
14, // 14: webapi.PlayerData.PetUnlockList:type_name -> webapi.ModInfo
|
14, // 14: webapi.PlayerData.PetUnlockList:type_name -> webapi.ModInfo
|
||||||
|
@ -9645,7 +9715,7 @@ var file_common_proto_depIdxs = []int32{
|
||||||
32, // 21: webapi.ExchangeShop.Items:type_name -> webapi.ItemInfo
|
32, // 21: webapi.ExchangeShop.Items:type_name -> webapi.ItemInfo
|
||||||
25, // 22: webapi.ExchangeShopList.List:type_name -> webapi.ExchangeShop
|
25, // 22: webapi.ExchangeShopList.List:type_name -> webapi.ExchangeShop
|
||||||
29, // 23: webapi.ExchangeShopList.Weight:type_name -> webapi.ShopWeight
|
29, // 23: webapi.ExchangeShopList.Weight:type_name -> webapi.ShopWeight
|
||||||
89, // 24: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry
|
90, // 24: webapi.ItemShop.Award:type_name -> webapi.ItemShop.AwardEntry
|
||||||
30, // 25: webapi.ItemShopList.List:type_name -> webapi.ItemShop
|
30, // 25: webapi.ItemShopList.List:type_name -> webapi.ItemShop
|
||||||
32, // 26: webapi.MatchInfoAward.ItemId:type_name -> webapi.ItemInfo
|
32, // 26: webapi.MatchInfoAward.ItemId:type_name -> webapi.ItemInfo
|
||||||
33, // 27: webapi.GameMatchDate.Award:type_name -> webapi.MatchInfoAward
|
33, // 27: webapi.GameMatchDate.Award:type_name -> webapi.MatchInfoAward
|
||||||
|
@ -9666,14 +9736,14 @@ var file_common_proto_depIdxs = []int32{
|
||||||
38, // 42: webapi.WelfareSpree.Item:type_name -> webapi.WelfareDate
|
38, // 42: webapi.WelfareSpree.Item:type_name -> webapi.WelfareDate
|
||||||
48, // 43: webapi.WelfareFirstPayDataList.List:type_name -> webapi.WelfareSpree
|
48, // 43: webapi.WelfareFirstPayDataList.List:type_name -> webapi.WelfareSpree
|
||||||
48, // 44: webapi.WelfareContinuousPayDataList.List:type_name -> webapi.WelfareSpree
|
48, // 44: webapi.WelfareContinuousPayDataList.List:type_name -> webapi.WelfareSpree
|
||||||
90, // 45: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry
|
91, // 45: webapi.VIPcfg.Award:type_name -> webapi.VIPcfg.AwardEntry
|
||||||
91, // 46: webapi.VIPcfg.Privilege1:type_name -> webapi.VIPcfg.Privilege1Entry
|
92, // 46: webapi.VIPcfg.Privilege1:type_name -> webapi.VIPcfg.Privilege1Entry
|
||||||
92, // 47: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry
|
93, // 47: webapi.VIPcfg.Privilege7:type_name -> webapi.VIPcfg.Privilege7Entry
|
||||||
93, // 48: webapi.VIPcfg.Privilege9:type_name -> webapi.VIPcfg.Privilege9Entry
|
94, // 48: webapi.VIPcfg.Privilege9:type_name -> webapi.VIPcfg.Privilege9Entry
|
||||||
51, // 49: webapi.VIPcfgDataList.List:type_name -> webapi.VIPcfg
|
51, // 49: webapi.VIPcfgDataList.List:type_name -> webapi.VIPcfg
|
||||||
38, // 50: webapi.ChessRankConfig.Item:type_name -> webapi.WelfareDate
|
38, // 50: webapi.ChessRankConfig.Item:type_name -> webapi.WelfareDate
|
||||||
55, // 51: webapi.ChessRankcfgData.Datas:type_name -> webapi.ChessRankConfig
|
55, // 51: webapi.ChessRankcfgData.Datas:type_name -> webapi.ChessRankConfig
|
||||||
94, // 52: webapi.ActInviteConfig.PayScore:type_name -> webapi.ActInviteConfig.PayScoreEntry
|
95, // 52: webapi.ActInviteConfig.PayScore:type_name -> webapi.ActInviteConfig.PayScoreEntry
|
||||||
62, // 53: webapi.ActInviteConfig.Awards1:type_name -> webapi.RankAward
|
62, // 53: webapi.ActInviteConfig.Awards1:type_name -> webapi.RankAward
|
||||||
62, // 54: webapi.ActInviteConfig.Awards2:type_name -> webapi.RankAward
|
62, // 54: webapi.ActInviteConfig.Awards2:type_name -> webapi.RankAward
|
||||||
62, // 55: webapi.ActInviteConfig.Awards3:type_name -> webapi.RankAward
|
62, // 55: webapi.ActInviteConfig.Awards3:type_name -> webapi.RankAward
|
||||||
|
@ -9690,12 +9760,12 @@ var file_common_proto_depIdxs = []int32{
|
||||||
69, // 66: webapi.DiamondLotteryData.Info:type_name -> webapi.DiamondLotteryInfo
|
69, // 66: webapi.DiamondLotteryData.Info:type_name -> webapi.DiamondLotteryInfo
|
||||||
70, // 67: webapi.DiamondLotteryData.Players:type_name -> webapi.DiamondLotteryPlayers
|
70, // 67: webapi.DiamondLotteryData.Players:type_name -> webapi.DiamondLotteryPlayers
|
||||||
72, // 68: webapi.DiamondLotteryConfig.LotteryData:type_name -> webapi.DiamondLotteryData
|
72, // 68: webapi.DiamondLotteryConfig.LotteryData:type_name -> webapi.DiamondLotteryData
|
||||||
98, // 69: webapi.ItemConfig.Items:type_name -> server.DB_GameItem
|
99, // 69: webapi.ItemConfig.Items:type_name -> server.DB_GameItem
|
||||||
32, // 70: webapi.RankAwardInfo.Item:type_name -> webapi.ItemInfo
|
32, // 70: webapi.RankAwardInfo.Item:type_name -> webapi.ItemInfo
|
||||||
75, // 71: webapi.RankTypeInfo.Award:type_name -> webapi.RankAwardInfo
|
75, // 71: webapi.RankTypeInfo.Award:type_name -> webapi.RankAwardInfo
|
||||||
76, // 72: webapi.RankTypeConfig.Info:type_name -> webapi.RankTypeInfo
|
76, // 72: webapi.RankTypeConfig.Info:type_name -> webapi.RankTypeInfo
|
||||||
95, // 73: webapi.SkinLevel.UpItem:type_name -> webapi.SkinLevel.UpItemEntry
|
96, // 73: webapi.SkinLevel.UpItem:type_name -> webapi.SkinLevel.UpItemEntry
|
||||||
96, // 74: webapi.SkinItem.UnlockParam:type_name -> webapi.SkinItem.UnlockParamEntry
|
97, // 74: webapi.SkinItem.UnlockParam:type_name -> webapi.SkinItem.UnlockParamEntry
|
||||||
78, // 75: webapi.SkinItem.Levels:type_name -> webapi.SkinLevel
|
78, // 75: webapi.SkinItem.Levels:type_name -> webapi.SkinLevel
|
||||||
79, // 76: webapi.SkinConfig.Items:type_name -> webapi.SkinItem
|
79, // 76: webapi.SkinConfig.Items:type_name -> webapi.SkinItem
|
||||||
82, // 77: webapi.AwardLogConfig.AwardLog:type_name -> webapi.AwardLogData
|
82, // 77: webapi.AwardLogConfig.AwardLog:type_name -> webapi.AwardLogData
|
||||||
|
@ -10758,6 +10828,18 @@ func file_common_proto_init() {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
file_common_proto_msgTypes[87].Exporter = func(v interface{}, i int) interface{} {
|
||||||
|
switch v := v.(*SpiritConfig); i {
|
||||||
|
case 0:
|
||||||
|
return &v.state
|
||||||
|
case 1:
|
||||||
|
return &v.sizeCache
|
||||||
|
case 2:
|
||||||
|
return &v.unknownFields
|
||||||
|
default:
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
type x struct{}
|
type x struct{}
|
||||||
out := protoimpl.TypeBuilder{
|
out := protoimpl.TypeBuilder{
|
||||||
|
@ -10765,7 +10847,7 @@ func file_common_proto_init() {
|
||||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||||
RawDescriptor: file_common_proto_rawDesc,
|
RawDescriptor: file_common_proto_rawDesc,
|
||||||
NumEnums: 0,
|
NumEnums: 0,
|
||||||
NumMessages: 97,
|
NumMessages: 98,
|
||||||
NumExtensions: 0,
|
NumExtensions: 0,
|
||||||
NumServices: 0,
|
NumServices: 0,
|
||||||
},
|
},
|
||||||
|
|
|
@ -898,3 +898,10 @@ message MatchAudience {
|
||||||
int32 SnId = 2; // 玩家ID
|
int32 SnId = 2; // 玩家ID
|
||||||
int64 Ts = 3; // 时间戳
|
int64 Ts = 3; // 时间戳
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// etcd /game/spirit
|
||||||
|
message SpiritConfig {
|
||||||
|
string Platform = 1; // 平台
|
||||||
|
int32 On = 2; // 精灵开关 1开启 2关闭
|
||||||
|
string Url = 3;
|
||||||
|
}
|
2
public
2
public
|
@ -1 +1 @@
|
||||||
Subproject commit 70e09ba50291dd290c3ff6aadb89d127ef4a0f9a
|
Subproject commit 07c189d652b84910258fa33eb3214d39c53edec4
|
|
@ -91,6 +91,8 @@ func init() {
|
||||||
etcd.Register(etcd.ETCDKEY_GUIDE, webapi.GuideConfig{}, platformConfigEvent)
|
etcd.Register(etcd.ETCDKEY_GUIDE, webapi.GuideConfig{}, platformConfigEvent)
|
||||||
// 比赛观众
|
// 比赛观众
|
||||||
etcd.Register(etcd.ETCDKEY_MatchAudience, webapi.MatchAudience{}, handlerEvent)
|
etcd.Register(etcd.ETCDKEY_MatchAudience, webapi.MatchAudience{}, handlerEvent)
|
||||||
|
// 小精灵配置
|
||||||
|
etcd.Register(etcd.ETCDKEY_Spirit, webapi.SpiritConfig{}, platformConfigEvent)
|
||||||
}
|
}
|
||||||
|
|
||||||
func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, event *clientv3.Event, data interface{}) {
|
func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, event *clientv3.Event, data interface{}) {
|
||||||
|
@ -118,11 +120,7 @@ func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, e
|
||||||
PlatformMgrSingleton.GetConfig(config.Platform).CommonNotices = config
|
PlatformMgrSingleton.GetConfig(config.Platform).CommonNotices = config
|
||||||
if !isInit {
|
if !isInit {
|
||||||
// 通知公共变更
|
// 通知公共变更
|
||||||
for _, v := range PlayerMgrSington.playerOfPlatform[config.Platform] {
|
PlayerMgrSington.BroadcastMessageToPlatform(config.Platform, int(hallproto.GameHallPacketID_PACKET_SC_NoticeChange), &hallproto.SCNoticeChange{})
|
||||||
if v != nil && v.IsOnLine() {
|
|
||||||
v.SendToClient(int(hallproto.GameHallPacketID_PACKET_SC_NoticeChange), &hallproto.SCNoticeChange{})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
case *webapi.GameConfigGlobal:
|
case *webapi.GameConfigGlobal:
|
||||||
if isInit {
|
if isInit {
|
||||||
|
@ -191,16 +189,12 @@ func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, e
|
||||||
PlatformMgrSingleton.GetConfig(config.Platform).ChannelSwitch[config.GetTp()] = config
|
PlatformMgrSingleton.GetConfig(config.Platform).ChannelSwitch[config.GetTp()] = config
|
||||||
if !isInit {
|
if !isInit {
|
||||||
// 通知变更
|
// 通知变更
|
||||||
for _, v := range PlayerMgrSington.playerOfPlatform[config.Platform] {
|
PlayerMgrSington.BroadcastMessageToPlatform(config.Platform, int(playerproto.PlayerPacketID_PACKET_SCExchangeChannel), &playerproto.SCExchangeChannel{
|
||||||
if v != nil && v.IsOnLine() {
|
Datas: []*playerproto.ChannelSwitch{{
|
||||||
v.SendToClient(int(playerproto.PlayerPacketID_PACKET_SCExchangeChannel), &playerproto.SCExchangeChannel{
|
Tp: config.Tp,
|
||||||
Datas: []*playerproto.ChannelSwitch{{
|
OnChannelName: config.OnChannelName,
|
||||||
Tp: config.Tp,
|
}},
|
||||||
OnChannelName: config.OnChannelName,
|
})
|
||||||
}},
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
case *webapi.GameConfigGroup:
|
case *webapi.GameConfigGroup:
|
||||||
PlatformGameGroupMgrSington.UpsertGameGroup(config)
|
PlatformGameGroupMgrSington.UpsertGameGroup(config)
|
||||||
|
@ -312,13 +306,9 @@ func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, e
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
if len(items) > 0 {
|
if len(items) > 0 {
|
||||||
for _, v := range PlayerMgrSington.playerOfPlatform[config.Platform] {
|
PlayerMgrSington.BroadcastMessageToPlatform(config.Platform, int(playerproto.PlayerPacketID_PACKET_SCItem), &playerproto.SCItem{
|
||||||
if v != nil && v.IsOnLine() {
|
Items: items,
|
||||||
v.SendToClient(int(playerproto.PlayerPacketID_PACKET_SCItem), &playerproto.SCItem{
|
})
|
||||||
Items: items,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -330,6 +320,19 @@ func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, e
|
||||||
PlatformMgrSingleton.GetConfig(config.Platform).AwardLogConfig = config
|
PlatformMgrSingleton.GetConfig(config.Platform).AwardLogConfig = config
|
||||||
case *webapi.GuideConfig:
|
case *webapi.GuideConfig:
|
||||||
PlatformMgrSingleton.GetConfig(config.Platform).GuideConfig = config
|
PlatformMgrSingleton.GetConfig(config.Platform).GuideConfig = config
|
||||||
|
case *webapi.SpiritConfig:
|
||||||
|
PlatformMgrSingleton.GetConfig(config.Platform).SpiritConfig = config
|
||||||
|
if !isInit {
|
||||||
|
PlayerMgrSington.BroadcastMessageToPlatform(config.Platform, int(playerproto.PlayerPacketID_PACKET_SCDataConfig), &playerproto.SCDataConfig{
|
||||||
|
Cfg: []*playerproto.Config{
|
||||||
|
{
|
||||||
|
Tp: 1,
|
||||||
|
On: config.GetOn() == 1,
|
||||||
|
Value: config.GetUrl(),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
logger.Logger.Errorf("etcd completeKey:%s, Not processed", completeKey)
|
logger.Logger.Errorf("etcd completeKey:%s, Not processed", completeKey)
|
||||||
}
|
}
|
||||||
|
|
|
@ -3089,10 +3089,13 @@ func (this *Player) SendPlayerInfo() {
|
||||||
if this.scene != nil && this.thrscene == 0 {
|
if this.scene != nil && this.thrscene == 0 {
|
||||||
this.SendGameConfig(int32(this.scene.gameId), this.Platform, this.Channel)
|
this.SendGameConfig(int32(this.scene.gameId), this.Platform, this.Channel)
|
||||||
}
|
}
|
||||||
this.SCItems()
|
|
||||||
//this.SendJackpotInfo()
|
//this.SendJackpotInfo()
|
||||||
|
// 后台道具配置
|
||||||
|
this.SCItems()
|
||||||
// 引导配置
|
// 引导配置
|
||||||
this.SCGuide()
|
this.SCGuide()
|
||||||
|
// 小精灵配置
|
||||||
|
this.SCSpirit()
|
||||||
}
|
}
|
||||||
|
|
||||||
//func (this *Player) SendJackpotInfo() {
|
//func (this *Player) SendJackpotInfo() {
|
||||||
|
@ -4942,3 +4945,18 @@ func (this *Player) SCGuide() {
|
||||||
this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SCGuideConfig), pack)
|
this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SCGuideConfig), pack)
|
||||||
logger.Logger.Tracef("SCGuideConfig: %v", pack)
|
logger.Logger.Tracef("SCGuideConfig: %v", pack)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (this *Player) SCSpirit() {
|
||||||
|
cfg := PlatformMgrSingleton.GetConfig(this.Platform).SpiritConfig
|
||||||
|
pack := &playerproto.SCDataConfig{
|
||||||
|
Cfg: []*playerproto.Config{
|
||||||
|
{
|
||||||
|
Tp: 1,
|
||||||
|
On: cfg.On == 1,
|
||||||
|
Value: cfg.Url,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SCDataConfig), pack)
|
||||||
|
logger.Logger.Tracef("SCDataConfig: %v", pack)
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue