diff --git a/modules/items/module.go b/modules/items/module.go index c1fe371cc..deb67eff2 100644 --- a/modules/items/module.go +++ b/modules/items/module.go @@ -159,7 +159,7 @@ func (this *Items) AddItems(session comm.IUserSession, items map[string]int32, b this.itemsChangePush(session, change) //推送道具背包变化 } for k, v := range items { - tasks = append(tasks, comm.GettaskParam(comm.Rtype187, utils.ToInt32(k), v)) + tasks = append(tasks, comm.GettaskParam(comm.Rtype187, v, utils.ToInt32(k))) } if len(tasks) > 0 { go this.ModuleRtask.TriggerTask(session.GetUserId(), tasks...) diff --git a/modules/rtask/module.go b/modules/rtask/module.go index 15c613de4..f0d679637 100644 --- a/modules/rtask/module.go +++ b/modules/rtask/module.go @@ -411,9 +411,20 @@ func (this *ModuleRtask) CheckCondis(uid string, condiIds ...int32) (cids []int3 } for _, condId := range condiIds { - if _, ok := this.modelRtask.checkCondi(uid, condId, record); ok { - cids = append(cids, condId) + if r, ok := record.Vals[condId]; ok { + conf, err := this.configure.getRtaskTypeById(condId) + if err != nil || conf == nil { + errors.Errorf("conf not found condiID: %v", condId) + return + } + if r.Data[0] > conf.Data1 { + cids = append(cids, condId) + } } + + // if _, ok := this.modelRtask.checkCondi(uid, condId, record); ok { + // cids = append(cids, condId) + // } } return diff --git a/modules/rtask/verifyHandle.go b/modules/rtask/verifyHandle.go index 53ad47385..f1bef976b 100644 --- a/modules/rtask/verifyHandle.go +++ b/modules/rtask/verifyHandle.go @@ -23,19 +23,20 @@ func (this *ModelRtaskRecord) verifyMultiEqual(uid string, record *pb.DBRtaskRec //参数比较,默认第一个参数soGreateEqual,其它soEqual switch paramLen { case 1: - ok, err = soGreatEqual(params[0], cfg.Data1) + // ok, err = soGreatEqual(params[0], cfg.Data1) + ok = true return case 2: - if ok, err = soGreatEqual(params[0], cfg.Data1); !ok { - return - } + // if ok, err = soGreatEqual(params[0], cfg.Data1); !ok { + // return + // } if ok, err = soEqual(params[1], cfg.Data2); !ok { return } case 3: - if ok, err = soGreatEqual(params[0], cfg.Data1); !ok { - return - } + // if ok, err = soGreatEqual(params[0], cfg.Data1); !ok { + // return + // } if ok, err = soEqual(params[1], cfg.Data2); !ok { return } @@ -43,9 +44,9 @@ func (this *ModelRtaskRecord) verifyMultiEqual(uid string, record *pb.DBRtaskRec return } case 4: - if ok, err = soGreatEqual(params[0], cfg.Data1); !ok { - return - } + // if ok, err = soGreatEqual(params[0], cfg.Data1); !ok { + // return + // } if ok, err = soEqual(params[1], cfg.Data2); !ok { return } @@ -56,9 +57,9 @@ func (this *ModelRtaskRecord) verifyMultiEqual(uid string, record *pb.DBRtaskRec return } case 5: - if ok, err = soGreatEqual(params[0], cfg.Data1); !ok { - return - } + // if ok, err = soGreatEqual(params[0], cfg.Data1); !ok { + // return + // } if ok, err = soEqual(params[1], cfg.Data2); !ok { return }