Hermes / api-game

Download as
Browse Code »

Commit a7c3578ec293de3a00b109412eef094651efc5d6

Authored by 王家文
1 parent 8c2f40fa
Exists in master and in 1 other branch dev-wjw

fix🐛:根据策划需求，卡包ID从string改为int类型

Showing 4 changed files with 8 additions and 10 deletions   Show diff stats
configs/confcardholder/config.go
  Diff comments   View file @a7c3578
... ... @@ -23,7 +23,7 @@ type ActivityConfig struct {
23 23 Awards map[string]string // 奖励配置
24 24 AlbumConfig map[int]AlbumConfig // 卡组配置
25 25 CardConfig map[int]CardConfig // 卡牌配置
26   - CardholderConfig map[string]OpenCardholderConfig // 卡包开卡规则
  26 + CardholderConfig map[int]OpenCardholderConfig // 卡包开卡规则
27 27 NormalCardStarConfig map[string]NormalCardStarConfig // k=ID_用户序列_用户分组 卡片星级配置
28 28 CardSequenceConfig map[string]CardSequenceConfig // k=ID_用户序列_用户分组 卡片星级对应卡牌配置
29 29 StarShopConfig map[int]StarShopConfig // 星星商店配置
... ... @@ -115,7 +115,7 @@ type CardConfig struct {
115 115  
116 116 // OpenCardholderConfig 卡包开卡规则表
117 117 type OpenCardholderConfig struct {
118   - Id string `json:"id"` // ID
  118 + Id int `json:"id"` // ID
119 119 IsGoldCardholder int `json:"is_gold_card_holder"` // 是否是金卡包
120 120 IsNew int `json:"is_new"` // 是否是新卡包
121 121 GuaranteedStarCardId string `json:"guaranteed_star_card_id"` // 保底卡星级序列ID
... ...
configs/confcardholder/decode.go
  Diff comments   View file @a7c3578
... ... @@ -25,7 +25,7 @@ func (c *ActivityConfig) Decode(gameId string, rawData any) {
25 25 c.Awards = make(map[string]string)
26 26 c.AlbumConfig = make(map[int]AlbumConfig)
27 27 c.CardConfig = make(map[int]CardConfig)
28   - c.CardholderConfig = make(map[string]OpenCardholderConfig)
  28 + c.CardholderConfig = make(map[int]OpenCardholderConfig)
29 29 c.NormalCardStarConfig = make(map[string]NormalCardStarConfig)
30 30 c.CardSequenceConfig = make(map[string]CardSequenceConfig)
31 31 c.StarShopConfig = make(map[int]StarShopConfig)
... ...
service/cardholder/handle.go
  Diff comments   View file @a7c3578
... ... @@ -8,7 +8,6 @@ import (
8 8 "apigame/util/util-lx/lxtime"
9 9 "apigame/util/utslice"
10 10 "apigame/util/utstring"
11   - "strconv"
12 11 "strings"
13 12 )
14 13  
... ... @@ -84,7 +83,7 @@ func HandleOpen(req *models.ReqCardHolderOpen) (code string, rsp models.RspCardH
84 83 }
85 84 // 检查卡包ID
86 85 for _, idCardholder := range req.Ids {
87   - _, okCardholder := config.CardholderConfig[strconv.Itoa(idCardholder)]
  86 + _, okCardholder := config.CardholderConfig[idCardholder]
88 87 if !okCardholder {
89 88 code = code_msg.RECODE_MERGE_CARDHOLDER_CARDHOLDERID_ERROR
90 89 return
... ... @@ -104,7 +103,7 @@ func HandleOpen(req *models.ReqCardHolderOpen) (code string, rsp models.RspCardH
104 103 sequenceId, cohort := GetUserSequenceIdAndCohort(player.Uid)
105 104 allNewCards := make([]int, 0)
106 105 for _, idCardholder := range req.Ids {
107   - confCardholder, _ := config.CardholderConfig[strconv.Itoa(idCardholder)]
  106 + confCardholder, _ := config.CardholderConfig[idCardholder]
108 107 newCards := DoOpen(gameId,
109 108 player, config,
110 109 confCardholder,
... ... @@ -195,7 +194,7 @@ func HandleShopExchange(req *models.ReqStarShopExchange) (code string, rsp model
195 194 code = code_msg.RECODE_MERGE_CONFIG_ERROR
196 195 return
197 196 }
198   - confCardholder, okCardholder := config.CardholderConfig[strconv.Itoa(cardholderId)]
  197 + confCardholder, okCardholder := config.CardholderConfig[cardholderId]
199 198 if !okCardholder {
200 199 code = code_msg.RECODE_MERGE_CONFIG_ERROR
201 200 return
... ...
service/cardholder/logic.go
  Diff comments   View file @a7c3578
... ... @@ -12,7 +12,6 @@ import (
12 12 "apigame/util/zjson"
13 13 "github.com/samber/lo"
14 14 "sort"
15   - "strconv"
16 15 )
17 16  
18 17 // CheckStatus 判断活动是否开启
... ... @@ -197,7 +196,7 @@ func DoOpen(gameId string,
197 196 {
198 197 recordBase := NewRecordBase(player.Uid, sequenceId, cohort, config.Id, player.Details.Round)
199 198 _ = svmysql.Create(NewRecordOpen(recordBase,
200   - openMode, utstring.StringToInt(confCardholder.Id), zjson.Str(newCards)),
  199 + openMode, confCardholder.Id, zjson.Str(newCards)),
201 200 gameId)
202 201 }
203 202  
... ... @@ -382,7 +381,7 @@ func NextActivityAutoExchange(gameId string, player *Player, config *confcardhol
382 381 sequenceId, cohort := GetUserSequenceIdAndCohort(player.Uid)
383 382 allNewCards := make([]int, 0)
384 383 for _, idCardholder := range player.Details.AutoExchangeHolder {
385   - confCardholder, _ := config.CardholderConfig[strconv.Itoa(idCardholder)]
  384 + confCardholder, _ := config.CardholderConfig[idCardholder]
386 385 newCards := DoOpen(gameId,
387 386 player, config,
388 387 confCardholder,
... ...