diff --git a/configs/confcardholder/config.go b/configs/confcardholder/config.go index 8f422c0..c8bbc04 100644 --- a/configs/confcardholder/config.go +++ b/configs/confcardholder/config.go @@ -23,7 +23,7 @@ type ActivityConfig struct { Awards map[string]string // 奖励配置 AlbumConfig map[int]AlbumConfig // 卡组配置 CardConfig map[int]CardConfig // 卡牌配置 - CardholderConfig map[string]OpenCardholderConfig // 卡包开卡规则 + CardholderConfig map[int]OpenCardholderConfig // 卡包开卡规则 NormalCardStarConfig map[string]NormalCardStarConfig // k=ID_用户序列_用户分组 卡片星级配置 CardSequenceConfig map[string]CardSequenceConfig // k=ID_用户序列_用户分组 卡片星级对应卡牌配置 StarShopConfig map[int]StarShopConfig // 星星商店配置 @@ -115,7 +115,7 @@ type CardConfig struct { // OpenCardholderConfig 卡包开卡规则表 type OpenCardholderConfig struct { - Id string `json:"id"` // ID + Id int `json:"id"` // ID IsGoldCardholder int `json:"is_gold_card_holder"` // 是否是金卡包 IsNew int `json:"is_new"` // 是否是新卡包 GuaranteedStarCardId string `json:"guaranteed_star_card_id"` // 保底卡星级序列ID diff --git a/configs/confcardholder/decode.go b/configs/confcardholder/decode.go index 16d2984..1ac88f6 100644 --- a/configs/confcardholder/decode.go +++ b/configs/confcardholder/decode.go @@ -25,7 +25,7 @@ func (c *ActivityConfig) Decode(gameId string, rawData any) { c.Awards = make(map[string]string) c.AlbumConfig = make(map[int]AlbumConfig) c.CardConfig = make(map[int]CardConfig) - c.CardholderConfig = make(map[string]OpenCardholderConfig) + c.CardholderConfig = make(map[int]OpenCardholderConfig) c.NormalCardStarConfig = make(map[string]NormalCardStarConfig) c.CardSequenceConfig = make(map[string]CardSequenceConfig) c.StarShopConfig = make(map[int]StarShopConfig) diff --git a/service/cardholder/handle.go b/service/cardholder/handle.go index 936aee5..30e4246 100644 --- a/service/cardholder/handle.go +++ b/service/cardholder/handle.go @@ -8,7 +8,6 @@ import ( "apigame/util/util-lx/lxtime" "apigame/util/utslice" "apigame/util/utstring" - "strconv" "strings" ) @@ -84,7 +83,7 @@ func HandleOpen(req *models.ReqCardHolderOpen) (code string, rsp models.RspCardH } // 检查卡包ID for _, idCardholder := range req.Ids { - _, okCardholder := config.CardholderConfig[strconv.Itoa(idCardholder)] + _, okCardholder := config.CardholderConfig[idCardholder] if !okCardholder { code = code_msg.RECODE_MERGE_CARDHOLDER_CARDHOLDERID_ERROR return @@ -104,7 +103,7 @@ func HandleOpen(req *models.ReqCardHolderOpen) (code string, rsp models.RspCardH sequenceId, cohort := GetUserSequenceIdAndCohort(player.Uid) allNewCards := make([]int, 0) for _, idCardholder := range req.Ids { - confCardholder, _ := config.CardholderConfig[strconv.Itoa(idCardholder)] + confCardholder, _ := config.CardholderConfig[idCardholder] newCards := DoOpen(gameId, player, config, confCardholder, @@ -195,7 +194,7 @@ func HandleShopExchange(req *models.ReqStarShopExchange) (code string, rsp model code = code_msg.RECODE_MERGE_CONFIG_ERROR return } - confCardholder, okCardholder := config.CardholderConfig[strconv.Itoa(cardholderId)] + confCardholder, okCardholder := config.CardholderConfig[cardholderId] if !okCardholder { code = code_msg.RECODE_MERGE_CONFIG_ERROR return diff --git a/service/cardholder/logic.go b/service/cardholder/logic.go index b46485b..b1909c5 100644 --- a/service/cardholder/logic.go +++ b/service/cardholder/logic.go @@ -12,7 +12,6 @@ import ( "apigame/util/zjson" "github.com/samber/lo" "sort" - "strconv" ) // CheckStatus 判断活动是否开启 @@ -197,7 +196,7 @@ func DoOpen(gameId string, { recordBase := NewRecordBase(player.Uid, sequenceId, cohort, config.Id, player.Details.Round) _ = svmysql.Create(NewRecordOpen(recordBase, - openMode, utstring.StringToInt(confCardholder.Id), zjson.Str(newCards)), + openMode, confCardholder.Id, zjson.Str(newCards)), gameId) } @@ -382,7 +381,7 @@ func NextActivityAutoExchange(gameId string, player *Player, config *confcardhol sequenceId, cohort := GetUserSequenceIdAndCohort(player.Uid) allNewCards := make([]int, 0) for _, idCardholder := range player.Details.AutoExchangeHolder { - confCardholder, _ := config.CardholderConfig[strconv.Itoa(idCardholder)] + confCardholder, _ := config.CardholderConfig[idCardholder] newCards := DoOpen(gameId, player, config, confCardholder, -- libgit2 0.21.0