diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index f587a4375..1adc53391 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -62,16 +62,6 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq return } - // 每日抽卡上限校验 - if cfgGlobal.DrawToplimit < heroRecord.Daycount { - errdata = &pb.ErrorData{ - Code: pb.ErrorCode_HeroDrwaMax, - Title: pb.ErrorCode_HeroDrwaMax.ToString(), - Message: fmt.Sprintf("单日抽卡达到上限,抽卡次数:%d", cfgGlobal.DrawToplimit), - } - return - } - for _, v := range drawConf.RecruitmentType { appointmap[v.K] = v.S // 指定次抽数据 } @@ -83,6 +73,17 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq if cfgGlobal == nil { return } + + // 每日抽卡上限校验 + if cfgGlobal.DrawToplimit < heroRecord.Daycount { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_HeroDrwaMax, + Title: pb.ErrorCode_HeroDrwaMax.ToString(), + Message: fmt.Sprintf("单日抽卡达到上限,抽卡次数:%d", cfgGlobal.DrawToplimit), + } + return + } + if errdata = this.DrawCardCheck(session, req); errdata != nil { return }