feat✨:配置框架重构回滚

王家文
1 parent 23dc082b
Showing 42 changed files with 914 additions and 1544 deletions Show diff stats
configs-db/confapi/config.go
configs-db/confapi/get.go
configs-db/confbase/external.go
configs-db/confbase/interface.go
configs-db/confcardholder/config.go
configs-db/confcardholder/decode.go
configs-db/confcardholder/get.go
configs-db/confglobal/config.go
configs-db/confglobal/get.go
configs-db/confroomrank/config.go
configs-db/confroomrank/decode.go
configs-db/confroomrank/get.go
configs-db/init.go
configs/confapi/config.go
configs/confapi/get.go
configs/confbase/external.go
configs/confbase/interface.go
configs/confcardholder/config.go
configs/confcardholder/decode.go
configs/confcardholder/get.go
@@ -1,48 +0,0 @@
-package confapi
-
-import (
-	"apigame/configs-db/confbase"
-	"apigame/service-common/svconst"
-	"fmt"
-)
-
-// ApiGameConfig api游戏配置
-type ApiGameConfig struct {
-	Raw *Raw
-}
-
-func (c *ApiGameConfig) GetUid() string {
-	return c.Raw.GameId
-}
-
-func (c *ApiGameConfig) CheckCurrent() bool {
-	return true
-}
-
-func (c *ApiGameConfig) ConfInfo(suffix string) *confbase.ConfInfo {
-	tableName := "s_game_config"
-	cacheKey := fmt.Sprintf("%s:%s:%s", svconst.REDIS_CACHEP_REFIX, tableName, suffix)
-	return &confbase.ConfInfo{
-		DbMysql:      svconst.DbApi,
-		TableName:    tableName,
-		KeyName:      "gameid",
-		CacheKey:     cacheKey,
-		CacheCurrent: cacheKey + ":current",
-		CacheTime:    300,
-	}
-}
-
-// Raw 配置原始数据
-type Raw struct {
-	AppId  string `gorm:"column:appid"`
-	GameId string `gorm:"column:gameid"`
-	Secret string `gorm:"column:secret"`
-	AppKey string `gorm:"column:appkey"`
-	Name   string `gorm:"column:name"`
-}
-
-// Decode 解析配置原始数据
-func (c *ApiGameConfig) Decode(gameId string, rawData any) {
-	raw := rawData.(*Raw)
-	c.Raw = raw
-}
@@ -1,19 +0,0 @@
-package confapi
-
-import (
-	"apigame/configs-db/confbase"
-	"errors"
-)
-
-// GetConfig 获取 api游戏配置
-func GetConfig(gameId string) (conf *ApiGameConfig, err error) {
-
-	conf = new(ApiGameConfig)
-	has := confbase.GetConfig[*ApiGameConfig, Raw](gameId, gameId, conf)
-	if !has {
-		err = errors.New("confapi.GetConfig error")
-		return
-	}
-
-	return
-}
@@ -1,113 +0,0 @@
-package confbase
-
-import (
-	"apigame/util/util-lx/lxalilog"
-	"apigame/util/zjson"
-	"apigame/util/zredis"
-	"fmt"
-	"runtime/debug"
-)
-
-var CacheState = 1 // 0=关闭 1=打开
-
-func SaveCache[T IConfData](gameId string, obj T) {
-	info := obj.ConfInfo(gameId)
-	_ = zredis.SetEx(info.CacheKey, zjson.Str(obj), info.CacheTime)
-}
-
-func LoadCache[T IConfData](gameId string, obj T) (has bool) {
-	if CacheState == 0 {
-		return false
-	}
-	has = true
-	info := obj.ConfInfo(gameId)
-	text, err := zredis.Get(info.CacheKey)
-	if err != nil {
-		has = false
-		return
-	}
-	err = zjson.Obj(text, &obj)
-	if err != nil {
-		fmt.Println(err)
-		has = false
-		return
-	}
-	return
-}
-
-func LoadData[T1 IConfData, T2 IConfRawData](gameId string, confId any, obj T1) (has bool) {
-	confRaw := new(T2)
-	info := obj.ConfInfo(gameId)
-	db := info.DbMysql
-	result := db.Table(info.TableName).Where(fmt.Sprintf("%s = ?", info.KeyName), confId).First(confRaw)
-
-	has = result.RowsAffected != 0
-	err := result.Error
-	if err != nil {
-		lxalilog.Errors(err, "confbase.LoadData error", gameId, confId)
-		fmt.Printf("%s", debug.Stack())
-		return
-	}
-	if !has {
-		return
-	}
-
-	obj.Decode(gameId, confRaw)
-	return
-}
-
-func FindDuringTime[T1 IConfData, T2 IConfRawData](obj T1, raw *T2, gameId string) (has bool) {
-	info := obj.ConfInfo(gameId)
-	db := info.DbMysql
-	result := db.Table(info.TableName).Where(info.CurrentQuery, info.CurrentArgs...).First(raw)
-	has = result.RowsAffected != 0
-	return
-}
-
-func GetConfig[T1 IConfData, T2 IConfRawData](gameId string, confId any, obj T1) (has bool) {
-	has = LoadCache(gameId, obj)
-	if has {
-		return
-	}
-	has = LoadData[T1, T2](gameId, confId, obj)
-	if !has {
-		return
-	}
-	SaveCache(gameId, obj)
-	return
-}
-
-// GetCurrent 获取 当前配置
-func GetCurrent[T1 IConfData, T2 IConfRawData](gameId string, obj T1) bool {
-	has := false
-	info := obj.ConfInfo(gameId)
-	currentKey := info.CacheCurrent
-	currentId := zredis.GetString(currentKey)
-	if currentId != "" {
-		has = GetConfig[T1, T2](gameId, currentId, obj)
-		if has {
-			if !obj.CheckCurrent() {
-				has = false
-			}
-		}
-	}
-	return has
-}
-
-// FindCurrent 查找 当前配置
-func FindCurrent[T1 IConfData, T2 IConfRawData](gameId string, obj T1) bool {
-	has := false
-	info := obj.ConfInfo(gameId)
-	currentKey := info.CacheCurrent
-	currentId := zredis.GetString(currentKey)
-	confRaw := new(T2)
-	has = FindDuringTime[T1, T2](obj, confRaw, gameId)
-	if has {
-		obj.Decode(gameId, confRaw)
-		SaveCache(gameId, obj)
-		has = true
-		currentId = obj.GetUid()
-		_ = zredis.Set(currentKey, currentId)
-	}
-	return has
-}
@@ -1,31 +0,0 @@
-package confbase
-
-import "gorm.io/gorm"
-
-// ConfInfo 配置对象信息
-type ConfInfo struct {
-	DbMysql      *gorm.DB
-	TableName    string
-	KeyName      string
-	CurrentQuery any
-	CurrentArgs  []any
-	CacheKey     string
-	CacheCurrent string
-	CacheTime    int
-}
-
-// IConfData 配置对象
-type IConfData interface {
-	// ConfInfo redis存储信息
-	ConfInfo(suffix string) *ConfInfo
-	// Decode 解码
-	Decode(gameId string, rawData any)
-	// GetUid 获取keyID
-	GetUid() string
-	// CheckCurrent 判断当前开放
-	CheckCurrent() bool
-}
-
-// IConfRawData mysql存储对象
-type IConfRawData interface {
-}
@@ -1,153 +0,0 @@
-package confcardholder
-
-import (
-	"apigame/configs-db/confbase"
-	"apigame/service-common/svconst"
-	"apigame/util/util-lx/lxtime"
-	"apigame/util/zconvert"
-	"fmt"
-)
-
-// ActivityConfig 卡牌活动配置 分析后数据
-type ActivityConfig struct {
-	Raw *ActivityConfigRaw `json:"-"`
-
-	Id          int64  // ID
-	OpenLevel   int    // 开启等级
-	PreviewTime int64  // 预告时间
-	StartTime   int64  // 开始时间
-	EndTime     int64  // 结束时间
-	Round       int    // 轮数
-	IconPath    string // icon资源路径
-
-	Awards               map[string]string               // 奖励配置
-	AlbumConfig          map[int]AlbumConfig             // 卡组配置
-	CardConfig           map[int]CardConfig              // 卡牌配置
-	CardholderConfig     map[int]OpenCardholderConfig    // 卡包开卡规则
-	NormalCardStarConfig map[string]NormalCardStarConfig // k=ID_用户序列_用户分组 卡片星级配置
-	CardSequenceConfig   map[string]CardSequenceConfig   // k=ID_用户序列_用户分组 卡片星级对应卡牌配置
-	StarShopConfig       map[int]StarShopConfig          // 星星商店配置
-	ListSequenceId       []int                           // 用户序列组ID列表
-
-	Client *ActivityConfigClient
-	GameId string // 所属游戏ID
-}
-
-func (c *ActivityConfig) GetUid() string {
-	return zconvert.Int64ToStr(c.Id)
-}
-
-func (c *ActivityConfig) CheckCurrent() bool {
-	timeNow := lxtime.NowUninx()
-	return timeNow >= c.StartTime && timeNow <= c.EndTime && c.Raw.Status == 1
-}
-
-func (c *ActivityConfig) ConfInfo(suffix string) *confbase.ConfInfo {
-	tableName := svconst.MYSQL_TABLE_S_CARDHOLDER_CONFIG
-	cacheKey := fmt.Sprintf("%s:%s:%s", svconst.REDIS_CACHEP_REFIX, tableName, suffix)
-	timeNow := lxtime.NowUninx()
-	return &confbase.ConfInfo{
-		DbMysql:      svconst.DbConfig,
-		TableName:    fmt.Sprintf("%s_%s", tableName, suffix),
-		KeyName:      "id",
-		CurrentQuery: "status = ? AND start_time <= ? AND end_time >= ?",
-		CurrentArgs:  []any{1, timeNow, timeNow},
-		CacheKey:     fmt.Sprintf("%s:%d", cacheKey, c.Id),
-		CacheCurrent: cacheKey + ":current",
-		CacheTime:    300,
-	}
-}
-
-// ActivityConfigRaw 卡牌活动配置 原始数据
-type ActivityConfigRaw struct {
-	Id          int64  `gorm:"column:id;primaryKey"` // ID
-	OpenLevel   int    // 开启等级
-	PreviewTime int64  // 预告时间
-	StartTime   int64  // 开始时间
-	EndTime     int64  // 结束时间
-	Round       int    // 轮数
-	IconPath    string // icon资源路径
-
-	Awards                 string // 奖励配置
-	AlbumConfig            string // 卡组配置
-	CardConfig             string // 卡牌配置
-	CardHolderConfig       string // 卡包开卡规则
-	NormalCardStarSequence string // 卡片星级配置
-	CardSequenceConfig     string // 卡片星级对应卡牌配置
-	StarShopConfig         string // 星星商店配置
-
-	Ver        string // 版本号
-	Status     int    // 状态 0=关闭 1=开启
-	UpdateTime int64  // 修改时间戳
-}
-
-// ActivityConfigClient 卡牌活动配置 给客户端数据
-type ActivityConfigClient struct {
-	Id          int64                  `form:"id" json:"id"`                     // ID
-	Round       int                    `form:"round" json:"round"`               // 轮数
-	IconPath    string                 `form:"icon_path" json:"icon_path"`       // icon资源路径
-	RoundAwards map[string]string      `form:"round_awards" json:"round_awards"` // 轮次奖励配置
-	Albums      []AlbumConfig          `form:"albums" json:"albums"`             // 卡组配置
-	Cards       []CardConfig           `form:"cards" json:"cards"`               // 卡牌配置
-	Holders     []OpenCardholderConfig `form:"holders" json:"holders"`           // 卡包开卡规则
-	StarShop    []StarShopConfig       `form:"star_shop" json:"star_shop"`       // 星星商店配置
-}
-
-// AlbumConfig 卡组表
-type AlbumConfig struct {
-	SetId     int               `json:"set_id"`     // 卡组名
-	Name      int               `json:"name"`       // 卡组图片
-	Icon      string            `json:"icon"`       // 卡组id
-	Rewards   map[string]string `json:"rewards"`    // 集齐奖励 k=轮次
-	StartTime int64             `json:"start_time"` // 开始时间
-	EndTime   int64             `json:"end_time"`   // 结束时间
-}
-
-// CardConfig 卡牌表
-type CardConfig struct {
-	Id     int    `json:"id"`          // ID
-	Name   int    `json:"name"`        // 卡牌名字
-	Icon   string `json:"icon"`        // 卡牌图标
-	Desc   int    `json:"desc"`        // 卡牌描述
-	SetId  int    `json:"album_setid"` // 卡组id
-	Star   int    `json:"star"`        // 星级
-	IsGold int    `json:"is_gold"`     // 是否是金卡
-	IsSend int    `json:"is_send"`     // 卡片是否可赠送
-}
-
-// OpenCardholderConfig 卡包开卡规则表
-type OpenCardholderConfig struct {
-	Id                     int    `json:"id"`                        // ID
-	CardPackIcon           string `json:"img"`                       // 卡包资源名
-	IsGoldCardholder       int    `json:"is_gold_card_holder"`       // 是否是金卡包
-	IsNew                  int    `json:"is_new"`                    // 是否是新卡包
-	GuaranteedStarCardId   int    `json:"guaranteed_star_card_id"`   // 保底卡星级序列ID
-	NormalCardNumber       int    `json:"normal_card_number"`        // 非保底卡数量
-	MinimumGuaranteeCardId int    `json:"minimum_guarantee_card_id"` // 非保底卡牌序列ID
-	ActivityId             int    `json:"activity_id"`               // 对应活动ID
-	Star                   int    `json:"star"`                      // star
-	Name                   int    `json:"name"`                      // name
-}
-
-// NormalCardStarConfig 非保底卡星级ID
-type NormalCardStarConfig struct {
-	Id                   int   `json:"id"`                      // ID
-	SequenceId           int   `json:"user_sequence_id"`        // 用户序列组ID
-	Cohort               int   `json:"cohort"`                  // 用户分组
-	NormalCardSequenceId []int `json:"normal_card_sequence_id"` // 非保底星级序列
-}
-
-// CardSequenceConfig 星级ID对应的卡片
-type CardSequenceConfig struct {
-	Id         int   `json:"id"`               // ID
-	SequenceId int   `json:"user_sequence_id"` // 用户序列组ID
-	Cohort     int   `json:"cohort"`           // 用户分组
-	CardIdList []int `json:"card_id_list"`     // 卡牌抽取序列
-}
-
-// StarShopConfig 星星商店配置
-type StarShopConfig struct {
-	Id             int    `json:"id"`               // ID
-	NeedStarNumber int    `json:"need_star_number"` // 需求星星数
-	CardBagIds     string `json:"card_bag_ids"`     // 可换取的卡包ID {卡包类型,卡包ID,卡包数量}
-}
@@ -1,177 +0,0 @@
-package confcardholder
-
-import (
-	"apigame/util/util-lx/lxalilog"
-	"apigame/util/zslice"
-	"encoding/json"
-	"errors"
-	"fmt"
-)
-
-// Decode 解析配置原始数据
-func (c *ActivityConfig) Decode(gameId string, rawData any) {
-	raw := rawData.(*ActivityConfigRaw)
-	c.GameId = gameId
-	c.Raw = raw
-
-	c.Id = raw.Id
-	c.OpenLevel = raw.OpenLevel
-	c.PreviewTime = raw.PreviewTime
-	c.StartTime = raw.StartTime
-	c.EndTime = raw.EndTime
-	c.Round = raw.Round
-	c.IconPath = raw.IconPath
-
-	c.Awards = make(map[string]string)
-	c.AlbumConfig = make(map[int]AlbumConfig)
-	c.CardConfig = make(map[int]CardConfig)
-	c.CardholderConfig = make(map[int]OpenCardholderConfig)
-	c.NormalCardStarConfig = make(map[string]NormalCardStarConfig)
-	c.CardSequenceConfig = make(map[string]CardSequenceConfig)
-	c.StarShopConfig = make(map[int]StarShopConfig)
-	// 解析奖励
-	{
-		err := json.Unmarshal([]byte(raw.Awards), &c.Awards)
-		if err != nil {
-			lxalilog.Errors(err, raw.Awards, gameId, raw.Id)
-			return
-		}
-	}
-	// 卡组配置
-	{
-		configs := make([]AlbumConfig, 0)
-		err := json.Unmarshal([]byte(raw.AlbumConfig), &configs)
-		if err != nil {
-			lxalilog.Errors(err, raw.AlbumConfig, gameId, raw.Id)
-			return
-		}
-		for _, i2 := range configs {
-			c.AlbumConfig[i2.SetId] = i2
-		}
-	}
-	// 卡牌配置
-	{
-		configs := make([]CardConfig, 0)
-		err := json.Unmarshal([]byte(raw.CardConfig), &configs)
-		if err != nil {
-			lxalilog.Errors(err, raw.CardConfig, gameId, raw.Id)
-			return
-		}
-		for _, i2 := range configs {
-			c.CardConfig[i2.Id] = i2
-		}
-	}
-	// 卡包开卡规则
-	{
-		configs := make([]OpenCardholderConfig, 0)
-		err := json.Unmarshal([]byte(raw.CardHolderConfig), &configs)
-		if err != nil {
-			lxalilog.Errors(err, raw.CardHolderConfig, gameId, raw.Id)
-			return
-		}
-		for _, i2 := range configs {
-			c.CardholderConfig[i2.Id] = i2
-		}
-	}
-	// 卡片星级配置
-	{
-		configs := make([]NormalCardStarConfig, 0)
-		err := json.Unmarshal([]byte(raw.NormalCardStarSequence), &configs)
-		if err != nil {
-			lxalilog.Errors(err, raw.NormalCardStarSequence, gameId, raw.Id)
-			return
-		}
-		for _, i2 := range configs {
-			combineId := CombineIdSequenceIdCohort(i2.Id, i2.SequenceId, i2.Cohort)
-			c.NormalCardStarConfig[combineId] = i2
-			if !zslice.Contains(c.ListSequenceId, i2.SequenceId) {
-				c.ListSequenceId = append(c.ListSequenceId, i2.SequenceId)
-			}
-		}
-	}
-	// 卡片星级对应卡牌配置
-	{
-		configs := make([]CardSequenceConfig, 0)
-		err := json.Unmarshal([]byte(raw.CardSequenceConfig), &configs)
-		if err != nil {
-			lxalilog.Errors(err, raw.CardSequenceConfig, gameId, raw.Id)
-			return
-		}
-		for _, i2 := range configs {
-			combineId := CombineIdSequenceIdCohort(i2.Id, i2.SequenceId, i2.Cohort)
-			c.CardSequenceConfig[combineId] = i2
-			if !zslice.Contains(c.ListSequenceId, i2.SequenceId) {
-				c.ListSequenceId = append(c.ListSequenceId, i2.SequenceId)
-			}
-		}
-	}
-	// 星星商店配置
-	{
-		configs := make([]StarShopConfig, 0)
-		err := json.Unmarshal([]byte(raw.StarShopConfig), &configs)
-		if err != nil {
-			lxalilog.Errors(err, raw.StarShopConfig, gameId, raw.Id)
-			return
-		}
-		for _, i2 := range configs {
-			c.StarShopConfig[i2.Id] = i2
-		}
-	}
-
-	c.GenerateConfigClient()
-}
-
-// GenerateConfigClient 生成给客户端的配置
-func (c *ActivityConfig) GenerateConfigClient() {
-	configClient := &ActivityConfigClient{
-		Id:          c.Id,
-		Round:       c.Round,
-		IconPath:    c.IconPath,
-		RoundAwards: c.Awards,
-		Albums:      make([]AlbumConfig, 0),
-		Cards:       make([]CardConfig, 0),
-		Holders:     make([]OpenCardholderConfig, 0),
-		StarShop:    make([]StarShopConfig, 0),
-	}
-	for _, i2 := range c.AlbumConfig {
-		configClient.Albums = append(configClient.Albums, i2)
-	}
-	for _, i2 := range c.CardConfig {
-		configClient.Cards = append(configClient.Cards, i2)
-	}
-	for _, i2 := range c.CardholderConfig {
-		configClient.Holders = append(configClient.Holders, i2)
-	}
-	for _, i2 := range c.StarShopConfig {
-		configClient.StarShop = append(configClient.StarShop, i2)
-	}
-	c.Client = configClient
-}
-
-// CombineIdSequenceIdCohort 组合ID k=ID_用户序列_用户分组
-func CombineIdSequenceIdCohort(id, sequenceId, cohort int) string {
-	return fmt.Sprintf("%d_%d_%d", id, sequenceId, cohort)
-}
-
-// FindNormalCardStarConfig 查找配置 非保底卡星级ID
-func (c *ActivityConfig) FindNormalCardStarConfig(id, sequenceId, cohort int) (conf NormalCardStarConfig, has bool) {
-	combineId := CombineIdSequenceIdCohort(id, sequenceId, cohort)
-	conf, has = c.NormalCardStarConfig[combineId]
-	if !has {
-		lxalilog.Errors(errors.New("ht_cardholder NormalCardStarConfig error"), id, sequenceId, cohort)
-	}
-	return
-}
-
-// FindCardSequenceConfig 查找配置 星级ID对应的卡片
-func (c *ActivityConfig) FindCardSequenceConfig(id, sequenceId, cohort int) (conf CardSequenceConfig, has bool) {
-	combineId := CombineIdSequenceIdCohort(id, sequenceId, cohort)
-	conf, has = c.CardSequenceConfig[combineId]
-	if !has {
-		lxalilog.Errors(errors.New("ht_cardholder CardSequenceConfig error"), id, sequenceId, cohort)
-		fmt.Println(id)
-		fmt.Println(sequenceId)
-		fmt.Println(cohort)
-	}
-	return
-}
@@ -1,24 +0,0 @@
-package confcardholder
-
-import (
-	"apigame/configs-db/confbase"
-)
-
-// GetCurrent 获取 当前配置
-func GetCurrent(gameId string) (conf *ActivityConfig, has bool) {
-	conf = new(ActivityConfig)
-	has = confbase.GetCurrent[*ActivityConfig, ActivityConfigRaw](gameId, conf)
-	if !has {
-		conf = new(ActivityConfig)
-		has = confbase.FindCurrent[*ActivityConfig, ActivityConfigRaw](gameId, conf)
-	}
-	return
-}
-
-// GetConfig 获取 配置根据Id
-func GetConfig(gameId string, confId int64) (conf *ActivityConfig, has bool) {
-	conf = new(ActivityConfig)
-	has = confbase.GetConfig[*ActivityConfig, ActivityConfigRaw](gameId, confId, conf)
-
-	return
-}
@@ -1,67 +0,0 @@
-package confglobal
-
-import (
-	"apigame/configs-db/confbase"
-	"apigame/service-common/svconst"
-	"apigame/util/util-lx/lxalilog"
-	"encoding/json"
-	"fmt"
-)
-
-// GlobalConfig 全局配置
-type GlobalConfig struct {
-	Raw        *Raw `json:"-"`
-	Names      []string
-	Avatars    []string
-	AvatarPath string
-}
-
-func (c *GlobalConfig) GetUid() string {
-	return c.Raw.GameId
-}
-
-func (c *GlobalConfig) CheckCurrent() bool {
-	return true
-}
-
-func (c *GlobalConfig) ConfInfo(suffix string) *confbase.ConfInfo {
-	tableName := "s_game_global_config"
-	cacheKey := fmt.Sprintf("%s:%s:%s", svconst.REDIS_CACHEP_REFIX, tableName, suffix)
-	return &confbase.ConfInfo{
-		DbMysql:      svconst.DbConfig,
-		TableName:    tableName,
-		KeyName:      "gameid",
-		CacheKey:     cacheKey,
-		CacheCurrent: cacheKey + ":current",
-		CacheTime:    300,
-	}
-}
-
-// Raw 配置原始数据
-type Raw struct {
-	GameId       string `gorm:"column:gameid"`
-	NameConfig   string
-	AvatarConfig string
-	AvatarPath   string
-}
-
-// Decode 解析配置原始数据
-func (c *GlobalConfig) Decode(gameId string, rawData any) {
-	raw := rawData.(*Raw)
-	c.Raw = raw
-	{
-		err := json.Unmarshal([]byte(raw.NameConfig), &c.Names)
-		if err != nil {
-			lxalilog.Errors(err, raw.NameConfig, gameId, raw.GameId)
-			return
-		}
-	}
-	{
-		err := json.Unmarshal([]byte(raw.AvatarConfig), &c.Avatars)
-		if err != nil {
-			lxalilog.Errors(err, raw.AvatarConfig, gameId, raw.GameId)
-			return
-		}
-	}
-	c.AvatarPath = raw.AvatarPath
-}
@@ -1,19 +0,0 @@
-package confglobal
-
-import (
-	"apigame/configs-db/confbase"
-	"errors"
-)
-
-// GetConfig 获取 api游戏配置
-func GetConfig(gameId string) (conf *GlobalConfig, err error) {
-
-	conf = new(GlobalConfig)
-	has := confbase.GetConfig[*GlobalConfig, Raw](gameId, gameId, conf)
-	if !has {
-		err = errors.New("confglobal.GetConfig error")
-		return
-	}
-
-	return
-}
@@ -1,129 +0,0 @@
-package confroomrank
-
-import (
-	"apigame/configs-db/confbase"
-	"apigame/service-common/svconst"
-	"apigame/util/util-lx/lxtime"
-	"apigame/util/zconvert"
-	"fmt"
-)
-
-// ActivityConfig 房间排行活动配置 分析后数据
-type ActivityConfig struct {
-	Raw *ActivityConfigRaw `json:"-"`
-
-	Id          int64  // ID
-	Typ         int    // 排行榜类型
-	OpenLevel   int    // 开启等级
-	OpenScore   int64  // 开启积分
-	PreviewTime int64  // 预告时间
-	StartTime   int64  // 开始时间
-	EndTime     int64  // 结束时间
-	ReleaseTime string // 结算发奖时间
-
-	Robot map[int]RobotConfig // 机器人配置
-	Room  map[int]RoomConfig  // 房间配置
-
-	GameId string // 所属游戏ID
-}
-
-func (c *ActivityConfig) GetUid() string {
-	return zconvert.Int64ToStr(c.Id)
-}
-
-func (c *ActivityConfig) CheckCurrent() bool {
-	timeNow := lxtime.NowUninx()
-	return timeNow >= c.StartTime && timeNow <= c.EndTime && c.Raw.Status == 1
-}
-
-func (c *ActivityConfig) ConfInfo(suffix string) *confbase.ConfInfo {
-	tableName := svconst.MYSQL_TABLE_S_ROOMRANK_CONFIG
-	cacheKey := fmt.Sprintf("%s:%s:%s", svconst.REDIS_CACHEP_REFIX, tableName, suffix)
-	timeNow := lxtime.NowUninx()
-	return &confbase.ConfInfo{
-		DbMysql:      svconst.DbConfig,
-		TableName:    fmt.Sprintf("%s_%s", tableName, suffix),
-		KeyName:      "id",
-		CurrentQuery: "typ = ? AND status = ? AND start_time <= ? AND end_time >= ?",
-		CurrentArgs:  []any{c.Typ, 1, timeNow, timeNow},
-		CacheKey:     fmt.Sprintf("%s:%d", cacheKey, c.Id),
-		CacheCurrent: fmt.Sprintf("%s:%d:current", cacheKey, c.Typ),
-		CacheTime:    300,
-	}
-}
-
-// ActivityConfigRaw 房间排行活动配置 原始数据
-type ActivityConfigRaw struct {
-	Id          int64  `gorm:"column:id;primaryKey"` // ID
-	Serial      int64  // 轮次ID
-	Typ         int    // 排行榜类型
-	OpenLevel   int    // 开启等级
-	OpenScore   int64  // 开启积分
-	PreviewTime int64  // 预告时间
-	StartTime   int64  // 开始时间
-	EndTime     int64  // 结束时间
-	ReleaseTime string // 结算发奖时间
-
-	BootConfig string // 机器人配置
-	RoomConfig string // 房间配置
-
-	Ver        string // 版本号
-	Status     int    // 状态 0=关闭 1=开启
-	UpdateTime int64  // 修改时间戳
-}
-
-// GenerateConfigClient 生成给客户端的配置
-func (c *ActivityConfigRaw) GenerateConfigClient() *ActivityConfigClient {
-	configClient := &ActivityConfigClient{
-		Id:          c.Id,
-		Typ:         c.Typ,
-		Serial:      c.Serial,
-		OpenLevel:   c.OpenLevel,
-		OpenScore:   c.OpenScore,
-		PreviewTime: c.PreviewTime,
-		StartTime:   c.StartTime,
-		EndTime:     c.EndTime,
-		ReleaseTime: c.ReleaseTime,
-		Ver:         c.Ver,
-		Status:      c.Status,
-	}
-	return configClient
-}
-
-// ActivityConfigClient 房间排行活动配置 给客户端数据
-type ActivityConfigClient struct {
-	Id          int64  `form:"id" json:"id"`                     // ID
-	Typ         int    `form:"typ" json:"typ"`                   // 排行榜类型
-	Serial      int64  `form:"serial" json:"serial"`             // 轮次ID
-	OpenLevel   int    `form:"open_level" json:"open_level"`     // 开启等级
-	OpenScore   int64  `form:"open_score" json:"open_score"`     // 开启积分
-	PreviewTime int64  `form:"preview_time" json:"preview_time"` // 预告时间
-	StartTime   int64  `form:"start_time" json:"start_time"`     // 开始时间
-	EndTime     int64  `form:"end_time" json:"end_time"`         // 结束时间
-	ReleaseTime string `form:"release_time" json:"release_time"` // 结算发奖时间
-	Ver         string `form:"ver" json:"ver"`                   // 版本号
-	Status      int    `form:"status" json:"status"`             // 状态 0=关闭 1=开启
-}
-
-// RobotConfig 机器人配置
-type RobotConfig struct {
-	Id         int `json:"id"`          // id
-	MinScore   int `json:"min_score"`   // 最低分数
-	TotalScore int `json:"total_score"` // 总分数
-	Range      int `json:"range"`       // 总分浮动范围(%)
-}
-
-// RoomConfig 房间配置
-type RoomConfig struct {
-	Id              int               `json:"id"`                 // id
-	Levels          []int             `json:"level_range"`        // 等级范围
-	UserClass       int               `json:"rating"`             // 评级
-	UserScore       []int             `json:"score_range"`        // 分数范围
-	TotalPlayer     int               `json:"room_user_number"`   // 房间总人数
-	PlayerTypeCount [][]int           `json:"user_type_number"`   // 玩家类型数量
-	AutoRobot       []int             `json:"auto_room"`          // 自动填充机器人
-	InitRobot       [][]int           `json:"disposition_robots"` // 配置机器人
-	Awards          map[string]string `json:"rewards"`            // 奖励
-	SettleScores    []int             `json:"score_adjest"`       // 结算分数调整
-	SettleUserType  []int             `json:"user_type"`          // 结算用户类型
-}
@@ -1,50 +0,0 @@
-package confroomrank
-
-import (
-	"apigame/util/util-lx/lxalilog"
-	"encoding/json"
-)
-
-// Decode 解析配置原始数据
-func (c *ActivityConfig) Decode(gameId string, rawData any) {
-	raw := rawData.(*ActivityConfigRaw)
-	c.GameId = gameId
-	c.Raw = raw
-
-	c.Id = raw.Id
-	c.Typ = raw.Typ
-	c.OpenLevel = raw.OpenLevel
-	c.OpenScore = raw.OpenScore
-	c.PreviewTime = raw.PreviewTime
-	c.StartTime = raw.StartTime
-	c.EndTime = raw.EndTime
-	c.ReleaseTime = raw.ReleaseTime
-
-	c.Robot = make(map[int]RobotConfig)
-	c.Room = make(map[int]RoomConfig)
-
-	// 解析 机器人
-	{
-		configs := make([]RobotConfig, 0)
-		err := json.Unmarshal([]byte(raw.BootConfig), &configs)
-		if err != nil {
-			lxalilog.Errors(err, raw.BootConfig, gameId, raw.Id)
-			return
-		}
-		for _, i2 := range configs {
-			c.Robot[i2.Id] = i2
-		}
-	}
-	// 解析 房间
-	{
-		configs := make([]RoomConfig, 0)
-		err := json.Unmarshal([]byte(raw.RoomConfig), &configs)
-		if err != nil {
-			lxalilog.Errors(err, raw.RoomConfig, gameId, raw.Id)
-			return
-		}
-		for _, i2 := range configs {
-			c.Room[i2.Id] = i2
-		}
-	}
-}
@@ -1,44 +0,0 @@
-package confroomrank
-
-import (
-	"apigame/configs-db/confbase"
-	"apigame/util/util-lx/lxalilog"
-	"apigame/util/util-lx/lxtime"
-)
-
-// GetCurrent 获取 当前配置
-func GetCurrent(gameId string, topType int) (conf *ActivityConfig, has bool) {
-	conf = new(ActivityConfig)
-	conf.Typ = topType
-	has = confbase.GetCurrent[*ActivityConfig, ActivityConfigRaw](gameId, conf)
-	if !has {
-		conf = new(ActivityConfig)
-		conf.Typ = topType
-		has = confbase.FindCurrent[*ActivityConfig, ActivityConfigRaw](gameId, conf)
-	}
-	return
-}
-
-// GetConfig 获取 配置根据Id
-func GetConfig(gameId string, confId int64) (conf *ActivityConfig, has bool) {
-	conf = new(ActivityConfig)
-	has = confbase.GetConfig[*ActivityConfig, ActivityConfigRaw](gameId, confId, conf)
-
-	return
-}
-
-// GetCurrentConfigs 获取当前配置列表
-func GetCurrentConfigs(gameId string) []*ActivityConfigRaw {
-	obj := new(ActivityConfig)
-	info := obj.ConfInfo(gameId)
-	db := info.DbMysql
-	timeNow := lxtime.NowUninx()
-	objs := make([]*ActivityConfigRaw, 0)
-	result := db.Table(info.TableName).Where(
-		"status = ? AND start_time <= ? AND end_time >= ?",
-		1, timeNow, timeNow).Find(&objs)
-	if result.Error != nil {
-		lxalilog.Errors(result.Error, "confroomrank.GetCurrentConfigs error", gameId)
-	}
-	return objs
-}
@@ -1,29 +0,0 @@
-package configs_db
-
-import (
-	"apigame/configs-db/confapi"
-	"apigame/configs-db/confcardholder"
-	"apigame/configs-db/confglobal"
-	"apigame/service-common/svconst"
-)
-
-func Init() bool {
-
-	for _, gameId := range svconst.GameList {
-		_, _ = confapi.GetConfig(gameId)
-	}
-
-	for _, gameId := range svconst.GameList {
-		_, _ = confglobal.GetConfig(gameId)
-	}
-
-	for _, gameId := range svconst.GameListCardHolder {
-		_, _ = confcardholder.GetCurrent(gameId)
-	}
-
-	//for _, gameId := range svconst.GameListRoomRank {
-	//	_, _ = confroomrank.GetCurrent(gameId)
-	//}
-
-	return true
-}
@@ -0,0 +1,48 @@
+package confapi
+
+import (
+	"apigame/configs/confbase"
+	"apigame/service-common/svconst"
+	"fmt"
+)
+
+// ApiGameConfig api游戏配置
+type ApiGameConfig struct {
+	Raw *Raw
+}
+
+func (c *ApiGameConfig) GetUid() string {
+	return c.Raw.GameId
+}
+
+func (c *ApiGameConfig) CheckCurrent() bool {
+	return true
+}
+
+func (c *ApiGameConfig) ConfInfo(suffix string) *confbase.ConfInfo {
+	tableName := "s_game_config"
+	cacheKey := fmt.Sprintf("%s:%s:%s", svconst.REDIS_CACHEP_REFIX, tableName, suffix)
+	return &confbase.ConfInfo{
+		DbMysql:      svconst.DbApi,
+		TableName:    tableName,
+		KeyName:      "gameid",
+		CacheKey:     cacheKey,
+		CacheCurrent: cacheKey + ":current",
+		CacheTime:    300,
+	}
+}
+
+// Raw 配置原始数据
+type Raw struct {
+	AppId  string `gorm:"column:appid"`
+	GameId string `gorm:"column:gameid"`
+	Secret string `gorm:"column:secret"`
+	AppKey string `gorm:"column:appkey"`
+	Name   string `gorm:"column:name"`
+}
+
+// Decode 解析配置原始数据
+func (c *ApiGameConfig) Decode(gameId string, rawData any) {
+	raw := rawData.(*Raw)
+	c.Raw = raw
+}
@@ -0,0 +1,19 @@
+package confapi
+
+import (
+	"apigame/configs/confbase"
+	"errors"
+)
+
+// GetConfig 获取 api游戏配置
+func GetConfig(gameId string) (conf *ApiGameConfig, err error) {
+
+	conf = new(ApiGameConfig)
+	has := confbase.GetConfig[*ApiGameConfig, Raw](gameId, gameId, conf)
+	if !has {
+		err = errors.New("confapi.GetConfig error")
+		return
+	}
+
+	return
+}
@@ -0,0 +1,113 @@
+package confbase
+
+import (
+	"apigame/util/util-lx/lxalilog"
+	"apigame/util/zjson"
+	"apigame/util/zredis"
+	"fmt"
+	"runtime/debug"
+)
+
+var CacheState = 1 // 0=关闭 1=打开
+
+func SaveCache[T IConfData](gameId string, obj T) {
+	info := obj.ConfInfo(gameId)
+	_ = zredis.SetEx(info.CacheKey, zjson.Str(obj), info.CacheTime)
+}
+
+func LoadCache[T IConfData](gameId string, obj T) (has bool) {
+	if CacheState == 0 {
+		return false
+	}
+	has = true
+	info := obj.ConfInfo(gameId)
+	text, err := zredis.Get(info.CacheKey)
+	if err != nil {
+		has = false
+		return
+	}
+	err = zjson.Obj(text, &obj)
+	if err != nil {
+		fmt.Println(err)
+		has = false
+		return
+	}
+	return
+}
+
+func LoadData[T1 IConfData, T2 IConfRawData](gameId string, confId any, obj T1) (has bool) {
+	confRaw := new(T2)
+	info := obj.ConfInfo(gameId)
+	db := info.DbMysql
+	result := db.Table(info.TableName).Where(fmt.Sprintf("%s = ?", info.KeyName), confId).First(confRaw)
+
+	has = result.RowsAffected != 0
+	err := result.Error
+	if err != nil {
+		lxalilog.Errors(err, "confbase.LoadData error", gameId, confId)
+		fmt.Printf("%s", debug.Stack())
+		return
+	}
+	if !has {
+		return
+	}
+
+	obj.Decode(gameId, confRaw)
+	return
+}
+
+func FindDuringTime[T1 IConfData, T2 IConfRawData](obj T1, raw *T2, gameId string) (has bool) {
+	info := obj.ConfInfo(gameId)
+	db := info.DbMysql
+	result := db.Table(info.TableName).Where(info.CurrentQuery, info.CurrentArgs...).First(raw)
+	has = result.RowsAffected != 0
+	return
+}
+
+func GetConfig[T1 IConfData, T2 IConfRawData](gameId string, confId any, obj T1) (has bool) {
+	has = LoadCache(gameId, obj)
+	if has {
+		return
+	}
+	has = LoadData[T1, T2](gameId, confId, obj)
+	if !has {
+		return
+	}
+	SaveCache(gameId, obj)
+	return
+}
+
+// GetCurrent 获取 当前配置
+func GetCurrent[T1 IConfData, T2 IConfRawData](gameId string, obj T1) bool {
+	has := false
+	info := obj.ConfInfo(gameId)
+	currentKey := info.CacheCurrent
+	currentId := zredis.GetString(currentKey)
+	if currentId != "" {
+		has = GetConfig[T1, T2](gameId, currentId, obj)
+		if has {
+			if !obj.CheckCurrent() {
+				has = false
+			}
+		}
+	}
+	return has
+}
+
+// FindCurrent 查找 当前配置
+func FindCurrent[T1 IConfData, T2 IConfRawData](gameId string, obj T1) bool {
+	has := false
+	info := obj.ConfInfo(gameId)
+	currentKey := info.CacheCurrent
+	currentId := zredis.GetString(currentKey)
+	confRaw := new(T2)
+	has = FindDuringTime[T1, T2](obj, confRaw, gameId)
+	if has {
+		obj.Decode(gameId, confRaw)
+		SaveCache(gameId, obj)
+		has = true
+		currentId = obj.GetUid()
+		_ = zredis.Set(currentKey, currentId)
+	}
+	return has
+}
@@ -0,0 +1,31 @@
+package confbase
+
+import "gorm.io/gorm"
+
+// ConfInfo 配置对象信息
+type ConfInfo struct {
+	DbMysql      *gorm.DB
+	TableName    string
+	KeyName      string
+	CurrentQuery any
+	CurrentArgs  []any
+	CacheKey     string
+	CacheCurrent string
+	CacheTime    int
+}
+
+// IConfData 配置对象
+type IConfData interface {
+	// ConfInfo redis存储信息
+	ConfInfo(suffix string) *ConfInfo
+	// Decode 解码
+	Decode(gameId string, rawData any)
+	// GetUid 获取keyID
+	GetUid() string
+	// CheckCurrent 判断当前开放
+	CheckCurrent() bool
+}
+
+// IConfRawData mysql存储对象
+type IConfRawData interface {
+}
@@ -0,0 +1,153 @@
+package confcardholder
+
+import (
+	"apigame/configs/confbase"
+	"apigame/service-common/svconst"
+	"apigame/util/util-lx/lxtime"
+	"apigame/util/zconvert"
+	"fmt"
+)
+
+// ActivityConfig 卡牌活动配置 分析后数据
+type ActivityConfig struct {
+	Raw *ActivityConfigRaw `json:"-"`
+
+	Id          int64  // ID
+	OpenLevel   int    // 开启等级
+	PreviewTime int64  // 预告时间
+	StartTime   int64  // 开始时间
+	EndTime     int64  // 结束时间
+	Round       int    // 轮数
+	IconPath    string // icon资源路径
+
+	Awards               map[string]string               // 奖励配置
+	AlbumConfig          map[int]AlbumConfig             // 卡组配置
+	CardConfig           map[int]CardConfig              // 卡牌配置
+	CardholderConfig     map[int]OpenCardholderConfig    // 卡包开卡规则
+	NormalCardStarConfig map[string]NormalCardStarConfig // k=ID_用户序列_用户分组 卡片星级配置
+	CardSequenceConfig   map[string]CardSequenceConfig   // k=ID_用户序列_用户分组 卡片星级对应卡牌配置
+	StarShopConfig       map[int]StarShopConfig          // 星星商店配置
+	ListSequenceId       []int                           // 用户序列组ID列表
+
+	Client *ActivityConfigClient
+	GameId string // 所属游戏ID
+}
+
+func (c *ActivityConfig) GetUid() string {
+	return zconvert.Int64ToStr(c.Id)
+}
+
+func (c *ActivityConfig) CheckCurrent() bool {
+	timeNow := lxtime.NowUninx()
+	return timeNow >= c.StartTime && timeNow <= c.EndTime && c.Raw.Status == 1
+}
+
+func (c *ActivityConfig) ConfInfo(suffix string) *confbase.ConfInfo {
+	tableName := svconst.MYSQL_TABLE_S_CARDHOLDER_CONFIG
+	cacheKey := fmt.Sprintf("%s:%s:%s", svconst.REDIS_CACHEP_REFIX, tableName, suffix)
+	timeNow := lxtime.NowUninx()
+	return &confbase.ConfInfo{
+		DbMysql:      svconst.DbConfig,
+		TableName:    fmt.Sprintf("%s_%s", tableName, suffix),
+		KeyName:      "id",
+		CurrentQuery: "status = ? AND start_time <= ? AND end_time >= ?",
+		CurrentArgs:  []any{1, timeNow, timeNow},
+		CacheKey:     fmt.Sprintf("%s:%d", cacheKey, c.Id),
+		CacheCurrent: cacheKey + ":current",
+		CacheTime:    300,
+	}
+}
+
+// ActivityConfigRaw 卡牌活动配置 原始数据
+type ActivityConfigRaw struct {
+	Id          int64  `gorm:"column:id;primaryKey"` // ID
+	OpenLevel   int    // 开启等级
+	PreviewTime int64  // 预告时间
+	StartTime   int64  // 开始时间
+	EndTime     int64  // 结束时间
+	Round       int    // 轮数
+	IconPath    string // icon资源路径
+
+	Awards                 string // 奖励配置
+	AlbumConfig            string // 卡组配置
+	CardConfig             string // 卡牌配置
+	CardHolderConfig       string // 卡包开卡规则
+	NormalCardStarSequence string // 卡片星级配置
+	CardSequenceConfig     string // 卡片星级对应卡牌配置
+	StarShopConfig         string // 星星商店配置
+
+	Ver        string // 版本号
+	Status     int    // 状态 0=关闭 1=开启
+	UpdateTime int64  // 修改时间戳
+}
+
+// ActivityConfigClient 卡牌活动配置 给客户端数据
+type ActivityConfigClient struct {
+	Id          int64                  `form:"id" json:"id"`                     // ID
+	Round       int                    `form:"round" json:"round"`               // 轮数
+	IconPath    string                 `form:"icon_path" json:"icon_path"`       // icon资源路径
+	RoundAwards map[string]string      `form:"round_awards" json:"round_awards"` // 轮次奖励配置
+	Albums      []AlbumConfig          `form:"albums" json:"albums"`             // 卡组配置
+	Cards       []CardConfig           `form:"cards" json:"cards"`               // 卡牌配置
+	Holders     []OpenCardholderConfig `form:"holders" json:"holders"`           // 卡包开卡规则
+	StarShop    []StarShopConfig       `form:"star_shop" json:"star_shop"`       // 星星商店配置
+}
+
+// AlbumConfig 卡组表
+type AlbumConfig struct {
+	SetId     int               `json:"set_id"`     // 卡组名
+	Name      int               `json:"name"`       // 卡组图片
+	Icon      string            `json:"icon"`       // 卡组id
+	Rewards   map[string]string `json:"rewards"`    // 集齐奖励 k=轮次
+	StartTime int64             `json:"start_time"` // 开始时间
+	EndTime   int64             `json:"end_time"`   // 结束时间
+}
+
+// CardConfig 卡牌表
+type CardConfig struct {
+	Id     int    `json:"id"`          // ID
+	Name   int    `json:"name"`        // 卡牌名字
+	Icon   string `json:"icon"`        // 卡牌图标
+	Desc   int    `json:"desc"`        // 卡牌描述
+	SetId  int    `json:"album_setid"` // 卡组id
+	Star   int    `json:"star"`        // 星级
+	IsGold int    `json:"is_gold"`     // 是否是金卡
+	IsSend int    `json:"is_send"`     // 卡片是否可赠送
+}
+
+// OpenCardholderConfig 卡包开卡规则表
+type OpenCardholderConfig struct {
+	Id                     int    `json:"id"`                        // ID
+	CardPackIcon           string `json:"img"`                       // 卡包资源名
+	IsGoldCardholder       int    `json:"is_gold_card_holder"`       // 是否是金卡包
+	IsNew                  int    `json:"is_new"`                    // 是否是新卡包
+	GuaranteedStarCardId   int    `json:"guaranteed_star_card_id"`   // 保底卡星级序列ID
+	NormalCardNumber       int    `json:"normal_card_number"`        // 非保底卡数量
+	MinimumGuaranteeCardId int    `json:"minimum_guarantee_card_id"` // 非保底卡牌序列ID
+	ActivityId             int    `json:"activity_id"`               // 对应活动ID
+	Star                   int    `json:"star"`                      // star
+	Name                   int    `json:"name"`                      // name
+}
+
+// NormalCardStarConfig 非保底卡星级ID
+type NormalCardStarConfig struct {
+	Id                   int   `json:"id"`                      // ID
+	SequenceId           int   `json:"user_sequence_id"`        // 用户序列组ID
+	Cohort               int   `json:"cohort"`                  // 用户分组
+	NormalCardSequenceId []int `json:"normal_card_sequence_id"` // 非保底星级序列
+}
+
+// CardSequenceConfig 星级ID对应的卡片
+type CardSequenceConfig struct {
+	Id         int   `json:"id"`               // ID
+	SequenceId int   `json:"user_sequence_id"` // 用户序列组ID
+	Cohort     int   `json:"cohort"`           // 用户分组
+	CardIdList []int `json:"card_id_list"`     // 卡牌抽取序列
+}
+
+// StarShopConfig 星星商店配置
+type StarShopConfig struct {
+	Id             int    `json:"id"`               // ID
+	NeedStarNumber int    `json:"need_star_number"` // 需求星星数
+	CardBagIds     string `json:"card_bag_ids"`     // 可换取的卡包ID {卡包类型,卡包ID,卡包数量}
+}
@@ -0,0 +1,177 @@
+package confcardholder
+
+import (
+	"apigame/util/util-lx/lxalilog"
+	"apigame/util/zslice"
+	"encoding/json"
+	"errors"
+	"fmt"
+)
+
+// Decode 解析配置原始数据
+func (c *ActivityConfig) Decode(gameId string, rawData any) {
+	raw := rawData.(*ActivityConfigRaw)
+	c.GameId = gameId
+	c.Raw = raw
+
+	c.Id = raw.Id
+	c.OpenLevel = raw.OpenLevel
+	c.PreviewTime = raw.PreviewTime
+	c.StartTime = raw.StartTime
+	c.EndTime = raw.EndTime
+	c.Round = raw.Round
+	c.IconPath = raw.IconPath
+
+	c.Awards = make(map[string]string)
+	c.AlbumConfig = make(map[int]AlbumConfig)
+	c.CardConfig = make(map[int]CardConfig)
+	c.CardholderConfig = make(map[int]OpenCardholderConfig)
+	c.NormalCardStarConfig = make(map[string]NormalCardStarConfig)
+	c.CardSequenceConfig = make(map[string]CardSequenceConfig)
+	c.StarShopConfig = make(map[int]StarShopConfig)
+	// 解析奖励
+	{
+		err := json.Unmarshal([]byte(raw.Awards), &c.Awards)
+		if err != nil {
+			lxalilog.Errors(err, raw.Awards, gameId, raw.Id)
+			return
+		}
+	}
+	// 卡组配置
+	{
+		configs := make([]AlbumConfig, 0)
+		err := json.Unmarshal([]byte(raw.AlbumConfig), &configs)
+		if err != nil {
+			lxalilog.Errors(err, raw.AlbumConfig, gameId, raw.Id)
+			return
+		}
+		for _, i2 := range configs {
+			c.AlbumConfig[i2.SetId] = i2
+		}
+	}
+	// 卡牌配置
+	{
+		configs := make([]CardConfig, 0)
+		err := json.Unmarshal([]byte(raw.CardConfig), &configs)
+		if err != nil {
+			lxalilog.Errors(err, raw.CardConfig, gameId, raw.Id)
+			return
+		}
+		for _, i2 := range configs {
+			c.CardConfig[i2.Id] = i2
+		}
+	}
+	// 卡包开卡规则
+	{
+		configs := make([]OpenCardholderConfig, 0)
+		err := json.Unmarshal([]byte(raw.CardHolderConfig), &configs)
+		if err != nil {
+			lxalilog.Errors(err, raw.CardHolderConfig, gameId, raw.Id)
+			return
+		}
+		for _, i2 := range configs {
+			c.CardholderConfig[i2.Id] = i2
+		}
+	}
+	// 卡片星级配置
+	{
+		configs := make([]NormalCardStarConfig, 0)
+		err := json.Unmarshal([]byte(raw.NormalCardStarSequence), &configs)
+		if err != nil {
+			lxalilog.Errors(err, raw.NormalCardStarSequence, gameId, raw.Id)
+			return
+		}
+		for _, i2 := range configs {
+			combineId := CombineIdSequenceIdCohort(i2.Id, i2.SequenceId, i2.Cohort)
+			c.NormalCardStarConfig[combineId] = i2
+			if !zslice.Contains(c.ListSequenceId, i2.SequenceId) {
+				c.ListSequenceId = append(c.ListSequenceId, i2.SequenceId)
+			}
+		}
+	}
+	// 卡片星级对应卡牌配置
+	{
+		configs := make([]CardSequenceConfig, 0)
+		err := json.Unmarshal([]byte(raw.CardSequenceConfig), &configs)
+		if err != nil {
+			lxalilog.Errors(err, raw.CardSequenceConfig, gameId, raw.Id)
+			return
+		}
+		for _, i2 := range configs {
+			combineId := CombineIdSequenceIdCohort(i2.Id, i2.SequenceId, i2.Cohort)
+			c.CardSequenceConfig[combineId] = i2
+			if !zslice.Contains(c.ListSequenceId, i2.SequenceId) {
+				c.ListSequenceId = append(c.ListSequenceId, i2.SequenceId)
+			}
+		}
+	}
+	// 星星商店配置
+	{
+		configs := make([]StarShopConfig, 0)
+		err := json.Unmarshal([]byte(raw.StarShopConfig), &configs)
+		if err != nil {
+			lxalilog.Errors(err, raw.StarShopConfig, gameId, raw.Id)
+			return
+		}
+		for _, i2 := range configs {
+			c.StarShopConfig[i2.Id] = i2
+		}
+	}
+
+	c.GenerateConfigClient()
+}
+
+// GenerateConfigClient 生成给客户端的配置
+func (c *ActivityConfig) GenerateConfigClient() {
+	configClient := &ActivityConfigClient{
+		Id:          c.Id,
+		Round:       c.Round,
+		IconPath:    c.IconPath,
+		RoundAwards: c.Awards,
+		Albums:      make([]AlbumConfig, 0),
+		Cards:       make([]CardConfig, 0),
+		Holders:     make([]OpenCardholderConfig, 0),
+		StarShop:    make([]StarShopConfig, 0),
+	}
+	for _, i2 := range c.AlbumConfig {
+		configClient.Albums = append(configClient.Albums, i2)
+	}
+	for _, i2 := range c.CardConfig {
+		configClient.Cards = append(configClient.Cards, i2)
+	}
+	for _, i2 := range c.CardholderConfig {
+		configClient.Holders = append(configClient.Holders, i2)
+	}
+	for _, i2 := range c.StarShopConfig {
+		configClient.StarShop = append(configClient.StarShop, i2)
+	}
+	c.Client = configClient
+}
+
+// CombineIdSequenceIdCohort 组合ID k=ID_用户序列_用户分组
+func CombineIdSequenceIdCohort(id, sequenceId, cohort int) string {
+	return fmt.Sprintf("%d_%d_%d", id, sequenceId, cohort)
+}
+
+// FindNormalCardStarConfig 查找配置 非保底卡星级ID
+func (c *ActivityConfig) FindNormalCardStarConfig(id, sequenceId, cohort int) (conf NormalCardStarConfig, has bool) {
+	combineId := CombineIdSequenceIdCohort(id, sequenceId, cohort)
+	conf, has = c.NormalCardStarConfig[combineId]
+	if !has {
+		lxalilog.Errors(errors.New("ht_cardholder NormalCardStarConfig error"), id, sequenceId, cohort)
+	}
+	return
+}
+
+// FindCardSequenceConfig 查找配置 星级ID对应的卡片
+func (c *ActivityConfig) FindCardSequenceConfig(id, sequenceId, cohort int) (conf CardSequenceConfig, has bool) {
+	combineId := CombineIdSequenceIdCohort(id, sequenceId, cohort)
+	conf, has = c.CardSequenceConfig[combineId]
+	if !has {
+		lxalilog.Errors(errors.New("ht_cardholder CardSequenceConfig error"), id, sequenceId, cohort)
+		fmt.Println(id)
+		fmt.Println(sequenceId)
+		fmt.Println(cohort)
+	}
+	return
+}
@@ -0,0 +1,24 @@
+package confcardholder
+
+import (
+	"apigame/configs/confbase"
+)
+
+// GetCurrent 获取 当前配置
+func GetCurrent(gameId string) (conf *ActivityConfig, has bool) {
+	conf = new(ActivityConfig)
+	has = confbase.GetCurrent[*ActivityConfig, ActivityConfigRaw](gameId, conf)
+	if !has {
+		conf = new(ActivityConfig)
+		has = confbase.FindCurrent[*ActivityConfig, ActivityConfigRaw](gameId, conf)
+	}
+	return
+}
+
+// GetConfig 获取 配置根据Id
+func GetConfig(gameId string, confId int64) (conf *ActivityConfig, has bool) {
+	conf = new(ActivityConfig)
+	has = confbase.GetConfig[*ActivityConfig, ActivityConfigRaw](gameId, confId, conf)
+
+	return
+}
@@ -0,0 +1,67 @@
+package confglobal
+
+import (
+	"apigame/configs/confbase"
+	"apigame/service-common/svconst"
+	"apigame/util/util-lx/lxalilog"
+	"encoding/json"
+	"fmt"
+)
+
+// GlobalConfig 全局配置
+type GlobalConfig struct {
+	Raw        *Raw `json:"-"`
+	Names      []string
+	Avatars    []string
+	AvatarPath string
+}
+
+func (c *GlobalConfig) GetUid() string {
+	return c.Raw.GameId
+}
+
+func (c *GlobalConfig) CheckCurrent() bool {
+	return true
+}
+
+func (c *GlobalConfig) ConfInfo(suffix string) *confbase.ConfInfo {
+	tableName := "s_game_global_config"
+	cacheKey := fmt.Sprintf("%s:%s:%s", svconst.REDIS_CACHEP_REFIX, tableName, suffix)
+	return &confbase.ConfInfo{
+		DbMysql:      svconst.DbConfig,
+		TableName:    tableName,
+		KeyName:      "gameid",
+		CacheKey:     cacheKey,
+		CacheCurrent: cacheKey + ":current",
+		CacheTime:    300,
+	}
+}
+
+// Raw 配置原始数据
+type Raw struct {
+	GameId       string `gorm:"column:gameid"`
+	NameConfig   string
+	AvatarConfig string
+	AvatarPath   string
+}
+
+// Decode 解析配置原始数据
+func (c *GlobalConfig) Decode(gameId string, rawData any) {
+	raw := rawData.(*Raw)
+	c.Raw = raw
+	{
+		err := json.Unmarshal([]byte(raw.NameConfig), &c.Names)
+		if err != nil {
+			lxalilog.Errors(err, raw.NameConfig, gameId, raw.GameId)
+			return
+		}
+	}
+	{
+		err := json.Unmarshal([]byte(raw.AvatarConfig), &c.Avatars)
+		if err != nil {
+			lxalilog.Errors(err, raw.AvatarConfig, gameId, raw.GameId)
+			return
+		}
+	}
+	c.AvatarPath = raw.AvatarPath
+}
@@ -0,0 +1,19 @@
+package confglobal
+
+import (
+	"apigame/configs/confbase"
+	"errors"
+)
+
+// GetConfig 获取 api游戏配置
+func GetConfig(gameId string) (conf *GlobalConfig, err error) {
+
+	conf = new(GlobalConfig)
+	has := confbase.GetConfig[*GlobalConfig, Raw](gameId, gameId, conf)
+	if !has {
+		err = errors.New("confglobal.GetConfig error")
+		return
+	}
+
+	return
+}
@@ -1,282 +0,0 @@
-// DO NOT EDIT!
-// This code is auto generated by go-xlsx-exporter
-// VERSION 1.3
-// go-protobuf v1.27.1
-
-package configs
-
-import (
-	reflect "reflect"
-	sync "sync"	
-	
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-/* type ConvertHandler func (field string, value interface{}) interface{}
-
-type MessageBase struct {
-	
-}
-
-func (item *MessageBase) GetConvertData(field string, value interface{}) {
-
-} */
-// Defined in table: data/abtest.xlsx:abtest;
-type AbTestCfg struct { 
-    state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-    ID uint32 `protobuf:"varint,1,opt,name=ID,proto3uint32" json:"ID,omitempty"`  /** 编号 */ 
-     
-    Name string `protobuf:"bytes,2,opt,name=Name,proto3string" json:"Name,omitempty"`  /** 分组名 */ 
-     
-    Min uint32 `protobuf:"varint,3,opt,name=Min,proto3uint32" json:"Min,omitempty"`  /** ID下限 */ 
-     
-    Max uint32 `protobuf:"varint,4,opt,name=Max,proto3uint32" json:"Max,omitempty"`  /** ID上限 */ 
-     
-    Condition string `protobuf:"bytes,5,opt,name=Condition,proto3string" json:"Condition,omitempty"`  /** 条件 */ 
-     
-    Config string `protobuf:"bytes,6,opt,name=Config,proto3string" json:"Config,omitempty"`  /** 配置 */ 
-     
-}
-
-func (x *AbTestCfg) Reset() {
-	*x = AbTestCfg{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_config_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *AbTestCfg) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AbTestCfg) ProtoMessage() {}
-
-func (x *AbTestCfg) ProtoReflect() protoreflect.Message {
-	mi := &file_config_proto_msgTypes[0]
-	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 AbTestCfg.ProtoReflect.Descriptor instead.
-func (*AbTestCfg) Descriptor() ([]byte, []int) {
-	return file_config_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *AbTestCfg) GetID() uint32 {
-	if x != nil {
-		return x.ID
-	}
-	return 0
-}
-
-func (x *AbTestCfg) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *AbTestCfg) GetMin() uint32 {
-	if x != nil {
-		return x.Min
-	}
-	return 0
-}
-
-func (x *AbTestCfg) GetMax() uint32 {
-	if x != nil {
-		return x.Max
-	}
-	return 0
-}
-
-func (x *AbTestCfg) GetCondition() string {
-	if x != nil {
-		return x.Condition
-	}
-	return ""
-}
-
-func (x *AbTestCfg) GetConfig() string {
-	if x != nil {
-		return x.Config
-	}
-	return ""
-}
-
-
-// Defined in table: data/abtest.xlsx:abtest;
-type AbTestCfg_ARRAY struct { 
-    state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-		
-    Items []*AbTestCfg `protobuf:"bytes,1,rep,name=Items,proto3*AbTestCfg" json:"Items,omitempty"` 
-     
-}
-
-func (x *AbTestCfg_ARRAY) Reset() {
-	*x = AbTestCfg_ARRAY{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_config_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *AbTestCfg_ARRAY) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AbTestCfg_ARRAY) ProtoMessage() {}
-
-func (x *AbTestCfg_ARRAY) ProtoReflect() protoreflect.Message {
-	mi := &file_config_proto_msgTypes[1]
-	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 AbTestCfg_ARRAY.ProtoReflect.Descriptor instead.
-func (*AbTestCfg_ARRAY) Descriptor() ([]byte, []int) {
-	return file_config_proto_rawDescGZIP(), []int{1}
-}
-    
-func (x *AbTestCfg_ARRAY) GetItems() []*AbTestCfg {
-	if x != nil {
-		return x.Items
-	}
-	return nil
-}
-
-
-var File_config_proto protoreflect.FileDescriptor
-
-var file_config_proto_rawDesc = []byte{
-0x0a,0x0c,0x63,0x6f,0x6e,0x66,0x69,0x67,0x2e,0x70,0x72,0x6f,0x74,0x6f,0x12,0x07,
-0x63,0x6f,0x6e,0x66,0x69,0x67,0x73,0x22,0x89,0x01,0x0a,0x09,0x41,0x62,0x54,0x65,
-0x73,0x74,0x43,0x66,0x67,0x12,0x0e,0x0a,0x02,0x49,0x44,0x18,0x01,0x20,0x01,0x28,
-0x0d,0x52,0x02,0x49,0x44,0x12,0x12,0x0a,0x04,0x4e,0x61,0x6d,0x65,0x18,0x02,0x20,
-0x01,0x28,0x09,0x52,0x04,0x4e,0x61,0x6d,0x65,0x12,0x10,0x0a,0x03,0x4d,0x69,0x6e,
-0x18,0x03,0x20,0x01,0x28,0x0d,0x52,0x03,0x4d,0x69,0x6e,0x12,0x10,0x0a,0x03,0x4d,
-0x61,0x78,0x18,0x04,0x20,0x01,0x28,0x0d,0x52,0x03,0x4d,0x61,0x78,0x12,0x1c,0x0a,
-0x09,0x43,0x6f,0x6e,0x64,0x69,0x74,0x69,0x6f,0x6e,0x18,0x05,0x20,0x01,0x28,0x09,
-0x52,0x09,0x43,0x6f,0x6e,0x64,0x69,0x74,0x69,0x6f,0x6e,0x12,0x16,0x0a,0x06,0x43,
-0x6f,0x6e,0x66,0x69,0x67,0x18,0x06,0x20,0x01,0x28,0x09,0x52,0x06,0x43,0x6f,0x6e,
-0x66,0x69,0x67,0x22,0x3b,0x0a,0x0f,0x41,0x62,0x54,0x65,0x73,0x74,0x43,0x66,0x67,
-0x5f,0x41,0x52,0x52,0x41,0x59,0x12,0x28,0x0a,0x05,0x49,0x74,0x65,0x6d,0x73,0x18,
-0x01,0x20,0x03,0x28,0x0b,0x32,0x12,0x2e,0x63,0x6f,0x6e,0x66,0x69,0x67,0x73,0x2e,
-0x41,0x62,0x54,0x65,0x73,0x74,0x43,0x66,0x67,0x52,0x05,0x49,0x74,0x65,0x6d,0x73,
-0x62,0x06,0x70,0x72,0x6f,0x74,0x6f,0x33,
-}
-
-var (
-	file_config_proto_rawDescOnce sync.Once
-	file_config_proto_rawDescData = file_config_proto_rawDesc
-)
-
-func file_config_proto_rawDescGZIP() []byte {
-	file_config_proto_rawDescOnce.Do(func() {
-		file_config_proto_rawDescData = protoimpl.X.CompressGZIP(file_config_proto_rawDescData)
-	})
-	return file_config_proto_rawDescData
-}
-
-var file_config_proto_enumTypes = make([]protoimpl.EnumInfo, 0)
-var file_config_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_config_proto_goTypes = []interface{}{
-	 (*AbTestCfg)(nil),				// 0: configs.AbTestCfg
-	 (*AbTestCfg_ARRAY)(nil),				// 1: configs.AbTestCfg_ARRAY
-	
-}
-
-var file_config_proto_depIdxs = []int32{
-	0, // 0: configs.AbTestCfg_ARRAY:type_name -> configs.AbTestCfg
-1, // [1:1] is the sub-list for method output_type
-1, // [1:1] is the sub-list for method input_type
-1, // [1:1] is the sub-list for extension type_name
-1, // [1:1] is the sub-list for extension extendee
-0, // [0:1] is the sub-list for field type_name
-}
-
-func file_config_proto_init() {
-	if File_config_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AbTestCfg); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		
-		file_config_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AbTestCfg_ARRAY); 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{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_config_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_config_proto_goTypes,
-		DependencyIndexes: file_config_proto_depIdxs,
-		EnumInfos:         file_config_proto_enumTypes,
-		MessageInfos:      file_config_proto_msgTypes,
-	}.Build()
-	File_config_proto = out.File
-	file_config_proto_rawDesc = nil
-	file_config_proto_goTypes = nil
-	file_config_proto_depIdxs = nil
-}
-
-func init() { 
-	file_config_proto_init()
-}
 \ No newline at end of file
@@ -0,0 +1,129 @@
+package confroomrank
+
+import (
+	"apigame/configs/confbase"
+	"apigame/service-common/svconst"
+	"apigame/util/util-lx/lxtime"
+	"apigame/util/zconvert"
+	"fmt"
+)
+
+// ActivityConfig 房间排行活动配置 分析后数据
+type ActivityConfig struct {
+	Raw *ActivityConfigRaw `json:"-"`
+
+	Id          int64  // ID
+	Typ         int    // 排行榜类型
+	OpenLevel   int    // 开启等级
+	OpenScore   int64  // 开启积分
+	PreviewTime int64  // 预告时间
+	StartTime   int64  // 开始时间
+	EndTime     int64  // 结束时间
+	ReleaseTime string // 结算发奖时间
+
+	Robot map[int]RobotConfig // 机器人配置
+	Room  map[int]RoomConfig  // 房间配置
+
+	GameId string // 所属游戏ID
+}
+
+func (c *ActivityConfig) GetUid() string {
+	return zconvert.Int64ToStr(c.Id)
+}
+
+func (c *ActivityConfig) CheckCurrent() bool {
+	timeNow := lxtime.NowUninx()
+	return timeNow >= c.StartTime && timeNow <= c.EndTime && c.Raw.Status == 1
+}
+
+func (c *ActivityConfig) ConfInfo(suffix string) *confbase.ConfInfo {
+	tableName := svconst.MYSQL_TABLE_S_ROOMRANK_CONFIG
+	cacheKey := fmt.Sprintf("%s:%s:%s", svconst.REDIS_CACHEP_REFIX, tableName, suffix)
+	timeNow := lxtime.NowUninx()
+	return &confbase.ConfInfo{
+		DbMysql:      svconst.DbConfig,
+		TableName:    fmt.Sprintf("%s_%s", tableName, suffix),
+		KeyName:      "id",
+		CurrentQuery: "typ = ? AND status = ? AND start_time <= ? AND end_time >= ?",
+		CurrentArgs:  []any{c.Typ, 1, timeNow, timeNow},
+		CacheKey:     fmt.Sprintf("%s:%d", cacheKey, c.Id),
+		CacheCurrent: fmt.Sprintf("%s:%d:current", cacheKey, c.Typ),
+		CacheTime:    300,
+	}
+}
+
+// ActivityConfigRaw 房间排行活动配置 原始数据
+type ActivityConfigRaw struct {
+	Id          int64  `gorm:"column:id;primaryKey"` // ID
+	Serial      int64  // 轮次ID
+	Typ         int    // 排行榜类型
+	OpenLevel   int    // 开启等级
+	OpenScore   int64  // 开启积分
+	PreviewTime int64  // 预告时间
+	StartTime   int64  // 开始时间
+	EndTime     int64  // 结束时间
+	ReleaseTime string // 结算发奖时间
+
+	BootConfig string // 机器人配置
+	RoomConfig string // 房间配置
+
+	Ver        string // 版本号
+	Status     int    // 状态 0=关闭 1=开启
+	UpdateTime int64  // 修改时间戳
+}
+
+// GenerateConfigClient 生成给客户端的配置
+func (c *ActivityConfigRaw) GenerateConfigClient() *ActivityConfigClient {
+	configClient := &ActivityConfigClient{
+		Id:          c.Id,
+		Typ:         c.Typ,
+		Serial:      c.Serial,
+		OpenLevel:   c.OpenLevel,
+		OpenScore:   c.OpenScore,
+		PreviewTime: c.PreviewTime,
+		StartTime:   c.StartTime,
+		EndTime:     c.EndTime,
+		ReleaseTime: c.ReleaseTime,
+		Ver:         c.Ver,
+		Status:      c.Status,
+	}
+	return configClient
+}
+
+// ActivityConfigClient 房间排行活动配置 给客户端数据
+type ActivityConfigClient struct {
+	Id          int64  `form:"id" json:"id"`                     // ID
+	Typ         int    `form:"typ" json:"typ"`                   // 排行榜类型
+	Serial      int64  `form:"serial" json:"serial"`             // 轮次ID
+	OpenLevel   int    `form:"open_level" json:"open_level"`     // 开启等级
+	OpenScore   int64  `form:"open_score" json:"open_score"`     // 开启积分
+	PreviewTime int64  `form:"preview_time" json:"preview_time"` // 预告时间
+	StartTime   int64  `form:"start_time" json:"start_time"`     // 开始时间
+	EndTime     int64  `form:"end_time" json:"end_time"`         // 结束时间
+	ReleaseTime string `form:"release_time" json:"release_time"` // 结算发奖时间
+	Ver         string `form:"ver" json:"ver"`                   // 版本号
+	Status      int    `form:"status" json:"status"`             // 状态 0=关闭 1=开启
+}
+
+// RobotConfig 机器人配置
+type RobotConfig struct {
+	Id         int `json:"id"`          // id
+	MinScore   int `json:"min_score"`   // 最低分数
+	TotalScore int `json:"total_score"` // 总分数
+	Range      int `json:"range"`       // 总分浮动范围(%)
+}
+
+// RoomConfig 房间配置
+type RoomConfig struct {
+	Id              int               `json:"id"`                 // id
+	Levels          []int             `json:"level_range"`        // 等级范围
+	UserClass       int               `json:"rating"`             // 评级
+	UserScore       []int             `json:"score_range"`        // 分数范围
+	TotalPlayer     int               `json:"room_user_number"`   // 房间总人数
+	PlayerTypeCount [][]int           `json:"user_type_number"`   // 玩家类型数量
+	AutoRobot       []int             `json:"auto_room"`          // 自动填充机器人
+	InitRobot       [][]int           `json:"disposition_robots"` // 配置机器人
+	Awards          map[string]string `json:"rewards"`            // 奖励
+	SettleScores    []int             `json:"score_adjest"`       // 结算分数调整
+	SettleUserType  []int             `json:"user_type"`          // 结算用户类型
+}
@@ -0,0 +1,50 @@
+package confroomrank
+
+import (
+	"apigame/util/util-lx/lxalilog"
+	"encoding/json"
+)
+
+// Decode 解析配置原始数据
+func (c *ActivityConfig) Decode(gameId string, rawData any) {
+	raw := rawData.(*ActivityConfigRaw)
+	c.GameId = gameId
+	c.Raw = raw
+
+	c.Id = raw.Id
+	c.Typ = raw.Typ
+	c.OpenLevel = raw.OpenLevel
+	c.OpenScore = raw.OpenScore
+	c.PreviewTime = raw.PreviewTime
+	c.StartTime = raw.StartTime
+	c.EndTime = raw.EndTime
+	c.ReleaseTime = raw.ReleaseTime
+
+	c.Robot = make(map[int]RobotConfig)
+	c.Room = make(map[int]RoomConfig)
+
+	// 解析 机器人
+	{
+		configs := make([]RobotConfig, 0)
+		err := json.Unmarshal([]byte(raw.BootConfig), &configs)
+		if err != nil {
+			lxalilog.Errors(err, raw.BootConfig, gameId, raw.Id)
+			return
+		}
+		for _, i2 := range configs {
+			c.Robot[i2.Id] = i2
+		}
+	}
+	// 解析 房间
+	{
+		configs := make([]RoomConfig, 0)
+		err := json.Unmarshal([]byte(raw.RoomConfig), &configs)
+		if err != nil {
+			lxalilog.Errors(err, raw.RoomConfig, gameId, raw.Id)
+			return
+		}
+		for _, i2 := range configs {
+			c.Room[i2.Id] = i2
+		}
+	}
+}
@@ -0,0 +1,44 @@
+package confroomrank
+
+import (
+	"apigame/configs/confbase"
+	"apigame/util/util-lx/lxalilog"
+	"apigame/util/util-lx/lxtime"
+)
+
+// GetCurrent 获取 当前配置
+func GetCurrent(gameId string, topType int) (conf *ActivityConfig, has bool) {
+	conf = new(ActivityConfig)
+	conf.Typ = topType
+	has = confbase.GetCurrent[*ActivityConfig, ActivityConfigRaw](gameId, conf)
+	if !has {
+		conf = new(ActivityConfig)
+		conf.Typ = topType
+		has = confbase.FindCurrent[*ActivityConfig, ActivityConfigRaw](gameId, conf)
+	}
+	return
+}
+
+// GetConfig 获取 配置根据Id
+func GetConfig(gameId string, confId int64) (conf *ActivityConfig, has bool) {
+	conf = new(ActivityConfig)
+	has = confbase.GetConfig[*ActivityConfig, ActivityConfigRaw](gameId, confId, conf)
+
+	return
+}
+
+// GetCurrentConfigs 获取当前配置列表
+func GetCurrentConfigs(gameId string) []*ActivityConfigRaw {
+	obj := new(ActivityConfig)
+	info := obj.ConfInfo(gameId)
+	db := info.DbMysql
+	timeNow := lxtime.NowUninx()
+	objs := make([]*ActivityConfigRaw, 0)
+	result := db.Table(info.TableName).Where(
+		"status = ? AND start_time <= ? AND end_time >= ?",
+		1, timeNow, timeNow).Find(&objs)
+	if result.Error != nil {
+		lxalilog.Errors(result.Error, "confroomrank.GetCurrentConfigs error", gameId)
+	}
+	return objs
+}
@@ -1,44 +0,0 @@
-package configs
-
-import (
-	"fmt"
-	"github.com/astaxie/beego"
-	"reflect"
-)
-
-func Init() bool {
-	fmt.Println("configs Init")
-	conf, _ := beego.AppConfig.GetSection("conf")
-	Initial(conf["path"], "ID")
-
-	//InitExt()
-	return true
-}
-
-func GetConfig[T any](id string, t T) (obj *T) {
-	var table = GetTable(t)
-	dt := table.GetItem(id)
-	if dt == nil {
-		return nil
-	}
-	obj = dt.(*T)
-	return
-}
-
-func HasConfig[T any](id string, t T) (has bool) {
-	var table = GetTable(t)
-	return table.GetItem(id) != nil
-}
-
-func GetOne[T any](t T) (obj *T) {
-	var table = GetTable(t)
-	if len(table.Items()) > 0 {
-		return table.Items()[0].(*T)
-	}
-	return nil
-}
-
-func GetTable[T any](t T) (table *DataTable) {
-	table = GetDataTable(reflect.TypeOf(t))
-	return
-}
@@ -0,0 +1,29 @@
+package configs
+
+import (
+	"apigame/configs/confapi"
+	"apigame/configs/confcardholder"
+	"apigame/configs/confglobal"
+	"apigame/service-common/svconst"
+)
+
+func Init() bool {
+
+	for _, gameId := range svconst.GameList {
+		_, _ = confapi.GetConfig(gameId)
+	}
+
+	for _, gameId := range svconst.GameList {
+		_, _ = confglobal.GetConfig(gameId)
+	}
+
+	for _, gameId := range svconst.GameListCardHolder {
+		_, _ = confcardholder.GetCurrent(gameId)
+	}
+
+	//for _, gameId := range svconst.GameListRoomRank {
+	//	_, _ = confroomrank.GetCurrent(gameId)
+	//}
+
+	return true
+}
@@ -1,280 +0,0 @@
-package configs
-
-import (
-	"fmt"
-	"os"
-	"reflect"
-	"strings"
-
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/reflect/protoregistry"
-)
-
-type DataTableMap map[string]IData
-type DataItemMap map[string]IData
-
-type DataArray []interface{}
-type DataMap map[string]interface{}
-
-var (
-	DefaultIndexKey = "ID"
-	BytesFileExt    = ".bytes"
-
-	dataDir      = ""
-	dataItemMap  = make(DataItemMap, 0)
-	dataTableMap = make(DataTableMap, 0)
-)
-
-type IFilenameGenerator interface {
-	GetFilename(typeName string) string
-}
-
-type IData interface {
-	DataType() reflect.Type
-}
-
-func DataDir() string {
-	return dataDir
-}
-
-func Initial(dir, defaultKeyName string) {
-	dataDir = strings.ReplaceAll(dir, "\\", "/")
-	if strings.LastIndex(dataDir, "/") != len(dataDir)-1 {
-		dataDir = dataDir + "/"
-	}
-
-	if defaultKeyName != "" {
-		DefaultIndexKey = defaultKeyName
-	}
-}
-
-func RegistDataTable(indexKey string, dataType reflect.Type) {
-	if _, ok := dataTableMap[dataType.Name()]; !ok {
-		var t = NewDataTable(indexKey, dataType)
-		dataTableMap[dataType.Name()] = t
-	}
-}
-
-func RegistDataTableExt(table IData) {
-	var dataType = table.DataType()
-	if _, ok := dataTableMap[dataType.Name()]; !ok {
-		dataTableMap[dataType.Name()] = table
-	}
-}
-
-func GetDataItem(dataType reflect.Type) *DataItem {
-	var dt *DataItem
-	if item, ok := dataItemMap[dataType.Name()]; !ok {
-		var t = NewDataItem(dataType)
-		dataItemMap[dataType.Name()] = t
-		dt = t
-	} else {
-		dt = item.(*DataItem)
-	}
-	return dt
-}
-
-func GetDataTable(dataType reflect.Type) *DataTable {
-	var dt *DataTable
-	if item, ok := dataTableMap[dataType.Name()]; !ok {
-		var t = NewDataTable("", dataType)
-		dataTableMap[dataType.Name()] = t
-		dt = t
-	} else {
-		dt = item.(*DataTable)
-	}
-	return dt
-}
-
-func getFullname(dataType reflect.Type) string {
-	var pkgs = strings.Split(dataType.PkgPath(), "/")
-	var pkg = pkgs[len(pkgs)-1]
-	var name = dataType.Name()
-	return fmt.Sprintf("%s.%s", pkg, name)
-}
-
-type DataItem struct {
-	dataType reflect.Type
-	data     interface{}
-	fileGen  IFilenameGenerator
-}
-
-func NewDataItem(dataType reflect.Type) *DataItem {
-	t := new(DataItem)
-	t.dataType = dataType
-	t.fileGen = t
-	return t
-}
-
-func (t *DataItem) DataType() reflect.Type {
-	return t.dataType
-}
-
-func (t *DataItem) Item() interface{} {
-	t.load()
-	return t.data
-}
-
-func (t *DataItem) Clear() {
-	t.data = nil
-}
-
-func (t *DataItem) GetFilename(typeName string) string {
-	return fmt.Sprintf("%s%s%s", dataDir, strings.ToLower(typeName), BytesFileExt)
-}
-
-func (t *DataItem) load() {
-	if t.data != nil {
-		return
-	}
-
-	var filename = t.fileGen.GetFilename(t.dataType.Name())
-	if ok, _ := PathExists(filename); !ok {
-		fmt.Printf("can not find data file %s", filename)
-		return
-	}
-
-	fullName := getFullname(t.dataType)
-	msgName := protoreflect.FullName(fullName)
-	msgType, err := protoregistry.GlobalTypes.FindMessageByName(msgName)
-	if err != nil {
-		fmt.Printf("can not find proto message named %v, %v", fullName, err)
-		return
-	}
-	message := msgType.New().Interface()
-
-	bytes, err := os.ReadFile(filename)
-	if err != nil {
-		fmt.Printf("read bytes file failed, %v", err)
-		return
-	}
-
-	err = proto.Unmarshal(bytes, message)
-	if err != nil {
-		fmt.Printf("proto unmarshal failed, %v", err)
-		return
-	}
-
-	t.data = message
-}
-
-type DataTable struct {
-	indexKey string
-	dataType reflect.Type
-	data     DataArray
-	dataMap  DataMap
-	fileGen  IFilenameGenerator
-}
-
-func NewDataTable(indexKey string, dataType reflect.Type) *DataTable {
-	if indexKey == "" {
-		indexKey = DefaultIndexKey
-	}
-
-	t := new(DataTable)
-	t.indexKey = indexKey
-	t.dataType = dataType
-	t.fileGen = t
-	return t
-}
-
-func (t *DataTable) DataType() reflect.Type {
-	return t.dataType
-}
-
-func (t *DataTable) Items() DataArray {
-	if t.data == nil {
-		t.load()
-	}
-	return t.data
-}
-
-func (t *DataTable) ItemsMap() DataMap {
-	if t.data == nil {
-		t.load()
-	}
-	t.itemsAsMap()
-	return t.dataMap
-}
-
-func (t *DataTable) GetItem(id string) interface{} {
-	var dataMap = t.ItemsMap()
-	if dt, ok := dataMap[id]; ok {
-		return dt
-	}
-	return nil
-}
-
-func (t *DataTable) Clear() {
-	t.data = nil
-	t.dataMap = nil
-}
-
-func (t *DataTable) GetFilename(typeName string) string {
-	return fmt.Sprintf("%s%s%s", dataDir, strings.ToLower(typeName), BytesFileExt)
-}
-
-func (t *DataTable) load() {
-	if t.data != nil {
-		return
-	}
-
-	var filename = t.fileGen.GetFilename(t.dataType.Name())
-	if ok, _ := PathExists(filename); !ok {
-		fmt.Printf("can not find data file %s", filename)
-		return
-	}
-
-	fullName := getFullname(t.dataType) + "_ARRAY"
-	msgName := protoreflect.FullName(fullName)
-	msgType, err := protoregistry.GlobalTypes.FindMessageByName(msgName)
-	if err != nil {
-		fmt.Printf("can not find proto message named %v, %v", fullName, err)
-		return
-	}
-	message := msgType.New().Interface()
-
-	bytes, err := os.ReadFile(filename)
-	if err != nil {
-		fmt.Printf("read bytes file failed, %v", err)
-		return
-	}
-
-	err = proto.Unmarshal(bytes, message)
-	if err != nil {
-		fmt.Printf("proto unmarshal failed, %v", err)
-		return
-	}
-
-	var value = reflect.ValueOf(message)
-	var elm = value.Elem()
-	if elm.Kind() != reflect.Struct {
-		fmt.Printf("type %s kind error", fullName)
-		return
-	}
-
-	t.data = make(DataArray, 0)
-	var items = elm.FieldByName("Items").Interface()
-	if reflect.TypeOf(items).Kind() == reflect.Slice {
-		s := reflect.ValueOf(items)
-		for i := 0; i < s.Len(); i++ {
-			ele := s.Index(i)
-			t.data = append(t.data, ele.Interface())
-		}
-	}
-}
-
-func (t *DataTable) itemsAsMap() {
-	if t.dataMap != nil {
-		return
-	}
-	t.dataMap = make(DataMap)
-
-	for _, item := range t.data {
-		var value = reflect.ValueOf(item)
-		var elm = value.Elem()
-		var idx = elm.FieldByName(t.indexKey).Interface()
-		t.dataMap[fmt.Sprintf("%v", idx)] = item
-	}
-}
@@ -1,14 +0,0 @@
-package configs
-
-import "os"
-
-func PathExists(path string) (bool, error) {
-	_, err := os.Stat(path)
-	if err == nil {
-		return true, nil
-	}
-	if os.IsNotExist(err) {
-		return false, nil
-	}
-	return false, err
-}
 package controllers
 import (
-	"apigame/configs-db/confbase"
+	"apigame/configs/confbase"
 	"apigame/models"
 	"apigame/service/code-msg"
 )
 package controllers
 import (
-	"apigame/configs-db/confcardholder"
+	"apigame/configs/confcardholder"
 	"apigame/models"
 	"apigame/service/code-msg"
 	"encoding/json"
@@ -2,7 +2,6 @@ package main
 import (
 	"apigame/configs"
-	"apigame/configs-db"
 	_ "apigame/routers"
 	"apigame/service"
 	"apigame/service-common/svconst"
@@ -66,10 +65,6 @@ func Init() bool {
 	//
 	//_ = config.InitLxLimit()
-	if !configs_db.Init() {
-		return false
-	}
-
 	if !configs.Init() {
 		return false
 	}
 package sign
 import (
-	"apigame/configs-db/confapi"
+	"apigame/configs/confapi"
 	"apigame/middleware/sdk"
 	"apigame/service/code-msg"
 	"apigame/util/util-lx/lxalilog"
 package svcommon
 import (
-	"apigame/configs-db/confglobal"
+	"apigame/configs/confglobal"
 	"apigame/util/zmisc"
 	"math/rand"
 )
 package cardholder
 import (
-	"apigame/configs-db/confcardholder"
+	"apigame/configs/confcardholder"
 	"apigame/models"
 	"apigame/service-common/svmysql"
 	"apigame/service/code-msg"
 	"apigame/util/util-lx/lxalilog"
 	"apigame/util/util-lx/lxtime"
 	"apigame/util/zslice"
-	"fmt"
 )
 // HandleGetConfig 活动配置
@@ -357,10 +356,6 @@ func HandleAutoExchangeInfo(req *models.ReqAutoExchangeInfo) (code string, rsp m
 	rsp.AutoExchangeHolder = player.Details.AutoExchangeHolderIds
 	rsp.NewCards = player.Details.AutoExchangeNewCards
-	fmt.Println("HandleAutoExchangeInfo rsp.LastStarCount", rsp.LastStarCount)
-	fmt.Println("HandleAutoExchangeInfo rsp.LastStarCount", rsp.AutoExchangeHolder)
-	fmt.Println("HandleAutoExchangeInfo rsp.LastStarCount", rsp.NewCards)
-
 	player.Details.LastStarCount = 0
 	player.Details.AutoExchangeHolderIds = make([]int, 0)
 	player.Details.AutoExchangeNewCards = make([][]int, 0)
 package cardholder
 import (
-	"apigame/configs-db/confcardholder"
+	"apigame/configs/confcardholder"
 	"apigame/models"
 	"apigame/service-common/svmysql"
 	"apigame/service/code-msg"
 package cardholder
 import (
-	"apigame/configs-db/confcardholder"
+	"apigame/configs/confcardholder"
 	"apigame/service-common/svmysql"
 	"apigame/util/util-lx/lxalilog"
 	"apigame/util/util-lx/lxtime"
 package roomrank
 import (
-	"apigame/configs-db/confroomrank"
+	"apigame/configs/confroomrank"
 	"apigame/models"
 	"apigame/service-common/svcommon"
 	"apigame/service/code-msg"
 package roomrank
 import (
-	"apigame/configs-db/confroomrank"
+	"apigame/configs/confroomrank"
 	"apigame/service-common/svconst"
 	"apigame/util/util-lx/lxtime"
 	"apigame/util/zconvert"
 package roomrank
 import (
-	"apigame/configs-db/confroomrank"
+	"apigame/configs/confroomrank"
 	"apigame/models"
 	"apigame/service-common/svcommon"
 	"apigame/service-common/svmysql"
 package roomrank
 import (
-	"apigame/configs-db/confroomrank"
+	"apigame/configs/confroomrank"
 	"apigame/service-common/svcommon"
 	"apigame/service-common/svmysql"
 	"apigame/util/util-lx/lxalilog"
	@@ -1,48 +0,0 @@	@@ -1,48 +0,0 @@
1	-package confapi
2	-
3	-import (
4	- "apigame/configs-db/confbase"
5	- "apigame/service-common/svconst"
6	- "fmt"
7	-)
8	-
9	-// ApiGameConfig api游戏配置
10	-type ApiGameConfig struct {
11	- Raw *Raw
12	-}
13	-
14	-func (c *ApiGameConfig) GetUid() string {
15	- return c.Raw.GameId
16	-}
17	-
18	-func (c *ApiGameConfig) CheckCurrent() bool {
19	- return true
20	-}
21	-
22	-func (c ApiGameConfig) ConfInfo(suffix string) confbase.ConfInfo {
23	- tableName := "s_game_config"
24	- cacheKey := fmt.Sprintf("%s:%s:%s", svconst.REDIS_CACHEP_REFIX, tableName, suffix)
25	- return &confbase.ConfInfo{
26	- DbMysql: svconst.DbApi,
27	- TableName: tableName,
28	- KeyName: "gameid",
29	- CacheKey: cacheKey,
30	- CacheCurrent: cacheKey + ":current",
31	- CacheTime: 300,
32	- }
33	-}
34	-
35	-// Raw 配置原始数据
36	-type Raw struct {
37	- AppId string `gorm:"column:appid"`
38	- GameId string `gorm:"column:gameid"`
39	- Secret string `gorm:"column:secret"`
40	- AppKey string `gorm:"column:appkey"`
41	- Name string `gorm:"column:name"`
42	-}
43	-
44	-// Decode 解析配置原始数据
45	-func (c *ApiGameConfig) Decode(gameId string, rawData any) {
46	- raw := rawData.(*Raw)
47	- c.Raw = raw
48	-}
	@@ -1,19 +0,0 @@	@@ -1,19 +0,0 @@
1	-package confapi
2	-
3	-import (
4	- "apigame/configs-db/confbase"
5	- "errors"
6	-)
7	-
8	-// GetConfig 获取 api游戏配置
9	-func GetConfig(gameId string) (conf *ApiGameConfig, err error) {
10	-
11	- conf = new(ApiGameConfig)
12	- has := confbase.GetConfig[*ApiGameConfig, Raw](gameId, gameId, conf)
13	- if !has {
14	- err = errors.New("confapi.GetConfig error")
15	- return
16	- }
17	-
18	- return
19	-}
	@@ -1,113 +0,0 @@	@@ -1,113 +0,0 @@
1	-package confbase
2	-
3	-import (
4	- "apigame/util/util-lx/lxalilog"
5	- "apigame/util/zjson"
6	- "apigame/util/zredis"
7	- "fmt"
8	- "runtime/debug"
9	-)
10	-
11	-var CacheState = 1 // 0=关闭 1=打开
12	-
13	-func SaveCache[T IConfData](gameId string, obj T) {
14	- info := obj.ConfInfo(gameId)
15	- _ = zredis.SetEx(info.CacheKey, zjson.Str(obj), info.CacheTime)
16	-}
17	-
18	-func LoadCache[T IConfData](gameId string, obj T) (has bool) {
19	- if CacheState == 0 {
20	- return false
21	- }
22	- has = true
23	- info := obj.ConfInfo(gameId)
24	- text, err := zredis.Get(info.CacheKey)
25	- if err != nil {
26	- has = false
27	- return
28	- }
29	- err = zjson.Obj(text, &obj)
30	- if err != nil {
31	- fmt.Println(err)
32	- has = false
33	- return
34	- }
35	- return
36	-}
37	-
38	-func LoadData[T1 IConfData, T2 IConfRawData](gameId string, confId any, obj T1) (has bool) {
39	- confRaw := new(T2)
40	- info := obj.ConfInfo(gameId)
41	- db := info.DbMysql
42	- result := db.Table(info.TableName).Where(fmt.Sprintf("%s = ?", info.KeyName), confId).First(confRaw)
43	-
44	- has = result.RowsAffected != 0
45	- err := result.Error
46	- if err != nil {
47	- lxalilog.Errors(err, "confbase.LoadData error", gameId, confId)
48	- fmt.Printf("%s", debug.Stack())
49	- return
50	- }
51	- if !has {
52	- return
53	- }
54	-
55	- obj.Decode(gameId, confRaw)
56	- return
57	-}
58	-
59	-func FindDuringTime[T1 IConfData, T2 IConfRawData](obj T1, raw *T2, gameId string) (has bool) {
60	- info := obj.ConfInfo(gameId)
61	- db := info.DbMysql
62	- result := db.Table(info.TableName).Where(info.CurrentQuery, info.CurrentArgs...).First(raw)
63	- has = result.RowsAffected != 0
64	- return
65	-}
66	-
67	-func GetConfig[T1 IConfData, T2 IConfRawData](gameId string, confId any, obj T1) (has bool) {
68	- has = LoadCache(gameId, obj)
69	- if has {
70	- return
71	- }
72	- has = LoadData[T1, T2](gameId, confId, obj)
73	- if !has {
74	- return
75	- }
76	- SaveCache(gameId, obj)
77	- return
78	-}
79	-
80	-// GetCurrent 获取当前配置
81	-func GetCurrent[T1 IConfData, T2 IConfRawData](gameId string, obj T1) bool {
82	- has := false
83	- info := obj.ConfInfo(gameId)
84	- currentKey := info.CacheCurrent
85	- currentId := zredis.GetString(currentKey)
86	- if currentId != "" {
87	- has = GetConfig[T1, T2](gameId, currentId, obj)
88	- if has {
89	- if !obj.CheckCurrent() {
90	- has = false
91	- }
92	- }
93	- }
94	- return has
95	-}
96	-
97	-// FindCurrent 查找当前配置
98	-func FindCurrent[T1 IConfData, T2 IConfRawData](gameId string, obj T1) bool {
99	- has := false
100	- info := obj.ConfInfo(gameId)
101	- currentKey := info.CacheCurrent
102	- currentId := zredis.GetString(currentKey)
103	- confRaw := new(T2)
104	- has = FindDuringTime[T1, T2](obj, confRaw, gameId)
105	- if has {
106	- obj.Decode(gameId, confRaw)
107	- SaveCache(gameId, obj)
108	- has = true
109	- currentId = obj.GetUid()
110	- _ = zredis.Set(currentKey, currentId)
111	- }
112	- return has
113	-}
	@@ -1,31 +0,0 @@	@@ -1,31 +0,0 @@
1	-package confbase
2	-
3	-import "gorm.io/gorm"
4	-
5	-// ConfInfo 配置对象信息
6	-type ConfInfo struct {
7	- DbMysql *gorm.DB
8	- TableName string
9	- KeyName string
10	- CurrentQuery any
11	- CurrentArgs []any
12	- CacheKey string
13	- CacheCurrent string
14	- CacheTime int
15	-}
16	-
17	-// IConfData 配置对象
18	-type IConfData interface {
19	- // ConfInfo redis存储信息
20	- ConfInfo(suffix string) *ConfInfo
21	- // Decode 解码
22	- Decode(gameId string, rawData any)
23	- // GetUid 获取keyID
24	- GetUid() string
25	- // CheckCurrent 判断当前开放
26	- CheckCurrent() bool
27	-}
28	-
29	-// IConfRawData mysql存储对象
30	-type IConfRawData interface {
31	-}
	@@ -1,153 +0,0 @@	@@ -1,153 +0,0 @@
1	-package confcardholder
2	-
3	-import (
4	- "apigame/configs-db/confbase"
5	- "apigame/service-common/svconst"
6	- "apigame/util/util-lx/lxtime"
7	- "apigame/util/zconvert"
8	- "fmt"
9	-)
10	-
11	-// ActivityConfig 卡牌活动配置分析后数据
12	-type ActivityConfig struct {
13	- Raw *ActivityConfigRaw `json:"-"`
14	-
15	- Id int64 // ID
16	- OpenLevel int // 开启等级
17	- PreviewTime int64 // 预告时间
18	- StartTime int64 // 开始时间
19	- EndTime int64 // 结束时间
20	- Round int // 轮数
21	- IconPath string // icon资源路径
22	-
23	- Awards map[string]string // 奖励配置
24	- AlbumConfig map[int]AlbumConfig // 卡组配置
25	- CardConfig map[int]CardConfig // 卡牌配置
26	- CardholderConfig map[int]OpenCardholderConfig // 卡包开卡规则
27	- NormalCardStarConfig map[string]NormalCardStarConfig // k=ID_用户序列_用户分组卡片星级配置
28	- CardSequenceConfig map[string]CardSequenceConfig // k=ID_用户序列_用户分组卡片星级对应卡牌配置
29	- StarShopConfig map[int]StarShopConfig // 星星商店配置
30	- ListSequenceId []int // 用户序列组ID列表
31	-
32	- Client *ActivityConfigClient
33	- GameId string // 所属游戏ID
34	-}
35	-
36	-func (c *ActivityConfig) GetUid() string {
37	- return zconvert.Int64ToStr(c.Id)
38	-}
39	-
40	-func (c *ActivityConfig) CheckCurrent() bool {
41	- timeNow := lxtime.NowUninx()
42	- return timeNow >= c.StartTime && timeNow <= c.EndTime && c.Raw.Status == 1
43	-}
44	-
45	-func (c ActivityConfig) ConfInfo(suffix string) confbase.ConfInfo {
46	- tableName := svconst.MYSQL_TABLE_S_CARDHOLDER_CONFIG
47	- cacheKey := fmt.Sprintf("%s:%s:%s", svconst.REDIS_CACHEP_REFIX, tableName, suffix)
48	- timeNow := lxtime.NowUninx()
49	- return &confbase.ConfInfo{
50	- DbMysql: svconst.DbConfig,
51	- TableName: fmt.Sprintf("%s_%s", tableName, suffix),
52	- KeyName: "id",
53	- CurrentQuery: "status = ? AND start_time <= ? AND end_time >= ?",
54	- CurrentArgs: []any{1, timeNow, timeNow},
55	- CacheKey: fmt.Sprintf("%s:%d", cacheKey, c.Id),
56	- CacheCurrent: cacheKey + ":current",
57	- CacheTime: 300,
58	- }
59	-}
60	-
61	-// ActivityConfigRaw 卡牌活动配置原始数据
62	-type ActivityConfigRaw struct {
63	- Id int64 `gorm:"column:id;primaryKey"` // ID
64	- OpenLevel int // 开启等级
65	- PreviewTime int64 // 预告时间
66	- StartTime int64 // 开始时间
67	- EndTime int64 // 结束时间
68	- Round int // 轮数
69	- IconPath string // icon资源路径
70	-
71	- Awards string // 奖励配置
72	- AlbumConfig string // 卡组配置
73	- CardConfig string // 卡牌配置
74	- CardHolderConfig string // 卡包开卡规则
75	- NormalCardStarSequence string // 卡片星级配置
76	- CardSequenceConfig string // 卡片星级对应卡牌配置
77	- StarShopConfig string // 星星商店配置
78	-
79	- Ver string // 版本号
80	- Status int // 状态 0=关闭 1=开启
81	- UpdateTime int64 // 修改时间戳
82	-}
83	-
84	-// ActivityConfigClient 卡牌活动配置给客户端数据
85	-type ActivityConfigClient struct {
86	- Id int64 `form:"id" json:"id"` // ID
87	- Round int `form:"round" json:"round"` // 轮数
88	- IconPath string `form:"icon_path" json:"icon_path"` // icon资源路径
89	- RoundAwards map[string]string `form:"round_awards" json:"round_awards"` // 轮次奖励配置
90	- Albums []AlbumConfig `form:"albums" json:"albums"` // 卡组配置
91	- Cards []CardConfig `form:"cards" json:"cards"` // 卡牌配置
92	- Holders []OpenCardholderConfig `form:"holders" json:"holders"` // 卡包开卡规则
93	- StarShop []StarShopConfig `form:"star_shop" json:"star_shop"` // 星星商店配置
94	-}
95	-
96	-// AlbumConfig 卡组表
97	-type AlbumConfig struct {
98	- SetId int `json:"set_id"` // 卡组名
99	- Name int `json:"name"` // 卡组图片
100	- Icon string `json:"icon"` // 卡组id
101	- Rewards map[string]string `json:"rewards"` // 集齐奖励 k=轮次
102	- StartTime int64 `json:"start_time"` // 开始时间
103	- EndTime int64 `json:"end_time"` // 结束时间
104	-}
105	-
106	-// CardConfig 卡牌表
107	-type CardConfig struct {
108	- Id int `json:"id"` // ID
109	- Name int `json:"name"` // 卡牌名字
110	- Icon string `json:"icon"` // 卡牌图标
111	- Desc int `json:"desc"` // 卡牌描述
112	- SetId int `json:"album_setid"` // 卡组id
113	- Star int `json:"star"` // 星级
114	- IsGold int `json:"is_gold"` // 是否是金卡
115	- IsSend int `json:"is_send"` // 卡片是否可赠送
116	-}
117	-
118	-// OpenCardholderConfig 卡包开卡规则表
119	-type OpenCardholderConfig struct {
120	- Id int `json:"id"` // ID
121	- CardPackIcon string `json:"img"` // 卡包资源名
122	- IsGoldCardholder int `json:"is_gold_card_holder"` // 是否是金卡包
123	- IsNew int `json:"is_new"` // 是否是新卡包
124	- GuaranteedStarCardId int `json:"guaranteed_star_card_id"` // 保底卡星级序列ID
125	- NormalCardNumber int `json:"normal_card_number"` // 非保底卡数量
126	- MinimumGuaranteeCardId int `json:"minimum_guarantee_card_id"` // 非保底卡牌序列ID
127	- ActivityId int `json:"activity_id"` // 对应活动ID
128	- Star int `json:"star"` // star
129	- Name int `json:"name"` // name
130	-}
131	-
132	-// NormalCardStarConfig 非保底卡星级ID
133	-type NormalCardStarConfig struct {
134	- Id int `json:"id"` // ID
135	- SequenceId int `json:"user_sequence_id"` // 用户序列组ID
136	- Cohort int `json:"cohort"` // 用户分组
137	- NormalCardSequenceId []int `json:"normal_card_sequence_id"` // 非保底星级序列
138	-}
139	-
140	-// CardSequenceConfig 星级ID对应的卡片
141	-type CardSequenceConfig struct {
142	- Id int `json:"id"` // ID
143	- SequenceId int `json:"user_sequence_id"` // 用户序列组ID
144	- Cohort int `json:"cohort"` // 用户分组
145	- CardIdList []int `json:"card_id_list"` // 卡牌抽取序列
146	-}
147	-
148	-// StarShopConfig 星星商店配置
149	-type StarShopConfig struct {
150	- Id int `json:"id"` // ID
151	- NeedStarNumber int `json:"need_star_number"` // 需求星星数
152	- CardBagIds string `json:"card_bag_ids"` // 可换取的卡包ID {卡包类型,卡包ID,卡包数量}
153	-}
	@@ -1,177 +0,0 @@	@@ -1,177 +0,0 @@
1	-package confcardholder
2	-
3	-import (
4	- "apigame/util/util-lx/lxalilog"
5	- "apigame/util/zslice"
6	- "encoding/json"
7	- "errors"
8	- "fmt"
9	-)
10	-
11	-// Decode 解析配置原始数据
12	-func (c *ActivityConfig) Decode(gameId string, rawData any) {
13	- raw := rawData.(*ActivityConfigRaw)
14	- c.GameId = gameId
15	- c.Raw = raw
16	-
17	- c.Id = raw.Id
18	- c.OpenLevel = raw.OpenLevel
19	- c.PreviewTime = raw.PreviewTime
20	- c.StartTime = raw.StartTime
21	- c.EndTime = raw.EndTime
22	- c.Round = raw.Round
23	- c.IconPath = raw.IconPath
24	-
25	- c.Awards = make(map[string]string)
26	- c.AlbumConfig = make(map[int]AlbumConfig)
27	- c.CardConfig = make(map[int]CardConfig)
28	- c.CardholderConfig = make(map[int]OpenCardholderConfig)
29	- c.NormalCardStarConfig = make(map[string]NormalCardStarConfig)
30	- c.CardSequenceConfig = make(map[string]CardSequenceConfig)
31	- c.StarShopConfig = make(map[int]StarShopConfig)
32	- // 解析奖励
33	- {
34	- err := json.Unmarshal([]byte(raw.Awards), &c.Awards)
35	- if err != nil {
36	- lxalilog.Errors(err, raw.Awards, gameId, raw.Id)
37	- return
38	- }
39	- }
40	- // 卡组配置
41	- {
42	- configs := make([]AlbumConfig, 0)
43	- err := json.Unmarshal([]byte(raw.AlbumConfig), &configs)
44	- if err != nil {
45	- lxalilog.Errors(err, raw.AlbumConfig, gameId, raw.Id)
46	- return
47	- }
48	- for _, i2 := range configs {
49	- c.AlbumConfig[i2.SetId] = i2
50	- }
51	- }
52	- // 卡牌配置
53	- {
54	- configs := make([]CardConfig, 0)
55	- err := json.Unmarshal([]byte(raw.CardConfig), &configs)
56	- if err != nil {
57	- lxalilog.Errors(err, raw.CardConfig, gameId, raw.Id)
58	- return
59	- }
60	- for _, i2 := range configs {
61	- c.CardConfig[i2.Id] = i2
62	- }
63	- }
64	- // 卡包开卡规则
65	- {
66	- configs := make([]OpenCardholderConfig, 0)
67	- err := json.Unmarshal([]byte(raw.CardHolderConfig), &configs)
68	- if err != nil {
69	- lxalilog.Errors(err, raw.CardHolderConfig, gameId, raw.Id)
70	- return
71	- }
72	- for _, i2 := range configs {
73	- c.CardholderConfig[i2.Id] = i2
74	- }
75	- }
76	- // 卡片星级配置
77	- {
78	- configs := make([]NormalCardStarConfig, 0)
79	- err := json.Unmarshal([]byte(raw.NormalCardStarSequence), &configs)
80	- if err != nil {
81	- lxalilog.Errors(err, raw.NormalCardStarSequence, gameId, raw.Id)
82	- return
83	- }
84	- for _, i2 := range configs {
85	- combineId := CombineIdSequenceIdCohort(i2.Id, i2.SequenceId, i2.Cohort)
86	- c.NormalCardStarConfig[combineId] = i2
87	- if !zslice.Contains(c.ListSequenceId, i2.SequenceId) {
88	- c.ListSequenceId = append(c.ListSequenceId, i2.SequenceId)
89	- }
90	- }
91	- }
92	- // 卡片星级对应卡牌配置
93	- {
94	- configs := make([]CardSequenceConfig, 0)
95	- err := json.Unmarshal([]byte(raw.CardSequenceConfig), &configs)
96	- if err != nil {
97	- lxalilog.Errors(err, raw.CardSequenceConfig, gameId, raw.Id)
98	- return
99	- }
100	- for _, i2 := range configs {
101	- combineId := CombineIdSequenceIdCohort(i2.Id, i2.SequenceId, i2.Cohort)
102	- c.CardSequenceConfig[combineId] = i2
103	- if !zslice.Contains(c.ListSequenceId, i2.SequenceId) {
104	- c.ListSequenceId = append(c.ListSequenceId, i2.SequenceId)
105	- }
106	- }
107	- }
108	- // 星星商店配置
109	- {
110	- configs := make([]StarShopConfig, 0)
111	- err := json.Unmarshal([]byte(raw.StarShopConfig), &configs)
112	- if err != nil {
113	- lxalilog.Errors(err, raw.StarShopConfig, gameId, raw.Id)
114	- return
115	- }
116	- for _, i2 := range configs {
117	- c.StarShopConfig[i2.Id] = i2
118	- }
119	- }
120	-
121	- c.GenerateConfigClient()
122	-}
123	-
124	-// GenerateConfigClient 生成给客户端的配置
125	-func (c *ActivityConfig) GenerateConfigClient() {
126	- configClient := &ActivityConfigClient{
127	- Id: c.Id,
128	- Round: c.Round,
129	- IconPath: c.IconPath,
130	- RoundAwards: c.Awards,
131	- Albums: make([]AlbumConfig, 0),
132	- Cards: make([]CardConfig, 0),
133	- Holders: make([]OpenCardholderConfig, 0),
134	- StarShop: make([]StarShopConfig, 0),
135	- }
136	- for _, i2 := range c.AlbumConfig {
137	- configClient.Albums = append(configClient.Albums, i2)
138	- }
139	- for _, i2 := range c.CardConfig {
140	- configClient.Cards = append(configClient.Cards, i2)
141	- }
142	- for _, i2 := range c.CardholderConfig {
143	- configClient.Holders = append(configClient.Holders, i2)
144	- }
145	- for _, i2 := range c.StarShopConfig {
146	- configClient.StarShop = append(configClient.StarShop, i2)
147	- }
148	- c.Client = configClient
149	-}
150	-
151	-// CombineIdSequenceIdCohort 组合ID k=ID_用户序列_用户分组
152	-func CombineIdSequenceIdCohort(id, sequenceId, cohort int) string {
153	- return fmt.Sprintf("%d_%d_%d", id, sequenceId, cohort)
154	-}
155	-
156	-// FindNormalCardStarConfig 查找配置非保底卡星级ID
157	-func (c *ActivityConfig) FindNormalCardStarConfig(id, sequenceId, cohort int) (conf NormalCardStarConfig, has bool) {
158	- combineId := CombineIdSequenceIdCohort(id, sequenceId, cohort)
159	- conf, has = c.NormalCardStarConfig[combineId]
160	- if !has {
161	- lxalilog.Errors(errors.New("ht_cardholder NormalCardStarConfig error"), id, sequenceId, cohort)
162	- }
163	- return
164	-}
165	-
166	-// FindCardSequenceConfig 查找配置星级ID对应的卡片
167	-func (c *ActivityConfig) FindCardSequenceConfig(id, sequenceId, cohort int) (conf CardSequenceConfig, has bool) {
168	- combineId := CombineIdSequenceIdCohort(id, sequenceId, cohort)
169	- conf, has = c.CardSequenceConfig[combineId]
170	- if !has {
171	- lxalilog.Errors(errors.New("ht_cardholder CardSequenceConfig error"), id, sequenceId, cohort)
172	- fmt.Println(id)
173	- fmt.Println(sequenceId)
174	- fmt.Println(cohort)
175	- }
176	- return
177	-}
	@@ -1,24 +0,0 @@	@@ -1,24 +0,0 @@
1	-package confcardholder
2	-
3	-import (
4	- "apigame/configs-db/confbase"
5	-)
6	-
7	-// GetCurrent 获取当前配置
8	-func GetCurrent(gameId string) (conf *ActivityConfig, has bool) {
9	- conf = new(ActivityConfig)
10	- has = confbase.GetCurrent[*ActivityConfig, ActivityConfigRaw](gameId, conf)
11	- if !has {
12	- conf = new(ActivityConfig)
13	- has = confbase.FindCurrent[*ActivityConfig, ActivityConfigRaw](gameId, conf)
14	- }
15	- return
16	-}
17	-
18	-// GetConfig 获取配置根据Id
19	-func GetConfig(gameId string, confId int64) (conf *ActivityConfig, has bool) {
20	- conf = new(ActivityConfig)
21	- has = confbase.GetConfig[*ActivityConfig, ActivityConfigRaw](gameId, confId, conf)
22	-
23	- return
24	-}
	@@ -1,67 +0,0 @@	@@ -1,67 +0,0 @@
1	-package confglobal
2	-
3	-import (
4	- "apigame/configs-db/confbase"
5	- "apigame/service-common/svconst"
6	- "apigame/util/util-lx/lxalilog"
7	- "encoding/json"
8	- "fmt"
9	-)
10	-
11	-// GlobalConfig 全局配置
12	-type GlobalConfig struct {
13	- Raw *Raw `json:"-"`
14	- Names []string
15	- Avatars []string
16	- AvatarPath string
17	-}
18	-
19	-func (c *GlobalConfig) GetUid() string {
20	- return c.Raw.GameId
21	-}
22	-
23	-func (c *GlobalConfig) CheckCurrent() bool {
24	- return true
25	-}
26	-
27	-func (c GlobalConfig) ConfInfo(suffix string) confbase.ConfInfo {
28	- tableName := "s_game_global_config"
29	- cacheKey := fmt.Sprintf("%s:%s:%s", svconst.REDIS_CACHEP_REFIX, tableName, suffix)
30	- return &confbase.ConfInfo{
31	- DbMysql: svconst.DbConfig,
32	- TableName: tableName,
33	- KeyName: "gameid",
34	- CacheKey: cacheKey,
35	- CacheCurrent: cacheKey + ":current",
36	- CacheTime: 300,
37	- }
38	-}
39	-
40	-// Raw 配置原始数据
41	-type Raw struct {
42	- GameId string `gorm:"column:gameid"`
43	- NameConfig string
44	- AvatarConfig string
45	- AvatarPath string
46	-}
47	-
48	-// Decode 解析配置原始数据
49	-func (c *GlobalConfig) Decode(gameId string, rawData any) {
50	- raw := rawData.(*Raw)
51	- c.Raw = raw
52	- {
53	- err := json.Unmarshal([]byte(raw.NameConfig), &c.Names)
54	- if err != nil {
55	- lxalilog.Errors(err, raw.NameConfig, gameId, raw.GameId)
56	- return
57	- }
58	- }
59	- {
60	- err := json.Unmarshal([]byte(raw.AvatarConfig), &c.Avatars)
61	- if err != nil {
62	- lxalilog.Errors(err, raw.AvatarConfig, gameId, raw.GameId)
63	- return
64	- }
65	- }
66	- c.AvatarPath = raw.AvatarPath
67	-}
	@@ -1,129 +0,0 @@	@@ -1,129 +0,0 @@
1	-package confroomrank
2	-
3	-import (
4	- "apigame/configs-db/confbase"
5	- "apigame/service-common/svconst"
6	- "apigame/util/util-lx/lxtime"
7	- "apigame/util/zconvert"
8	- "fmt"
9	-)
10	-
11	-// ActivityConfig 房间排行活动配置分析后数据
12	-type ActivityConfig struct {
13	- Raw *ActivityConfigRaw `json:"-"`
14	-
15	- Id int64 // ID
16	- Typ int // 排行榜类型
17	- OpenLevel int // 开启等级
18	- OpenScore int64 // 开启积分
19	- PreviewTime int64 // 预告时间
20	- StartTime int64 // 开始时间
21	- EndTime int64 // 结束时间
22	- ReleaseTime string // 结算发奖时间
23	-
24	- Robot map[int]RobotConfig // 机器人配置
25	- Room map[int]RoomConfig // 房间配置
26	-
27	- GameId string // 所属游戏ID
28	-}
29	-
30	-func (c *ActivityConfig) GetUid() string {
31	- return zconvert.Int64ToStr(c.Id)
32	-}
33	-
34	-func (c *ActivityConfig) CheckCurrent() bool {
35	- timeNow := lxtime.NowUninx()
36	- return timeNow >= c.StartTime && timeNow <= c.EndTime && c.Raw.Status == 1
37	-}
38	-
39	-func (c ActivityConfig) ConfInfo(suffix string) confbase.ConfInfo {
40	- tableName := svconst.MYSQL_TABLE_S_ROOMRANK_CONFIG
41	- cacheKey := fmt.Sprintf("%s:%s:%s", svconst.REDIS_CACHEP_REFIX, tableName, suffix)
42	- timeNow := lxtime.NowUninx()
43	- return &confbase.ConfInfo{
44	- DbMysql: svconst.DbConfig,
45	- TableName: fmt.Sprintf("%s_%s", tableName, suffix),
46	- KeyName: "id",
47	- CurrentQuery: "typ = ? AND status = ? AND start_time <= ? AND end_time >= ?",
48	- CurrentArgs: []any{c.Typ, 1, timeNow, timeNow},
49	- CacheKey: fmt.Sprintf("%s:%d", cacheKey, c.Id),
50	- CacheCurrent: fmt.Sprintf("%s:%d:current", cacheKey, c.Typ),
51	- CacheTime: 300,
52	- }
53	-}
54	-
55	-// ActivityConfigRaw 房间排行活动配置原始数据
56	-type ActivityConfigRaw struct {
57	- Id int64 `gorm:"column:id;primaryKey"` // ID
58	- Serial int64 // 轮次ID
59	- Typ int // 排行榜类型
60	- OpenLevel int // 开启等级
61	- OpenScore int64 // 开启积分
62	- PreviewTime int64 // 预告时间
63	- StartTime int64 // 开始时间
64	- EndTime int64 // 结束时间
65	- ReleaseTime string // 结算发奖时间
66	-
67	- BootConfig string // 机器人配置
68	- RoomConfig string // 房间配置
69	-
70	- Ver string // 版本号
71	- Status int // 状态 0=关闭 1=开启
72	- UpdateTime int64 // 修改时间戳
73	-}
74	-
75	-// GenerateConfigClient 生成给客户端的配置
76	-func (c ActivityConfigRaw) GenerateConfigClient() ActivityConfigClient {
77	- configClient := &ActivityConfigClient{
78	- Id: c.Id,
79	- Typ: c.Typ,
80	- Serial: c.Serial,
81	- OpenLevel: c.OpenLevel,
82	- OpenScore: c.OpenScore,
83	- PreviewTime: c.PreviewTime,
84	- StartTime: c.StartTime,
85	- EndTime: c.EndTime,
86	- ReleaseTime: c.ReleaseTime,
87	- Ver: c.Ver,
88	- Status: c.Status,
89	- }
90	- return configClient
91	-}
92	-
93	-// ActivityConfigClient 房间排行活动配置给客户端数据
94	-type ActivityConfigClient struct {
95	- Id int64 `form:"id" json:"id"` // ID
96	- Typ int `form:"typ" json:"typ"` // 排行榜类型
97	- Serial int64 `form:"serial" json:"serial"` // 轮次ID
98	- OpenLevel int `form:"open_level" json:"open_level"` // 开启等级
99	- OpenScore int64 `form:"open_score" json:"open_score"` // 开启积分
100	- PreviewTime int64 `form:"preview_time" json:"preview_time"` // 预告时间
101	- StartTime int64 `form:"start_time" json:"start_time"` // 开始时间
102	- EndTime int64 `form:"end_time" json:"end_time"` // 结束时间
103	- ReleaseTime string `form:"release_time" json:"release_time"` // 结算发奖时间
104	- Ver string `form:"ver" json:"ver"` // 版本号
105	- Status int `form:"status" json:"status"` // 状态 0=关闭 1=开启
106	-}
107	-
108	-// RobotConfig 机器人配置
109	-type RobotConfig struct {
110	- Id int `json:"id"` // id
111	- MinScore int `json:"min_score"` // 最低分数
112	- TotalScore int `json:"total_score"` // 总分数
113	- Range int `json:"range"` // 总分浮动范围(%)
114	-}
115	-
116	-// RoomConfig 房间配置
117	-type RoomConfig struct {
118	- Id int `json:"id"` // id
119	- Levels []int `json:"level_range"` // 等级范围
120	- UserClass int `json:"rating"` // 评级
121	- UserScore []int `json:"score_range"` // 分数范围
122	- TotalPlayer int `json:"room_user_number"` // 房间总人数
123	- PlayerTypeCount [][]int `json:"user_type_number"` // 玩家类型数量
124	- AutoRobot []int `json:"auto_room"` // 自动填充机器人
125	- InitRobot [][]int `json:"disposition_robots"` // 配置机器人
126	- Awards map[string]string `json:"rewards"` // 奖励
127	- SettleScores []int `json:"score_adjest"` // 结算分数调整
128	- SettleUserType []int `json:"user_type"` // 结算用户类型
129	-}
	@@ -1,50 +0,0 @@	@@ -1,50 +0,0 @@
1	-package confroomrank
2	-
3	-import (
4	- "apigame/util/util-lx/lxalilog"
5	- "encoding/json"
6	-)
7	-
8	-// Decode 解析配置原始数据
9	-func (c *ActivityConfig) Decode(gameId string, rawData any) {
10	- raw := rawData.(*ActivityConfigRaw)
11	- c.GameId = gameId
12	- c.Raw = raw
13	-
14	- c.Id = raw.Id
15	- c.Typ = raw.Typ
16	- c.OpenLevel = raw.OpenLevel
17	- c.OpenScore = raw.OpenScore
18	- c.PreviewTime = raw.PreviewTime
19	- c.StartTime = raw.StartTime
20	- c.EndTime = raw.EndTime
21	- c.ReleaseTime = raw.ReleaseTime
22	-
23	- c.Robot = make(map[int]RobotConfig)
24	- c.Room = make(map[int]RoomConfig)
25	-
26	- // 解析机器人
27	- {
28	- configs := make([]RobotConfig, 0)
29	- err := json.Unmarshal([]byte(raw.BootConfig), &configs)
30	- if err != nil {
31	- lxalilog.Errors(err, raw.BootConfig, gameId, raw.Id)
32	- return
33	- }
34	- for _, i2 := range configs {
35	- c.Robot[i2.Id] = i2
36	- }
37	- }
38	- // 解析房间
39	- {
40	- configs := make([]RoomConfig, 0)
41	- err := json.Unmarshal([]byte(raw.RoomConfig), &configs)
42	- if err != nil {
43	- lxalilog.Errors(err, raw.RoomConfig, gameId, raw.Id)
44	- return
45	- }
46	- for _, i2 := range configs {
47	- c.Room[i2.Id] = i2
48	- }
49	- }
50	-}