diff --git a/bin/json/game_buzkashifm.json b/bin/json/game_buzkashifm.json index 5eeb49383..24cdcc49e 100644 --- a/bin/json/game_buzkashifm.json +++ b/bin/json/game_buzkashifm.json @@ -32,7 +32,7 @@ { "num": 4, "type": 3, - "stime": "射门成功", + "stime": "抓羊成功", "broadcast": { "key": "buzkashi_buzkashi_fm_broadcast_4", "text": "完美的配合!" @@ -42,7 +42,7 @@ { "num": 5, "type": 4, - "stime": "射门失败", + "stime": "抓羊失败", "broadcast": { "key": "buzkashi_buzkashi_fm_broadcast_5", "text": "这招太狠了,希望没有人受伤" @@ -52,16 +52,6 @@ { "num": 6, "type": 5, - "stime": "使用药剂", - "broadcast": { - "key": "buzkashi_buzkashi_fm_broadcast_6", - "text": "大放异彩!" - }, - "icon": "" - }, - { - "num": 7, - "type": 6, "stime": "团队冲刺", "broadcast": { "key": "buzkashi_buzkashi_fm_broadcast_7", @@ -70,8 +60,8 @@ "icon": "" }, { - "num": 8, - "type": 7, + "num": 7, + "type": 6, "stime": "死亡", "broadcast": { "key": "buzkashi_buzkashi_fm_broadcast_8", @@ -80,19 +70,9 @@ "icon": "" }, { - "num": 9, - "type": 8, - "stime": "使用道具", - "broadcast": { - "key": "buzkashi_buzkashi_fm_broadcast_9", - "text": "大放异彩!" - }, - "icon": "" - }, - { - "num": 10, - "type": 9, - "stime": "射门时", + "num": 8, + "type": 7, + "stime": "投羊", "broadcast": { "key": "buzkashi_buzkashi_fm_broadcast_10", "text": "完美的配合!" diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 7d08b6605..9f5c13573 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -740,6 +740,7 @@ "buzkashi_sendtime": 1000, "buzkashi_speedbumptime": 3000, "buzkashi_speedbumphp": 1, + "buzkashi_sprintbumpscore": 10, "buzkashi_bumpdis": 5, "buzkashi_recovertime": 2000, "buzkashi_recoverHp": 1, diff --git a/bin/json/game_heroawaken.json b/bin/json/game_heroawaken.json index 05f032587..455b4cf40 100644 --- a/bin/json/game_heroawaken.json +++ b/bin/json/game_heroawaken.json @@ -1003,7 +1003,7 @@ "skill": 913005432, "describe": { "key": "hero_awaken_describe_28", - "text": "每次释放三技能时自身行动条增加10%" + "text": "每次释放三技能时自身行动值增加10%" }, "icon": "js_jx_img_icon06", "condition": 0, @@ -10859,7 +10859,7 @@ "skill": 934008433, "describe": { "key": "hero_awaken_describe_282", - "text": "三技能额外造成2段伤害并同样附加10%行动条吸收" + "text": "三技能额外造成2段伤害并同样附加10%行动值吸收" }, "icon": "js_jx_img_icon04", "condition": 0, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index e459683f5..d4ae1c2b5 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -6772,7 +6772,9 @@ 1, 1000 ], - "FollowSK": [], + "FollowSK": [ + 215005314 + ], "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, @@ -56589,7 +56591,9 @@ "Id": 913003315, "EmitPR": 1000, "From": 3, - "Where": [], + "Where": [ + "SelfHpproGreater=50" + ], "Order": "", "Limit": 1, "ExecuteCnt": 1, @@ -56599,7 +56603,9 @@ 2, 50 ], - "FollowSK": [], + "FollowSK": [ + 913003316 + ], "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, @@ -56616,11 +56622,9 @@ "Order": "", "Limit": 1, "ExecuteCnt": 1, - "Type": 11, + "Type": 24, "Argu": [ - 2, - 2, - 50 + 500 ], "FollowSK": [], "SucFollowSK": [], @@ -57558,10 +57562,10 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 391000008, + 390001554, 1000, 1, - 1 + -1 ], "FollowSK": [], "SucFollowSK": [], @@ -58288,7 +58292,7 @@ { "Id": 914005313, "EmitPR": 1000, - "From": 3, + "From": 12, "Where": [], "Order": "", "Limit": 10, @@ -58661,17 +58665,16 @@ { "Id": 913005311, "EmitPR": 1000, - "From": 1, + "From": 3, "Where": [], "Order": "", "Limit": 10, "ExecuteCnt": 1, - "Type": 3, + "Type": 2, "Argu": [ - 390001001, - 1000, - 1, - 1 + 491300532, + -1, + -1 ], "FollowSK": [], "SucFollowSK": [], @@ -58685,6 +58688,30 @@ { "Id": 913005312, "EmitPR": 1000, + "From": 1, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001001, + 1000, + 0, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 913005313, + "EmitPR": 1000, "From": 3, "Where": [], "Order": "", @@ -58704,7 +58731,7 @@ "RevisiParams": [] }, { - "Id": 913005313, + "Id": 913005314, "EmitPR": 1000, "From": 3, "Where": [], @@ -58727,17 +58754,15 @@ "RevisiParams": [] }, { - "Id": 913005314, + "Id": 913005315, "EmitPR": 1000, - "From": 1, + "From": 12, "Where": [], "Order": "", "Limit": 10, "ExecuteCnt": 1, "Type": 15, "Argu": [ - 0, - -1, 1, -1, 2, @@ -59001,7 +59026,7 @@ "Type": 3, "Argu": [ 391000000, - 100, + 1000, 1, -1 ], @@ -59025,7 +59050,7 @@ "Type": 3, "Argu": [ 391000013, - 100, + 1000, 1, -1 ], diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 31c3a3a5a..d2ebd117a 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -37939,8 +37939,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 913003315, - 913003316 + 913003315 ] }, "passSkill": [], @@ -38271,7 +38270,7 @@ "Target": 0, "ChildSkill": { "Id": [ - 913005312 + 913005313 ] }, "passSkill": [], @@ -38301,10 +38300,12 @@ "Target": 0, "ChildSkill": { "Id": [ - 913005313 + 913005314 ] }, - "passSkill": [], + "passSkill": [ + 913005314 + ], "Desc": { "key": "skill_skill_atk_Desc_913005433_1", "text": "3技能添加攻击提升时若目标身上已有攻击提升效果,减少目标所有技能冷却1回合" diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index cfa52c8fa..54e8c5704 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -8957,7 +8957,7 @@ }, "BuffType": 102, "EffectArgu": [ - 23, + 5, 10, 400 ], diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index cb303aa01..6ff615dca 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -7464,7 +7464,7 @@ { "Id": 491500232, "When": 16, - "FromCheck": "", + "FromCheck": "Target=3", "TargetCheck": "Target=2", "MainSkillCheck": "MainSkillID=1150025311", "AfterSkillCheck": "", @@ -8089,5 +8089,25 @@ 1000, 914008314 ] + }, + { + "Id": 491300532, + "When": 20, + "FromCheck": "Target=3", + "TargetCheck": "Target=1", + "MainSkillCheck": "", + "AfterSkillCheck": "SkillID=213005311", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 913005312 + ] } ] \ No newline at end of file