更新配置

This commit is contained in:
wh_zcy 2023-01-04 16:07:48 +08:00
parent 6580f92a4e
commit e4be401bdb
3 changed files with 52 additions and 22 deletions

View File

@ -2,14 +2,14 @@
{ {
"key": 10100, "key": 10100,
"lock": 1, "lock": 1,
"ontxe": 999999, "ontxe": 0,
"id_after": 10101, "id_after": 10101,
"group": 1, "group": 1,
"des": 2, "des": 2,
"icon": "", "icon": "",
"npc": [ "npc": [
"scenes_boundary_01_recordtask", "scenes_boundary_01_recordtask",
"杰克-入场", "杰克",
"150" "150"
], ],
"getafter_event": [ "getafter_event": [
@ -30,7 +30,7 @@
{ {
"key": 10101, "key": 10101,
"lock": 1, "lock": 1,
"ontxe": 10100, "ontxe": 10101,
"id_after": 10102, "id_after": 10102,
"group": 1, "group": 1,
"des": 2, "des": 2,
@ -52,7 +52,7 @@
{ {
"key": 10102, "key": 10102,
"lock": 1, "lock": 1,
"ontxe": 10101, "ontxe": 0,
"id_after": 10103, "id_after": 10103,
"group": 1, "group": 1,
"des": 2, "des": 2,
@ -1747,7 +1747,7 @@
], ],
"completetask": 0, "completetask": 0,
"auto_accept": 0, "auto_accept": 0,
"overtips": 1, "overtips": 0,
"reword": [] "reword": []
}, },
{ {
@ -1769,7 +1769,7 @@
], ],
"completetask": 0, "completetask": 0,
"auto_accept": 1, "auto_accept": 1,
"overtips": 1, "overtips": 0,
"reword": [] "reword": []
}, },
{ {
@ -1791,7 +1791,7 @@
], ],
"completetask": 0, "completetask": 0,
"auto_accept": 0, "auto_accept": 0,
"overtips": 1, "overtips": 0,
"reword": [] "reword": []
}, },
{ {
@ -1813,7 +1813,7 @@
], ],
"completetask": 0, "completetask": 0,
"auto_accept": 0, "auto_accept": 0,
"overtips": 1, "overtips": 0,
"reword": [] "reword": []
}, },
{ {
@ -1835,7 +1835,7 @@
], ],
"completetask": 0, "completetask": 0,
"auto_accept": 0, "auto_accept": 0,
"overtips": 1, "overtips": 0,
"reword": [] "reword": []
}, },
{ {
@ -1857,7 +1857,7 @@
], ],
"completetask": 0, "completetask": 0,
"auto_accept": 0, "auto_accept": 0,
"overtips": 1, "overtips": 0,
"reword": [] "reword": []
}, },
{ {
@ -1879,7 +1879,7 @@
], ],
"completetask": 0, "completetask": 0,
"auto_accept": 0, "auto_accept": 0,
"overtips": 1, "overtips": 0,
"reword": [] "reword": []
}, },
{ {
@ -1901,7 +1901,7 @@
], ],
"completetask": 0, "completetask": 0,
"auto_accept": 0, "auto_accept": 0,
"overtips": 1, "overtips": 0,
"reword": [] "reword": []
}, },
{ {
@ -1923,7 +1923,7 @@
], ],
"completetask": 0, "completetask": 0,
"auto_accept": 0, "auto_accept": 0,
"overtips": 1, "overtips": 0,
"reword": [] "reword": []
}, },
{ {
@ -1945,7 +1945,7 @@
], ],
"completetask": 0, "completetask": 0,
"auto_accept": 0, "auto_accept": 0,
"overtips": 1, "overtips": 0,
"reword": [] "reword": []
}, },
{ {
@ -1967,6 +1967,28 @@
], ],
"completetask": 0, "completetask": 0,
"auto_accept": 0, "auto_accept": 0,
"overtips": 0,
"reword": []
},
{
"key": 101,
"lock": 1,
"ontxe": 0,
"id_after": 0,
"group": 2,
"des": 2,
"icon": "",
"npc": [
"scenes_boundary_01_recordtask",
"杰克A",
"150"
],
"getafter_event": [
2,
1002
],
"completetask": 0,
"auto_accept": 0,
"overtips": 1, "overtips": 1,
"reword": [] "reword": []
} }

View File

@ -291,6 +291,7 @@ func (this *ModuleRtask) SendToRtask(session comm.IUserSession, rtaskType comm.T
if code := this.CheckCondi(uid, conf.Id); code == pb.ErrorCode_Success { if code := this.CheckCondi(uid, conf.Id); code == pb.ErrorCode_Success {
module, err := this.service.GetModule(comm.ModuleWorldtask) module, err := this.service.GetModule(comm.ModuleWorldtask)
if err == nil { if err == nil {
// 世界任务
if worldtask, ok := module.(comm.IWorldtask); ok { if worldtask, ok := module.(comm.IWorldtask); ok {
if err := worldtask.TaskcondNotify(session, conf.Id); err != nil { if err := worldtask.TaskcondNotify(session, conf.Id); err != nil {
var customErr = new(comm.CustomError) var customErr = new(comm.CustomError)

View File

@ -78,17 +78,24 @@ func TestMatrxing(t *testing.T) {
} }
func TestCompre(t *testing.T) { func TestCompre(t *testing.T) {
a := []int32{1, 2, 4, 5} // a := []int32{1, 2, 4, 5}
b := []int32{1, 2, 4} // b := []int32{1, 2, 4}
fmt.Println(utils.ForContainer(a, b)) // fmt.Println(utils.ForContainer(a, b))
} }
func TestDeletex(t *testing.T) { func TestDeletex(t *testing.T) {
a := []int32{1, 2, 3, 4} // a := []int32{1, 2, 3, 4}
c := utils.Deletex(a, 2) // c := utils.Deletex(a, 2)
fmt.Println(c) // fmt.Println(c)
} }
func TestDiffDays(t *testing.T) { func TestDiffDays(t *testing.T) {
fmt.Println(utils.DiffDays(1614527999, 1614614400)) // fmt.Println(utils.DiffDays(1614527999, 1614614400))
} }
func BenchmarkRandNumbers(b *testing.B) {
for i := 0; i < b.N; i++ {
b.ReportAllocs()
utils.RandomNumbers(0, 7, 4)
}
}