This commit is contained in:
meixiongfeng 2023-03-28 14:19:19 +08:00
parent 387b23f97d
commit d41600bbdc
13 changed files with 571 additions and 1252 deletions

View File

@ -157,15 +157,15 @@
},
{
"id": 114,
"type_sp": 0,
"tasktxt": "",
"type_sp": 1,
"tasktxt": "招募一次守护者",
"type": 14,
"valid": 0,
"data1": 10,
"data1": 1,
"data2": 0,
"data3": 0,
"data4": 0,
"data5": 0
"data5": 101
},
{
"id": 115,
@ -721,7 +721,7 @@
},
{
"id": 161,
"type_sp": 0,
"type_sp": 1,
"tasktxt": "",
"type": 61,
"valid": 0,
@ -729,7 +729,7 @@
"data2": 0,
"data3": 0,
"data4": 0,
"data5": 0
"data5": 102
},
{
"id": 162,
@ -877,15 +877,15 @@
},
{
"id": 174,
"type_sp": 0,
"tasktxt": "",
"type_sp": 1,
"tasktxt": "尝试挑战邦尼兔",
"type": 70,
"valid": 0,
"data1": 1,
"data2": 101,
"data3": 0,
"data4": 0,
"data5": 0
"data5": 10050
},
{
"id": 175,
@ -1211,6 +1211,18 @@
"data4": 0,
"data5": 0
},
{
"id": 203,
"type_sp": 1,
"tasktxt": "调查这些木桩",
"type": 149,
"valid": 1,
"data1": 1,
"data2": 0,
"data3": 0,
"data4": 0,
"data5": 0
},
{
"id": 301,
"type_sp": 1,

View File

@ -1,373 +1,35 @@
[
{
"id": 1,
"id": 101,
"datas": [
"bossfight_pt_02",
"0新手引导-杰克-中轴城常驻待机",
"功能入口-招募",
"901"
],
"event": [
2,
401
10,
107
],
"goto": 0
},
{
"id": 2,
"id": 102,
"datas": [
"bossfight_pt_02",
"0新手引导-杰克-中轴城常驻待机",
"功能入口-主线",
"901"
],
"event": [
2,
402
],
"goto": 0
},
{
"id": 3,
"datas": [
"bossfight_pt_02",
"1.新手引导-花朵-中轴城",
"901"
],
"event": [
2,
403
],
"goto": 1
},
{
"id": 4,
"datas": [
"bossfight_pt_02",
"1.新手引导-花朵-中轴城",
"901"
],
"event": [
2,
404
],
"goto": 0
},
{
"id": 5,
"datas": [
"bossfight_pt_02",
"0新手引导-杰克-中轴城常驻待机",
"901"
],
"event": [
2,
406
],
"goto": 0
},
{
"id": 6,
"datas": [
"bossfight_pt_02",
"3新手引导-波比-正常待机-中轴城",
"901"
],
"event": [
2,
407
],
"goto": 0
},
{
"id": 7,
"datas": [
"bossfight_pt_02",
"2新手引导-邦尼兔-正常待机-中轴城",
"901"
],
"event": [
2,
408
],
"goto": 0
},
{
"id": 8,
"datas": [
"bossfight_pt_02",
"新手引导-波比-右屏圣树1",
"901"
],
"event": [
2,
410
],
"goto": 1
},
{
"id": 9,
"datas": [
"bossfight_pt_02",
"新手引导-波比-右屏圣树2",
"901"
],
"event": [
2,
411
],
"goto": 0
},
{
"id": 10,
"datas": [
"bossfight_pt_02",
"新手引导-豺狼人-右屏圣树",
"901"
],
"event": [
2,
412
],
"goto": 0
},
{
"id": 11,
"datas": [
"bossfight_pt_02",
"新手引导-豺狼人-右屏圣树",
"901"
],
"event": [
2,
413
],
"goto": 0
},
{
"id": 12,
"datas": [
"bossfight_pt_02",
"新手引导-波比-犀牛守卫",
"901"
],
"event": [
4,
10,
166
],
"goto": 0
},
{
"id": 13,
"id": 10010,
"datas": [
"bossfight_pt_02",
"新手引导-波比-犀牛守卫",
"901"
],
"event": [
2,
416
],
"goto": 0
},
{
"id": 14,
"datas": [
"bossfight_pt_02",
"新手引导-波比-右屏圣树3",
"901"
],
"event": [
9,
1
],
"goto": 0
},
{
"id": 15,
"datas": [
"bossfight_pt_02",
"新手引导-波比-右屏圣树3",
"901"
],
"event": [
2,
420
],
"goto": 0
},
{
"id": 16,
"datas": [
"bossfight_pt_02",
"0新手引导-杰克-中轴城常驻待机",
"901"
],
"event": [
2,
422
],
"goto": 0
},
{
"id": 17,
"datas": [
"bossfight_pt_02",
"0新手引导-杰克-中轴城常驻待机",
"901"
],
"event": [
2,
423
],
"goto": 0
},
{
"id": 18,
"datas": [
"bossfight_pt_02",
"0新手引导-杰克-中轴城常驻待机",
"901"
],
"event": [
2,
425
],
"goto": 0
},
{
"id": 19,
"datas": [
"bossfight_pt_02",
"0新手引导-杰克-中轴城常驻待机",
"901"
],
"event": [
2,
426
],
"goto": 0
},
{
"id": 20,
"datas": [
"scenes_smithy_01",
"暴夫纳特铁匠铺",
"901"
],
"event": [
2,
427
],
"goto": 0
},
{
"id": 21,
"datas": [
"scenes_smithy_02",
"打造",
"901"
],
"event": [
2,
428
],
"goto": 0
},
{
"id": 22,
"datas": [
"bossfight_pt_02",
"0新手引导-杰克-中轴城常驻待机",
"901"
],
"event": [
2,
429
],
"goto": 0
},
{
"id": 23,
"datas": [
"bossfight_pt_02",
"0新手引导-杰克-中轴城常驻待机",
"901"
],
"event": [
2,
430
],
"goto": 0
},
{
"id": 24,
"datas": [
"bossfight_pt_02",
"0新手引导-杰克-中轴城常驻待机",
"901"
],
"event": [
2,
431
],
"goto": 0
},
{
"id": 25,
"datas": [
"bossfight_pt_02",
"0新手引导-杰克-中轴城常驻待机",
"901"
],
"event": [
2,
432
],
"goto": 0
},
{
"id": 26,
"datas": [
"bossfight_pt_02",
"功能入口-商人",
"901"
],
"event": [
10,
122
],
"goto": 0
},
{
"id": 27,
"datas": [
"scenes_smithy_02",
"打造",
"139"
],
"event": [
2,
500
],
"goto": 0
},
{
"id": 28,
"datas": [
"scenes_smithy_02",
"打造",
"139"
],
"event": [
2,
404
],
"goto": 0
},
{
"id": 29,
"datas": [
"bossfight_pt_02",
"功能入口-主线关卡",
"20010_熊猫_1",
"901"
],
"event": [
@ -377,13 +39,133 @@
"goto": 0
},
{
"id": 30,
"id": 10020,
"datas": [
"bossfight_pt_02",
"传送点-铁匠铺",
"20020_骇客蛛_1",
"901"
],
"event": [],
"event": [
2,
500
],
"goto": 0
},
{
"id": 10030,
"datas": [
"bossfight_pt_02",
"20030_熊猫_2",
"901"
],
"event": [
2,
500
],
"goto": 0
},
{
"id": 10040,
"datas": [
"bossfight_pt_02",
"20040_邦尼兔_1",
"901"
],
"event": [
2,
500
],
"goto": 0
},
{
"id": 10050,
"datas": [
"bossfight_pt_02",
"20040_邦尼兔_1",
"901"
],
"event": [
2,
500
],
"goto": 0
},
{
"id": 10060,
"datas": [
"bossfight_pt_02",
"20050_熊猫_3",
"901"
],
"event": [
2,
500
],
"goto": 0
},
{
"id": 10070,
"datas": [
"武馆",
"20060_武馆师傅_1",
"武馆"
],
"event": [
2,
500
],
"goto": 0
},
{
"id": 10080,
"datas": [
"武馆",
"20060_武馆邦尼兔_1",
"武馆"
],
"event": [
2,
500
],
"goto": 0
},
{
"id": 10090,
"datas": [
"bossfight_pt_02",
"20070_熊猫_4",
"901"
],
"event": [
2,
500
],
"goto": 0
},
{
"id": 10100,
"datas": [
"bossfight_pt_02",
"20070_熊猫_4",
"901"
],
"event": [
2,
500
],
"goto": 0
},
{
"id": 10110,
"datas": [
"bossfight_pt_02",
"20020_骇客蛛_1",
"901"
],
"event": [
2,
505
],
"goto": 0
}
]

View File

@ -1,21 +0,0 @@
[
{
"key": 2,
"disposable_loop": [
201,
203,
202,
204,
203,
202,
201,
204
],
"fixed_loop": [
201,
202,
203,
204
]
}
]

View File

@ -10640,9 +10640,10 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 21,
"Type": 25,
"Argu": [
1,
4,
6,
33
],
@ -10889,10 +10890,10 @@
{
"Id": 214003213,
"EmitPR": 1000,
"From": 4,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
@ -10914,10 +10915,10 @@
{
"Id": 214003214,
"EmitPR": 1000,
"From": 4,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
@ -10938,10 +10939,10 @@
{
"Id": 214003223,
"EmitPR": 1000,
"From": 4,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
@ -10963,10 +10964,10 @@
{
"Id": 214003224,
"EmitPR": 1000,
"From": 4,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
@ -10987,10 +10988,10 @@
{
"Id": 214003233,
"EmitPR": 1000,
"From": 4,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
@ -11012,10 +11013,10 @@
{
"Id": 214003234,
"EmitPR": 1000,
"From": 4,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
@ -11036,10 +11037,10 @@
{
"Id": 214003243,
"EmitPR": 1000,
"From": 4,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
@ -11061,10 +11062,10 @@
{
"Id": 214003244,
"EmitPR": 1000,
"From": 4,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
@ -11085,10 +11086,10 @@
{
"Id": 214003311,
"EmitPR": 1000,
"From": 4,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 3,
"Type": 1,
"Argu": [
@ -11096,7 +11097,10 @@
4,
500
],
"FollowSK": [],
"FollowSK": [
214003351,
214003352
],
"SucFollowSK": [
214003312
],
@ -11110,10 +11114,10 @@
{
"Id": 214003312,
"EmitPR": 400,
"From": 4,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 1,
"Type": 12,
"Argu": [
@ -11131,10 +11135,10 @@
{
"Id": 214003321,
"EmitPR": 1000,
"From": 4,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 3,
"Type": 1,
"Argu": [
@ -11142,7 +11146,10 @@
4,
550
],
"FollowSK": [],
"FollowSK": [
214003351,
214003352
],
"SucFollowSK": [
214003322
],
@ -11156,10 +11163,10 @@
{
"Id": 214003322,
"EmitPR": 400,
"From": 4,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 1,
"Type": 12,
"Argu": [
@ -11177,10 +11184,10 @@
{
"Id": 214003331,
"EmitPR": 1000,
"From": 4,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 3,
"Type": 1,
"Argu": [
@ -11188,7 +11195,10 @@
4,
550
],
"FollowSK": [],
"FollowSK": [
214003351,
214003352
],
"SucFollowSK": [
214003332
],
@ -11202,10 +11212,10 @@
{
"Id": 214003332,
"EmitPR": 500,
"From": 4,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 1,
"Type": 12,
"Argu": [
@ -11223,10 +11233,10 @@
{
"Id": 214003341,
"EmitPR": 1000,
"From": 4,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 3,
"Type": 1,
"Argu": [
@ -11234,7 +11244,10 @@
4,
600
],
"FollowSK": [],
"FollowSK": [
214003351,
214003352
],
"SucFollowSK": [
214003342
],
@ -11248,10 +11261,10 @@
{
"Id": 214003342,
"EmitPR": 500,
"From": 4,
"From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 10,
"ExecuteCnt": 1,
"Type": 12,
"Argu": [
@ -11266,6 +11279,54 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 214003351,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 25,
"Argu": [
1,
4,
6,
33
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 214003352,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001105,
1000,
1,
1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 245003011,
"EmitPR": 1000,
@ -11674,17 +11735,15 @@
{
"Id": 235003112,
"EmitPR": 1000,
"From": 9,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 8,
"Type": 31,
"Argu": [
0,
0,
1,
1000
2
],
"FollowSK": [],
"SucFollowSK": [],
@ -11698,7 +11757,7 @@
{
"Id": 235003113,
"EmitPR": 1000,
"From": 9,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
@ -11735,7 +11794,9 @@
1,
-1
],
"FollowSK": [],
"FollowSK": [
235003215
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@ -11759,7 +11820,9 @@
1,
-1
],
"FollowSK": [],
"FollowSK": [
235003215
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@ -11779,8 +11842,8 @@
"Type": 2,
"Argu": [
435003211,
1,
-1
-1,
0
],
"FollowSK": [],
"SucFollowSK": [],
@ -11802,8 +11865,8 @@
"Type": 2,
"Argu": [
435003212,
1,
-1
-1,
0
],
"FollowSK": [],
"SucFollowSK": [],
@ -11820,7 +11883,7 @@
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"Limit": 50,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
@ -11852,7 +11915,9 @@
1,
-1
],
"FollowSK": [],
"FollowSK": [
235003217
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@ -11869,14 +11934,13 @@
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Type": 30,
"Argu": [
390001126,
1000,
1,
-1
10
],
"FollowSK": [
235003218
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@ -11908,6 +11972,53 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 235003220,
"EmitPR": 1000,
"From": 1,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
413004111,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 235003221,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 50,
"ExecuteCnt": 10,
"Type": 3,
"Argu": [
390001212,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 235003311,
"EmitPR": 1000,
@ -11916,12 +12027,10 @@
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 8,
"Type": 31,
"Argu": [
0,
0,
1,
1000
1
],
"FollowSK": [],
"SucFollowSK": [],
@ -11960,7 +12069,7 @@
{
"Id": 235003313,
"EmitPR": 1000,
"From": 9,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
@ -12618,6 +12727,32 @@
45
],
"FollowSK": [],
"SucFollowSK": [
235005112
],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 235005112,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 25,
"Argu": [
1,
6,
4,
45
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
@ -12658,7 +12793,7 @@
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 2,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,

View File

@ -943,7 +943,7 @@
"key": "skill_buffdes_390001126",
"text": "无法附加减益状态"
},
"BuffType": 0,
"BuffType": 20,
"EffectArgu": [],
"BufParNum": 1,
"RelyCheckArgu": [],
@ -1222,8 +1222,7 @@
},
"BuffType": 23,
"EffectArgu": [
35,
250
350
],
"BufParNum": 1,
"RelyCheckArgu": [],
@ -1321,9 +1320,10 @@
"key": "skill_buffdes_390001212",
"text": "检测效果最多叠加50层"
},
"BuffType": 1,
"BuffType": 45,
"EffectArgu": [
10
50,
30
],
"BufParNum": 1,
"RelyCheckArgu": [],
@ -1345,10 +1345,12 @@
},
"Desc": {
"key": "skill_buffdes_390001213",
"text": ""
"text": "一方收到攻击另一方收到此次伤害的80%的真实伤害"
},
"BuffType": 0,
"EffectArgu": [],
"BuffType": 94,
"EffectArgu": [
800
],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],

View File

@ -580,39 +580,39 @@
},
{
"Id": 435003211,
"When": 19,
"When": 5,
"FromCheck": "",
"TargetCheck": "Target=3",
"TargetCheck": "Target=3,HasBuff=0",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "Effect=0,Succ=1",
"BuffCheck": "",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 99,
"Callback": [
235003215
235003211
]
},
{
"Id": 435003212,
"When": 19,
"When": 5,
"FromCheck": "",
"TargetCheck": "Target=3",
"TargetCheck": "Target=3,HasBuff=1",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "Effect=0,Succ=0",
"BuffCheck": "",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 99,
"Callback": [
235003215
235003212
]
},
{
"Id": 435003213,
"When": 16,
"When": 14,
"FromCheck": "",
"TargetCheck": "Target=3",
"MainSkillCheck": "",

View File

@ -5,7 +5,11 @@
"key": "mainline_name_10001",
"text": "章节1全部任务"
},
"task_type": 2,
"task_icon": "",
"task_txt": {
"key": "story_80",
"text": "这是描述"
},
"reword": [
{
"a": "item",

View File

@ -3,152 +3,140 @@
"key": 20010,
"lock": 1,
"ontxe": 0,
"id_after": 20011,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
},
"task_name": {
"key": "task_name_01",
"text": "这是哪里"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
},
"npc": 1,
"completetask": [
20001,
20002
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": [
"practice"
]
},
{
"key": 20011,
"lock": 1,
"ontxe": 20010,
"id_after": 20012,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
},
"task_name": {
"key": "task_name_02",
"text": "和这个少年谈谈"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
},
"npc": 2,
"completetask": [
0
],
"deliver_npc": 1,
"auto_accept": 0,
"reword": [],
"module": [
"practice"
]
},
{
"key": 20012,
"lock": 1,
"ontxe": 20011,
"id_after": 20020,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
"key": "story_80",
"text": "1"
},
"task_name": {
"key": "task_name_03",
"text": "触摸花朵"
"key": "story_80",
"text": "1"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
"text": "1"
},
"npc": 3,
"npc": 10010,
"completetask": [
0
],
"deliver_npc": 1,
"deliver_npc": 10020,
"auto_accept": 1,
"reword": [],
"module": [
"practice"
]
"reword": [
{
"a": "item",
"t": "110001",
"n": 100
}
],
"module": []
},
{
"key": 20020,
"lock": 1,
"ontxe": 20012,
"ontxe": 20010,
"id_after": 20030,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "story_80",
"text": "1"
},
"task_name": {
"key": "story_80",
"text": "1"
},
"task_display": {
"key": "story_80",
"text": "1"
},
"npc": 10020,
"completetask": [
0
],
"deliver_npc": 10030,
"auto_accept": 0,
"reword": [
{
"a": "item",
"t": "110001",
"n": 101
}
],
"module": []
},
{
"key": 20030,
"lock": 1,
"ontxe": 20020,
"id_after": 20040,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
"key": "story_80",
"text": "1"
},
"task_name": {
"key": "task_name_04",
"text": "触摸花朵"
"key": "story_80",
"text": "1"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
"text": "1"
},
"npc": 4,
"npc": 10030,
"completetask": [
0
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"deliver_npc": 10040,
"auto_accept": 0,
"reword": [
{
"a": "item",
"t": "110001",
"n": 102
}
],
"module": []
},
{
"key": 20040,
"lock": 1,
"ontxe": 20020,
"ontxe": 20030,
"id_after": 20050,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
"key": "story_80",
"text": "1"
},
"task_name": {
"key": "task_name_05",
"text": "和杰克谈谈"
"key": "story_80",
"text": "1"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
"text": "1"
},
"npc": 5,
"npc": 10040,
"completetask": [
0
174
],
"deliver_npc": 0,
"auto_accept": 0,
"reword": [
{
"a": "item",
"t": "110001",
"n": 103
}
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
},
{
@ -160,24 +148,30 @@
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
"key": "story_80",
"text": "1"
},
"task_name": {
"key": "task_name_06",
"text": "这个小家伙是?"
"key": "story_80",
"text": "1"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
"text": "1"
},
"npc": 6,
"npc": 10060,
"completetask": [
0
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"deliver_npc": 0,
"auto_accept": 0,
"reword": [
{
"a": "item",
"t": "110001",
"n": 104
}
],
"module": []
},
{
@ -189,24 +183,30 @@
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
"key": "story_80",
"text": "1"
},
"task_name": {
"key": "task_name_07",
"text": "和邦尼兔谈谈"
"key": "story_80",
"text": "1"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
"text": "1"
},
"npc": 7,
"npc": 10070,
"completetask": [
0
203
],
"deliver_npc": 10080,
"auto_accept": 0,
"reword": [
{
"a": "item",
"t": "110001",
"n": 105
}
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
},
{
@ -218,24 +218,30 @@
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
"key": "story_80",
"text": "1"
},
"task_name": {
"key": "task_name_08",
"text": "和波比谈谈"
"key": "story_80",
"text": "1"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
"text": "1"
},
"npc": 8,
"npc": 10090,
"completetask": [
0
114
],
"deliver_npc": 10100,
"auto_accept": 0,
"reword": [
{
"a": "item",
"t": "110001",
"n": 106
}
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
},
{
@ -247,533 +253,57 @@
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
"key": "story_80",
"text": "1"
},
"task_name": {
"key": "task_name_09",
"text": "和波比谈谈"
"key": "story_80",
"text": "1"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
"text": "1"
},
"npc": 9,
"npc": 10110,
"completetask": [
0
161
],
"deliver_npc": 0,
"auto_accept": 0,
"reword": [
{
"a": "item",
"t": "110001",
"n": 107
}
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
},
{
"key": 20090,
"lock": 1,
"ontxe": 20080,
"id_after": 20100,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
},
"task_name": {
"key": "task_name_10",
"text": "和豺狼人谈谈"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
},
"npc": 10,
"completetask": [
174
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [
{
"a": "hero",
"t": "34006",
"n": 1
}
],
"module": []
},
{
"key": 20100,
"lock": 1,
"ontxe": 20090,
"id_after": 20110,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
},
"task_name": {
"key": "task_name_11",
"text": "和豺狼人谈谈"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
},
"npc": 11,
"completetask": [
0
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
},
{
"key": 20110,
"lock": 1,
"ontxe": 20100,
"id_after": 20120,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
},
"task_name": {
"key": "task_name_12",
"text": "走入黑洞"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
},
"npc": 12,
"completetask": [
198
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [
{
"a": "item",
"t": "30001",
"n": 30
}
],
"module": []
},
{
"key": 20120,
"lock": 1,
"ontxe": 20110,
"id_after": 20130,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
},
"task_name": {
"key": "task_name_13",
"text": "和犀牛守卫谈谈"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
},
"npc": 13,
"completetask": [
0
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
},
{
"key": 20130,
"lock": 1,
"ontxe": 20120,
"id_after": 20140,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
},
"task_name": {
"key": "task_name_14",
"text": "和波比谈谈"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
},
"npc": 14,
"completetask": [
0
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
},
{
"key": 20140,
"lock": 1,
"ontxe": 20130,
"id_after": 20150,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
},
"task_name": {
"key": "task_name_15",
"text": "和波比谈谈"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
},
"npc": 15,
"completetask": [
0
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
},
{
"key": 20150,
"lock": 1,
"ontxe": 20140,
"id_after": 0,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
"key": "story_80",
"text": "1"
},
"task_name": {
"key": "task_name_16",
"text": "敬请期待后续剧情"
"key": "story_80",
"text": "1"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
"text": "1"
},
"npc": 16,
"npc": 10010,
"completetask": [
0
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
},
{
"key": 20160,
"lock": 1,
"ontxe": 20151,
"id_after": 20170,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
},
"task_name": {
"key": "story_80",
"text": "初来乍到"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
},
"npc": 17,
"completetask": [
0
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
},
{
"key": 20170,
"lock": 1,
"ontxe": 20160,
"id_after": 20180,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
},
"task_name": {
"key": "story_80",
"text": "初来乍到"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
},
"npc": 18,
"completetask": [
0
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
},
{
"key": 20180,
"lock": 1,
"ontxe": 20170,
"id_after": 20190,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
},
"task_name": {
"key": "story_80",
"text": "初来乍到"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
},
"npc": 19,
"completetask": [
0
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [
{
"a": "item",
"t": "120001",
"n": 3
}
],
"module": []
},
{
"key": 20190,
"lock": 1,
"ontxe": 20180,
"id_after": 20200,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
},
"task_name": {
"key": "story_80",
"text": "初来乍到"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
},
"npc": 20,
"completetask": [
0
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
},
{
"key": 20200,
"lock": 1,
"ontxe": 20190,
"id_after": 20210,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
},
"task_name": {
"key": "story_80",
"text": "初来乍到"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
},
"npc": 21,
"completetask": [
0
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
},
{
"key": 20210,
"lock": 1,
"ontxe": 20200,
"id_after": 20220,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
},
"task_name": {
"key": "story_80",
"text": "初来乍到"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
},
"npc": 22,
"completetask": [
301
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
},
{
"key": 20220,
"lock": 1,
"ontxe": 20210,
"id_after": 20230,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
},
"task_name": {
"key": "story_80",
"text": "初来乍到"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
},
"npc": 23,
"completetask": [
302
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
},
{
"key": 20230,
"lock": 1,
"ontxe": 20220,
"id_after": 20240,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
},
"task_name": {
"key": "story_80",
"text": "初来乍到"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
},
"npc": 24,
"completetask": [
303
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
},
{
"key": 20240,
"lock": 1,
"ontxe": 20230,
"id_after": 0,
"group": 2,
"des": 2,
"icon": "",
"task_Tname": {
"key": "task_name_01",
"text": "这是哪里"
},
"task_name": {
"key": "story_80",
"text": "初来乍到"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
},
"npc": 25,
"completetask": [
114
],
"deliver_npc": 1,
"auto_accept": 1,
"reword": [],
"module": []
},
{
"key": 30001,
"lock": 1,
"ontxe": 20010,
"id_after": 0,
"group": 3,
"des": 3,
"icon": "",
"task_Tname": {
"key": "story_80",
"text": "初来乍到"
},
"task_name": {
"key": "story_80",
"text": "初来乍到"
},
"task_display": {
"key": "story_80",
"text": "新手引导"
},
"npc": 30,
"completetask": [
20003
],
"deliver_npc": 1,
"deliver_npc": 0,
"auto_accept": 0,
"reword": [],
"module": []

View File

@ -108,62 +108,49 @@ func (this *SeasonPagoda) GetSeasonReward() []int32 {
return sz
}
}
func (this *SeasonPagoda) GetSeasonLoop(id int32) *cfg.GameSeasonLoopData {
if v, err := this.GetConfigure(game_seasonloop); err != nil {
log.Errorf("get global conf err:%v", err)
return nil
} else {
if configure, ok := v.(*cfg.GameSeasonLoop); ok {
return configure.Get(id)
}
log.Errorf("%T no is *cfg.Game_global", v)
return nil
}
}
// // 赛季塔结束
func (this *SeasonPagoda) TimerSeasonOver() {
this.module.Debugf("TimerSeasonOver:%d", configure.Now().Unix())
if db.IsCross() {
if conn, err := db.Cross(); err == nil {
if rst := conn.Mgo.FindOne(comm.TableSeasonData, bson.M{}); rst != nil {
serverData := &pb.DBServerData{}
rst.Decode(serverData)
conf := this.GetSeasonLoop(comm.SeasonType) // 获取赛季塔重置配置
if serverData.FixedLoop == 0 {
if len(conf.DisposableLoop) >= int(serverData.DisposableLoop) && len(conf.FixedLoop) > 0 { // 开始执行循环逻辑
serverData.FixedLoop = 1
serverData.DisposableLoop = 0
serverData.SeasonType = conf.FixedLoop[int(serverData.FixedLoop)-1]
} else {
serverData.DisposableLoop++
serverData.SeasonType = conf.DisposableLoop[int(serverData.DisposableLoop)-1]
}
// func (this *SeasonPagoda) TimerSeasonOver() {
// this.module.Debugf("TimerSeasonOver:%d", configure.Now().Unix())
// if db.IsCross() {
// if conn, err := db.Cross(); err == nil {
// if rst := conn.Mgo.FindOne(comm.TableSeasonData, bson.M{}); rst != nil {
// serverData := &pb.DBServerData{}
// rst.Decode(serverData)
// conf := this.GetSeasonLoop(comm.SeasonType) // 获取赛季塔重置配置
// if serverData.FixedLoop == 0 {
// if len(conf.DisposableLoop) >= int(serverData.DisposableLoop) && len(conf.FixedLoop) > 0 { // 开始执行循环逻辑
// serverData.FixedLoop = 1
// serverData.DisposableLoop = 0
// serverData.SeasonType = conf.FixedLoop[int(serverData.FixedLoop)-1]
// } else {
// serverData.DisposableLoop++
// serverData.SeasonType = conf.DisposableLoop[int(serverData.DisposableLoop)-1]
// }
} else { // 循环
if len(conf.FixedLoop) >= int(serverData.FixedLoop) {
serverData.FixedLoop = 1
} else {
serverData.FixedLoop++
}
serverData.SeasonType = conf.FixedLoop[int(serverData.FixedLoop)-1]
}
this.DB.UpdateOne(comm.TableSeasonData, bson.M{}, serverData)
fmt.Printf("%v", serverData)
}
}
}
// } else { // 循环
// if len(conf.FixedLoop) >= int(serverData.FixedLoop) {
// serverData.FixedLoop = 1
// } else {
// serverData.FixedLoop++
// }
// serverData.SeasonType = conf.FixedLoop[int(serverData.FixedLoop)-1]
// }
// this.DB.UpdateOne(comm.TableSeasonData, bson.M{}, serverData)
// fmt.Printf("%v", serverData)
// }
// }
// }
// if _, err := this.service.RpcGo(context.Background(),
// comm.Service_Worker,
// string(comm.Rpc_ModuleSeasonPagodaReward),
// pb.EmptyReq{},
// nil,
// ); err != nil {
// this.module.Errorln(err)
// }
}
// if _, err := this.service.RpcGo(context.Background(),
// comm.Service_Worker,
// string(comm.Rpc_ModuleSeasonPagodaReward),
// pb.EmptyReq{},
// nil,
// ); err != nil {
// this.module.Errorln(err)
// }
//}
// 赛季塔开始
func (this *SeasonPagoda) TimerSeasonStar() {

View File

@ -1,42 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GameSeasonLoop struct {
_dataMap map[int32]*GameSeasonLoopData
_dataList []*GameSeasonLoopData
}
func NewGameSeasonLoop(_buf []map[string]interface{}) (*GameSeasonLoop, error) {
_dataList := make([]*GameSeasonLoopData, 0, len(_buf))
dataMap := make(map[int32]*GameSeasonLoopData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameSeasonLoopData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
return &GameSeasonLoop{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameSeasonLoop) GetDataMap() map[int32]*GameSeasonLoopData {
return table._dataMap
}
func (table *GameSeasonLoop) GetDataList() []*GameSeasonLoopData {
return table._dataList
}
func (table *GameSeasonLoop) Get(key int32) *GameSeasonLoopData {
return table._dataMap[key]
}

View File

@ -1,65 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameSeasonLoopData struct {
Key int32
DisposableLoop []int32
FixedLoop []int32
}
const TypeId_GameSeasonLoopData = 1327247853
func (*GameSeasonLoopData) GetTypeId() int32 {
return 1327247853
}
func (_v *GameSeasonLoopData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["disposable_loop"].([]interface{}); !_ok_ { err = errors.New("disposable_loop error"); return }
_v.DisposableLoop = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.DisposableLoop = append(_v.DisposableLoop, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["fixed_loop"].([]interface{}); !_ok_ { err = errors.New("fixed_loop error"); return }
_v.FixedLoop = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.FixedLoop = append(_v.FixedLoop, _list_v_)
}
}
return
}
func DeserializeGameSeasonLoopData(_buf map[string]interface{}) (*GameSeasonLoopData, error) {
v := &GameSeasonLoopData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

View File

@ -13,7 +13,8 @@ import "errors"
type GameWorldAllData struct {
组id int32
Name string
TaskType int32
TaskIcon string
TaskTxt string
Reword []*Gameatn
}
@ -26,7 +27,8 @@ func (*GameWorldAllData) GetTypeId() int32 {
func (_v *GameWorldAllData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["组id"].(float64); !_ok_ { err = errors.New("组id error"); return }; _v.组id = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["task_type"].(float64); !_ok_ { err = errors.New("task_type error"); return }; _v.TaskType = int32(_tempNum_) }
{ var _ok_ bool; if _v.TaskIcon, _ok_ = _buf["task_icon"].(string); !_ok_ { err = errors.New("task_icon error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskTxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskTxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{
var _arr_ []interface{}
var _ok_ bool

View File

@ -59,7 +59,6 @@ type Tables struct {
Opencond *GameOpencond
Pagoda *GamePagoda
PagodaTaskReward *GamePagodaTaskReward
SeasonLoop *GameSeasonLoop
RdtaskCondi *GameRdtaskCondi
RdtaskNpc *GameRdtaskNpc
Gourmet *GameGourmet
@ -472,12 +471,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.PagodaTaskReward, err = NewGamePagodaTaskReward(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_seasonloop") ; err != nil {
return nil, err
}
if tables.SeasonLoop, err = NewGameSeasonLoop(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_rdtaskcondi") ; err != nil {
return nil, err
}