配置表更新

This commit is contained in:
meixiongfeng 2022-08-24 20:01:21 +08:00
parent 4e75419f38
commit 9ef0b28252
8 changed files with 1982 additions and 1946 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -4,8 +4,8 @@
"var": [
{
"a": "hero",
"t": "25001",
"n": 5
"t": "11001",
"n": 1
}
]
},
@ -24,8 +24,8 @@
"var": [
{
"a": "hero",
"t": "25004",
"n": 5
"t": "11003",
"n": 2
}
]
},
@ -154,8 +154,8 @@
"var": [
{
"a": "hero",
"t": "42911",
"n": 10
"t": "11009",
"n": 1
}
]
},
@ -164,8 +164,8 @@
"var": [
{
"a": "hero",
"t": "43911",
"n": 10
"t": "11009",
"n": 1
}
]
},
@ -174,8 +174,8 @@
"var": [
{
"a": "hero",
"t": "44911",
"n": 10
"t": "11009",
"n": 1
}
]
},
@ -184,8 +184,8 @@
"var": [
{
"a": "hero",
"t": "43901",
"n": 10
"t": "11001",
"n": 1
}
]
},

View File

@ -879,5 +879,278 @@
],
"Desc": [],
"buffid": []
},
{
"Id": 125001011,
"Name": {
"key": "skillname_125001011",
"text": "阿宝队长技"
},
"ico": "jn_dzj_01",
"act": "",
"Type": 3,
"MaxLV": 1,
"CD": [
-1
],
"Target": 1,
"ChildSkill": [
{
"Id": [
225001011
]
}
],
"Desc": [],
"buffid": []
},
{
"Id": 125001111,
"Name": {
"key": "skillname_125001111",
"text": "阿宝1技能"
},
"ico": "jn_icon_001",
"act": "Skill_1",
"Type": 1,
"MaxLV": 5,
"CD": [
0,
0,
0,
0,
0
],
"Target": 2,
"ChildSkill": [
{
"Id": [
225001111
]
},
{
"Id": [
225001121
]
},
{
"Id": [
225001131
]
},
{
"Id": [
225001141
]
},
{
"Id": [
225001151
]
}
],
"Desc": [],
"buffid": []
},
{
"Id": 125001211,
"Name": {
"key": "skillname_125001211",
"text": "阿宝2技能"
},
"ico": "jn_icon_002",
"act": "",
"Type": 2,
"MaxLV": 5,
"CD": [
4,
4,
4,
4,
3
],
"Target": 1,
"ChildSkill": [
{
"Id": [
225001211
]
},
{
"Id": [
225001221
]
},
{
"Id": [
225001231
]
},
{
"Id": [
225001241
]
},
{
"Id": [
225001251
]
}
],
"Desc": [],
"buffid": []
},
{
"Id": 125001312,
"Name": {
"key": "skillname_125001211",
"text": "阿宝2技能"
},
"ico": "",
"act": "Skill_2",
"Type": 0,
"MaxLV": 0,
"CD": [],
"Target": 1,
"ChildSkill": [
{
"Id": [
225001216
]
},
{
"Id": [
225001226
]
},
{
"Id": [
225001236
]
},
{
"Id": [
225001246
]
},
{
"Id": [
225001256
]
}
],
"Desc": [],
"buffid": []
},
{
"Id": 125001311,
"Name": {
"key": "skillname_125001311",
"text": "阿宝3技能"
},
"ico": "jn_icon_003",
"act": "Skill_3",
"Type": 1,
"MaxLV": 5,
"CD": [
5,
5,
5,
5,
4
],
"Target": 2,
"ChildSkill": [
{
"Id": [
225001311,
225001312,
225001313
]
},
{
"Id": [
225001321,
225001312,
225001313
]
},
{
"Id": [
225001331,
225001312,
225001313
]
},
{
"Id": [
225001341,
225001312,
225001313
]
},
{
"Id": [
225001341,
225001312,
225001313
]
}
],
"Desc": [],
"buffid": []
},
{
"Id": 925001211,
"Name": {
"key": "skillname_925001211",
"text": "阿宝2技能"
},
"ico": "jn_icon_002",
"act": "Skill_2",
"Type": 2,
"MaxLV": 5,
"CD": [
4,
4,
4,
4,
3
],
"Target": 1,
"ChildSkill": [
{
"Id": [
925001211,
925001212
]
},
{
"Id": [
925001221,
925001222
]
},
{
"Id": [
925001231,
925001232
]
},
{
"Id": [
925001241,
925001242
]
},
{
"Id": [
925001251,
925001252
]
}
],
"Desc": [],
"buffid": []
}
]

View File

@ -2932,6 +2932,81 @@
"Limit": 1,
"Type": 3,
"ExecuteCnt": 1,
"Argu": [
390001210,
1000,
1,
1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001215,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 2,
"ExecuteCnt": 1,
"Argu": [
425001213,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001216,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": [],
"Limit": 10,
"Type": 1,
"ExecuteCnt": 1,
"Argu": [
1,
5,
900
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001221,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 2,
"ExecuteCnt": 1,
"Argu": [
425001221,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001222,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 3,
"ExecuteCnt": 1,
"Argu": [
390001209,
1000,
@ -2942,5 +3017,547 @@
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001223,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 2,
"ExecuteCnt": 1,
"Argu": [
425001222,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001224,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 3,
"ExecuteCnt": 1,
"Argu": [
390001210,
1000,
1,
1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001225,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 2,
"ExecuteCnt": 1,
"Argu": [
425001223,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001226,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": [],
"Limit": 10,
"Type": 1,
"ExecuteCnt": 1,
"Argu": [
1,
5,
950
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001231,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 2,
"ExecuteCnt": 1,
"Argu": [
425001231,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001232,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 3,
"ExecuteCnt": 1,
"Argu": [
390001209,
1000,
1,
1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001233,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 2,
"ExecuteCnt": 1,
"Argu": [
425001232,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001234,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 3,
"ExecuteCnt": 1,
"Argu": [
390001210,
1000,
1,
1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001235,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 2,
"ExecuteCnt": 1,
"Argu": [
425001233,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001236,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": [],
"Limit": 10,
"Type": 1,
"ExecuteCnt": 1,
"Argu": [
1,
5,
1000
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001241,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 2,
"ExecuteCnt": 1,
"Argu": [
425001241,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001242,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 3,
"ExecuteCnt": 1,
"Argu": [
390001209,
1000,
1,
1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001243,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 2,
"ExecuteCnt": 1,
"Argu": [
425001242,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001244,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 3,
"ExecuteCnt": 1,
"Argu": [
390001210,
1000,
1,
1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001245,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 2,
"ExecuteCnt": 1,
"Argu": [
425001243,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001246,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": [],
"Limit": 10,
"Type": 1,
"ExecuteCnt": 1,
"Argu": [
1,
5,
1000
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001251,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 2,
"ExecuteCnt": 1,
"Argu": [
425001251,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001252,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 3,
"ExecuteCnt": 1,
"Argu": [
390001209,
1000,
1,
1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001253,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 2,
"ExecuteCnt": 1,
"Argu": [
425001252,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001254,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 3,
"ExecuteCnt": 1,
"Argu": [
390001210,
1000,
1,
1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001255,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 2,
"ExecuteCnt": 1,
"Argu": [
425001253,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001256,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": [],
"Limit": 10,
"Type": 1,
"ExecuteCnt": 1,
"Argu": [
1,
5,
1100
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001311,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 1,
"ExecuteCnt": 1,
"Argu": [
1,
4,
800,
1,
5,
1000
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001312,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 3,
"ExecuteCnt": 1,
"Argu": [
390001002,
1000,
1,
2
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001313,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 3,
"ExecuteCnt": 1,
"Argu": [
390001111,
1000,
1,
2
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001321,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 1,
"ExecuteCnt": 1,
"Argu": [
1,
4,
800,
1,
5,
1100
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001331,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 1,
"ExecuteCnt": 1,
"Argu": [
1,
4,
800,
1,
5,
1200
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
},
{
"Id": 225001341,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": [],
"Limit": 1,
"Type": 1,
"ExecuteCnt": 1,
"Argu": [
1,
4,
800,
1,
5,
1400
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false
}
]

View File

@ -879,5 +879,278 @@
],
"Desc": [],
"buffid": []
},
{
"Id": 125001011,
"Name": {
"key": "skillname_125001011",
"text": "阿宝队长技"
},
"ico": "jn_dzj_01",
"act": "",
"Type": 3,
"MaxLV": 1,
"CD": [
-1
],
"Target": 1,
"ChildSkill": [
{
"Id": [
225001011
]
}
],
"Desc": [],
"buffid": []
},
{
"Id": 125001111,
"Name": {
"key": "skillname_125001111",
"text": "阿宝1技能"
},
"ico": "jn_icon_001",
"act": "Skill_1",
"Type": 1,
"MaxLV": 5,
"CD": [
0,
0,
0,
0,
0
],
"Target": 2,
"ChildSkill": [
{
"Id": [
225001111
]
},
{
"Id": [
225001121
]
},
{
"Id": [
225001131
]
},
{
"Id": [
225001141
]
},
{
"Id": [
225001151
]
}
],
"Desc": [],
"buffid": []
},
{
"Id": 125001211,
"Name": {
"key": "skillname_125001211",
"text": "阿宝2技能"
},
"ico": "jn_icon_002",
"act": "",
"Type": 2,
"MaxLV": 5,
"CD": [
4,
4,
4,
4,
3
],
"Target": 1,
"ChildSkill": [
{
"Id": [
225001211
]
},
{
"Id": [
225001221
]
},
{
"Id": [
225001231
]
},
{
"Id": [
225001241
]
},
{
"Id": [
225001251
]
}
],
"Desc": [],
"buffid": []
},
{
"Id": 125001312,
"Name": {
"key": "skillname_125001211",
"text": "阿宝2技能"
},
"ico": "",
"act": "Skill_2",
"Type": 0,
"MaxLV": 0,
"CD": [],
"Target": 1,
"ChildSkill": [
{
"Id": [
225001216
]
},
{
"Id": [
225001226
]
},
{
"Id": [
225001236
]
},
{
"Id": [
225001246
]
},
{
"Id": [
225001256
]
}
],
"Desc": [],
"buffid": []
},
{
"Id": 125001311,
"Name": {
"key": "skillname_125001311",
"text": "阿宝3技能"
},
"ico": "jn_icon_003",
"act": "Skill_3",
"Type": 1,
"MaxLV": 5,
"CD": [
5,
5,
5,
5,
4
],
"Target": 2,
"ChildSkill": [
{
"Id": [
225001311,
225001312,
225001313
]
},
{
"Id": [
225001321,
225001312,
225001313
]
},
{
"Id": [
225001331,
225001312,
225001313
]
},
{
"Id": [
225001341,
225001312,
225001313
]
},
{
"Id": [
225001341,
225001312,
225001313
]
}
],
"Desc": [],
"buffid": []
},
{
"Id": 925001211,
"Name": {
"key": "skillname_925001211",
"text": "阿宝2技能"
},
"ico": "jn_icon_002",
"act": "Skill_2",
"Type": 2,
"MaxLV": 5,
"CD": [
4,
4,
4,
4,
3
],
"Target": 1,
"ChildSkill": [
{
"Id": [
925001211,
925001212
]
},
{
"Id": [
925001221,
925001222
]
},
{
"Id": [
925001231,
925001232
]
},
{
"Id": [
925001241,
925001242
]
},
{
"Id": [
925001251,
925001252
]
}
],
"Desc": [],
"buffid": []
}
]

View File

@ -68,7 +68,9 @@
"Id": 425001211,
"When": "RouEnd",
"Where": "3",
"AddCon": [],
"AddCon": [
"cd=4"
],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
@ -86,7 +88,9 @@
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": []
"Callback": [
225001214
]
},
{
"Id": 425001213,
@ -96,16 +100,168 @@
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": []
"Callback": [
125001212
]
},
{
"Id": 425001214,
"When": "CriCal",
"Id": 425001221,
"When": "RouEnd",
"Where": "3",
"AddCon": [
"cd=4"
],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
225001222
]
},
{
"Id": 425001222,
"When": "SufEnd",
"Where": "3",
"AddCon": [
"EffID=390001209"
],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
225001224
]
},
{
"Id": 425001223,
"When": "RouFro",
"Where": "3",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": []
"Callback": [
125001212
]
},
{
"Id": 425001231,
"When": "RouEnd",
"Where": "3",
"AddCon": [
"cd=4"
],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
225001232
]
},
{
"Id": 425001232,
"When": "SufEnd",
"Where": "3",
"AddCon": [
"EffID=390001209"
],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
225001234
]
},
{
"Id": 425001233,
"When": "RouFro",
"Where": "3",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
125001212
]
},
{
"Id": 425001241,
"When": "RouEnd",
"Where": "3",
"AddCon": [
"cd=4"
],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
225001242
]
},
{
"Id": 425001242,
"When": "SufEnd",
"Where": "3",
"AddCon": [
"EffID=390001209"
],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
225001244
]
},
{
"Id": 425001243,
"When": "RouFro",
"Where": "3",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
125001212
]
},
{
"Id": 425001251,
"When": "RouEnd",
"Where": "3",
"AddCon": [
"cd=3"
],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
225001252
]
},
{
"Id": 425001252,
"When": "SufEnd",
"Where": "3",
"AddCon": [
"EffID=390001209"
],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
225001254
]
},
{
"Id": 425001253,
"When": "RouFro",
"Where": "3",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
125001212
]
}
]

View File

@ -287,6 +287,7 @@ func (this *Hero) KungFuHero(session comm.IUserSession, heroObjID string, bKongf
"isOverlying": false,
"sameCount": 1,
}
_hero.Status = pb.HeroType_HeroTypeKongFu
_hero.SameCount = 1
err1 := this.modelHero.ChangeList(session.GetUserId(), heroObjID, _heroMap) // 修改英雄信息
if err1 != nil {