diff --git a/modules/sys/model_sys.go b/modules/sys/model_sys.go index 39be355be..c5d467292 100644 --- a/modules/sys/model_sys.go +++ b/modules/sys/model_sys.go @@ -43,30 +43,58 @@ func (this *ModelSys) validCond(uid string, condData *cfg.GameOpencondData) stri iuser := this.moduleSys.ModuleUser user := iuser.GetUser(uid) if user == nil { + flag = false return "" } if user.Lv >= conf.Param { flag = true + }else{ + flag = false } case 2: //关卡ID - flag = true + iuser := this.moduleSys.ModuleUser + ex, err := iuser.GetUserExpand(uid) + if err != nil { + flag = false + return "" + } + if ex.Uid == "" { + flag = false + return "" + } + + if v, ok := ex.Mline[1]; ok { + if v >= conf.Param { + flag = true + }else{ + flag = false + } + }else{ + flag = false + } case 3: //世界任务ID module, err := this.service.GetModule(comm.ModuleWorldtask) if err != nil { this.moduleSys.Debugln(err) + flag = false return "" } if i, ok := module.(comm.IWorldtask); ok { d := i.GetMyWorldtask(uid) if _, ok := d.LastTaskIds[conf.Param]; ok { flag = true + }else{ + flag = false } + }else{ + flag = false } } - if flag { - return condData.Id - } + } + + if flag { + return condData.Id } return "" }