diff --git a/service/cardholder/handle.go b/service/cardholder/handle.go index f9df395..6def221 100644 --- a/service/cardholder/handle.go +++ b/service/cardholder/handle.go @@ -15,14 +15,14 @@ func HandleInfo(req *models.ReqCardHolderInfo) (code string, rsp models.RspCardH code = constd.RECODE_OK // 尝试更新配置 - Config, hasConfig := TryUpdateConfig(req.GameID) + config, hasConfig := TryUpdateConfig(req.GameID) if !hasConfig { code = constd.RECODE_MERGE_CARDHOLDER_NOTOPEN_ERROR return } // 读取游戏数据 - gameData := LoadData(req.GameID, req.UID, Config.Id) + gameData := LoadData(req.GameID, req.UID, config.Id) rsp.CardHolderInfo = gameData.GetInfo() @@ -35,19 +35,19 @@ func HandleGetNew(req *models.ReqCardHolderGetNew) (code string, rsp models.RspC code = constd.RECODE_OK // 尝试更新配置 - Config, hasConfig := TryUpdateConfig(req.GameID) + config, hasConfig := TryUpdateConfig(req.GameID) if !hasConfig { code = constd.RECODE_MERGE_CARDHOLDER_NOTOPEN_ERROR return } // 检查活动状态 - code = CheckStatus(Config) + code = CheckStatus(config) if code != constd.RECODE_OK { return } // 检查卡包ID - _, okCardholderConfig := Config.CardholderConfig[strconv.Itoa(req.Id)] + _, okCardholderConfig := config.CardholderConfig[strconv.Itoa(req.Id)] if !okCardholderConfig { code = constd.RECODE_MERGE_CARDHOLDER_CARDHOLDERID_ERROR return @@ -59,9 +59,9 @@ func HandleGetNew(req *models.ReqCardHolderGetNew) (code string, rsp models.RspC } // 读取游戏数据 - gameData := LoadData(req.GameID, req.UID, Config.Id) + gameData := LoadData(req.GameID, req.UID, config.Id) // 检查游戏数据 轮次等 - code = CheckGameData(gameData, Config) + code = CheckGameData(gameData, config) if code != constd.RECODE_OK { return } @@ -73,7 +73,7 @@ func HandleGetNew(req *models.ReqCardHolderGetNew) (code string, rsp models.RspC rsp.CardHolderInfo = gameData.GetInfo() // 记录日志 - dto.SaveRecord(req.GameID, dto.NewCardHolderRecordGetNew(gameData.Uid, Config.Id, gameData.Details.Round, + dto.SaveRecord(req.GameID, dto.NewCardHolderRecordGetNew(gameData.Uid, config.Id, gameData.Details.Round, req.Id, req.Count)) return @@ -85,28 +85,28 @@ func HandleOpen(req *models.ReqCardHolderOpen) (code string, rsp models.RspCardH code = constd.RECODE_OK // 尝试更新配置 - Config, hasConfig := TryUpdateConfig(req.GameID) + config, hasConfig := TryUpdateConfig(req.GameID) if !hasConfig { code = constd.RECODE_MERGE_CARDHOLDER_NOTOPEN_ERROR return } // 检查活动状态 - code = CheckStatus(Config) + code = CheckStatus(config) if code != constd.RECODE_OK { return } // 检查卡包ID - confCardholder, okCardholderConfig := Config.CardholderConfig[strconv.Itoa(req.Id)] + confCardholder, okCardholderConfig := config.CardholderConfig[strconv.Itoa(req.Id)] if !okCardholderConfig { code = constd.RECODE_MERGE_CARDHOLDER_CARDHOLDERID_ERROR return } // 读取游戏数据 - gameData := LoadData(req.GameID, req.UID, Config.Id) + gameData := LoadData(req.GameID, req.UID, config.Id) // 检查游戏数据 轮次等 - code = CheckGameData(gameData, Config) + code = CheckGameData(gameData, config) if code != constd.RECODE_OK { return } @@ -124,14 +124,14 @@ func HandleOpen(req *models.ReqCardHolderOpen) (code string, rsp models.RspCardH //logs.Debug("wjwdbg 用户分组IDcohort:", cohort) if confCardholder.IsNew != 0 { // 如果是新卡包 按顺序查找数目最少的一张卡抽取 - cardId := GetNewCard(gameData, Config) + cardId := GetNewCard(gameData, config) //logs.Debug("wjwdbg 抽取新卡ID:", cardId) // 增加卡牌 gameData.Details.Cards[cardId] += 1 rsp.NewCards = append(rsp.NewCards, cardId) } else { getCardFunc := func(cardConfigId string) { - confCardSequence, hasCardSequence := Config.FindCardSequenceConfig(cardConfigId, sequenceId, cohort) + confCardSequence, hasCardSequence := config.FindCardSequenceConfig(cardConfigId, sequenceId, cohort) if hasCardSequence { combineId := CombineIdSequenceIdCohort(cardConfigId, sequenceId, cohort) scale := gameData.Details.CardSequenceScales[combineId] @@ -154,7 +154,7 @@ func HandleOpen(req *models.ReqCardHolderOpen) (code string, rsp models.RspCardH // 非保底卡 if confCardholder.NormalCardNumber > 0 { count := confCardholder.NormalCardNumber - confNormalCardStar, hasNormalCardStar := Config.FindNormalCardStarConfig(confCardholder.MinimumGuaranteeCardId, sequenceId, cohort) + confNormalCardStar, hasNormalCardStar := config.FindNormalCardStarConfig(confCardholder.MinimumGuaranteeCardId, sequenceId, cohort) if hasNormalCardStar { combineIdStar := CombineIdSequenceIdCohort(confCardholder.MinimumGuaranteeCardId, sequenceId, cohort) scaleStar := gameData.Details.StarSequenceScales[combineIdStar] @@ -178,7 +178,7 @@ func HandleOpen(req *models.ReqCardHolderOpen) (code string, rsp models.RspCardH SaveData(req.GameID, gameData) // 记录日志 - dto.SaveRecord(req.GameID, dto.NewCardHolderRecordOpen(gameData.Uid, Config.Id, gameData.Details.Round, + dto.SaveRecord(req.GameID, dto.NewCardHolderRecordOpen(gameData.Uid, config.Id, gameData.Details.Round, req.Id, utjson.JsonString(rsp.NewCards))) //logs.Debug("wjwdbg 获取卡牌列表:", rsp.NewCards) @@ -197,29 +197,29 @@ func HandleGetRewardAlbum(req *models.ReqCardHolderGetRewardAlbum) (code string, code = constd.RECODE_OK // 尝试更新配置 - Config, hasConfig := TryUpdateConfig(req.GameID) + config, hasConfig := TryUpdateConfig(req.GameID) if !hasConfig { code = constd.RECODE_MERGE_CARDHOLDER_NOTOPEN_ERROR return } // 检查活动状态 - code = CheckStatus(Config) + code = CheckStatus(config) if code != constd.RECODE_OK { return } // 检查卡组ID albumId := strconv.Itoa(req.Id) - confAlbum, okAlbum := Config.AlbumConfig[albumId] + confAlbum, okAlbum := config.AlbumConfig[albumId] if !okAlbum { code = constd.RECODE_MERGE_CARDHOLDER_ALBUMID_ERROR return } // 读取游戏数据 - gameData := LoadData(req.GameID, req.UID, Config.Id) + gameData := LoadData(req.GameID, req.UID, config.Id) // 检查游戏数据 轮次等 - code = CheckGameData(gameData, Config) + code = CheckGameData(gameData, config) if code != constd.RECODE_OK { return } @@ -231,9 +231,9 @@ func HandleGetRewardAlbum(req *models.ReqCardHolderGetRewardAlbum) (code string, return } // 检查卡组内卡是否集齐 - for _, config := range Config.CardConfig { - if config.SetId == albumId { - count := gameData.Details.Cards[config.Id] + for _, conf := range config.CardConfig { + if conf.SetId == albumId { + count := gameData.Details.Cards[conf.Id] if count < 1 { code = constd.RECODE_MERGE_CARDHOLDER_ALBUM_NOTFINISH_ERROR return @@ -253,7 +253,7 @@ func HandleGetRewardAlbum(req *models.ReqCardHolderGetRewardAlbum) (code string, rsp.CardHolderInfo = gameData.GetInfo() // 记录日志 - dto.SaveRecord(req.GameID, dto.NewCardHolderRecordRewardAlbum(gameData.Uid, Config.Id, gameData.Details.Round, + dto.SaveRecord(req.GameID, dto.NewCardHolderRecordRewardAlbum(gameData.Uid, config.Id, gameData.Details.Round, req.Id, rsp.Award)) return @@ -265,30 +265,30 @@ func HandleGetRewardRound(req *models.ReqCardHolderGetRewardRound) (code string, code = constd.RECODE_OK // 尝试更新配置 - Config, hasConfig := TryUpdateConfig(req.GameID) + config, hasConfig := TryUpdateConfig(req.GameID) if !hasConfig { code = constd.RECODE_MERGE_CARDHOLDER_NOTOPEN_ERROR return } // 检查活动状态 - code = CheckStatus(Config) + code = CheckStatus(config) if code != constd.RECODE_OK { return } // 读取游戏数据 - gameData := LoadData(req.GameID, req.UID, Config.Id) + gameData := LoadData(req.GameID, req.UID, config.Id) // 检查游戏数据 轮次等 - code = CheckGameData(gameData, Config) + code = CheckGameData(gameData, config) if code != constd.RECODE_OK { return } // 判断所有卡组是否已经集齐 // 检查卡组内卡是否集齐 - for _, config := range Config.AlbumConfig { - count := gameData.Details.Album[config.SetId] + for _, conf := range config.AlbumConfig { + count := gameData.Details.Album[conf.SetId] if count < 1 { code = constd.RECODE_MERGE_CARDHOLDER_ROUND_NOTFINISH_ERROR return @@ -298,10 +298,10 @@ func HandleGetRewardRound(req *models.ReqCardHolderGetRewardRound) (code string, // 当前轮次 round := gameData.Details.Round // 返回奖励 - rsp.Award = Config.Awards[uttype.IntToString(round)] + rsp.Award = config.Awards[uttype.IntToString(round)] // 记录日志 - dto.SaveRecord(req.GameID, dto.NewCardHolderRecordRewardRound(gameData.Uid, Config.Id, gameData.Details.Round, + dto.SaveRecord(req.GameID, dto.NewCardHolderRecordRewardRound(gameData.Uid, config.Id, gameData.Details.Round, rsp.Award)) // 处理轮次完成 -- libgit2 0.21.0