diff --git a/modules/hero/api_resonanceSelect.go b/modules/hero/api_resonanceSelect.go index 988c48a89..9e483e905 100644 --- a/modules/hero/api_resonanceSelect.go +++ b/modules/hero/api_resonanceSelect.go @@ -13,13 +13,7 @@ func (this *apiComp) ResonanceUseEnergyCheck(session comm.IUserSession, req *pb. code = pb.ErrorCode_ReqParameterError return } - // for _, v := range req.Energy { - // if v.UseEnergy < 0 || (v.UseType != comm.ResonanceAtkPro && v.UseType != comm.ResonanceHpPro && v.UseType != comm.ResonanceDefPro) { - // code = pb.ErrorCode_ReqParameterError - // return - // } - // } return } diff --git a/modules/hero/module.go b/modules/hero/module.go index b4c5b87ed..7ab66361f 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -216,6 +216,36 @@ func (this *Hero) GetSpecifiedHero(session comm.IUserSession, heroConfId string, if session.GetUserId() == "" || heroConfId == "" || star == 0 || lv == 0 || amount == 0 { return pb.ErrorCode_ReqParameterError } + // 等级校验 + conf := this.configure.GetHeroConfig(heroConfId) + if conf == nil { + code = pb.ErrorCode_ReqParameterError + return + } + cid := heroConfId + maxStar := conf.Star + starConf := this.configure.GetHeroStarupConfig(cid, conf.Star) + if starConf == nil { + code = pb.ErrorCode_ReqParameterError + return + } + // 获取最大星级 + for i := 1; ; i++ { + starConf := this.configure.GetHeroStarupConfig(cid, conf.Star+int32(i)) + if starConf == nil { + break + } + if starConf != nil && starConf.Gold == 0 { + maxStar = star + int32(i) + break + } + } + + maxLv := this.configure.GetHeroStargrowConfigByStar(maxStar) // 最大等级 + if star > maxStar || lv > maxLv { + code = pb.ErrorCode_ReqParameterError + return + } hero, err := this.modelHero.createOneHero(session.GetUserId(), heroConfId) if err != nil { return pb.ErrorCode_HeroCreate @@ -502,7 +532,6 @@ func (this *Hero) ContinuousRestriction(uid string, heroCid string, drawCount in } } } - } } } @@ -687,7 +716,5 @@ func (this *Hero) GetAllMaxHero(session comm.IUserSession) (code pb.ErrorCode) { if len(changeHero) > 0 { session.SendMsg("hero", "change", &pb.HeroChangePush{List: changeHero}) } - return - } diff --git a/modules/privilege/api_getlist.go b/modules/privilege/api_getlist.go index 52d6c8e2d..78cb1d36f 100644 --- a/modules/privilege/api_getlist.go +++ b/modules/privilege/api_getlist.go @@ -15,10 +15,8 @@ func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.PrivilegeGe ///获取特权列表 func (this *apiComp) Getlist(session comm.IUserSession, req *pb.PrivilegeGetListReq) (code pb.ErrorCode, data proto.Message) { - list, err := this.module.modelPrivilege.getPrivilegeList(session.GetUserId()) - if err != nil { - this.module.Errorf("can't get privilege list :%v", err) - } + list, _ := this.module.modelPrivilege.getPrivilegeList(session.GetUserId()) + session.SendMsg(string(this.module.GetType()), PrivilegeGetListResp, &pb.PrivilegeGetListResp{Data: list}) return } diff --git a/modules/privilege/api_viplist.go b/modules/privilege/api_viplist.go index 0fed30caf..3e6d5ead1 100644 --- a/modules/privilege/api_viplist.go +++ b/modules/privilege/api_viplist.go @@ -15,10 +15,8 @@ func (this *apiComp) VipListCheck(session comm.IUserSession, req *pb.PrivilegeVi ///获取特权列表 func (this *apiComp) VipList(session comm.IUserSession, req *pb.PrivilegeVipListReq) (code pb.ErrorCode, data proto.Message) { - list, err := this.module.modelVip.getVipList(session.GetUserId()) - if err != nil { - this.module.Errorf("can't get privilege list :%v", err) - } + list, _ := this.module.modelVip.getVipList(session.GetUserId()) + session.SendMsg(string(this.module.GetType()), PrivilegeVipListResp, &pb.PrivilegeVipListResp{Data: list}) return } diff --git a/modules/privilege/module.go b/modules/privilege/module.go index 87ac32772..41152e5a3 100644 --- a/modules/privilege/module.go +++ b/modules/privilege/module.go @@ -337,7 +337,7 @@ func (this *Privilege) AddVipData(session comm.IUserSession, oldVip, newVip int3 Reward: map[int32]bool{}, Privilege: map[int32]*pb.PrivilegeList{}, CTime: configure.Now().Unix(), - RewardTime: 0, + RewardTime: configure.Now().Unix(), } if err = this.modelVip.addVipData(session.GetUserId(), vip); err != nil { this.Errorf("err:%v", err) @@ -360,12 +360,23 @@ func (this *Privilege) AddVipData(session comm.IUserSession, oldVip, newVip int3 } } } + // 发放每日福利 + var res []*pb.UserAssets + for _, v := range conf.Daygift { + res = append(res, &pb.UserAssets{ + A: v.A, + T: v.T, + N: v.N, + }) + } + this.mail.SendMailByCid(session, comm.VipDaily, res) } } update["privilege"] = vip.Privilege this.modelVip.modifyVipData(session.GetUserId(), update) session.SendMsg(string(this.GetType()), PrivilegeGetListResp, &pb.PrivilegeVipListResp{Data: vip}) + } // 发送特权每日奖励