liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update

Browse Source
This commit is contained in:
meixiongfeng 2023-05-25 18:32:37 +08:00
parent a5217a3839
commit 90cd46979f
3 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/items/module.go
View File

@ -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...)

15
modules/rtask/module.go
View File

@ -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

27
modules/rtask/verifyHandle.go
View File

@ -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
}