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

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
meixiongfeng 2022-11-29 15:38:09 +08:00
commit 86aaa10e1e
2 changed files with 92 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
bin/json/game_rdtaskcondi.json
View File

@ -848,7 +848,7 @@
{ {
"id": 173, "id": 173,
"datatype": 2, "datatype": 2,
"type": 71, "type": 72,
"inited": [], "inited": [],
"data1": 1, "data1": 1,
"data2": 0, "data2": 0,
@ -1076,17 +1076,6 @@
"data4": 4, "data4": 4,
"data5": 4 "data5": 4
}, },
{
"id": 194,
"datatype": 2,
"type": 138,
"inited": [],
"data1": 30,
"data2": 0,
"data3": 0,
"data4": 0,
"data5": 0
},
{ {
"id": 195, "id": 195,
"datatype": 2, "datatype": 2,
@ -3792,5 +3781,93 @@
"data3": 0, "data3": 0,
"data4": 0, "data4": 0,
"data5": 0 "data5": 0
},
{
"id": 5011001,
"datatype": 2,
"type": 11,
"inited": [],
"data1": 3,
"data2": 0,
"data3": 0,
"data4": 0,
"data5": 0
},
{
"id": 5012001,
"datatype": 2,
"type": 12,
"inited": [],
"data1": 1,
"data2": 0,
"data3": 0,
"data4": 0,
"data5": 0
},
{
"id": 5018001,
"datatype": 2,
"type": 18,
"inited": [],
"data1": 1,
"data2": 0,
"data3": 0,
"data4": 0,
"data5": 0
},
{
"id": 5024001,
"datatype": 2,
"type": 24,
"inited": [],
"data1": 1,
"data2": 0,
"data3": 0,
"data4": 0,
"data5": 0
},
{
"id": 5047001,
"datatype": 2,
"type": 47,
"inited": [],
"data1": 6,
"data2": 0,
"data3": 0,
"data4": 0,
"data5": 0
},
{
"id": 5063001,
"datatype": 2,
"type": 63,
"inited": [],
"data1": 100,
"data2": 0,
"data3": 0,
"data4": 0,
"data5": 0
},
{
"id": 5068001,
"datatype": 2,
"type": 68,
"inited": [],
"data1": 200000,
"data2": 0,
"data3": 0,
"data4": 0,
"data5": 0
},
{
"id": 5104001,
"datatype": 2,
"type": 104,
"inited": [],
"data1": 100,
"data2": 0,
"data3": 0,
"data4": 0,
"data5": 0
} }
] ]

5
modules/rtask/module.go
View File

@ -155,7 +155,7 @@ func (this *ModuleRtask) initRtaskVerifyHandle() {
verify: this.modelRtask.verfiyRtype10, verify: this.modelRtask.verfiyRtype10,
update: this.modelRtaskRecord.overrideUpdate, update: this.modelRtaskRecord.overrideUpdate,
}) })
case comm.Rtype11: case comm.Rtype11, comm.Rtype84, comm.Rtype85:
this.registerVerifyHandle(v.Id, &rtaskCondi{ this.registerVerifyHandle(v.Id, &rtaskCondi{
cfg: typeCfg, cfg: typeCfg,
find: this.modelRtaskRecord.lessEqualFirstParam, find: this.modelRtaskRecord.lessEqualFirstParam,
@ -174,7 +174,8 @@ func (this *ModuleRtask) initRtaskVerifyHandle() {
comm.Rtype26, comm.Rtype27, comm.Rtype28, comm.Rtype38, comm.Rtype26, comm.Rtype27, comm.Rtype28, comm.Rtype38,
comm.Rtype39, comm.Rtype50, comm.Rtype51, comm.Rtype53, comm.Rtype39, comm.Rtype50, comm.Rtype51, comm.Rtype53,
comm.Rtype54, comm.Rtype57, comm.Rtype58, comm.Rtype60, comm.Rtype54, comm.Rtype57, comm.Rtype58, comm.Rtype60,
comm.Rtype62, comm.Rtype64, comm.Rtype69, comm.Rtype72, comm.Rtype104: comm.Rtype62, comm.Rtype64, comm.Rtype69, comm.Rtype72, comm.Rtype88, comm.Rtype104,
comm.Rtype96, comm.Rtype105, comm.Rtype128, comm.Rtype130, comm.Rtype131:
this.registerVerifyHandle(v.Id, &rtaskCondi{ this.registerVerifyHandle(v.Id, &rtaskCondi{
cfg: typeCfg, cfg: typeCfg,
find: this.modelRtaskRecord.lessEqualFirstParam, find: this.modelRtaskRecord.lessEqualFirstParam,