diff --git a/conf/conf/db/s_cardholder_record_getnew_.sql b/conf/conf/db/s_cardholder_record_getnew_.sql deleted file mode 100644 index 486d309..0000000 --- a/conf/conf/db/s_cardholder_record_getnew_.sql +++ /dev/null @@ -1,13 +0,0 @@ -CREATE TABLE `{tablename}` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '日志ID', - `uid` bigint(20) NOT NULL DEFAULT 0 COMMENT '玩家唯一ID', - `sequence_id` varchar(255) NOT NULL DEFAULT '' COMMENT '用户序列组ID', - `cohort` varchar(255) NOT NULL DEFAULT '' COMMENT '用户分组ID', - `activity_id` bigint(20) NOT NULL DEFAULT 0 COMMENT '活动ID', - `round` int(11) NOT NULL DEFAULT 0 COMMENT '活动轮次', - `cardholder_id` int(11) NOT NULL DEFAULT 0 COMMENT '卡包ID', - `cardholder_count` int(11) NOT NULL DEFAULT 0 COMMENT '卡包数量', - `create_time` bigint(20) NOT NULL DEFAULT 0 COMMENT '创建时间戳', - `update_time` bigint(20) NOT NULL DEFAULT 0 COMMENT '修改时间戳', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COMMENT = '开卡包活动日志获得卡包'; \ No newline at end of file diff --git a/conf/conf/db/s_cardholder_record_rewardalbum_.sql b/conf/conf/db/s_cardholder_record_rewardalbum_.sql index af69013..e4acef0 100644 --- a/conf/conf/db/s_cardholder_record_rewardalbum_.sql +++ b/conf/conf/db/s_cardholder_record_rewardalbum_.sql @@ -5,7 +5,7 @@ CREATE TABLE `{tablename}` ( `cohort` varchar(255) NOT NULL DEFAULT '' COMMENT '用户分组ID', `activity_id` bigint(20) NOT NULL DEFAULT 0 COMMENT '活动ID', `round` int(11) NOT NULL DEFAULT 0 COMMENT '活动轮次', - `album_id` int(11) NOT NULL DEFAULT 0 COMMENT '卡组ID', + `album_id` varchar(255) NOT NULL DEFAULT '' COMMENT '卡组ID', `award` varchar(255) NOT NULL DEFAULT '' COMMENT '奖励内容', `create_time` bigint(20) NOT NULL DEFAULT 0 COMMENT '创建时间戳', `update_time` bigint(20) NOT NULL DEFAULT 0 COMMENT '修改时间戳', diff --git a/controllers/cardholder.go b/controllers/cardholder.go index 7bb7445..a2c55bc 100644 --- a/controllers/cardholder.go +++ b/controllers/cardholder.go @@ -10,14 +10,14 @@ type CardHolderController struct { BaseController } -// ActivityInfo 活动信息 -func (c *CardHolderController) ActivityInfo() { - req := new(models.ReqCardHolderActivityInfo) +// GetConfig 活动配置 +func (c *CardHolderController) GetConfig() { + req := new(models.ReqCardHolderGetConfig) if !c.GetPostData(req) { return } - code, rsp := cardholder.HandleActivityInfo(req) + code, rsp := cardholder.HandleGetConfig(req) c.RetRspCodeData(code, rsp) } @@ -34,18 +34,6 @@ func (c *CardHolderController) Info() { c.RetRspCodeData(code, rsp) } -// GetNew 获取卡包 -func (c *CardHolderController) GetNew() { - req := new(models.ReqCardHolderGetNew) - if !c.GetPostData(req) { - return - } - - code, rsp := cardholder.HandleGetNew(req) - - c.RetRspCodeData(code, rsp) -} - // Open 卡包打开 func (c *CardHolderController) Open() { req := new(models.ReqCardHolderOpen) @@ -57,27 +45,3 @@ func (c *CardHolderController) Open() { c.RetRspCodeData(code, rsp) } - -// GetRewardAlbum 领取卡组奖励 -func (c *CardHolderController) GetRewardAlbum() { - req := new(models.ReqCardHolderGetRewardAlbum) - if !c.GetPostData(req) { - return - } - - code, rsp := cardholder.HandleGetRewardAlbum(req) - - c.RetRspCodeData(code, rsp) -} - -// GetRewardRound 领取轮次奖励 -func (c *CardHolderController) GetRewardRound() { - req := new(models.ReqCardHolderGetRewardRound) - if !c.GetPostData(req) { - return - } - - code, rsp := cardholder.HandleGetRewardRound(req) - - c.RetRspCodeData(code, rsp) -} diff --git a/dto/cardholder-record.go b/dto/cardholder-record.go index 7bc0b52..5988eb0 100644 --- a/dto/cardholder-record.go +++ b/dto/cardholder-record.go @@ -43,37 +43,6 @@ func NewCardHolderRecordBase(uid int64, sequenceId string, cohort string, activi } } -// CardHolderRecordGetNew 开卡包活动日志获得卡包 -type CardHolderRecordGetNew struct { - CardHolderRecordBase - CardholderId int // 卡包ID - CardholderCount int // 卡包数量 -} - -func (d *CardHolderRecordGetNew) TableName(gameId string) string { - return constd.MYSQL_TABLE_S_CARDHOLDER_RECORD_GETNEW + gameId -} - -func (d *CardHolderRecordGetNew) CreateSqlPath() string { - return constd.MYSQL_TABLE_S_CARDHOLDER_RECORD_GETNEW -} - -func (d *CardHolderRecordGetNew) SqlPairs() map[string]string { - m := d.SqlPairsBase() - m["cardholder_id"] = fmt.Sprintf("%d", d.CardholderId) - m["cardholder_count"] = fmt.Sprintf("%d", d.CardholderCount) - return m -} - -func NewCardHolderRecordGetNew(recordBase CardHolderRecordBase, - cardholderId int, cardholderCount int) *CardHolderRecordGetNew { - return &CardHolderRecordGetNew{ - CardHolderRecordBase: recordBase, - CardholderId: cardholderId, - CardholderCount: cardholderCount, - } -} - // CardHolderRecordOpen 开卡包活动日志开卡包 type CardHolderRecordOpen struct { CardHolderRecordBase @@ -108,7 +77,7 @@ func NewCardHolderRecordOpen(recordBase CardHolderRecordBase, // CardHolderRecordRewardAlbum 开卡包活动日志领取卡组奖励 type CardHolderRecordRewardAlbum struct { CardHolderRecordBase - AlbumId int // 卡组ID + AlbumId string // 卡组ID Award string // 奖励内容 } @@ -122,13 +91,13 @@ func (d *CardHolderRecordRewardAlbum) CreateSqlPath() string { func (d *CardHolderRecordRewardAlbum) SqlPairs() map[string]string { m := d.SqlPairsBase() - m["album_id"] = fmt.Sprintf("%d", d.AlbumId) + m["album_id"] = fmt.Sprintf("'%s'", d.AlbumId) m["award"] = fmt.Sprintf("'%s'", d.Award) return m } func NewCardHolderRecordRewardAlbum(recordBase CardHolderRecordBase, - albumId int, award string) *CardHolderRecordRewardAlbum { + albumId string, award string) *CardHolderRecordRewardAlbum { return &CardHolderRecordRewardAlbum{ CardHolderRecordBase: recordBase, AlbumId: albumId, diff --git a/dto/cardholder.go b/dto/cardholder.go index ef47902..a317eed 100644 --- a/dto/cardholder.go +++ b/dto/cardholder.go @@ -16,7 +16,6 @@ func InitCardholder() { for _, gameId := range constd.GameListCardHolder { CreateTable(o, constd.MYSQL_MERGECOMMON, new(CardHolderData), gameId) - CreateTable(o, constd.MYSQL_MERGECOMMON, new(CardHolderRecordGetNew), gameId) CreateTable(o, constd.MYSQL_MERGECOMMON, new(CardHolderRecordOpen), gameId) CreateTable(o, constd.MYSQL_MERGECOMMON, new(CardHolderRecordRewardAlbum), gameId) CreateTable(o, constd.MYSQL_MERGECOMMON, new(CardHolderRecordRewardRound), gameId) @@ -36,7 +35,6 @@ type CardHolderData struct { // CardHolderDataDetails 卡牌活动详情 type CardHolderDataDetails struct { - Cardholder map[int]int // 卡包数量 k=卡包ID v=卡包数量 Cards map[int]int // 每张卡集了多少张 k=卡牌ID v=数量 Album map[string]int // 卡组奖励领取 k=卡组ID v=数量 StarSequenceScales map[string]int // 星级序列刻度 k=ID_用户序列_用户分组 v=刻度 @@ -55,7 +53,6 @@ func NewCardHolderData(uid int64) *CardHolderData { func NewCardHolderDataDetails() *CardHolderDataDetails { return &CardHolderDataDetails{ - Cardholder: make(map[int]int), Cards: make(map[int]int), Album: make(map[string]int), StarSequenceScales: make(map[string]int), diff --git a/models/cardholder.go b/models/cardholder.go index f66632e..530ff21 100644 --- a/models/cardholder.go +++ b/models/cardholder.go @@ -2,14 +2,14 @@ package models // 卡包 -// ReqCardHolderActivityInfo 请求 活动信息 -type ReqCardHolderActivityInfo struct { +// ReqCardHolderGetConfig 请求 活动配置 +type ReqCardHolderGetConfig struct { BaseLoginInfo BaseSign } -// RspCardHolderActivityInfo 返回 活动信息 -type RspCardHolderActivityInfo struct { +// RspCardHolderGetConfig 返回 活动配置 +type RspCardHolderGetConfig struct { ActivityId int64 `form:"activity_id" json:"activity_id"` // 活动配置 0=无活动 PreviewTime int64 `form:"preview_time" json:"preview_time"` // 活动预告时间 StartTime int64 `form:"start_time" json:"start_time"` // 活动开始时间 @@ -18,10 +18,9 @@ type RspCardHolderActivityInfo struct { // CardHolderInfo 卡包信息 type CardHolderInfo struct { - Cardholder map[int]int `form:"cardholder" json:"cardholder"` // 卡包数量 k=卡包ID v=卡包数量 - Cards map[int]int `form:"cards" json:"cards"` // 每张卡集了多少张 k=卡牌ID v=数量 - Album map[string]int `form:"album" json:"album"` // 卡组奖励领取 k=卡组ID v=数量 - Round int `form:"round" json:"round"` // 卡册当前轮次 + Cards map[int]int `form:"cards" json:"cards"` // 每张卡集了多少张 k=卡牌ID v=数量 + Album map[string]int `form:"album" json:"album"` // 卡组奖励领取 k=卡组ID v=数量 + Round int `form:"round" json:"round"` // 卡册当前轮次 } // ReqCardHolderInfo 请求 卡包信息 @@ -58,7 +57,9 @@ type ReqCardHolderOpen struct { // RspCardHolderOpen 返回 打开卡包 type RspCardHolderOpen struct { CardHolderInfo - NewCards []int `form:"new_cards" json:"new_cards"` // 新获得的卡牌列表 + NewCards []int `form:"new_cards" json:"new_cards"` // 新获得的卡牌列表 + AwardAlbum map[string]string `form:"award_album" json:"award_album"` // 触发的卡组奖励列表 k=出发的卡组ID v=对应奖励 + AwardRound string `form:"award_round" json:"award_round"` // 触发的轮次奖励列表 空字符串未触发 } // ReqCardHolderGetRewardAlbum 请求 领取卡组奖励 diff --git a/routers/router.go b/routers/router.go index 42f100e..460f339 100644 --- a/routers/router.go +++ b/routers/router.go @@ -10,19 +10,13 @@ func init() { prefix := "/3ad7e4ab95ae2249" - // 海滩项目 - // 活动信息 - beego.Router(prefix+"/cardholder/activityinfo", &controllers.CardHolderController{}, "post:ActivityInfo") + // 卡包卡牌活动 + // 活动配置 + beego.Router(prefix+"/cardholder/getconfig", &controllers.CardHolderController{}, "post:GetConfig") // 卡包信息 beego.Router(prefix+"/cardholder/info", &controllers.CardHolderController{}, "post:Info") - // 获取卡包 - beego.Router(prefix+"/cardholder/getnew", &controllers.CardHolderController{}, "post:GetNew") // 卡包打开 beego.Router(prefix+"/cardholder/open", &controllers.CardHolderController{}, "post:Open") - // 领取卡组奖励 - beego.Router(prefix+"/cardholder/getrewardalbum", &controllers.CardHolderController{}, "post:GetRewardAlbum") - // 领取轮次奖励 - beego.Router(prefix+"/cardholder/getrewardround", &controllers.CardHolderController{}, "post:GetRewardRound") beego.ErrorController(&controllers.ErrorController{}) } diff --git a/service/cardholder/handle.go b/service/cardholder/handle.go index daf8b77..a45886d 100644 --- a/service/cardholder/handle.go +++ b/service/cardholder/handle.go @@ -4,15 +4,16 @@ import ( "apigame/dto" "apigame/models" "apigame/service/constd" + "apigame/util/util-lx/lxalilog" "apigame/util/util-lx/lxtime" "apigame/util/utjson" "apigame/util/uttype" "strconv" ) -// HandleActivityInfo 活动信息 -func HandleActivityInfo(req *models.ReqCardHolderActivityInfo) (code string, rsp models.RspCardHolderActivityInfo) { - rsp = models.RspCardHolderActivityInfo{} +// HandleGetConfig 活动配置 +func HandleGetConfig(req *models.ReqCardHolderGetConfig) (code string, rsp models.RspCardHolderGetConfig) { + rsp = models.RspCardHolderGetConfig{} code = constd.RECODE_OK // 尝试更新配置 @@ -52,61 +53,12 @@ func HandleInfo(req *models.ReqCardHolderInfo) (code string, rsp models.RspCardH return } -// HandleGetNew 获取卡包 -func HandleGetNew(req *models.ReqCardHolderGetNew) (code string, rsp models.RspCardHolderGetNew) { - rsp = models.RspCardHolderGetNew{} - code = constd.RECODE_OK - - // 尝试更新配置 - config, hasConfig := TryUpdateConfig(req.GameID) - if !hasConfig { - code = constd.RECODE_MERGE_CARDHOLDER_NOTOPEN_ERROR - return - } - - // 检查活动状态 - code = CheckStatus(config) - if code != constd.RECODE_OK { - return - } - // 检查卡包ID - _, okCardholderConfig := config.CardholderConfig[strconv.Itoa(req.Id)] - if !okCardholderConfig { - code = constd.RECODE_MERGE_CARDHOLDER_CARDHOLDERID_ERROR - return - } - // 检查卡包数量 - if req.Count < 1 { - code = constd.RECODE_MERGE_CARDHOLDER_COUNTILLEGAL_ERROR - return - } - - // 读取游戏数据 - gameData := LoadData(req.GameID, req.UID, config.Id) - // 检查游戏数据 轮次等 - code = CheckGameData(gameData, config) - if code != constd.RECODE_OK { - return - } - - gameData.Details.Cardholder[req.Id] += req.Count - SaveData(req.GameID, gameData) - - // 返回信息 - rsp.CardHolderInfo = GetInfo(gameData, config) - - sequenceId, cohort := GetUserSequenceIdAndCohort(req.UID) - // 记录日志 - recordBase := dto.NewCardHolderRecordBase(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round) - dto.SaveRecord(req.GameID, dto.NewCardHolderRecordGetNew(recordBase, - req.Id, req.Count)) - - return -} - // HandleOpen 打开卡包 func HandleOpen(req *models.ReqCardHolderOpen) (code string, rsp models.RspCardHolderOpen) { - rsp = models.RspCardHolderOpen{} + rsp = models.RspCardHolderOpen{ + NewCards: make([]int, 0), + AwardAlbum: make(map[string]string), + } code = constd.RECODE_OK // 尝试更新配置 @@ -136,13 +88,6 @@ func HandleOpen(req *models.ReqCardHolderOpen) (code string, rsp models.RspCardH return } - // 判断卡包数目 - countOld, _ := gameData.Details.Cardholder[req.Id] - if countOld < 1 { - code = constd.RECODE_MERGE_CARDHOLDER_CARDHOLDER_NOTENOUGH_ERROR - return - } - // 开始处理抽卡 sequenceId, cohort := GetUserSequenceIdAndCohort(req.UID) //logs.Debug("wjwdbg 用户序列组IDsequenceId", sequenceId) @@ -196,148 +141,67 @@ func HandleOpen(req *models.ReqCardHolderOpen) (code string, rsp models.RspCardH } } - // 删除一个卡包 - gameData.Details.Cardholder[req.Id] = countOld - 1 - - // 存档 - SaveData(req.GameID, gameData) - - // 记录日志 - recordBase := dto.NewCardHolderRecordBase(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round) - dto.SaveRecord(req.GameID, dto.NewCardHolderRecordOpen(recordBase, - req.Id, utjson.JsonString(rsp.NewCards))) - - //logs.Debug("wjwdbg 获取卡牌列表:", rsp.NewCards) - uttype.Shuffle(rsp.NewCards) - //logs.Debug("wjwdbg 获取卡牌列表打乱:", rsp.NewCards) - - // 返回信息 - rsp.CardHolderInfo = GetInfo(gameData, config) - - return -} - -// HandleGetRewardAlbum 领取卡组奖励 -func HandleGetRewardAlbum(req *models.ReqCardHolderGetRewardAlbum) (code string, rsp models.RspCardHolderGetRewardAlbum) { - rsp = models.RspCardHolderGetRewardAlbum{} - code = constd.RECODE_OK - - // 尝试更新配置 - config, hasConfig := TryUpdateConfig(req.GameID) - if !hasConfig { - code = constd.RECODE_MERGE_CARDHOLDER_NOTOPEN_ERROR - return + // 记录开卡包日志 + { + recordBase := dto.NewCardHolderRecordBase(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round) + dto.SaveRecord(req.GameID, dto.NewCardHolderRecordOpen(recordBase, + req.Id, utjson.JsonString(rsp.NewCards))) } - // 检查活动状态 - code = CheckStatus(config) - if code != constd.RECODE_OK { - return - } - // 检查卡组ID - albumId := strconv.Itoa(req.Id) - confAlbum, okAlbum := config.AlbumConfig[albumId] - if !okAlbum { - code = constd.RECODE_MERGE_CARDHOLDER_ALBUMID_ERROR - return - } - - // 读取游戏数据 - gameData := LoadData(req.GameID, req.UID, config.Id) - // 检查游戏数据 轮次等 - code = CheckGameData(gameData, config) - if code != constd.RECODE_OK { - return - } - - // 是否已领过 - countGot := gameData.Details.Album[albumId] - if countGot > 0 { - code = constd.RECODE_MERGE_CARDHOLDER_ALBUM_HASGOT_ERROR - return - } - // 检查卡组内卡是否集齐 - 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 - } + // 根据新获得卡牌列表 判断 触发的卡组奖励列表 + for _, cardId := range rsp.NewCards { + confCard, hasConfCard := config.CardConfig[cardId] + if !hasConfCard { + lxalilog.Errors("CardConfig cant find cardId", cardId) + continue } - } - - gameData.Details.Album[albumId] += 1 - SaveData(req.GameID, gameData) - - // 当前轮次 - round := gameData.Details.Round - // 返回奖励 - rsp.Award = confAlbum.Rewards[uttype.IntToString(round)] - - // 返回信息 - rsp.CardHolderInfo = GetInfo(gameData, config) - - sequenceId, cohort := GetUserSequenceIdAndCohort(req.UID) - // 记录日志 - recordBase := dto.NewCardHolderRecordBase(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round) - dto.SaveRecord(req.GameID, dto.NewCardHolderRecordRewardAlbum(recordBase, - req.Id, rsp.Award)) - - return -} - -// HandleGetRewardRound 领取轮次奖励 -func HandleGetRewardRound(req *models.ReqCardHolderGetRewardRound) (code string, rsp models.RspCardHolderGetRewardRound) { - rsp = models.RspCardHolderGetRewardRound{} - code = constd.RECODE_OK - - // 尝试更新配置 - config, hasConfig := TryUpdateConfig(req.GameID) - if !hasConfig { - code = constd.RECODE_MERGE_CARDHOLDER_NOTOPEN_ERROR - return - } - - // 检查活动状态 - code = CheckStatus(config) - if code != constd.RECODE_OK { - return - } - - // 读取游戏数据 - gameData := LoadData(req.GameID, req.UID, config.Id) - // 检查游戏数据 轮次等 - code = CheckGameData(gameData, config) - if code != constd.RECODE_OK { - return - } - - // 判断所有卡组是否已经集齐 - // 检查卡组内卡是否集齐 - for _, conf := range config.AlbumConfig { - count := gameData.Details.Album[conf.SetId] - if count < 1 { - code = constd.RECODE_MERGE_CARDHOLDER_ROUND_NOTFINISH_ERROR - return + albumId := confCard.SetId + // 是否已领过 + countGot := gameData.Details.Album[albumId] + if countGot > 0 { + continue + } + confAlbum, hasConfAlbum := config.AlbumConfig[albumId] + if !hasConfAlbum { + lxalilog.Errors("AlbumConfig cant find albumId", albumId) + continue + } + // 检查卡组内卡是否集齐 + if !CheckAlbumFinish(albumId, gameData, config) { + continue + } + // 集齐处理发奖 + gameData.Details.Album[albumId] += 1 + award := confAlbum.Rewards[uttype.IntToString(gameData.Details.Round)] + rsp.AwardAlbum[albumId] = award + { + // 记录日志 + recordBase := dto.NewCardHolderRecordBase(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round) + dto.SaveRecord(req.GameID, dto.NewCardHolderRecordRewardAlbum(recordBase, + albumId, award)) } } + // 判断 处理 发放轮次奖励 轮次完成 + if CheckRoundFinish(gameData, config) { + // 返回奖励 + rsp.AwardRound = config.Awards[uttype.IntToString(gameData.Details.Round)] - // 当前轮次 - round := gameData.Details.Round - // 返回奖励 - rsp.Award = config.Awards[uttype.IntToString(round)] + // 记录日志 + recordBase := dto.NewCardHolderRecordBase(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round) + dto.SaveRecord(req.GameID, dto.NewCardHolderRecordRewardRound(recordBase, + rsp.AwardRound)) - sequenceId, cohort := GetUserSequenceIdAndCohort(req.UID) - // 记录日志 - recordBase := dto.NewCardHolderRecordBase(gameData.Uid, sequenceId, cohort, config.Id, gameData.Details.Round) - dto.SaveRecord(req.GameID, dto.NewCardHolderRecordRewardRound(recordBase, - rsp.Award)) + // 处理轮次完成 + HandleNextRound(gameData) + } - // 处理轮次完成 - HandleNextRound(gameData) + // 存档 SaveData(req.GameID, gameData) + //logs.Debug("wjwdbg 获取卡牌列表:", rsp.NewCards) + uttype.Shuffle(rsp.NewCards) + //logs.Debug("wjwdbg 获取卡牌列表打乱:", rsp.NewCards) + // 返回信息 rsp.CardHolderInfo = GetInfo(gameData, config) diff --git a/service/cardholder/logic.go b/service/cardholder/logic.go index ab9500b..01e1d3d 100644 --- a/service/cardholder/logic.go +++ b/service/cardholder/logic.go @@ -120,6 +120,30 @@ func GetNewCard(gameData *dto.CardHolderData, conf *CardActivityConfig) int { return int(indexMin % rate) } +// CheckAlbumFinish 判断卡组是否已集齐 +func CheckAlbumFinish(albumId string, gameData *dto.CardHolderData, config *CardActivityConfig) bool { + for _, conf := range config.CardConfig { + if conf.SetId == albumId { + count := gameData.Details.Cards[conf.Id] + if count < 1 { + return false + } + } + } + return true +} + +// CheckRoundFinish 判断轮次是否已集齐(所有卡组集齐) +func CheckRoundFinish(gameData *dto.CardHolderData, config *CardActivityConfig) bool { + for _, conf := range config.AlbumConfig { + count := gameData.Details.Album[conf.SetId] + if count < 1 { + return false + } + } + return true +} + // HandleNextRound 处理轮次完成 保留卡包 星级序列刻度 卡牌序列刻度 func HandleNextRound(gameData *dto.CardHolderData) { gameData.Details.Round += 1 @@ -129,13 +153,9 @@ func HandleNextRound(gameData *dto.CardHolderData) { func GetInfo(gameData *dto.CardHolderData, conf *CardActivityConfig) models.CardHolderInfo { info := models.CardHolderInfo{ - Cardholder: make(map[int]int), - Cards: make(map[int]int), - Album: make(map[string]int), - Round: 0, - } - for i, i2 := range gameData.Details.Cardholder { - info.Cardholder[i] = i2 + Cards: make(map[int]int), + Album: make(map[string]int), + Round: 0, } for i, i2 := range gameData.Details.Cards { info.Cards[i] = i2 -- libgit2 0.21.0