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

上传旧时光任务判断

Browse Source
This commit is contained in:
liwei1dao 2023-05-26 19:14:16 +08:00
parent 1089324677
commit a2dfecd664
7 changed files with 341 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

508
bin/json/game_horoscope.json
View File

File diff suppressed because it is too large Load Diff

2
bin/json/game_mail.json
View File

@ -244,7 +244,7 @@
}, },
"recipient": { "recipient": {
"key": "mail_mail_recipient_12", "key": "mail_mail_recipient_12",
"text": "亲爱的的玩家你在跑商中荣获第{0}名：这是您的排名奖励请查收" "text": "亲爱的{0}："
}, },
"content": { "content": {
"key": "mail_mail_content_12", "key": "mail_mail_content_12",

53
bin/json/game_skillafteratk.json
View File

@ -11393,13 +11393,15 @@
"Argu": [ "Argu": [
1, 1,
4, 4,
900 900,
2,
1,
55
], ],
"FollowSK": [ "FollowSK": [],
245003112, "SucFollowSK": [
245003113 245003112
], ],
"SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -11410,31 +11412,6 @@
{ {
"Id": 245003112, "Id": 245003112,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 21,
"Argu": [
1,
1,
55
],
"FollowSK": [
245003113
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 245003113,
"EmitPR": 1000,
"From": 3, "From": 3,
"Where": [], "Where": [],
"Order": "", "Order": "",
@ -11599,8 +11576,8 @@
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 5, "Type": 5,
"Argu": [ "Argu": [
1, 2,
1, 2,
350 350
], ],
"FollowSK": [], "FollowSK": [],
@ -17142,6 +17119,7 @@
"Type": 32, "Type": 32,
"Argu": [ "Argu": [
3, 3,
-1,
-1 -1
], ],
"FollowSK": [], "FollowSK": [],
@ -17263,8 +17241,7 @@
"Type": 2, "Type": 2,
"Argu": [ "Argu": [
444004211, 444004211,
1000, -1,
1,
-1 -1
], ],
"FollowSK": [], "FollowSK": [],
@ -18285,6 +18262,7 @@
"Type": 32, "Type": 32,
"Argu": [ "Argu": [
3, 3,
1,
1 1
], ],
"FollowSK": [], "FollowSK": [],
@ -18451,6 +18429,7 @@
"Type": 32, "Type": 32,
"Argu": [ "Argu": [
3, 3,
2,
2 2
], ],
"FollowSK": [], "FollowSK": [],
@ -21629,7 +21608,9 @@
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 40, "Type": 40,
"Argu": [ "Argu": [
10 2,
2,
50
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -21771,7 +21752,7 @@
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 2, "Type": 2,
"Argu": [ "Argu": [
455006314, 455006312,
1, 1,
0 0
], ],

3
bin/json/game_skillatk.json
View File

@ -12936,8 +12936,7 @@
"ChildSkill": { "ChildSkill": {
"Id": [ "Id": [
255007211, 255007211,
255007213, 255007213
225007214
] ]
}, },
"Desc": { "Desc": {

128
bin/json/game_worldtask.json
View File

@ -5159,7 +5159,7 @@
}, },
{ {
"key": 30350, "key": 30350,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
"id_after": 30360, "id_after": 30360,
@ -5203,7 +5203,7 @@
}, },
{ {
"key": 30360, "key": 30360,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30350, "ontxe": 30350,
"id_after": 30370, "id_after": 30370,
@ -5247,7 +5247,7 @@
}, },
{ {
"key": 30370, "key": 30370,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30360, "ontxe": 30360,
"id_after": 0, "id_after": 0,
@ -5291,7 +5291,7 @@
}, },
{ {
"key": 30380, "key": 30380,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
"id_after": 30390, "id_after": 30390,
@ -5335,7 +5335,7 @@
}, },
{ {
"key": 30390, "key": 30390,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30380, "ontxe": 30380,
"id_after": 30400, "id_after": 30400,
@ -5379,7 +5379,7 @@
}, },
{ {
"key": 30400, "key": 30400,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30390, "ontxe": 30390,
"id_after": 0, "id_after": 0,
@ -5423,7 +5423,7 @@
}, },
{ {
"key": 30410, "key": 30410,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
"id_after": 30420, "id_after": 30420,
@ -5467,7 +5467,7 @@
}, },
{ {
"key": 30420, "key": 30420,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30410, "ontxe": 30410,
"id_after": 30430, "id_after": 30430,
@ -5511,7 +5511,7 @@
}, },
{ {
"key": 30430, "key": 30430,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30420, "ontxe": 30420,
"id_after": 0, "id_after": 0,
@ -5555,7 +5555,7 @@
}, },
{ {
"key": 30440, "key": 30440,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
"id_after": 30450, "id_after": 30450,
@ -5599,7 +5599,7 @@
}, },
{ {
"key": 30450, "key": 30450,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30440, "ontxe": 30440,
"id_after": 30460, "id_after": 30460,
@ -5643,7 +5643,7 @@
}, },
{ {
"key": 30460, "key": 30460,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30450, "ontxe": 30450,
"id_after": 0, "id_after": 0,
@ -5687,7 +5687,7 @@
}, },
{ {
"key": 30470, "key": 30470,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
"id_after": 30480, "id_after": 30480,
@ -5731,7 +5731,7 @@
}, },
{ {
"key": 30480, "key": 30480,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30470, "ontxe": 30470,
"id_after": 30490, "id_after": 30490,
@ -5775,7 +5775,7 @@
}, },
{ {
"key": 30490, "key": 30490,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30480, "ontxe": 30480,
"id_after": 0, "id_after": 0,
@ -5819,7 +5819,7 @@
}, },
{ {
"key": 30500, "key": 30500,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
"id_after": 30510, "id_after": 30510,
@ -5863,7 +5863,7 @@
}, },
{ {
"key": 30510, "key": 30510,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30500, "ontxe": 30500,
"id_after": 0, "id_after": 0,
@ -5907,7 +5907,7 @@
}, },
{ {
"key": 30520, "key": 30520,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
"id_after": 30530, "id_after": 30530,
@ -5951,7 +5951,7 @@
}, },
{ {
"key": 30530, "key": 30530,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30520, "ontxe": 30520,
"id_after": 0, "id_after": 0,
@ -5995,7 +5995,7 @@
}, },
{ {
"key": 30540, "key": 30540,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
"id_after": 30550, "id_after": 30550,
@ -6039,7 +6039,7 @@
}, },
{ {
"key": 30550, "key": 30550,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30540, "ontxe": 30540,
"id_after": 30560, "id_after": 30560,
@ -6083,7 +6083,7 @@
}, },
{ {
"key": 30560, "key": 30560,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30550, "ontxe": 30550,
"id_after": 30570, "id_after": 30570,
@ -6127,7 +6127,7 @@
}, },
{ {
"key": 30570, "key": 30570,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30560, "ontxe": 30560,
"id_after": 30580, "id_after": 30580,
@ -6171,7 +6171,7 @@
}, },
{ {
"key": 30580, "key": 30580,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30570, "ontxe": 30570,
"id_after": 30590, "id_after": 30590,
@ -6215,7 +6215,7 @@
}, },
{ {
"key": 30590, "key": 30590,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30580, "ontxe": 30580,
"id_after": 0, "id_after": 0,
@ -6259,7 +6259,7 @@
}, },
{ {
"key": 30600, "key": 30600,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
"id_after": 30610, "id_after": 30610,
@ -6303,7 +6303,7 @@
}, },
{ {
"key": 30610, "key": 30610,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30600, "ontxe": 30600,
"id_after": 30620, "id_after": 30620,
@ -6347,7 +6347,7 @@
}, },
{ {
"key": 30620, "key": 30620,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30610, "ontxe": 30610,
"id_after": 30630, "id_after": 30630,
@ -6391,7 +6391,7 @@
}, },
{ {
"key": 30630, "key": 30630,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30620, "ontxe": 30620,
"id_after": 0, "id_after": 0,
@ -6435,7 +6435,7 @@
}, },
{ {
"key": 30640, "key": 30640,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
"id_after": 30650, "id_after": 30650,
@ -6479,7 +6479,7 @@
}, },
{ {
"key": 30650, "key": 30650,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30640, "ontxe": 30640,
"id_after": 30660, "id_after": 30660,
@ -6523,7 +6523,7 @@
}, },
{ {
"key": 30660, "key": 30660,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30650, "ontxe": 30650,
"id_after": 30670, "id_after": 30670,
@ -6567,7 +6567,7 @@
}, },
{ {
"key": 30670, "key": 30670,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30660, "ontxe": 30660,
"id_after": 0, "id_after": 0,
@ -6611,7 +6611,7 @@
}, },
{ {
"key": 30680, "key": 30680,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
"id_after": 30690, "id_after": 30690,
@ -6655,7 +6655,7 @@
}, },
{ {
"key": 30690, "key": 30690,
"lock": 999, "lock": 1,
"lockend": 0, "lockend": 0,
"ontxe": 30680, "ontxe": 30680,
"id_after": 0, "id_after": 0,
@ -6699,7 +6699,7 @@
}, },
{ {
"key": 30700, "key": 30700,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
"id_after": 30710, "id_after": 30710,
@ -6743,7 +6743,7 @@
}, },
{ {
"key": 30710, "key": 30710,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30700, "ontxe": 30700,
"id_after": 30720, "id_after": 30720,
@ -6787,7 +6787,7 @@
}, },
{ {
"key": 30720, "key": 30720,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30710, "ontxe": 30710,
"id_after": 0, "id_after": 0,
@ -6831,7 +6831,7 @@
}, },
{ {
"key": 30730, "key": 30730,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
"id_after": 30740, "id_after": 30740,
@ -6875,7 +6875,7 @@
}, },
{ {
"key": 30740, "key": 30740,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30730, "ontxe": 30730,
"id_after": 30750, "id_after": 30750,
@ -6919,7 +6919,7 @@
}, },
{ {
"key": 30750, "key": 30750,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30740, "ontxe": 30740,
"id_after": 0, "id_after": 0,
@ -6963,7 +6963,7 @@
}, },
{ {
"key": 30760, "key": 30760,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
"id_after": 30770, "id_after": 30770,
@ -7007,7 +7007,7 @@
}, },
{ {
"key": 30770, "key": 30770,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30760, "ontxe": 30760,
"id_after": 0, "id_after": 0,
@ -7051,11 +7051,11 @@
}, },
{ {
"key": 30780, "key": 30780,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
"id_after": 30790, "id_after": 30790,
"group": 630, "group": 621,
"des": 3, "des": 3,
"icon": "", "icon": "",
"task_Tname": { "task_Tname": {
@ -7095,10 +7095,10 @@
}, },
{ {
"key": 30790, "key": 30790,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30780, "ontxe": 30780,
"id_after": 30800, "id_after": 99999,
"group": 630, "group": 630,
"des": 3, "des": 3,
"icon": "", "icon": "",
@ -7139,7 +7139,7 @@
}, },
{ {
"key": 30800, "key": 30800,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30790, "ontxe": 30790,
"id_after": 0, "id_after": 0,
@ -7183,7 +7183,7 @@
}, },
{ {
"key": 30810, "key": 30810,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
"id_after": 30820, "id_after": 30820,
@ -7227,7 +7227,7 @@
}, },
{ {
"key": 30820, "key": 30820,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30810, "ontxe": 30810,
"id_after": 30830, "id_after": 30830,
@ -7271,7 +7271,7 @@
}, },
{ {
"key": 30830, "key": 30830,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30820, "ontxe": 30820,
"id_after": 30840, "id_after": 30840,
@ -7315,7 +7315,7 @@
}, },
{ {
"key": 30840, "key": 30840,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30830, "ontxe": 30830,
"id_after": 30850, "id_after": 30850,
@ -7359,7 +7359,7 @@
}, },
{ {
"key": 30850, "key": 30850,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30840, "ontxe": 30840,
"id_after": 30860, "id_after": 30860,
@ -7403,7 +7403,7 @@
}, },
{ {
"key": 30860, "key": 30860,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30850, "ontxe": 30850,
"id_after": 30870, "id_after": 30870,
@ -7447,7 +7447,7 @@
}, },
{ {
"key": 30870, "key": 30870,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30860, "ontxe": 30860,
"id_after": 30880, "id_after": 30880,
@ -7491,7 +7491,7 @@
}, },
{ {
"key": 30880, "key": 30880,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30870, "ontxe": 30870,
"id_after": 30890, "id_after": 30890,
@ -7535,7 +7535,7 @@
}, },
{ {
"key": 30890, "key": 30890,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30880, "ontxe": 30880,
"id_after": 0, "id_after": 0,
@ -7579,7 +7579,7 @@
}, },
{ {
"key": 30900, "key": 30900,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
"id_after": 30910, "id_after": 30910,
@ -7623,7 +7623,7 @@
}, },
{ {
"key": 30910, "key": 30910,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30900, "ontxe": 30900,
"id_after": 30920, "id_after": 30920,
@ -7667,7 +7667,7 @@
}, },
{ {
"key": 30920, "key": 30920,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30910, "ontxe": 30910,
"id_after": 30930, "id_after": 30930,
@ -7711,7 +7711,7 @@
}, },
{ {
"key": 30930, "key": 30930,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30920, "ontxe": 30920,
"id_after": 0, "id_after": 0,
@ -7755,7 +7755,7 @@
}, },
{ {
"key": 30940, "key": 30940,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 20010, "ontxe": 20010,
"id_after": 30950, "id_after": 30950,
@ -7799,7 +7799,7 @@
}, },
{ {
"key": 30950, "key": 30950,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30940, "ontxe": 30940,
"id_after": 30960, "id_after": 30960,
@ -7843,7 +7843,7 @@
}, },
{ {
"key": 30960, "key": 30960,
"lock": 1, "lock": 999,
"lockend": 0, "lockend": 0,
"ontxe": 30950, "ontxe": 30950,
"id_after": 0, "id_after": 0,

8
modules/rtask/module.go
View File

@ -233,7 +233,7 @@ func (this *ModuleRtask) getHandle(tt comm.TaskType) (handles []*rtaskCondHandle
handle := &rtaskCondHandle{ handle := &rtaskCondHandle{
condId: v.Id, condId: v.Id,
verify: this.modelRtask.verifyRtype111, verify: this.modelRtask.verifyRtype111,
update: this.modelRtaskRecord.addUpdate, update: this.modelRtaskRecord.overrideUpdate,
} }
handles = append(handles, handle) handles = append(handles, handle)
this.registerVerifyHandle(v.Id, handle) this.registerVerifyHandle(v.Id, handle)
@ -241,7 +241,7 @@ func (this *ModuleRtask) getHandle(tt comm.TaskType) (handles []*rtaskCondHandle
handle := &rtaskCondHandle{ handle := &rtaskCondHandle{
condId: v.Id, condId: v.Id,
verify: this.modelRtask.verifyRtype123, verify: this.modelRtask.verifyRtype123,
update: this.modelRtaskRecord.addUpdate, update: this.modelRtaskRecord.overrideUpdate,
} }
handles = append(handles, handle) handles = append(handles, handle)
this.registerVerifyHandle(v.Id, handle) this.registerVerifyHandle(v.Id, handle)
@ -396,7 +396,7 @@ func (this *ModuleRtask) processTasks(session comm.IUserSession, taskParams ...*
return return
} }
if sociaty, ok := sociatyModule.(comm.ISociaty); ok { if sociaty, ok := sociatyModule.(comm.ISociaty); ok {
if err2 := sociaty.TaskcondNotify(uid, condIds); err2 != nil { if err2 := sociaty.TaskcondNotify(uid, condIdsForNotify); err2 != nil {
} }
} }
@ -436,7 +436,7 @@ func (this *ModuleRtask) CheckCondis(uid string, condiIds ...int32) (cids []int3
errors.Errorf("conf not found condiID: %v", condId) errors.Errorf("conf not found condiID: %v", condId)
return return
} }
if r.Data[0] > conf.Data1 { if r.Data[0] >= conf.Data1 {
cids = append(cids, condId) cids = append(cids, condId)
} }
} }

1
modules/rtask/verifyHandle.go
View File

@ -476,7 +476,6 @@ func (this *ModelRtask) verifyRtype111(uid string, cfg *cfg.GameRdtaskCondiData,
for _, hero := range ml.GetHeroList(uid) { for _, hero := range ml.GetHeroList(uid) {
if ok, err = soGreatEqual(hero.Lv, cfg.Data2); ok { if ok, err = soGreatEqual(hero.Lv, cfg.Data2); ok {
count++ count++
return
} }
} }
} }