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

修改任务枚举

Browse Source
This commit is contained in:
wh_zcy 2023-05-25 18:43:20 +08:00
parent 90cd46979f
commit 30ccfc256c
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/rtask/module.go
View File

@ -176,7 +176,7 @@ func (this *ModuleRtask) getHandle(tt comm.TaskType) (handles []*rtaskCondHandle
case comm.Rtype25, comm.Rtype30, case comm.Rtype25, comm.Rtype30,
comm.Rtype32, comm.Rtype33, comm.Rtype34, comm.Rtype36, comm.Rtype32, comm.Rtype33, comm.Rtype34, comm.Rtype36,
comm.Rtype37, comm.Rtype40, comm.Rtype37, comm.Rtype40,
comm.Rtype46, comm.Rtype73, comm.Rtype76, comm.Rtype77, comm.Rtype79, comm.Rtype80, comm.Rtype83, comm.Rtype46, comm.Rtype76, comm.Rtype77, comm.Rtype79, comm.Rtype80, comm.Rtype83,
comm.Rtype52, comm.Rtype55, comm.Rtype56, comm.Rtype82, comm.Rtype52, comm.Rtype55, comm.Rtype56, comm.Rtype82,
comm.Rtype65, comm.Rtype66, comm.Rtype67, comm.Rtype68, comm.Rtype70, comm.Rtype140, comm.Rtype65, comm.Rtype66, comm.Rtype67, comm.Rtype68, comm.Rtype70, comm.Rtype140,
comm.Rtype169, comm.Rtype170, comm.Rtype174, comm.Rtype179, comm.Rtype180: comm.Rtype169, comm.Rtype170, comm.Rtype174, comm.Rtype179, comm.Rtype180:
@ -187,6 +187,14 @@ func (this *ModuleRtask) getHandle(tt comm.TaskType) (handles []*rtaskCondHandle
} }
handles = append(handles, handle) handles = append(handles, handle)
this.registerVerifyHandle(v.Id, handle) this.registerVerifyHandle(v.Id, handle)
case comm.Rtype73:
handle := &rtaskCondHandle{
condId: v.Id,
verify: this.modelRtaskRecord.verifyThirdGreatEqualParam,
update: this.modelRtaskRecord.addUpdate,
}
handles = append(handles, handle)
this.registerVerifyHandle(v.Id, handle)
case comm.Rtype41, comm.Rtype42: case comm.Rtype41, comm.Rtype42:
handle := &rtaskCondHandle{ handle := &rtaskCondHandle{
condId: v.Id, condId: v.Id,

16
modules/rtask/verifyHandle.go
View File

@ -107,19 +107,13 @@ func (this *ModelRtaskRecord) verifyThirdLessEqualParam(uid string, record *pb.D
//参数比较,默认第一个参数soGreateEqual,其它soEqual //参数比较,默认第一个参数soGreateEqual,其它soEqual
switch paramLen { switch paramLen {
case 1: case 1:
ok, err = soGreatEqual(params[0], cfg.Data1) ok=true
return return
case 2: case 2:
if ok, err = soGreatEqual(params[0], cfg.Data1); !ok {
return
}
if ok, err = soEqual(params[1], cfg.Data2); !ok { if ok, err = soEqual(params[1], cfg.Data2); !ok {
return return
} }
case 3: case 3:
if ok, err = soGreatEqual(params[0], cfg.Data1); !ok {
return
}
if ok, err = soEqual(params[1], cfg.Data2); !ok { if ok, err = soEqual(params[1], cfg.Data2); !ok {
return return
} }
@ -142,19 +136,13 @@ func (this *ModelRtaskRecord) verifyThirdGreatEqualParam(uid string, record *pb.
//参数比较,默认第一个参数soGreateEqual,其它soEqual //参数比较,默认第一个参数soGreateEqual,其它soEqual
switch paramLen { switch paramLen {
case 1: case 1:
ok, err = soGreatEqual(params[0], cfg.Data1) ok = true
return return
case 2: case 2:
if ok, err = soGreatEqual(params[0], cfg.Data1); !ok {
return
}
if ok, err = soEqual(params[1], cfg.Data2); !ok { if ok, err = soEqual(params[1], cfg.Data2); !ok {
return return
} }
case 3: case 3:
if ok, err = soGreatEqual(params[0], cfg.Data1); !ok {
return
}
if ok, err = soEqual(params[1], cfg.Data2); !ok { if ok, err = soEqual(params[1], cfg.Data2); !ok {
return return
} }