diff --git a/modules/library/api_getreward.go b/modules/library/api_getreward.go index 44a956652..f4b5cdbf2 100644 --- a/modules/library/api_getreward.go +++ b/modules/library/api_getreward.go @@ -28,11 +28,31 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewa code = pb.ErrorCode_LibraryNoData return } + // fetterlv check + var minLv int32 + conf := this.module.configure.GetLibraryFetter(fetter.Fid, req.Fetterlv) if conf == nil { code = pb.ErrorCode_ConfigNoFound + } + + for _, v := range conf.Hid { // 获取羁绊等级 + _d := this.module.modelFetter.GetFetterByHeroId(session.GetUserId(), v) + if _d != nil { + if minLv == 0 { + minLv = _d.Favorlv + } + if _d.Favorlv > minLv { + minLv = _d.Favorlv + } + } + } + + if minLv < req.Fetterlv { + code = pb.ErrorCode_LibraryLvReward return } + for k := range fetter.Prize { if k == req.Fetterlv { code = pb.ErrorCode_LibraryReward diff --git a/modules/library/model_fetter.go b/modules/library/model_fetter.go index aa144476b..9afb299ef 100644 --- a/modules/library/model_fetter.go +++ b/modules/library/model_fetter.go @@ -60,3 +60,13 @@ func (this *modelFetter) getOneHeroFetter(uid, oid string) *pb.DBHeroFetter { } return fetter } + +func (this *modelFetter) GetFetterByHeroId(uid, cid string) *pb.DBHeroFetter { + list := this.getHeroFetterList(uid) + for _, v := range list { + if v.Heroid == cid { // 找到了直接返回 + return v + } + } + return nil +} diff --git a/stress/robot/options.go b/stress/robot/options.go deleted file mode 100644 index 35fbfb84b..000000000 --- a/stress/robot/options.go +++ /dev/null @@ -1,40 +0,0 @@ -package robot - -type Options struct { - WsUrl string //客户端访问网关的ws接口地址 - RegUrl string //账号注册接口地址 - Account string //玩家账号 - Create bool - Secretkey string //秘钥串 - ServerId string //区服ID - Role bool //是否创角 -} - -func DefaultOpts() *Options { - return &Options{ - WsUrl: "ws://10.0.0.9:7891/gateway", - RegUrl: "http://10.0.0.9:8000/register", - Create: false, - ServerId: "1", - } -} - -type Option func(*Options) - -func WithWsUrl(addr string) Option { - return func(o *Options) { - o.WsUrl = addr - } -} - -func WithAccount(account string) Option { - return func(o *Options) { - o.Account = account - } -} - -func WithCreate(create bool) Option { - return func(o *Options) { - o.Create = create - } -} diff --git a/stress/robot/robot.go b/stress/robot/robot.go index d36e7bc6e..f5e618b52 100644 --- a/stress/robot/robot.go +++ b/stress/robot/robot.go @@ -139,7 +139,7 @@ func traceFunc(module string, funcName string, uid string, funcArgs interface{}) //次方法在用户登录成功后调用 func (r *Robot) onUserLoaded() { //user - r.RunUser() + //r.RunUser() } type RobotFormatter struct { diff --git a/stress/robot/user.go b/stress/robot/user.go deleted file mode 100644 index adb767e15..000000000 --- a/stress/robot/user.go +++ /dev/null @@ -1,60 +0,0 @@ -package robot - -import ( - "go_dreamfactory/comm" - "go_dreamfactory/modules/user" - "go_dreamfactory/pb" -) - -//申明测试接口及请求和响应参数 -var user_builders = []*TestCase{ - { - desc: "修改名称", - mainType: string(comm.ModuleUser), - subType: user.UserSubTypeModifyName, - req: &pb.UserModifynameReq{ //设置请求参数 - Name: "uuuuuu", - }, - rsp: &pb.UserModifynameResp{}, - // enabled: true, - }, - { - desc: "查看图鉴", - mainType: string(comm.ModuleUser), - subType: "gettujian", - req: &pb.UserGetTujianReq{}, - rsp: &pb.UserGetTujianResp{}, - // enabled: true, - }, { - desc: "获取配置", - mainType: string(comm.ModuleUser), - subType: user.UserSubTypeGetSetting, - req: &pb.UserGetSettingReq{}, - rsp: &pb.UserGetSettingResp{}, - // enabled: true, - }, { - desc: "更新配置", - mainType: string(comm.ModuleUser), - subType: user.UserSubTypeUpdatesetting, - req: &pb.UserUpdateSettingReq{ - Setting: &pb.DBUserSetting{ - Huazhi: 2, - Kangjuchi: 1, - Gaoguang: true, - }, - }, - rsp: &pb.UserUpdateSettingResp{}, - // enabled: true, - }, { - desc: "验证码", - mainType: string(comm.ModuleUser), - subType: user.UserSubTypeVeriCode, - req: &pb.UserVeriCodeReq{}, - rsp: &pb.UserVeriCodeResp{}, - }, -} - -//声明加入到构建器并发起请求 -func (r *Robot) RunUser() { - //r.addBuilders(user_builders) -}