diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index fa41ba563..dd287e780 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -250,10 +250,11 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq if int32(len(v)) > randomIndex { if star == 5 { // 抽出5星英雄后A次抽奖内不会再抽到5星英雄(普通卡池+阵营卡池) curDrawCount := drawCount - req.DrawCount - if curDrawCount <= 10 { // 首次十连不计算 + if drawCount <= 10 { // 前10次不计算(连续抽卡最多连续出A个相同阵营的英雄) + szCards = append(szCards, v[randomIndex].Id) continue } - newID := this.module.ContinuousRestriction(session.GetUserId(), v[randomIndex].Id, curDrawCount+int32(index), strPool[index]) + newID := this.module.ContinuousRestriction(session.GetUserId(), v[randomIndex].Id, curDrawCount+int32(index+1), strPool[index]) szCards = append(szCards, newID) continue } diff --git a/modules/privilege/api_buygift.go b/modules/privilege/api_buygift.go index fde416306..584ce6cec 100644 --- a/modules/privilege/api_buygift.go +++ b/modules/privilege/api_buygift.go @@ -53,10 +53,10 @@ func (this *apiComp) BuyGift(session comm.IUserSession, req *pb.PrivilegeBuyGift return } vip.Reward[req.VipLv] = true - update := map[string]interface{}{ + + this.module.modelVip.modifyVipData(session.GetUserId(), map[string]interface{}{ "reward": vip.Reward, - } - this.module.modelVip.modifyVipData(session.GetUserId(), update) + }) // 推送 session.SendMsg(string(this.module.GetType()), PrivilegeBuyGiftResp, &pb.PrivilegeBuyGiftResp{Data: vip}) return diff --git a/modules/privilege/module.go b/modules/privilege/module.go index 8248e3c31..e9e4e5e25 100644 --- a/modules/privilege/module.go +++ b/modules/privilege/module.go @@ -353,7 +353,7 @@ func (this *Privilege) AddVipData(session comm.IUserSession, oldVip, newVip int3 return } } - update := map[string]interface{}{} + for i := oldVip + 1; i <= newVip; i++ { conf := this.configure.GetVipConfigureData(i) if conf != nil { @@ -381,11 +381,12 @@ func (this *Privilege) AddVipData(session comm.IUserSession, oldVip, newVip int3 this.mail.SendMailByCid(session, comm.VipDaily, res) } } - update["privilege"] = vip.Privilege - this.modelVip.modifyVipData(session.GetUserId(), update) + + this.modelVip.modifyVipData(session.GetUserId(), map[string]interface{}{ + "privilege": vip.Privilege, + }) session.SendMsg(string(this.GetType()), PrivilegeGetListResp, &pb.PrivilegeVipListResp{Data: vip}) - } // 发送特权每日奖励 diff --git a/modules/viking/api_challenge.go b/modules/viking/api_challenge.go index 469bc2800..7c3728faf 100644 --- a/modules/viking/api_challenge.go +++ b/modules/viking/api_challenge.go @@ -40,7 +40,6 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng } if code = this.module.CheckRes(session, []*cfg.Gameatn{costRes}); code != pb.ErrorCode_Success { - // if req.AutoBuy { // 不够的时候看是否能自动购买 if code = this.module.AutoBuyTicket(session); code != pb.ErrorCode_Success { return @@ -49,7 +48,6 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng code = pb.ErrorCode_VikingMaxChallengeCount return } - //return } cfgData := this.module.configure.GetVikingBossConfigData(req.BossId, req.Difficulty)