配置同步

This commit is contained in:
meixiongfeng 2024-01-29 17:44:25 +08:00
parent 31a6480c67
commit 9721eacc5e
18 changed files with 2010 additions and 1089 deletions

View File

@ -28194,7 +28194,7 @@
"key": "buried_buried_condi_tasktxt_920",
"text": "在塔岗监狱中消耗15点体力"
},
"type": 237,
"type": 248,
"valid": 1,
"head": {
"a": "attr",
@ -28208,7 +28208,9 @@
"text": ""
},
"value": 15,
"filter": [],
"filter": [
4
],
"filter2": []
},
{
@ -28816,7 +28818,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_940",
"text": "在维京远征种消耗28体力"
"text": "在维京远征种消耗28体力"
},
"type": 201,
"valid": 1,
@ -32994,7 +32996,7 @@
"key": "",
"text": ""
},
"value": 3,
"value": 1,
"filter": [],
"filter2": []
},
@ -33024,7 +33026,7 @@
"key": "",
"text": ""
},
"value": 4,
"value": 2,
"filter": [],
"filter2": []
},
@ -33054,7 +33056,7 @@
"key": "",
"text": ""
},
"value": 5,
"value": 3,
"filter": [],
"filter2": []
},
@ -33084,7 +33086,7 @@
"key": "",
"text": ""
},
"value": 6,
"value": 4,
"filter": [],
"filter2": []
},
@ -33114,7 +33116,7 @@
"key": "",
"text": ""
},
"value": 7,
"value": 5,
"filter": [],
"filter2": []
},

View File

@ -1409,9 +1409,7 @@
{
"id": 242,
"insert": 1,
"filter": [
"gte"
]
"filter": []
},
{
"id": 243,

File diff suppressed because it is too large Load Diff

View File

@ -797,6 +797,14 @@
"plunder_pvp_college_time": 7,
"plunder_pvp_plunderum": 3,
"plunder_pvp_transportnum": 3,
"plunder_pvp_seasontime": 2,
"plunder_pvp_timeon": 5,
"plunder_pvp_endtime": 22,
"plunder_pvp_remake": {
"a": "item",
"t": "30000002",
"n": 3
},
"pvp_endtime": 3,
"pvp_maintenancetime": 2,
"pvp_integraltool": "pvpintegral",

View File

@ -878,5 +878,15 @@
},
"data": "10070",
"prefix": ""
},
{
"id": 89,
"type": 1,
"text": {
"key": "GM_GM_text_136",
"text": "创建公会"
},
"data": "",
"prefix": ""
}
]

View File

@ -7752,7 +7752,7 @@
"type": 2,
"ip": 1,
"sd": 1,
"handbook": true,
"handbook": false,
"prefab": "53001",
"rotation": "0|0|0",
"revolve": 0,

File diff suppressed because it is too large Load Diff

View File

@ -28924,7 +28924,7 @@
"condition": 50,
"skilltxt": {
"key": "hero_talent_hero_talent_skilltxt_1084",
"text": "攻击时附带消耗自身血量5%附带消耗血量100%的伤害"
"text": "3技能额外附带2回合免疫效果"
},
"skillicon": "js_jx_img_icon09",
"attr": {

View File

@ -47143,6 +47143,170 @@
"sale": [],
"gm": 0
},
{
"id": "25010006",
"name": {
"key": "item_item_name_25010006",
"text": "菲奥娜的袜子"
},
"usetype": 1,
"color": 4,
"bagtype": 0,
"index": 1,
"special_type": 0,
"hold": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "item_25010006",
"intr": {
"key": "item_item_intr_25010006",
"text": "菲奥娜的袜子"
},
"describe": {
"key": "",
"text": ""
},
"dialogue": {
"key": "",
"text": ""
},
"sale": [],
"gm": 0
},
{
"id": "25010007",
"name": {
"key": "item_item_name_25010007",
"text": "驯龙笔记"
},
"usetype": 1,
"color": 4,
"bagtype": 0,
"index": 1,
"special_type": 0,
"hold": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "item_25010007",
"intr": {
"key": "item_item_intr_25010007",
"text": "驯龙笔记"
},
"describe": {
"key": "",
"text": ""
},
"dialogue": {
"key": "",
"text": ""
},
"sale": [],
"gm": 0
},
{
"id": "25010008",
"name": {
"key": "item_item_name_25010008",
"text": "陈旧的靴子"
},
"usetype": 1,
"color": 4,
"bagtype": 0,
"index": 1,
"special_type": 0,
"hold": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "item_25010008",
"intr": {
"key": "item_item_intr_25010008",
"text": "陈旧的靴子"
},
"describe": {
"key": "",
"text": ""
},
"dialogue": {
"key": "",
"text": ""
},
"sale": [],
"gm": 0
},
{
"id": "25010009",
"name": {
"key": "item_item_name_25010009",
"text": "毛线球"
},
"usetype": 1,
"color": 4,
"bagtype": 0,
"index": 1,
"special_type": 0,
"hold": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "item_25010009",
"intr": {
"key": "item_item_intr_25010009",
"text": "毛线球"
},
"describe": {
"key": "",
"text": ""
},
"dialogue": {
"key": "",
"text": ""
},
"sale": [],
"gm": 0
},
{
"id": "30000001",
"name": {
@ -47168,7 +47332,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "item_30000001",
"img": "attr_merchantmoney",
"intr": {
"key": "item_item_intr_30000001",
"text": "掠夺勇气值,用于解锁额外的运输位。"
@ -47183,5 +47347,87 @@
},
"sale": [],
"gm": 0
},
{
"id": "30000002",
"name": {
"key": "item_item_name_30000002",
"text": "黑板擦"
},
"usetype": 1,
"color": 4,
"bagtype": 0,
"index": 1,
"special_type": 0,
"hold": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "item_24010002",
"intr": {
"key": "item_item_intr_30000002",
"text": "可以用来刷新货船,来寻找更新有的货物进行运输。"
},
"describe": {
"key": "",
"text": ""
},
"dialogue": {
"key": "",
"text": ""
},
"sale": [],
"gm": 0
},
{
"id": "30000003",
"name": {
"key": "item_item_name_30000003",
"text": "瓶盖"
},
"usetype": 1,
"color": 4,
"bagtype": 0,
"index": 1,
"special_type": 0,
"hold": 0,
"time": 0,
"reddottype": 0,
"effects": "",
"modelName": "",
"box_id": 0,
"synthetize_num": 0,
"synthetize_deplete": [],
"synthetize_get": [],
"decompose_deplete": [],
"decompose_get": [],
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "attr_guildexp",
"intr": {
"key": "item_item_intr_30000003",
"text": "可以用来解锁养成线内容,提高运输船护卫队的战斗和防守能力,以及一些特殊的战局效果。"
},
"describe": {
"key": "",
"text": ""
},
"dialogue": {
"key": "",
"text": ""
},
"sale": [],
"gm": 0
}
]

View File

@ -8404,6 +8404,111 @@
"modelsize": 1,
"skillSequence": []
},
{
"Id": 102111,
"pos": 1,
"captainId": 0,
"IsBoss": false,
"bossHpCnt": 0,
"heroid": 51012,
"star": 3,
"equip": [],
"newskill": [],
"lv": 10,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": -1,
"modelsize": 1,
"skillSequence": []
},
{
"Id": 102111,
"pos": 2,
"captainId": 0,
"IsBoss": false,
"bossHpCnt": 0,
"heroid": 51012,
"star": 3,
"equip": [],
"newskill": [],
"lv": 10,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 70,
"modelsize": 1,
"skillSequence": []
},
{
"Id": 102111,
"pos": 3,
"captainId": 0,
"IsBoss": false,
"bossHpCnt": 0,
"heroid": 51012,
"star": 3,
"equip": [],
"newskill": [],
"lv": 10,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 58,
"modelsize": 1,
"skillSequence": []
},
{
"Id": 102111,
"pos": 4,
"captainId": 0,
"IsBoss": false,
"bossHpCnt": 0,
"heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
"lv": 10,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": 61,
"modelsize": 1,
"skillSequence": []
},
{
"Id": 102111,
"pos": 5,
"captainId": 0,
"IsBoss": false,
"bossHpCnt": 0,
"heroid": -1,
"star": 3,
"equip": [],
"newskill": [],
"lv": 10,
"hppro": 1,
"atkpro": 1,
"defpro": 1,
"skill1": 1,
"skill2": 1,
"skill3": 1,
"speed": -1,
"modelsize": 1,
"skillSequence": []
},
{
"Id": 102611,
"pos": 1,

View File

@ -41436,6 +41436,110 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 244002121,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"TriggerAnim": "",
"Type": 1,
"Argu": [
1,
4,
3000
],
"FollowSK": [
244002112
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 244002131,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"TriggerAnim": "",
"Type": 1,
"Argu": [
1,
4,
3000
],
"FollowSK": [
244002112
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 244002141,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"TriggerAnim": "",
"Type": 1,
"Argu": [
1,
4,
3000
],
"FollowSK": [
244002112
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 244002151,
"EmitPR": 1000,
"From": 4,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"TriggerAnim": "",
"Type": 1,
"Argu": [
1,
4,
3000
],
"FollowSK": [
244002112
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 244002211,
"EmitPR": 1000,
@ -58030,11 +58134,11 @@
"Limit": 10,
"ExecuteCnt": 1,
"TriggerAnim": "",
"Type": 11,
"Type": 2,
"Argu": [
2,
2,
50
483500521,
-1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
@ -58048,17 +58152,18 @@
{
"Id": 835005213,
"EmitPR": 1000,
"From": 2,
"From": 1,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"TriggerAnim": "",
"Type": 11,
"Type": 3,
"Argu": [
2,
2,
50
390001111,
1000,
1,
2
],
"FollowSK": [],
"SucFollowSK": [],
@ -74514,7 +74619,7 @@
391000119,
1000,
1,
-1
2
],
"FollowSK": [],
"SucFollowSK": [],
@ -74893,7 +74998,7 @@
391000119,
1000,
1,
-1
2
],
"FollowSK": [],
"SucFollowSK": [],
@ -75271,7 +75376,7 @@
391000119,
1000,
1,
-1
2
],
"FollowSK": [],
"SucFollowSK": [],
@ -75378,5 +75483,30 @@
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 210000004,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"TriggerAnim": "",
"Type": 3,
"Argu": [
391000131,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
}
]

View File

@ -26307,7 +26307,7 @@
{
"id": 143007211,
"level": 1,
"MaxLV": 3,
"MaxLV": 1,
"UnavailablePlayTypes": [],
"SkillFlag": 2,
"EffectFlag": 2,
@ -26337,72 +26337,6 @@
"buffid": [],
"map": ""
},
{
"id": 143007211,
"level": 2,
"MaxLV": 3,
"UnavailablePlayTypes": [],
"SkillFlag": 2,
"EffectFlag": 2,
"Priority": 2,
"Name": {
"key": "skill_skill_atk_Name_143007211",
"text": "老练包扎"
},
"ico": "jn_43007_2",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
"Type": 2,
"CD": 0,
"Where": [],
"Target": 0,
"ChildSkill": {
"Id": [
243007211
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_143007211_2",
"text": "冷却回合减少1回合。"
},
"buffid": [],
"map": ""
},
{
"id": 143007211,
"level": 3,
"MaxLV": 3,
"UnavailablePlayTypes": [],
"SkillFlag": 2,
"EffectFlag": 2,
"Priority": 2,
"Name": {
"key": "skill_skill_atk_Name_143007211",
"text": "老练包扎"
},
"ico": "jn_43007_2",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
"Type": 2,
"CD": 0,
"Where": [],
"Target": 0,
"ChildSkill": {
"Id": [
243007211
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_143007211_3",
"text": "冷却回合减少1回合。"
},
"buffid": [],
"map": ""
},
{
"id": 143007311,
"level": 1,
@ -32942,7 +32876,7 @@
{
"id": 144002111,
"level": 1,
"MaxLV": 1,
"MaxLV": 5,
"UnavailablePlayTypes": [],
"SkillFlag": 1,
"EffectFlag": 5,
@ -32967,7 +32901,139 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_144002111_1",
"text": "蛇先生对敌方1个目标造成攻击力120%的伤害并有60%概率驱散目标1个增益效果。"
"text": "蛇先生对敌方1个目标造成攻击力300%的伤害并有60%概率驱散目标1个增益效果。"
},
"buffid": [],
"map": ""
},
{
"id": 144002111,
"level": 2,
"MaxLV": 5,
"UnavailablePlayTypes": [],
"SkillFlag": 1,
"EffectFlag": 5,
"Priority": 1,
"Name": {
"key": "skill_skill_atk_Name_144002111",
"text": "蛇咬"
},
"ico": "jn_44002_1",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_1",
"Type": 1,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
244002121
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_144002111_2",
"text": "伤害提升至310%。"
},
"buffid": [],
"map": ""
},
{
"id": 144002111,
"level": 3,
"MaxLV": 5,
"UnavailablePlayTypes": [],
"SkillFlag": 1,
"EffectFlag": 5,
"Priority": 1,
"Name": {
"key": "skill_skill_atk_Name_144002111",
"text": "蛇咬"
},
"ico": "jn_44002_1",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_1",
"Type": 1,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
244002131
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_144002111_3",
"text": "伤害提升至320%。"
},
"buffid": [],
"map": ""
},
{
"id": 144002111,
"level": 4,
"MaxLV": 5,
"UnavailablePlayTypes": [],
"SkillFlag": 1,
"EffectFlag": 5,
"Priority": 1,
"Name": {
"key": "skill_skill_atk_Name_144002111",
"text": "蛇咬"
},
"ico": "jn_44002_1",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_1",
"Type": 1,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
244002141
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_144002111_4",
"text": "伤害提升至330%。"
},
"buffid": [],
"map": ""
},
{
"id": 144002111,
"level": 5,
"MaxLV": 5,
"UnavailablePlayTypes": [],
"SkillFlag": 1,
"EffectFlag": 5,
"Priority": 1,
"Name": {
"key": "skill_skill_atk_Name_144002111",
"text": "蛇咬"
},
"ico": "jn_44002_1",
"CorrectPos": 0,
"IsMelee": 1,
"act": "Skill_1",
"Type": 1,
"CD": 0,
"Where": [],
"Target": 2,
"ChildSkill": {
"Id": [
244002151
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_144002111_5",
"text": "伤害提升至340%。"
},
"buffid": [],
"map": ""
@ -32975,7 +33041,77 @@
{
"id": 144002211,
"level": 1,
"MaxLV": 1,
"MaxLV": 4,
"UnavailablePlayTypes": [],
"SkillFlag": 3,
"EffectFlag": 8,
"Priority": 2,
"Name": {
"key": "skill_skill_atk_Name_144002211",
"text": "分享推推糖"
},
"ico": "jn_44002_2",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
"Type": 1,
"CD": 6,
"Where": [],
"Target": 0,
"ChildSkill": {
"Id": [
244002211
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_144002211_1",
"text": "蛇先生己方回复各自最大生命在10%的生命和自身攻击力80%的生命并附加1回合[color=#37d8a9]复苏[/color] 状态。"
},
"buffid": [
390001127
],
"map": ""
},
{
"id": 144002211,
"level": 2,
"MaxLV": 4,
"UnavailablePlayTypes": [],
"SkillFlag": 3,
"EffectFlag": 8,
"Priority": 2,
"Name": {
"key": "skill_skill_atk_Name_144002211",
"text": "分享推推糖"
},
"ico": "jn_44002_2",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
"Type": 1,
"CD": 5,
"Where": [],
"Target": 0,
"ChildSkill": {
"Id": [
244002211
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_144002211_2",
"text": "冷却时间减少1回合。"
},
"buffid": [
390001127
],
"map": ""
},
{
"id": 144002211,
"level": 3,
"MaxLV": 4,
"UnavailablePlayTypes": [],
"SkillFlag": 3,
"EffectFlag": 8,
@ -32999,8 +33135,43 @@
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_144002211_1",
"text": "蛇先生己方回复各自最大生命在10%的生命和自身攻击力80%的生命并附加1回合[color=#37d8a9]复苏[/color] 状态。"
"key": "skill_skill_atk_Desc_144002211_3",
"text": "冷却时间减少1回合。"
},
"buffid": [
390001127
],
"map": ""
},
{
"id": 144002211,
"level": 4,
"MaxLV": 4,
"UnavailablePlayTypes": [],
"SkillFlag": 3,
"EffectFlag": 8,
"Priority": 2,
"Name": {
"key": "skill_skill_atk_Name_144002211",
"text": "分享推推糖"
},
"ico": "jn_44002_2",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_2",
"Type": 1,
"CD": 3,
"Where": [],
"Target": 0,
"ChildSkill": {
"Id": [
244002211
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_144002211_4",
"text": "冷却时间减少1回合。"
},
"buffid": [
390001127
@ -33010,7 +33181,77 @@
{
"id": 144002311,
"level": 1,
"MaxLV": 1,
"MaxLV": 4,
"UnavailablePlayTypes": [],
"SkillFlag": 4,
"EffectFlag": 10,
"Priority": 3,
"Name": {
"key": "skill_skill_atk_Name_144002311",
"text": "窃计开始"
},
"ico": "jn_44002_3",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_3",
"Type": 1,
"CD": 7,
"Where": [],
"Target": 0,
"ChildSkill": {
"Id": [
244002311
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_144002311_1",
"text": "蛇先生己方提升25%行动值,并施加[color=#37d8a9]滑稽的伪装[/color] 。"
},
"buffid": [
390001436
],
"map": ""
},
{
"id": 144002311,
"level": 2,
"MaxLV": 4,
"UnavailablePlayTypes": [],
"SkillFlag": 4,
"EffectFlag": 10,
"Priority": 3,
"Name": {
"key": "skill_skill_atk_Name_144002311",
"text": "窃计开始"
},
"ico": "jn_44002_3",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_3",
"Type": 1,
"CD": 6,
"Where": [],
"Target": 0,
"ChildSkill": {
"Id": [
244002311
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_144002311_2",
"text": "冷却时间减少1回合。"
},
"buffid": [
390001436
],
"map": ""
},
{
"id": 144002311,
"level": 3,
"MaxLV": 4,
"UnavailablePlayTypes": [],
"SkillFlag": 4,
"EffectFlag": 10,
@ -33034,8 +33275,43 @@
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_144002311_1",
"text": "蛇先生己方提升25%行动值,并施加[color=#37d8a9]滑稽的伪装[/color] 。"
"key": "skill_skill_atk_Desc_144002311_3",
"text": "冷却时间减少1回合。"
},
"buffid": [
390001436
],
"map": ""
},
{
"id": 144002311,
"level": 4,
"MaxLV": 4,
"UnavailablePlayTypes": [],
"SkillFlag": 4,
"EffectFlag": 10,
"Priority": 3,
"Name": {
"key": "skill_skill_atk_Name_144002311",
"text": "窃计开始"
},
"ico": "jn_44002_3",
"CorrectPos": 0,
"IsMelee": 0,
"act": "Skill_3",
"Type": 1,
"CD": 4,
"Where": [],
"Target": 0,
"ChildSkill": {
"Id": [
244002311
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_144002311_4",
"text": "冷却时间减少1回合。"
},
"buffid": [
390001436
@ -50958,7 +51234,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_835005431_1",
"text": "3技能新增效果每次攻击时每点速度提供攻击力0.33%的额外伤害"
"text": "每次攻击时每点速度提供攻击力0.33%的额外伤害"
},
"buffid": [],
"map": ""
@ -51018,14 +51294,15 @@
"Target": 0,
"ChildSkill": {
"Id": [
835005212,
835005213
835005212
]
},
"passSkill": [],
"passSkill": [
835005212
],
"Desc": {
"key": "skill_skill_atk_Desc_835005423_1",
"text": "攻击时附带消耗自身血量5%附带消耗血量100%的伤害"
"text": "3技能额外附带2回合免疫效果"
},
"buffid": [],
"map": ""
@ -61726,5 +62003,38 @@
},
"buffid": [],
"map": ""
},
{
"id": 100000004,
"level": 1,
"MaxLV": 1,
"UnavailablePlayTypes": [],
"SkillFlag": 0,
"EffectFlag": 0,
"Priority": 0,
"Name": {
"key": "skill_skill_atk_Name_100000004",
"text": ""
},
"ico": "",
"CorrectPos": 0,
"IsMelee": 0,
"act": "",
"Type": 4,
"CD": 0,
"Where": [],
"Target": 0,
"ChildSkill": {
"Id": [
210000004
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_100000004_1",
"text": "黑化特效"
},
"buffid": [],
"map": ""
}
]

View File

@ -14667,7 +14667,7 @@
"OverlayTimes": 1,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_icon_buff_fcsz",
"buffIcon": "ty_icon_buff_xyun",
"buffeffect": "",
"buffpos": "",
"AddTrigger": 0,
@ -15046,5 +15046,40 @@
"TriggerAnim": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
},
{
"Id": 391000131,
"Name": {
"key": "skill_skill_buff_Name_391000131",
"text": ""
},
"Desc": {
"key": "skill_skill_buff_Desc_391000131",
"text": "黑化特效"
},
"BuffType": 0,
"EffectArgu": [],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
0
],
"AddEffect": false,
"RemoveType": false,
"Priority": 0,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "effect_53001_evil_heiyan",
"buffpos": "根节点",
"AddTrigger": 0,
"TriggerEffect": "",
"TriggerPos": "",
"TriggerAnim": "",
"forbidFloat": 0,
"ReplaceBuffID": 0
}
]

View File

@ -13533,5 +13533,31 @@
"Callback": [
285003514
]
},
{
"Id": 483500521,
"Name": {
"key": "skill_skill_passive_Name_483500521",
"text": ""
},
"icon": "",
"When": 16,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "SkillPos=3",
"AfterSkillCheck": "",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
"PasCorrection": 0,
"TriggerAnim": "",
"Type": "CallSkillPas",
"MaxEmitTimesInRoundByRole": 0,
"MaxEmitTimes": 0,
"MaxEmitTimesInRound": 1,
"Callback": [
835005213
]
}
]

View File

@ -568,5 +568,21 @@
"carexe": 500,
"reward": 0,
"exreward": []
},
{
"id": 127,
"FormatList": [
102111
],
"BattleReadyID": 10103009,
"EventList": [],
"playexp": {
"a": "attr",
"t": "exp",
"n": 1
},
"carexe": 500,
"reward": 0,
"exreward": []
}
]

View File

@ -582,6 +582,10 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, heros []*pb.DBHero,
}
return
}
if hero.HeroID == "" { // 这里出bug了
this.module.Errorf("获取英雄数据出问题.玩家id:%s 英雄对象:%v", session.GetUserId(), hero)
continue
}
update = make(map[string]interface{}, 0)
curExp = hero.Exp
curLv = hero.Lv

View File

@ -886,7 +886,6 @@ func (this *Hero) AddHerosExp(session comm.IUserSession, heroObjs []string, exp
}
return
}
if curAddExp, award, errdata = this.modelHero.AddCardExp(session, heros, exp, nil); errdata != nil {
return
}

View File

@ -286,6 +286,10 @@ type GameGlobalData struct {
PlunderPvpCollegeTime int32
PlunderPvpPlunderum int32
PlunderPvpTransportnum int32
PlunderPvpSeasontime int32
PlunderPvpTimeon int32
PlunderPvpEndtime int32
PlunderPvpRemake *Gameatn
PvpEndtime int32
PvpMaintenancetime int32
PvpIntegraltool string
@ -1107,6 +1111,10 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_college_time"].(float64); !_ok_ { err = errors.New("plunder_pvp_college_time error"); return }; _v.PlunderPvpCollegeTime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_plunderum"].(float64); !_ok_ { err = errors.New("plunder_pvp_plunderum error"); return }; _v.PlunderPvpPlunderum = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_transportnum"].(float64); !_ok_ { err = errors.New("plunder_pvp_transportnum error"); return }; _v.PlunderPvpTransportnum = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_seasontime"].(float64); !_ok_ { err = errors.New("plunder_pvp_seasontime error"); return }; _v.PlunderPvpSeasontime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_timeon"].(float64); !_ok_ { err = errors.New("plunder_pvp_timeon error"); return }; _v.PlunderPvpTimeon = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_endtime"].(float64); !_ok_ { err = errors.New("plunder_pvp_endtime error"); return }; _v.PlunderPvpEndtime = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["plunder_pvp_remake"].(map[string]interface{}); !_ok_ { err = errors.New("plunder_pvp_remake error"); return }; if _v.PlunderPvpRemake, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pvp_endtime"].(float64); !_ok_ { err = errors.New("pvp_endtime error"); return }; _v.PvpEndtime = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pvp_maintenancetime"].(float64); !_ok_ { err = errors.New("pvp_maintenancetime error"); return }; _v.PvpMaintenancetime = int32(_tempNum_) }
{ var _ok_ bool; if _v.PvpIntegraltool, _ok_ = _buf["pvp_integraltool"].(string); !_ok_ { err = errors.New("pvp_integraltool error"); return } }