From 7d1d0d45bdb512ea7fede0f34557e2845d6b1f60 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 31 Aug 2023 17:14:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9D=90=E9=AA=91=E9=85=8D=E7=BD=AE=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_battleready.json | 235 +- bin/json/game_buzkashigrade.json | 12 +- bin/json/game_buzkashitrack.json | 36 +- bin/json/game_dragonplay.json | 55 + bin/json/game_global.json | 32 +- bin/json/game_gm.json | 10 + bin/json/game_hero.json | 4 +- bin/json/game_item.json | 184 ++ bin/json/game_loading.json | 10 + bin/json/game_photofilter.json | 10 +- bin/json/game_shopitem.json | 6 +- bin/json/game_skillafteratk.json | 1504 +++++++++++- bin/json/game_skillatk.json | 2022 ++++++++++++++++- bin/json/game_skillbuff.json | 142 ++ bin/json/game_skillpassive.json | 463 +++- bin/json/game_trainlv.json | 916 +++++++- bin/json/game_worldtask.json | 2 +- sys/configure/structs/Game.BattleReadyData.go | 4 +- .../structs/Game.BuzkashiGradeData.go | 2 + sys/configure/structs/Game.DragonPlayData.go | 2 + sys/configure/structs/game.globalData.go | 58 +- .../structs/game.skillPassiveData.go | 2 + 22 files changed, 5366 insertions(+), 345 deletions(-) diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 74b455634..6d2c81c05 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -8,11 +8,14 @@ "scenesfight_07" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -37,11 +40,14 @@ "scenesfight_07" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -66,11 +72,14 @@ "scenesfight_05_01" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -95,11 +104,14 @@ "scenesfight_06" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -124,11 +136,14 @@ "bossfight_spinymandrilla_02" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -153,11 +168,14 @@ "scenesfight_07" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -182,11 +200,14 @@ "scenesfight_07" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -211,11 +232,14 @@ "bossfight_spinymandrilla_02" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -240,11 +264,14 @@ "scenesfight_07" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -269,11 +296,14 @@ "scenesfight_07" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -298,11 +328,14 @@ "scenesfight_07" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -327,11 +360,14 @@ "scenesfight_07" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -356,11 +392,14 @@ "scenesfight_07" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -385,11 +424,14 @@ "scenesfight_07" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -414,11 +456,14 @@ "scenesfight_07" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -443,11 +488,14 @@ "scenesfight_06" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -472,11 +520,14 @@ "scenesfight_07" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -501,11 +552,14 @@ "scenesfight_06" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -530,11 +584,14 @@ "scenesfight_06" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -559,11 +616,14 @@ "scenesfight_03_02" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -588,11 +648,14 @@ "bossfight_spinymandrilla_02" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -617,11 +680,14 @@ "bossfight_naturetitan_01" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -646,11 +712,14 @@ "bossfight_spinymandrilla_02" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -675,11 +744,14 @@ "bossfight_chef_01" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -704,11 +776,14 @@ "bossfight_spinymandrilla_03" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 1, @@ -733,11 +808,14 @@ "bossfight_translate_01" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 1, @@ -762,11 +840,14 @@ "scenesfight_08" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -791,11 +872,14 @@ "scenesfight_08" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -820,11 +904,14 @@ "bossfight_dragon_01" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 1, @@ -849,11 +936,14 @@ "scenesfight_06" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -878,11 +968,14 @@ "scenesfight_06" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "battleready_battleready_RuleTips_1", "text": "只能上阵真诚属性的守护者" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -909,11 +1002,14 @@ "scenesfight_06" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "battleready_battleready_RuleTips_2", "text": "只能上阵直觉属性的守护者" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -940,11 +1036,14 @@ "scenesfight_06" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "battleready_battleready_RuleTips_3", "text": "只能上阵共情属性的守护者" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -971,11 +1070,14 @@ "bossfight_naturetitan_02" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -1000,11 +1102,14 @@ "bossfight_naturetitan_03" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -1029,11 +1134,14 @@ "scenesfight_07" ], "HideAlienSpace": 0, - "ShowBuff": 1, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [ 14 ], @@ -1060,11 +1168,14 @@ "scenesfight_05_01" ], "HideAlienSpace": 1, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -1089,11 +1200,14 @@ "scenesfight_05_01" ], "HideAlienSpace": 1, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -1121,11 +1235,14 @@ "scenesfight_05_01" ], "HideAlienSpace": 1, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -1150,11 +1267,14 @@ "scenesfight_08" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [ 109 ], @@ -1181,11 +1301,14 @@ "scenesfight_08" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [ 110 ], @@ -1212,11 +1335,14 @@ "scenesfight_06" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [ 111, 114 @@ -1247,11 +1373,14 @@ "scenesfight_05_01" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [ 112 ], @@ -1278,11 +1407,14 @@ "bossfight_spinymandrilla_02" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -1307,11 +1439,14 @@ "scenesfight_05_01" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -1336,11 +1471,14 @@ "scenesfight_08" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [], "ScoreGroupID": 0, "disableAiCamera": 0, @@ -1365,11 +1503,14 @@ "scenesfight_05_01" ], "HideAlienSpace": 0, - "ShowBuff": 0, "RuleTips": { "key": "", "text": "" }, + "BattleTips": { + "key": "", + "text": "" + }, "battleEvents": [ 113 ], diff --git a/bin/json/game_buzkashigrade.json b/bin/json/game_buzkashigrade.json index c8cc0d97b..7d1e28fc4 100644 --- a/bin/json/game_buzkashigrade.json +++ b/bin/json/game_buzkashigrade.json @@ -2,21 +2,25 @@ { "num": 1, "distance": 10, - "value": 8 + "value": 8, + "energy": 20 }, { "num": 2, "distance": 15, - "value": 6 + "value": 6, + "energy": 15 }, { "num": 3, "distance": 20, - "value": 4 + "value": 4, + "energy": 10 }, { "num": 4, "distance": 25, - "value": 2 + "value": 2, + "energy": 5 } ] \ No newline at end of file diff --git a/bin/json/game_buzkashitrack.json b/bin/json/game_buzkashitrack.json index 6772263e2..e5fb3eddf 100644 --- a/bin/json/game_buzkashitrack.json +++ b/bin/json/game_buzkashitrack.json @@ -2,25 +2,41 @@ { "id": 100001, "track": "Track", + "type": 0, + "startPos": 1, + "endPos": 2, + "local": 0 + }, + { + "id": 100002, + "track": "Track", "type": 1, + "startPos": 2, + "endPos": 3, + "local": 1 + }, + { + "id": 100003, + "track": "Track", + "type": 2, + "startPos": 3, + "endPos": 4, + "local": 2 + }, + { + "id": 100004, + "track": "Track", + "type": 3, "startPos": 1, "endPos": 2, "local": 1 }, { - "id": 100002, + "id": 100005, "track": "Track", - "type": 2, + "type": 4, "startPos": 2, "endPos": 3, "local": 2 - }, - { - "id": 100003, - "track": "Track", - "type": 3, - "startPos": 3, - "endPos": 4, - "local": 3 } ] \ No newline at end of file diff --git a/bin/json/game_dragonplay.json b/bin/json/game_dragonplay.json index 687fea44a..aa42ba459 100644 --- a/bin/json/game_dragonplay.json +++ b/bin/json/game_dragonplay.json @@ -6,6 +6,11 @@ "type": 1, "exp": 10, "time": 2, + "deplete": { + "a": "attr", + "t": "gold", + "n": 1 + }, "group": 0 }, { @@ -15,6 +20,11 @@ "type": 3, "exp": 10, "time": 2, + "deplete": { + "a": "attr", + "t": "gold", + "n": 2 + }, "group": 10001 }, { @@ -24,6 +34,11 @@ "type": 4, "exp": 10, "time": 2, + "deplete": { + "a": "attr", + "t": "gold", + "n": 3 + }, "group": 0 }, { @@ -33,6 +48,11 @@ "type": 1, "exp": 10, "time": 2, + "deplete": { + "a": "attr", + "t": "gold", + "n": 4 + }, "group": 0 }, { @@ -42,6 +62,11 @@ "type": 2, "exp": 10, "time": 2, + "deplete": { + "a": "attr", + "t": "gold", + "n": 5 + }, "group": 0 }, { @@ -51,6 +76,11 @@ "type": 3, "exp": 10, "time": 2, + "deplete": { + "a": "attr", + "t": "gold", + "n": 6 + }, "group": 10002 }, { @@ -60,6 +90,11 @@ "type": 4, "exp": 10, "time": 2, + "deplete": { + "a": "attr", + "t": "gold", + "n": 7 + }, "group": 0 }, { @@ -69,6 +104,11 @@ "type": 1, "exp": 10, "time": 2, + "deplete": { + "a": "attr", + "t": "gold", + "n": 8 + }, "group": 0 }, { @@ -78,6 +118,11 @@ "type": 2, "exp": 10, "time": 2, + "deplete": { + "a": "attr", + "t": "gold", + "n": 9 + }, "group": 0 }, { @@ -87,6 +132,11 @@ "type": 4, "exp": 10, "time": 2, + "deplete": { + "a": "attr", + "t": "gold", + "n": 10 + }, "group": 0 }, { @@ -96,6 +146,11 @@ "type": 5, "exp": 10, "time": 2, + "deplete": { + "a": "attr", + "t": "gold", + "n": 11 + }, "group": 0 } ] \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index c42f4b1eb..a3c7c44d3 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -696,8 +696,6 @@ "favorability_likes": 1500, "favorability_dislikes": 500, "buzkashi_time": 180, - "buzkashi_schedule": 200, - "buzkashi_stime": 3000, "buzkashi_vreward": [ { "a": "attr", @@ -727,6 +725,26 @@ } ], "buzkashi_resurrection": 10000, + "buzkashi_caddtracktime": 1000, + "buzkashi_addtracktime": 1000, + "buzkashi_subtracktime": 1000, + "buzkashi_bumpspeedtime": 1000, + "buzkashi_deathsubtime": 1000, + "buzkashi_catchsubtime": 1000, + "buzkashi_itemendtime": 1000, + "buzkashi_schedule": 200, + "buzkashi_stime": 3000, + "buzkashi_sendtime": 1000, + "buzkashi_speedbumptime": 3000, + "buzkashi_speedbumphp": 1, + "buzkashi_bumpdis": 5, + "buzkashi_recovertime": 2000, + "buzkashi_recoverHp": 1, + "buzkashi_deathspeed": 800, + "buzkashi_catch": 2000, + "buzkashi_catchspeed": 800, + "buzkashi_recentPlayer": 10, + "task_activation": 10000007, "favorability_attenuation": [ { "k": 3, @@ -742,16 +760,6 @@ } ], "mounts": "20030001", - "buzkashi_recentPlayer": 10, - "task_activation": 10000007, - "buzkashi_speedbumptime": 3000, - "buzkashi_speedbumphp": 1, - "buzkashi_recovertime": 2000, - "buzkashi_recoverHp": 1, - "buzkashi_deathspeed": 800, - "buzkashi_goal": 2000, - "buzkashi_goalspeed": 800, - "buzkashi_bumpdis": 5, "stamina_potion": { "a": "item", "t": "10000003", diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json index 38bf9d2ce..cdd6d6fca 100644 --- a/bin/json/game_gm.json +++ b/bin/json/game_gm.json @@ -358,5 +358,15 @@ }, "data": "", "prefix": "bingo:newmail" + }, + { + "id": 39, + "type": 2, + "text": { + "key": "GM_GM_text_39", + "text": "完成满点任务（满点ID）" + }, + "data": "", + "prefix": "bingo:buried,{0}" } ] \ No newline at end of file diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 1df9662aa..156903609 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -7531,7 +7531,7 @@ "key": "atlas_55005", "text": "" }, - "enteranivalue": 0, + "enteranivalue": 1000, "camerainterval": 0, "equiprcom": [ 1, @@ -7687,7 +7687,7 @@ "key": "atlas_55007", "text": "" }, - "enteranivalue": 0, + "enteranivalue": 1000, "camerainterval": 0, "equiprcom": [ 1, diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 3ccb9c00b..cd8fb3660 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -19600,5 +19600,189 @@ } ], "gm": 1 + }, + { + "id": "24011001", + "name": { + "key": "item_item_name_402", + "text": "第一章货币" + }, + "usetype": 1, + "color": 2, + "bagtype": 6, + "index": 1, + "special_type": 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": "", + "intr": { + "key": "", + "text": "" + }, + "describe": { + "key": "item_item_describe_404", + "text": "" + }, + "dialogue": { + "key": "item_item_dialogue_402", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "gm": 1 + }, + { + "id": "24021001", + "name": { + "key": "item_item_name_403", + "text": "第二章货币" + }, + "usetype": 1, + "color": 2, + "bagtype": 6, + "index": 1, + "special_type": 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": "", + "intr": { + "key": "", + "text": "" + }, + "describe": { + "key": "item_item_describe_405", + "text": "" + }, + "dialogue": { + "key": "item_item_dialogue_403", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "gm": 1 + }, + { + "id": "24031001", + "name": { + "key": "item_item_name_404", + "text": "第三章货币" + }, + "usetype": 1, + "color": 2, + "bagtype": 6, + "index": 1, + "special_type": 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": "", + "intr": { + "key": "", + "text": "" + }, + "describe": { + "key": "item_item_describe_406", + "text": "" + }, + "dialogue": { + "key": "item_item_dialogue_404", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "gm": 1 + }, + { + "id": "24041001", + "name": { + "key": "item_item_name_405", + "text": "第四章货币" + }, + "usetype": 1, + "color": 2, + "bagtype": 6, + "index": 1, + "special_type": 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": "", + "intr": { + "key": "", + "text": "" + }, + "describe": { + "key": "item_item_describe_407", + "text": "" + }, + "dialogue": { + "key": "item_item_dialogue_405", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "gm": 1 } ] \ No newline at end of file diff --git a/bin/json/game_loading.json b/bin/json/game_loading.json index ba3473d25..3c98d9e49 100644 --- a/bin/json/game_loading.json +++ b/bin/json/game_loading.json @@ -168,5 +168,15 @@ "key": "loading_Sheet1_prompt_17", "text": "打败森林泰坦就能获得打造辅助套装的材料。" } + }, + { + "id": 1018, + "scene": "GuildScene", + "image": "ld_mh_gh", + "icon": "loading_icon_fc", + "prompt": { + "key": "loading_Sheet1_prompt_18", + "text": "俱乐部是大家一起快乐玩耍的好地方。" + } } ] \ No newline at end of file diff --git a/bin/json/game_photofilter.json b/bin/json/game_photofilter.json index 1e968269a..c7b3645b7 100644 --- a/bin/json/game_photofilter.json +++ b/bin/json/game_photofilter.json @@ -2,7 +2,7 @@ { "id": 1, "filtername": { - "key": "photoshop_filter_filtername_3", + "key": "photoshop_filter_filtername_1", "text": "无滤镜" }, "filter": "", @@ -11,7 +11,7 @@ { "id": 2, "filtername": { - "key": "photoshop_filter_filtername_3", + "key": "photoshop_filter_filtername_2", "text": "功夫早晨" }, "filter": "效果3", @@ -20,7 +20,7 @@ { "id": 3, "filtername": { - "key": "photoshop_filter_filtername_4", + "key": "photoshop_filter_filtername_3", "text": "史莱克回忆" }, "filter": "效果2", @@ -29,7 +29,7 @@ { "id": 4, "filtername": { - "key": "photoshop_filter_filtername_5", + "key": "photoshop_filter_filtername_4", "text": "波比暖阳" }, "filter": "效果5", @@ -38,7 +38,7 @@ { "id": 5, "filtername": { - "key": "photoshop_filter_filtername_6", + "key": "photoshop_filter_filtername_5", "text": "梦魇降临" }, "filter": "效果6", diff --git a/bin/json/game_shopitem.json b/bin/json/game_shopitem.json index 276c9c840..8e10aaf7e 100644 --- a/bin/json/game_shopitem.json +++ b/bin/json/game_shopitem.json @@ -23981,7 +23981,7 @@ "iteminfo": [ { "a": "item", - "t": "10000001", + "t": "10000021", "n": 1 } ], @@ -24017,7 +24017,7 @@ "iteminfo": [ { "a": "item", - "t": "10000001", + "t": "10000022", "n": 1 } ], @@ -24053,7 +24053,7 @@ "iteminfo": [ { "a": "item", - "t": "10000001", + "t": "10000023", "n": 1 } ], diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index b224ab7b6..2219f8108 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -5543,7 +5543,7 @@ "ExecuteCnt": 1, "Type": 2, "Argu": [ - 435001211, + 413002211, -1, 1 ], @@ -5559,7 +5559,7 @@ { "Id": 213002212, "EmitPR": 1000, - "From": 9, + "From": 12, "Where": [], "Order": "", "Limit": 1, @@ -14391,12 +14391,12 @@ "Where": [], "Order": "Type=Rand", "Limit": 2, - "ExecuteCnt": 1, + "ExecuteCnt": 2, "Type": 1, "Argu": [ 1, 4, - 3000 + 3200 ], "FollowSK": [], "SucFollowSK": [ @@ -14933,7 +14933,7 @@ "Argu": [ 1, 4, - 2000 + 3000 ], "FollowSK": [], "SucFollowSK": [], @@ -15003,7 +15003,7 @@ "Argu": [ 1, 4, - 2100 + 3250 ], "FollowSK": [], "SucFollowSK": [], @@ -15026,7 +15026,7 @@ "Argu": [ 1, 4, - 2200 + 3500 ], "FollowSK": [], "SucFollowSK": [], @@ -15049,7 +15049,7 @@ "Argu": [ 1, 4, - 2300 + 3750 ], "FollowSK": [], "SucFollowSK": [], @@ -15072,7 +15072,7 @@ "Argu": [ 1, 4, - 2400 + 4000 ], "FollowSK": [], "SucFollowSK": [], @@ -22698,6 +22698,106 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 233001121, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 1350 + ], + "FollowSK": [], + "SucFollowSK": [ + 233001112 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 233001131, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 1450 + ], + "FollowSK": [], + "SucFollowSK": [ + 233001112 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 233001141, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 1550 + ], + "FollowSK": [], + "SucFollowSK": [ + 233001112 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 233001151, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 1650 + ], + "FollowSK": [], + "SucFollowSK": [ + 233001112 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 233001211, "EmitPR": 1000, @@ -22736,11 +22836,10 @@ 4, 3000 ], - "FollowSK": [ - 233001313 - ], + "FollowSK": [], "SucFollowSK": [ - 233001312 + 233001312, + 233001313 ], "FailFollowSK": [], "MustHit": false, @@ -22797,6 +22896,110 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 233001321, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 3100 + ], + "FollowSK": [], + "SucFollowSK": [ + 233001313, + 233001312 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 233001331, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 3200 + ], + "FollowSK": [], + "SucFollowSK": [ + 233001313, + 233001312 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 233001341, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 3300 + ], + "FollowSK": [], + "SucFollowSK": [ + 233001313, + 233001312 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 233001351, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 3400 + ], + "FollowSK": [], + "SucFollowSK": [ + 233001313, + 233001312 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 243003011, "EmitPR": 1000, @@ -22984,10 +23187,7 @@ 2, 200 ], - "FollowSK": [ - 243003212, - 243003213 - ], + "FollowSK": [], "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, @@ -22999,7 +23199,7 @@ { "Id": 243003212, "EmitPR": 1000, - "From": 1, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -23011,7 +23211,9 @@ 200 ], "FollowSK": [], - "SucFollowSK": [], + "SucFollowSK": [ + 243003213 + ], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -23055,7 +23257,9 @@ 240 ], "FollowSK": [], - "SucFollowSK": [], + "SucFollowSK": [ + 243003213 + ], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -23078,7 +23282,9 @@ 280 ], "FollowSK": [], - "SucFollowSK": [], + "SucFollowSK": [ + 243003213 + ], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -23101,7 +23307,9 @@ 320 ], "FollowSK": [], - "SucFollowSK": [], + "SucFollowSK": [ + 243003213 + ], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -23121,10 +23329,12 @@ "Argu": [ 2, 2, - 360 + 350 ], "FollowSK": [], - "SucFollowSK": [], + "SucFollowSK": [ + 243003213 + ], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -23146,10 +23356,10 @@ 2, 200 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 243003312 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -23169,10 +23379,10 @@ "Argu": [ 200 ], - "FollowSK": [ + "FollowSK": [], + "SucFollowSK": [ 243003313 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -23600,10 +23810,11 @@ 3200 ], "FollowSK": [ - 215002112, + 215002112 + ], + "SucFollowSK": [ 215002113 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -23673,10 +23884,11 @@ 3500 ], "FollowSK": [ - 215002112, + 215002112 + ], + "SucFollowSK": [ 215002113 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -23699,10 +23911,11 @@ 3800 ], "FollowSK": [ - 215002112, + 215002112 + ], + "SucFollowSK": [ 215002113 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -23725,10 +23938,11 @@ 4100 ], "FollowSK": [ - 215002112, + 215002112 + ], + "SucFollowSK": [ 215002113 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -23751,10 +23965,11 @@ 4500 ], "FollowSK": [ - 215002112, + 215002112 + ], + "SucFollowSK": [ 215002113 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -26122,7 +26337,7 @@ "DpsCondition": "", "RevisiCondition": "", "RevisiParams": [ - 3, + 1, 200 ] }, @@ -26150,7 +26365,7 @@ "DpsCondition": "", "RevisiCondition": "", "RevisiParams": [ - 3, + 1, 200 ] }, @@ -26178,7 +26393,7 @@ "DpsCondition": "", "RevisiCondition": "", "RevisiParams": [ - 3, + 1, 200 ] }, @@ -26206,7 +26421,7 @@ "DpsCondition": "", "RevisiCondition": "", "RevisiParams": [ - 3, + 1, 200 ] }, @@ -26234,7 +26449,7 @@ "DpsCondition": "", "RevisiCondition": "", "RevisiParams": [ - 3, + 1, 200 ] }, @@ -28877,10 +29092,11 @@ 45 ], "FollowSK": [ - 214002112, + 214002112 + ], + "SucFollowSK": [ 214002211 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -28930,10 +29146,11 @@ 45 ], "FollowSK": [ - 214002112, + 214002112 + ], + "SucFollowSK": [ 214002211 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -28959,10 +29176,11 @@ 45 ], "FollowSK": [ - 214002112, + 214002112 + ], + "SucFollowSK": [ 214002211 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -28988,10 +29206,11 @@ 45 ], "FollowSK": [ - 214002112, + 214002112 + ], + "SucFollowSK": [ 214002211 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -29017,10 +29236,11 @@ 45 ], "FollowSK": [ - 214002112, + 214002112 + ], + "SucFollowSK": [ 214002211 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -29116,10 +29336,11 @@ 150 ], "FollowSK": [ - 214002312, + 214002312 + ], + "SucFollowSK": [ 214002211 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -29169,10 +29390,11 @@ 150 ], "FollowSK": [ - 214002312, + 214002312 + ], + "SucFollowSK": [ 214002211 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -29198,10 +29420,11 @@ 150 ], "FollowSK": [ - 214002312, + 214002312 + ], + "SucFollowSK": [ 214002211 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -29227,10 +29450,11 @@ 150 ], "FollowSK": [ - 214002312, + 214002312 + ], + "SucFollowSK": [ 214002211 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -29256,10 +29480,11 @@ 150 ], "FollowSK": [ - 214002312, + 214002312 + ], + "SucFollowSK": [ 214002211 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -29377,10 +29602,10 @@ 900 ], "FollowSK": [ - 243007312, - 243007313 + 243007312 ], "SucFollowSK": [ + 243007313, 243007314 ], "FailFollowSK": [], @@ -30485,7 +30710,7 @@ "From": 2, "Where": [], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 1, "Type": 8, "Argu": [ @@ -30508,7 +30733,7 @@ "From": 2, "Where": [], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 1, "Type": 3, "Argu": [ @@ -31367,8 +31592,8 @@ "From": 4, "Where": [], "Order": "", - "Limit": 1, - "ExecuteCnt": 1, + "Limit": 2, + "ExecuteCnt": 2, "Type": 1, "Argu": [ 1, @@ -31386,6 +31611,106 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 244003121, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 2, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 1450 + ], + "FollowSK": [ + 244003112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244003131, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 2, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 1550 + ], + "FollowSK": [ + 244003112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244003141, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 2, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 1650 + ], + "FollowSK": [ + 244003112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244003151, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 2, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 1750 + ], + "FollowSK": [ + 244003112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 244003112, "EmitPR": 1000, @@ -31462,16 +31787,16 @@ { "Id": 244003211, "EmitPR": 1000, - "From": 1, + "From": 3, "Where": [], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 1, "Type": 2, "Argu": [ - 451011211, - 1, - 1 + 444003211, + -1, + -1 ], "FollowSK": [], "SucFollowSK": [], @@ -31488,12 +31813,12 @@ "From": 1, "Where": [], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 1, "Type": 8, "Argu": [ 1, - -1, + 1, 1000 ], "FollowSK": [ @@ -31515,12 +31840,9 @@ "Order": "", "Limit": 10, "ExecuteCnt": 1, - "Type": 3, + "Type": 12, "Argu": [ - 390001429, - 1000, - 1, - 1 + 50 ], "FollowSK": [], "SucFollowSK": [], @@ -31556,6 +31878,106 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 244003321, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 5200 + ], + "FollowSK": [ + 244003312 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244003331, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 5300 + ], + "FollowSK": [ + 244003312 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244003341, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 5400 + ], + "FollowSK": [ + 244003312 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244003351, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 5500 + ], + "FollowSK": [ + 244003312 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 244003312, "EmitPR": 1000, @@ -31583,15 +32005,15 @@ { "Id": 244003313, "EmitPR": 1000, - "From": 1, + "From": 3, "Where": [], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 1, "Type": 2, "Argu": [ 444003311, - 1, + -1, 1 ], "FollowSK": [ @@ -31608,10 +32030,12 @@ { "Id": 244003314, "EmitPR": 1000, - "From": 1, - "Where": [], + "From": 3, + "Where": [ + "MainSkillPosNoCD=3" + ], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 1, "Type": 15, "Argu": [ @@ -31816,10 +32240,11 @@ 600 ], "FollowSK": [ - 215003212, + 215003212 + ], + "SucFollowSK": [ 215003213 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -31889,10 +32314,11 @@ 700 ], "FollowSK": [ - 215003212, + 215003212 + ], + "SucFollowSK": [ 215003213 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -31915,10 +32341,11 @@ 800 ], "FollowSK": [ - 215003212, + 215003212 + ], + "SucFollowSK": [ 215003213 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -31941,10 +32368,11 @@ 900 ], "FollowSK": [ - 215003212, + 215003212 + ], + "SucFollowSK": [ 215003213 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -31967,10 +32395,11 @@ 1000 ], "FollowSK": [ - 215003212, + 215003212 + ], + "SucFollowSK": [ 215003213 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -32070,10 +32499,11 @@ 80 ], "FollowSK": [ - 215003314, + 215003314 + ], + "SucFollowSK": [ 215003315 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -32114,7 +32544,7 @@ "Argu": [ 1, 4, - 1700 + 1550 ], "FollowSK": [ 215003312 @@ -32139,7 +32569,7 @@ "Argu": [ 1, 4, - 1900 + 1600 ], "FollowSK": [ 215003312 @@ -32164,7 +32594,7 @@ "Argu": [ 1, 4, - 2100 + 1650 ], "FollowSK": [ 215003312 @@ -32189,7 +32619,7 @@ "Argu": [ 1, 4, - 2400 + 1700 ], "FollowSK": [ 215003312 @@ -32314,10 +32744,11 @@ 1750 ], "FollowSK": [ - 243004212, + 243004212 + ], + "SucFollowSK": [ 243004213 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -32437,10 +32868,11 @@ 5200 ], "FollowSK": [ - 243004313, + 243004313 + ], + "SucFollowSK": [ 243004314 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -32543,6 +32975,106 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 223003121, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 2300 + ], + "FollowSK": [ + 223003112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 223003131, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 2400 + ], + "FollowSK": [ + 223003112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 223003141, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 2500 + ], + "FollowSK": [ + 223003112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 223003151, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 2600 + ], + "FollowSK": [ + 223003112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 223003211, "EmitPR": 1000, @@ -32555,7 +33087,7 @@ "Argu": [ 1, 4, - 2400 + 1200 ], "FollowSK": [ 223003212 @@ -32589,6 +33121,106 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 223003221, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 1300 + ], + "FollowSK": [ + 223003212 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 223003231, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 1400 + ], + "FollowSK": [ + 223003212 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 223003241, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 1500 + ], + "FollowSK": [ + 223003212 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 223003251, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 1600 + ], + "FollowSK": [ + 223003212 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 223003311, "EmitPR": 1000, @@ -32622,6 +33254,106 @@ "Limit": 1, "ExecuteCnt": 1, "Type": 5, + "Argu": [ + 2, + 2, + 200 + ], + "FollowSK": [ + 223003313 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 223003322, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 5, + "Argu": [ + 2, + 2, + 220 + ], + "FollowSK": [ + 223003313 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 223003333, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 5, + "Argu": [ + 2, + 2, + 240 + ], + "FollowSK": [ + 223003313 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 223003343, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 5, + "Argu": [ + 2, + 2, + 260 + ], + "FollowSK": [ + 223003313 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 223003353, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 5, "Argu": [ 2, 2, @@ -32710,6 +33442,106 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 244001121, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 3500 + ], + "FollowSK": [ + 244001112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244001131, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 3600 + ], + "FollowSK": [ + 244001112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244001141, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 3700 + ], + "FollowSK": [ + 244001112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244001151, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 3800 + ], + "FollowSK": [ + 244001112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 244001112, "EmitPR": 1000, @@ -32803,6 +33635,106 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 244001221, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 5400 + ], + "FollowSK": [ + 244001212 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244001231, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 5500 + ], + "FollowSK": [ + 244001212 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244001241, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 5600 + ], + "FollowSK": [ + 244001212 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244001251, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 5700 + ], + "FollowSK": [ + 244001212 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 244001212, "EmitPR": 1000, @@ -32913,10 +33845,119 @@ 6000 ], "FollowSK": [ - 244001313, + 244001313 + ], + "SucFollowSK": [ + 244001314 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244001322, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 6100 + ], + "FollowSK": [ + 244001313 + ], + "SucFollowSK": [ + 244001314 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244001332, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 6200 + ], + "FollowSK": [ + 244001313 + ], + "SucFollowSK": [ + 244001314 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244001342, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 6300 + ], + "FollowSK": [ + 244001313 + ], + "SucFollowSK": [ + 244001314 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 244001352, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 6400 + ], + "FollowSK": [ + 244001313 + ], + "SucFollowSK": [ 244001314 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -33023,6 +34064,114 @@ 500 ] }, + { + "Id": 235004121, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 3300 + ], + "FollowSK": [ + 235004112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "EnemyNoBuff=0", + "RevisiParams": [ + 500 + ] + }, + { + "Id": 235004131, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 3400 + ], + "FollowSK": [ + 235004112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "EnemyNoBuff=0", + "RevisiParams": [ + 500 + ] + }, + { + "Id": 235004141, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 3500 + ], + "FollowSK": [ + 235004112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "EnemyNoBuff=0", + "RevisiParams": [ + 500 + ] + }, + { + "Id": 235004151, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 3600 + ], + "FollowSK": [ + 235004112 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "EnemyNoBuff=0", + "RevisiParams": [ + 500 + ] + }, { "Id": 235004112, "EmitPR": 1000, @@ -33145,6 +34294,114 @@ 100 ] }, + { + "Id": 235004321, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 6600 + ], + "FollowSK": [ + 235004312 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 102, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [ + 100 + ] + }, + { + "Id": 235004331, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 6700 + ], + "FollowSK": [ + 235004312 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 102, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [ + 100 + ] + }, + { + "Id": 235004341, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 6800 + ], + "FollowSK": [ + 235004312 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 102, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [ + 100 + ] + }, + { + "Id": 235004351, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 6900 + ], + "FollowSK": [ + 235004312 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 102, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [ + 100 + ] + }, { "Id": 235004312, "EmitPR": 1000, @@ -33601,10 +34858,11 @@ 1300 ], "FollowSK": [ - 233004112, + 233004112 + ], + "SucFollowSK": [ 233004113 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -34385,10 +35643,11 @@ 1100 ], "FollowSK": [ - 225002112, + 225002112 + ], + "SucFollowSK": [ 225002113 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -35380,10 +36639,11 @@ 250 ], "FollowSK": [ - 244002312, + 244002312 + ], + "SucFollowSK": [ 244002313 ], - "SucFollowSK": [], "FailFollowSK": [], "MustHit": false, "DpsRevisiType": 0, @@ -40759,7 +42019,7 @@ "From": 1, "Where": [], "Order": "", - "Limit": 1, + "Limit": 10, "ExecuteCnt": 1, "Type": 3, "Argu": [ @@ -57750,7 +59010,7 @@ "ExecuteCnt": 1, "Type": 2, "Argu": [ - 443007211, + 491400231, -1, -1 ], @@ -57766,7 +59026,7 @@ { "Id": 914008314, "EmitPR": 1000, - "From": 3, + "From": 8, "Where": [], "Order": "", "Limit": 10, @@ -58811,8 +60071,9 @@ "MustHit": false, "DpsRevisiType": 105, "DpsCondition": "", - "RevisiCondition": "1", + "RevisiCondition": "", "RevisiParams": [ + 1, 50 ] }, @@ -58956,8 +60217,9 @@ "MustHit": false, "DpsRevisiType": 108, "DpsCondition": "", - "RevisiCondition": "3", + "RevisiCondition": "", "RevisiParams": [ + 3, 50 ] }, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index bcdfe7c48..f7818496d 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -9565,7 +9565,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_124008111_1", - "text": "暴芙那特对敌方1个目标造成2次自身攻击力150%的伤害，并有40%概率附加2回合[color=#e5621b]童年阴影[/color]效果。" + "text": "暴芙那特对敌方1个目标造成2次自身攻击力150%的伤害，并有40%概率附加2回合[color=#e5621b]童年阴影[/color]效果。某悍夫那特在场，则本次攻击额外附加目标最大生命值5%的伤害，但最高无法超过自身攻击力的60%。" }, "buffid": [ 390001101 @@ -9722,7 +9722,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_124008211_1", - "text": "暴芙那特对敌方全体造成1次自身攻击力300%的伤害，并有40%概率附加2回合[color=#e5621b]速度下降[/color]效果。" + "text": "暴芙那特对敌方全体造成1次自身攻击力300%的伤害，并有40%概率附加2回合[color=#e5621b]速度下降[/color]效果。若悍夫那特在场，则本次攻击额外造成伤害。" }, "buffid": [ 390001008 @@ -10069,10 +10069,12 @@ 234008113 ] }, - "passSkill": [], + "passSkill": [ + 234008113 + ], "Desc": { "key": "skill_skill_atk_Desc_134008111_1", - "text": "悍夫那特对敌方一个目标造成1次自身攻击力320%的伤害，并有40%概率击退目标10%行动值。" + "text": "悍夫那特对敌方一个目标造成1次自身攻击力320%的伤害，并有40%概率击退目标10%行动值。若暴芙那特在场，则本次攻击额外随机攻击2个目标。" }, "buffid": [], "map": "" @@ -10100,7 +10102,9 @@ 234008113 ] }, - "passSkill": [], + "passSkill": [ + 234008113 + ], "Desc": { "key": "skill_skill_atk_Desc_134008111_2", "text": "每次伤害提升至350%。" @@ -10131,7 +10135,9 @@ 234008113 ] }, - "passSkill": [], + "passSkill": [ + 234008113 + ], "Desc": { "key": "skill_skill_atk_Desc_134008111_3", "text": "每次伤害提升至380%。" @@ -10162,7 +10168,9 @@ 234008113 ] }, - "passSkill": [], + "passSkill": [ + 234008113 + ], "Desc": { "key": "skill_skill_atk_Desc_134008111_4", "text": "每次伤害提升至410%。" @@ -10193,7 +10201,9 @@ 234008113 ] }, - "passSkill": [], + "passSkill": [ + 234008113 + ], "Desc": { "key": "skill_skill_atk_Desc_134008111_5", "text": "每次伤害提升至450%。" @@ -10224,10 +10234,12 @@ 234008213 ] }, - "passSkill": [], + "passSkill": [ + 234008213 + ], "Desc": { "key": "skill_skill_atk_Desc_134008211_1", - "text": "悍夫那特对敌方造成3次自身攻击力120%的伤害，并有40%概率附加1回合[color=#e5621b]眩晕[/color]效果。" + "text": "悍夫那特对敌方造成3次自身攻击力120%的伤害，并有40%概率附加1回合[color=#e5621b]眩晕[/color]效果。若暴芙那特在场，则本次攻击额外造成伤害。" }, "buffid": [ 390001105 @@ -10257,7 +10269,9 @@ 234008213 ] }, - "passSkill": [], + "passSkill": [ + 234008213 + ], "Desc": { "key": "skill_skill_atk_Desc_134008211_2", "text": "每次伤害提升至130%。" @@ -10288,7 +10302,9 @@ 234008213 ] }, - "passSkill": [], + "passSkill": [ + 234008213 + ], "Desc": { "key": "skill_skill_atk_Desc_134008211_3", "text": "每次伤害提升至140%。" @@ -10319,7 +10335,9 @@ 234008213 ] }, - "passSkill": [], + "passSkill": [ + 234008213 + ], "Desc": { "key": "skill_skill_atk_Desc_134008211_4", "text": "每次伤害提升至150%。" @@ -10350,7 +10368,9 @@ 234008213 ] }, - "passSkill": [], + "passSkill": [ + 234008213 + ], "Desc": { "key": "skill_skill_atk_Desc_134008211_5", "text": "每次伤害提升至160%。" @@ -17090,10 +17110,138 @@ ], "map": "" }, + { + "id": 133001111, + "level": 2, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_133001111", + "text": "兽骨击打" + }, + "ico": "jn_33001_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 233001121 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_133001111_2", + "text": "伤害提升至135%。" + }, + "buffid": [ + 390001008 + ], + "map": "" + }, + { + "id": 133001111, + "level": 3, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_133001111", + "text": "兽骨击打" + }, + "ico": "jn_33001_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 233001131 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_133001111_3", + "text": "伤害提升至145%。" + }, + "buffid": [ + 390001008 + ], + "map": "" + }, + { + "id": 133001111, + "level": 4, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_133001111", + "text": "兽骨击打" + }, + "ico": "jn_33001_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 233001141 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_133001111_4", + "text": "伤害提升至155%。" + }, + "buffid": [ + 390001008 + ], + "map": "" + }, + { + "id": 133001111, + "level": 5, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_133001111", + "text": "兽骨击打" + }, + "ico": "jn_33001_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 233001151 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_133001111_5", + "text": "伤害提升至165%。" + }, + "buffid": [ + 390001008 + ], + "map": "" + }, { "id": 133001211, "level": 1, - "MaxLV": 1, + "MaxLV": 2, "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_133001211", @@ -17122,10 +17270,42 @@ ], "map": "" }, + { + "id": 133001211, + "level": 2, + "MaxLV": 2, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_133001211", + "text": "血色号角" + }, + "ico": "jn_33001_2", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_2", + "Type": 1, + "CD": 2, + "Where": [], + "Target": 1, + "ChildSkill": { + "Id": [ + 233001221 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_133001211_2", + "text": "冷却时间减少1回合。" + }, + "buffid": [ + 390001001 + ], + "map": "" + }, { "id": 133001311, "level": 1, - "MaxLV": 1, + "MaxLV": 5, "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_133001311", @@ -17155,6 +17335,138 @@ ], "map": "" }, + { + "id": 133001311, + "level": 2, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_133001311", + "text": "腾跃冰原" + }, + "ico": "jn_33001_3", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_3", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 233001321 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_133001311_2", + "text": "伤害提升至310%。" + }, + "buffid": [ + 390001106, + 390001007 + ], + "map": "" + }, + { + "id": 133001311, + "level": 3, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_133001311", + "text": "腾跃冰原" + }, + "ico": "jn_33001_3", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_3", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 233001331 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_133001311_3", + "text": "伤害提升至320%。" + }, + "buffid": [ + 390001106, + 390001007 + ], + "map": "" + }, + { + "id": 133001311, + "level": 4, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_133001311", + "text": "腾跃冰原" + }, + "ico": "jn_33001_3", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_3", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 233001341 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_133001311_4", + "text": "伤害提升至330%。" + }, + "buffid": [ + 390001106, + 390001007 + ], + "map": "" + }, + { + "id": 133001311, + "level": 5, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_133001311", + "text": "腾跃冰原" + }, + "ico": "jn_33001_3", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_3", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 233001351 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_133001311_5", + "text": "伤害提升至340%。" + }, + "buffid": [ + 390001106, + 390001007 + ], + "map": "" + }, { "id": 143003011, "level": 1, @@ -17353,12 +17665,13 @@ "Type": 1, "CD": 3, "Where": [ - "HpproCreater=210" + "HpproGreater=210" ], "Target": 1, "ChildSkill": { "Id": [ - 243003211 + 243003211, + 243003212 ] }, "passSkill": [], @@ -17385,18 +17698,19 @@ "Type": 1, "CD": 3, "Where": [ - "HpproCreater=210" + "HpproGreater=210" ], "Target": 1, "ChildSkill": { "Id": [ - 243003222 + 243003222, + 243003212 ] }, "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_143003211_2", - "text": "恢复其最大生命值23%的生命" + "text": "恢复其最大生命值24%的生命" }, "buffid": [], "map": "" @@ -17417,18 +17731,19 @@ "Type": 1, "CD": 3, "Where": [ - "HpproCreater=210" + "HpproGreater=210" ], "Target": 1, "ChildSkill": { "Id": [ - 243003232 + 243003232, + 243003212 ] }, "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_143003211_3", - "text": "恢复其最大生命值26%的生命" + "text": "恢复其最大生命值28%的生命" }, "buffid": [], "map": "" @@ -17449,18 +17764,19 @@ "Type": 1, "CD": 3, "Where": [ - "HpproCreater=210" + "HpproGreater=210" ], "Target": 1, "ChildSkill": { "Id": [ - 243003242 + 243003242, + 243003212 ] }, "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_143003211_4", - "text": "恢复其最大生命值30%的生命" + "text": "恢复其最大生命值32%的生命" }, "buffid": [], "map": "" @@ -17481,12 +17797,13 @@ "Type": 1, "CD": 3, "Where": [ - "HpproCreater=210" + "HpproGreater=210" ], "Target": 1, "ChildSkill": { "Id": [ - 243003252 + 243003252, + 243003212 ] }, "passSkill": [], @@ -18492,7 +18809,9 @@ 224009112 ] }, - "passSkill": [], + "passSkill": [ + 224009112 + ], "Desc": { "key": "skill_skill_atk_Desc_124009111_1", "text": "云朵先生对敌方1个目标造成自身攻击力300%的伤害，若此次伤害触发了暴击，则使自身[color=#37d8a9]暴击提升[/color]效果延长1回合。" @@ -18525,12 +18844,16 @@ 224009112 ] }, - "passSkill": [], + "passSkill": [ + 224009113 + ], "Desc": { "key": "skill_skill_atk_Desc_124009111_2", "text": "伤害提升至325%。" }, - "buffid": [], + "buffid": [ + 390001004 + ], "map": "" }, { @@ -18556,12 +18879,16 @@ 224009112 ] }, - "passSkill": [], + "passSkill": [ + 224009114 + ], "Desc": { "key": "skill_skill_atk_Desc_124009111_3", "text": "伤害提升至350%。" }, - "buffid": [], + "buffid": [ + 390001004 + ], "map": "" }, { @@ -18587,12 +18914,16 @@ 224009112 ] }, - "passSkill": [], + "passSkill": [ + 224009115 + ], "Desc": { "key": "skill_skill_atk_Desc_124009111_4", "text": "伤害提升至375%。" }, - "buffid": [], + "buffid": [ + 390001004 + ], "map": "" }, { @@ -18618,12 +18949,16 @@ 224009112 ] }, - "passSkill": [], + "passSkill": [ + 224009116 + ], "Desc": { "key": "skill_skill_atk_Desc_124009111_5", "text": "伤害提升至400%。" }, - "buffid": [], + "buffid": [ + 390001004 + ], "map": "" }, { @@ -18649,7 +18984,9 @@ 224009213 ] }, - "passSkill": [], + "passSkill": [ + 224009213 + ], "Desc": { "key": "skill_skill_atk_Desc_124009211_1", "text": "云朵先生对敌方1个目标造成3次自身攻击力135%的伤害，并有50%的概率降低目标15%的行动值。触发暴击时为目标额外附加2回合[color=#e5621b]速度下降[/color]效果。" @@ -18682,12 +19019,16 @@ 224009213 ] }, - "passSkill": [], + "passSkill": [ + 224009213 + ], "Desc": { "key": "skill_skill_atk_Desc_124009211_2", "text": "伤害提升至150%。" }, - "buffid": [], + "buffid": [ + 390001008 + ], "map": "" }, { @@ -18713,12 +19054,16 @@ 224009213 ] }, - "passSkill": [], + "passSkill": [ + 224009213 + ], "Desc": { "key": "skill_skill_atk_Desc_124009211_3", "text": "伤害提升至165%。" }, - "buffid": [], + "buffid": [ + 390001008 + ], "map": "" }, { @@ -18744,12 +19089,16 @@ 224009213 ] }, - "passSkill": [], + "passSkill": [ + 224009213 + ], "Desc": { "key": "skill_skill_atk_Desc_124009211_4", "text": "伤害提升至180%。" }, - "buffid": [], + "buffid": [ + 390001008 + ], "map": "" }, { @@ -18775,12 +19124,16 @@ 224009213 ] }, - "passSkill": [], + "passSkill": [ + 224009213 + ], "Desc": { "key": "skill_skill_atk_Desc_124009211_5", "text": "伤害提升至195%。" }, - "buffid": [], + "buffid": [ + 390001008 + ], "map": "" }, { @@ -18847,7 +19200,10 @@ "key": "skill_skill_atk_Desc_124009311_2", "text": "伤害提升至165%。" }, - "buffid": [], + "buffid": [ + 390001004, + 390001106 + ], "map": "" }, { @@ -18879,7 +19235,10 @@ "key": "skill_skill_atk_Desc_124009311_3", "text": "伤害提升至180%。" }, - "buffid": [], + "buffid": [ + 390001004, + 390001106 + ], "map": "" }, { @@ -18911,7 +19270,10 @@ "key": "skill_skill_atk_Desc_124009311_4", "text": "伤害提升至195%。" }, - "buffid": [], + "buffid": [ + 390001004, + 390001106 + ], "map": "" }, { @@ -18943,7 +19305,10 @@ "key": "skill_skill_atk_Desc_124009311_5", "text": "伤害提升至210%。" }, - "buffid": [], + "buffid": [ + 390001004, + 390001106 + ], "map": "" }, { @@ -19619,7 +19984,9 @@ "key": "skill_skill_atk_Desc_133002111_2", "text": "伤害提升至155%。" }, - "buffid": [], + "buffid": [ + 390001007 + ], "map": "" }, { @@ -19649,7 +20016,9 @@ "key": "skill_skill_atk_Desc_133002111_3", "text": "伤害提升至170%。" }, - "buffid": [], + "buffid": [ + 390001007 + ], "map": "" }, { @@ -19679,7 +20048,9 @@ "key": "skill_skill_atk_Desc_133002111_4", "text": "伤害提升至185%。" }, - "buffid": [], + "buffid": [ + 390001007 + ], "map": "" }, { @@ -19709,7 +20080,9 @@ "key": "skill_skill_atk_Desc_133002111_5", "text": "伤害提升至200%。" }, - "buffid": [], + "buffid": [ + 390001007 + ], "map": "" }, { @@ -19773,7 +20146,9 @@ "key": "skill_skill_atk_Desc_133002211_2", "text": "伤害提升至130%。" }, - "buffid": [], + "buffid": [ + 390001431 + ], "map": "" }, { @@ -19804,7 +20179,9 @@ "key": "skill_skill_atk_Desc_133002211_3", "text": "伤害提升至140%。" }, - "buffid": [], + "buffid": [ + 390001432 + ], "map": "" }, { @@ -19835,7 +20212,9 @@ "key": "skill_skill_atk_Desc_133002211_4", "text": "伤害提升至150%。" }, - "buffid": [], + "buffid": [ + 390001433 + ], "map": "" }, { @@ -19866,7 +20245,9 @@ "key": "skill_skill_atk_Desc_133002211_5", "text": "伤害提升至165%。" }, - "buffid": [], + "buffid": [ + 390001434 + ], "map": "" }, { @@ -21336,13 +21717,133 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_114002111_1", - "text": "大龙对敌方1个目标造成攻击力30%的伤害，追加自身最大生命值6%的伤害，并有50%概率附加1回合[color=#e5621b]挑衅[/color] 状态。" + "text": "大龙对敌方1个目标造成攻击力100%的伤害，追加自身最大生命值4.5%的伤害，并有50%概率附加1回合[color=#e5621b]挑衅[/color] 状态。" }, "buffid": [ 390001110 ], "map": "" }, + { + "id": 114002111, + "level": 2, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_114002111", + "text": "嚣张气焰" + }, + "ico": "jn_14002_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 214002121 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_114002111_2", + "text": "伤害提升至110%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 114002111, + "level": 3, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_114002111", + "text": "嚣张气焰" + }, + "ico": "jn_14002_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 214002131 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_114002111_3", + "text": "伤害提升至120%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 114002111, + "level": 4, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_114002111", + "text": "嚣张气焰" + }, + "ico": "jn_14002_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 214002141 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_114002111_4", + "text": "伤害提升至130%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 114002111, + "level": 5, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_114002111", + "text": "嚣张气焰" + }, + "ico": "jn_14002_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 214002151 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_114002111_5", + "text": "伤害提升至140%。" + }, + "buffid": [], + "map": "" + }, { "id": 114002211, "level": 1, @@ -21525,9 +22026,7 @@ "key": "skill_skill_atk_Desc_114002311_5", "text": "伤害提升720%。" }, - "buffid": [ - 390001426 - ], + "buffid": [], "map": "" }, { @@ -22729,7 +23228,7 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_151012111_1", - "text": "对敌方1个目标发起攻击造成攻击力450%的伤害。" + "text": "对敌方1个目标发起攻击造成攻击力300%的伤害。" }, "buffid": [], "map": "" @@ -23021,7 +23520,7 @@ { "id": 144003111, "level": 1, - "MaxLV": 1, + "MaxLV": 5, "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_144003111", @@ -23037,8 +23536,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 244003111, - 244003113 + 244003111 ] }, "passSkill": [], @@ -23051,6 +23549,134 @@ ], "map": "" }, + { + "id": 144003111, + "level": 2, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144003111", + "text": "说谎的男孩" + }, + "ico": "jn_44003_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244003121 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_144003111_2", + "text": "伤害提升至145%。" + }, + "buffid": [ + 390001103 + ], + "map": "" + }, + { + "id": 144003111, + "level": 3, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144003111", + "text": "说谎的男孩" + }, + "ico": "jn_44003_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244003131 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_144003111_3", + "text": "伤害提升至155%。" + }, + "buffid": [ + 390001104 + ], + "map": "" + }, + { + "id": 144003111, + "level": 4, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144003111", + "text": "说谎的男孩" + }, + "ico": "jn_44003_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244003141 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_144003111_4", + "text": "伤害提升至165%。" + }, + "buffid": [ + 390001105 + ], + "map": "" + }, + { + "id": 144003111, + "level": 5, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144003111", + "text": "说谎的男孩" + }, + "ico": "jn_44003_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244003151 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_144003111_5", + "text": "伤害提升至175%。" + }, + "buffid": [ + 390001106 + ], + "map": "" + }, { "id": 144003211, "level": 1, @@ -23074,10 +23700,12 @@ 244003212 ] }, - "passSkill": [], + "passSkill": [ + 244003211 + ], "Desc": { "key": "skill_skill_atk_Desc_144003211_1", - "text": "每回合开始时，可吸收己方各1个减益状态，每吸收1个减益状态可增加己方5%的行动值。" + "text": "每回合开始时，可吸收己方各1个减益状态，每吸收1个减益状态可增加我方全体5%的行动值。" }, "buffid": [], "map": "" @@ -23085,7 +23713,7 @@ { "id": 144003311, "level": 1, - "MaxLV": 1, + "MaxLV": 5, "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_144003311", @@ -23105,7 +23733,9 @@ 244003313 ] }, - "passSkill": [], + "passSkill": [ + 244003313 + ], "Desc": { "key": "skill_skill_atk_Desc_144003311_1", "text": "对敌方造成攻击力510%的伤害，并为己方附加1回合[color=#37d8a9]殊死较量[/color] 状态；技能冷却期间，若友方队友死亡，将重置技能冷却时间。" @@ -23115,6 +23745,146 @@ ], "map": "" }, + { + "id": 144003311, + "level": 2, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144003311", + "text": "匹诺曹出击" + }, + "ico": "jn_44003_3", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_3", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244003121, + 244003313 + ] + }, + "passSkill": [ + 244003313 + ], + "Desc": { + "key": "skill_skill_atk_Desc_144003311_2", + "text": "伤害提升至520%。" + }, + "buffid": [ + 390001105 + ], + "map": "" + }, + { + "id": 144003311, + "level": 3, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144003311", + "text": "匹诺曹出击" + }, + "ico": "jn_44003_3", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_3", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244003131, + 244003313 + ] + }, + "passSkill": [ + 244003313 + ], + "Desc": { + "key": "skill_skill_atk_Desc_144003311_3", + "text": "伤害提升至530%。" + }, + "buffid": [ + 390001106 + ], + "map": "" + }, + { + "id": 144003311, + "level": 4, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144003311", + "text": "匹诺曹出击" + }, + "ico": "jn_44003_3", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_3", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244003141, + 244003313 + ] + }, + "passSkill": [ + 244003313 + ], + "Desc": { + "key": "skill_skill_atk_Desc_144003311_4", + "text": "伤害提升至540%。" + }, + "buffid": [ + 390001107 + ], + "map": "" + }, + { + "id": 144003311, + "level": 5, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144003311", + "text": "匹诺曹出击" + }, + "ico": "jn_44003_3", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_3", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244003151, + 244003313 + ] + }, + "passSkill": [ + 244003313 + ], + "Desc": { + "key": "skill_skill_atk_Desc_144003311_5", + "text": "伤害提升至550%。" + }, + "buffid": [ + 390001108 + ], + "map": "" + }, { "id": 115003011, "level": 1, @@ -23194,7 +23964,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 215003111 + 215003121 ] }, "passSkill": [], @@ -23224,7 +23994,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 215003111 + 215003131 ] }, "passSkill": [], @@ -23254,7 +24024,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 215003111 + 215003141 ] }, "passSkill": [], @@ -23284,7 +24054,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 215003111 + 215003151 ] }, "passSkill": [], @@ -23344,7 +24114,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 215003211 + 215003221 ] }, "passSkill": [], @@ -23374,7 +24144,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 215003211 + 215003231 ] }, "passSkill": [], @@ -23404,7 +24174,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 215003211 + 215003241 ] }, "passSkill": [], @@ -23434,7 +24204,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 215003211 + 215003251 ] }, "passSkill": [], @@ -23727,7 +24497,7 @@ { "id": 123003111, "level": 1, - "MaxLV": 1, + "MaxLV": 5, "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_123003111", @@ -23754,10 +24524,130 @@ "buffid": [], "map": "" }, + { + "id": 123003111, + "level": 2, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_123003111", + "text": "主调小夜曲" + }, + "ico": "jn_23003_1", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 223003121 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_123003111_2", + "text": "伤害提升至230%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 123003111, + "level": 3, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_123003111", + "text": "主调小夜曲" + }, + "ico": "jn_23003_1", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 223003131 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_123003111_3", + "text": "伤害提升至240%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 123003111, + "level": 4, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_123003111", + "text": "主调小夜曲" + }, + "ico": "jn_23003_1", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 223003141 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_123003111_4", + "text": "伤害提升至250%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 123003111, + "level": 5, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_123003111", + "text": "主调小夜曲" + }, + "ico": "jn_23003_1", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 223003151 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_123003111_5", + "text": "伤害提升至260%。" + }, + "buffid": [], + "map": "" + }, { "id": 123003211, "level": 1, - "MaxLV": 1, + "MaxLV": 5, "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_123003211", @@ -23779,7 +24669,127 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_123003211_1", - "text": "黛塔黛恩对敌方1个目标造成2次攻击力240%的伤害，每次降低目标15%行动值。" + "text": "黛塔黛恩对敌方1个目标造成2次攻击力120%的伤害，每次降低目标15%行动值。" + }, + "buffid": [], + "map": "" + }, + { + "id": 123003211, + "level": 2, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_123003211", + "text": "复调奏鸣曲" + }, + "ico": "jn_23003_2", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 223003221 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_123003211_2", + "text": "伤害提升至130%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 123003211, + "level": 3, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_123003211", + "text": "复调奏鸣曲" + }, + "ico": "jn_23003_2", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 223003231 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_123003211_3", + "text": "伤害提升至140%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 123003211, + "level": 4, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_123003211", + "text": "复调奏鸣曲" + }, + "ico": "jn_23003_2", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 223003241 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_123003211_4", + "text": "伤害提升至150%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 123003211, + "level": 5, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_123003211", + "text": "复调奏鸣曲" + }, + "ico": "jn_23003_2", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 223003251 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_123003211_5", + "text": "伤害提升至160%。" }, "buffid": [], "map": "" @@ -23787,7 +24797,7 @@ { "id": 123003311, "level": 1, - "MaxLV": 1, + "MaxLV": 5, "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_123003311", @@ -23811,7 +24821,143 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_123003311_1", - "text": "黛塔黛恩为己方1个目标恢复其最大生命值30%的生命，为其他友方目标恢复其最大生命值15%的生命，并为己方目标附加2回合[color=#37d8a9]暴击提升[/color] 状态。" + "text": "黛塔黛恩为己方1个目标恢复其最大生命值20%的生命，为其他友方目标恢复其最大生命值15%的生命，并为己方目标附加2回合[color=#37d8a9]暴击提升[/color] 状态。" + }, + "buffid": [ + 390001004 + ], + "map": "" + }, + { + "id": 123003311, + "level": 2, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_123003311", + "text": "乐终章：赴生" + }, + "ico": "jn_23003_3", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Where": [], + "Target": 1, + "ChildSkill": { + "Id": [ + 223003311, + 223003322, + 223003314 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_123003311_2", + "text": "治疗量增加至22%。" + }, + "buffid": [ + 390001004 + ], + "map": "" + }, + { + "id": 123003311, + "level": 3, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_123003311", + "text": "乐终章：赴生" + }, + "ico": "jn_23003_3", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Where": [], + "Target": 1, + "ChildSkill": { + "Id": [ + 223003311, + 223003332, + 223003314 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_123003311_3", + "text": "治疗量增加至24%。" + }, + "buffid": [ + 390001004 + ], + "map": "" + }, + { + "id": 123003311, + "level": 4, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_123003311", + "text": "乐终章：赴生" + }, + "ico": "jn_23003_3", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Where": [], + "Target": 1, + "ChildSkill": { + "Id": [ + 223003311, + 223003342, + 223003314 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_123003311_4", + "text": "治疗量增加至26%。" + }, + "buffid": [ + 390001004 + ], + "map": "" + }, + { + "id": 123003311, + "level": 5, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_123003311", + "text": "乐终章：赴生" + }, + "ico": "jn_23003_3", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Where": [], + "Target": 1, + "ChildSkill": { + "Id": [ + 223003311, + 223003352, + 223003314 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_123003311_5", + "text": "治疗量增加至30%。" }, "buffid": [ 390001004 @@ -23821,7 +24967,7 @@ { "id": 144001111, "level": 1, - "MaxLV": 1, + "MaxLV": 5, "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_144001111", @@ -23841,7 +24987,9 @@ 244001113 ] }, - "passSkill": [], + "passSkill": [ + 244001113 + ], "Desc": { "key": "skill_skill_atk_Desc_144001111_1", "text": "美肚鲨对敌方1个目标造成攻击力340%的伤害，有80%概率为目标附加2回合[color=#e5621b]禁疗[/color]状态，触发暴击时，使目标行动值减少30%。" @@ -23851,10 +24999,150 @@ ], "map": "" }, + { + "id": 144001111, + "level": 2, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144001111", + "text": "强袭头槌" + }, + "ico": "jn_44001_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244001121, + 244001113 + ] + }, + "passSkill": [ + 244001113 + ], + "Desc": { + "key": "skill_skill_atk_Desc_144001111_2", + "text": "伤害提升至350%。" + }, + "buffid": [ + 390001107 + ], + "map": "" + }, + { + "id": 144001111, + "level": 3, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144001111", + "text": "强袭头槌" + }, + "ico": "jn_44001_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244001131, + 244001113 + ] + }, + "passSkill": [ + 244001113 + ], + "Desc": { + "key": "skill_skill_atk_Desc_144001111_3", + "text": "伤害提升至360%。" + }, + "buffid": [ + 390001107 + ], + "map": "" + }, + { + "id": 144001111, + "level": 4, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144001111", + "text": "强袭头槌" + }, + "ico": "jn_44001_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244001141, + 244001113 + ] + }, + "passSkill": [ + 244001113 + ], + "Desc": { + "key": "skill_skill_atk_Desc_144001111_4", + "text": "伤害提升至370%。" + }, + "buffid": [ + 390001107 + ], + "map": "" + }, + { + "id": 144001111, + "level": 5, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144001111", + "text": "强袭头槌" + }, + "ico": "jn_44001_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244001151, + 244001113 + ] + }, + "passSkill": [ + 244001113 + ], + "Desc": { + "key": "skill_skill_atk_Desc_144001111_5", + "text": "伤害提升至380%。" + }, + "buffid": [ + 390001107 + ], + "map": "" + }, { "id": 144001211, "level": 1, - "MaxLV": 1, + "MaxLV": 5, "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_144001211", @@ -23874,7 +25162,9 @@ 244001213 ] }, - "passSkill": [], + "passSkill": [ + 244001213 + ], "Desc": { "key": "skill_skill_atk_Desc_144001211_1", "text": "美肚鲨对敌方1个目标造成攻击力530%的伤害，并为目标附加2个持续2回合的[color=#e5621b]流血[/color]状态。本次伤害若触发暴击则额外为目标附加2个持续2回合的[color=#e5621b]流血[/color]状态。" @@ -23884,10 +25174,150 @@ ], "map": "" }, + { + "id": 144001211, + "level": 2, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144001211", + "text": "锋锐利齿" + }, + "ico": "jn_44001_2", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244001221, + 244001213 + ] + }, + "passSkill": [ + 244001213 + ], + "Desc": { + "key": "skill_skill_atk_Desc_144001211_2", + "text": "伤害提升至540%。" + }, + "buffid": [ + 390001404 + ], + "map": "" + }, + { + "id": 144001211, + "level": 3, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144001211", + "text": "锋锐利齿" + }, + "ico": "jn_44001_2", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244001231, + 244001213 + ] + }, + "passSkill": [ + 244001213 + ], + "Desc": { + "key": "skill_skill_atk_Desc_144001211_3", + "text": "伤害提升至550%。" + }, + "buffid": [ + 390001404 + ], + "map": "" + }, + { + "id": 144001211, + "level": 4, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144001211", + "text": "锋锐利齿" + }, + "ico": "jn_44001_2", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244001241, + 244001213 + ] + }, + "passSkill": [ + 244001213 + ], + "Desc": { + "key": "skill_skill_atk_Desc_144001211_4", + "text": "伤害提升至560%。" + }, + "buffid": [ + 390001404 + ], + "map": "" + }, + { + "id": 144001211, + "level": 5, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144001211", + "text": "锋锐利齿" + }, + "ico": "jn_44001_2", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244001251, + 244001213 + ] + }, + "passSkill": [ + 244001213 + ], + "Desc": { + "key": "skill_skill_atk_Desc_144001211_5", + "text": "伤害提升至570%。" + }, + "buffid": [ + 390001404 + ], + "map": "" + }, { "id": 144001311, "level": 1, - "MaxLV": 1, + "MaxLV": 5, "UnavailablePlayTypes": [], "Name": { "key": "skill_skill_atk_Name_144001311", @@ -23910,7 +25340,147 @@ "passSkill": [], "Desc": { "key": "skill_skill_atk_Desc_144001311_1", - "text": "美肚鲨为自身附加3回合[color=#37d8a9]狂暴[/color]状态，并对敌方目标造成攻击力600%的伤害，有80%概率为目标附加2回合[color=#e5621b]速度下降[/color]，[color=#e5621b]防御下降[/color]状态。" + "text": "美肚鲨为自身附加3回合[color=#37d8a9]狂暴[/color]状态，并对敌方目标造成攻击力600%的伤害，有80%概率为目标附加2回合[color=#e5621b]速度下降[/color]和[color=#e5621b]防御下降[/color]状态。" + }, + "buffid": [ + 390001431, + 390001008, + 390001007 + ], + "map": "" + }, + { + "id": 144001311, + "level": 2, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144001311", + "text": "鲨之巨浪" + }, + "ico": "jn_44001_3", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244001311, + 244001322 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_144001311_2", + "text": "伤害提升至610%。" + }, + "buffid": [ + 390001431, + 390001008, + 390001007 + ], + "map": "" + }, + { + "id": 144001311, + "level": 3, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144001311", + "text": "鲨之巨浪" + }, + "ico": "jn_44001_3", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244001311, + 244001332 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_144001311_3", + "text": "伤害提升至620%。" + }, + "buffid": [ + 390001431, + 390001008, + 390001007 + ], + "map": "" + }, + { + "id": 144001311, + "level": 4, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144001311", + "text": "鲨之巨浪" + }, + "ico": "jn_44001_3", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244001311, + 244001342 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_144001311_4", + "text": "伤害提升至630%。" + }, + "buffid": [ + 390001431, + 390001008, + 390001007 + ], + "map": "" + }, + { + "id": 144001311, + "level": 5, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_144001311", + "text": "鲨之巨浪" + }, + "ico": "jn_44001_3", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 244001311, + 244001352 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_144001311_5", + "text": "伤害提升至640%。" }, "buffid": [ 390001431, @@ -23983,6 +25553,126 @@ ], "map": "" }, + { + "id": 135004111, + "level": 2, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_135004111", + "text": "敏捷扫堂腿" + }, + "ico": "jn_35004_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 235004121 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_135004111_2", + "text": "伤害提升至330%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 135004111, + "level": 3, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_135004111", + "text": "敏捷扫堂腿" + }, + "ico": "jn_35004_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 235004131 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_135004111_3", + "text": "伤害提升至340%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 135004111, + "level": 4, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_135004111", + "text": "敏捷扫堂腿" + }, + "ico": "jn_35004_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 235004141 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_135004111_4", + "text": "伤害提升至350%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 135004111, + "level": 5, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_135004111", + "text": "敏捷扫堂腿" + }, + "ico": "jn_35004_1", + "CorrectPos": 0, + "IsMelee": 1, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 235004151 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_135004111_5", + "text": "伤害提升至360%。" + }, + "buffid": [], + "map": "" + }, { "id": 135004211, "level": 1, @@ -24043,6 +25733,126 @@ "buffid": [], "map": "" }, + { + "id": 135004311, + "level": 2, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_135004311", + "text": "传奇血红爪" + }, + "ico": "jn_35004_3", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 235004321 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_135004311_2", + "text": "伤害提升至660%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 135004311, + "level": 3, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_135004311", + "text": "传奇血红爪" + }, + "ico": "jn_35004_3", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 235004331 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_135004311_3", + "text": "伤害提升至670%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 135004311, + "level": 4, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_135004311", + "text": "传奇血红爪" + }, + "ico": "jn_35004_3", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 235004341 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_135004311_4", + "text": "伤害提升至680%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 135004311, + "level": 5, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_135004311", + "text": "传奇血红爪" + }, + "ico": "jn_35004_3", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 235004351 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_135004311_5", + "text": "伤害提升至690%。" + }, + "buffid": [], + "map": "" + }, { "id": 124006011, "level": 1, @@ -24507,7 +26317,9 @@ "key": "skill_skill_atk_Desc_134005111_2", "text": "伤害提升至330%。" }, - "buffid": [], + "buffid": [ + 390001401 + ], "map": "" }, { @@ -24537,7 +26349,9 @@ "key": "skill_skill_atk_Desc_134005111_3", "text": "伤害提升至360%。" }, - "buffid": [], + "buffid": [ + 390001401 + ], "map": "" }, { @@ -24567,7 +26381,9 @@ "key": "skill_skill_atk_Desc_134005111_4", "text": "伤害提升至390%。" }, - "buffid": [], + "buffid": [ + 390001401 + ], "map": "" }, { @@ -24597,7 +26413,9 @@ "key": "skill_skill_atk_Desc_134005111_5", "text": "伤害提升至430%。" }, - "buffid": [], + "buffid": [ + 390001401 + ], "map": "" }, { @@ -24692,7 +26510,9 @@ "key": "skill_skill_atk_Desc_134005311_2", "text": "伤害提升至430%。" }, - "buffid": [], + "buffid": [ + 390001401 + ], "map": "" }, { @@ -24722,7 +26542,9 @@ "key": "skill_skill_atk_Desc_134005311_3", "text": "伤害提升至460%。" }, - "buffid": [], + "buffid": [ + 390001401 + ], "map": "" }, { @@ -24752,7 +26574,9 @@ "key": "skill_skill_atk_Desc_134005311_4", "text": "伤害提升至490%。" }, - "buffid": [], + "buffid": [ + 390001401 + ], "map": "" }, { @@ -24782,7 +26606,9 @@ "key": "skill_skill_atk_Desc_134005311_5", "text": "伤害提升至530%。" }, - "buffid": [], + "buffid": [ + 390001401 + ], "map": "" }, { diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 81a622de7..e8153edb8 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -10603,5 +10603,147 @@ "buffeffect": "", "buffpos": "", "forbidFloat": 0 + }, + { + "Id": 391000067, + "Name": { + "key": "skill_skill_buff_Name_391000067", + "text": "从弱势属性英雄受到的伤害增加50%，给优势属性的英雄造成的伤害增加50%。" + }, + "Desc": { + "key": "skill_skill_buff_Desc_391000067", + "text": "从弱势属性英雄受到的伤害增加50%，给优势属性的英雄造成的伤害增加50%。" + }, + "BuffType": 112, + "EffectArgu": [ + 500, + -500 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": [ + 3 + ], + "AddEffect": false, + "RemoveType": true, + "Priority": 0, + "NotOverlay": 0, + "OverlayTimes": 99, + "SameID": false, + "golbalbufficon": "", + "buffIcon": "", + "buffeffect": "", + "buffpos": "", + "forbidFloat": 0 + }, + { + "Id": 391000068, + "Name": { + "key": "skill_skill_buff_Name_391000068", + "text": "维京直觉" + }, + "Desc": { + "key": "skill_skill_buff_Desc_391000068", + "text": "（无法驱散类）每层使自身受到伤害降低，最高可叠加25层。" + }, + "BuffType": 129, + "EffectArgu": [ + -50 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": [ + 3, + 0 + ], + "AddEffect": false, + "RemoveType": false, + "Priority": 0, + "NotOverlay": 0, + "OverlayTimes": 25, + "SameID": false, + "golbalbufficon": "", + "buffIcon": "", + "buffeffect": "", + "buffpos": "", + "forbidFloat": 0 + }, + { + "Id": 391000069, + "Name": { + "key": "skill_skill_buff_Name_391000069", + "text": "维京之吼" + }, + "Desc": { + "key": "skill_skill_buff_Desc_391000069", + "text": "（无法驱散类）回合开始时受到伤害。携带者受到净化效果时恢复自身生命值，但受到其他所有治疗效果降低。" + }, + "BuffType": 130, + "EffectArgu": [ + 1, + 4, + 500, + 1, + 2, + 200, + -400 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": [ + 1, + 0 + ], + "AddEffect": false, + "RemoveType": false, + "Priority": 0, + "NotOverlay": 0, + "OverlayTimes": 1, + "SameID": false, + "golbalbufficon": "", + "buffIcon": "", + "buffeffect": "", + "buffpos": "", + "forbidFloat": 0 + }, + { + "Id": 391000070, + "Name": { + "key": "skill_skill_buff_Name_391000070", + "text": "维京标记" + }, + "Desc": { + "key": "skill_skill_buff_Desc_391000070", + "text": "（无法驱散类）自身受到来自无【标记】目标的伤害大幅降低。防御提升，造成的伤害提升。携带者死亡时，boss基础速度提升。" + }, + "BuffType": 131, + "EffectArgu": [ + 23, + 500, + 200, + -200, + 25 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": [ + 3, + 0 + ], + "AddEffect": false, + "RemoveType": false, + "Priority": 0, + "NotOverlay": 0, + "OverlayTimes": 1, + "SameID": false, + "golbalbufficon": "", + "buffIcon": "", + "buffeffect": "", + "buffpos": "", + "forbidFloat": 0 } ] \ No newline at end of file diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index fb0878f8e..cb303aa01 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -7,6 +7,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -27,6 +28,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "Effect=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -48,6 +50,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390002003", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -67,6 +70,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -86,6 +90,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -105,6 +110,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -124,6 +130,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -143,6 +150,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -162,6 +170,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -181,6 +190,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -200,6 +210,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -219,6 +230,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -238,6 +250,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -257,6 +270,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -276,6 +290,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -295,6 +310,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -314,6 +330,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -333,6 +350,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -352,6 +370,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "Effect=3,Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -371,6 +390,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -390,6 +410,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -409,6 +430,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -429,6 +451,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "SkillID=944006313", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -448,6 +471,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "SkillID=944006323", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -467,6 +491,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "SkillID=944006333", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -486,6 +511,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "SkillID=944006343", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -505,6 +531,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "SkillID=944006353", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -524,6 +551,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -543,6 +571,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -562,6 +591,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -581,6 +611,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 500, "PasCorrection": 0, @@ -601,6 +632,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -621,6 +653,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -640,6 +673,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -661,6 +695,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "Effect=0", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -680,6 +715,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "Effect=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -699,6 +735,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [ "LeftSelf=1" ], @@ -721,6 +758,7 @@ "MainSkillCheck": "MainSkillID=113003211", "AfterSkillCheck": "", "BuffCheck": "Effect=3,Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -740,6 +778,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -759,6 +798,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -778,6 +818,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -797,6 +838,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -816,6 +858,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "SkillID=245001112", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -835,6 +878,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "SkillID=245001312", "BuffCheck": "Effect=3,Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -854,6 +898,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -873,6 +918,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -892,6 +938,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001202", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -911,6 +958,7 @@ "MainSkillCheck": "MainSkillID=114001311", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -930,6 +978,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "SkillID=214001313", "BuffCheck": "BuffID=390001202,Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -949,6 +998,7 @@ "MainSkillCheck": "MainSkillID=124004111", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -968,6 +1018,7 @@ "MainSkillCheck": "MainSkillID=124004311", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -987,6 +1038,7 @@ "MainSkillCheck": "MainSkillID=124004312", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1006,6 +1058,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1025,6 +1078,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1044,6 +1098,7 @@ "MainSkillCheck": "MainSkillID=143002311", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1063,6 +1118,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "Effect=1,Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1082,6 +1138,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001214", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1101,6 +1158,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001214", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1120,6 +1178,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1139,6 +1198,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1158,6 +1218,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1177,6 +1238,7 @@ "MainSkillCheck": "MainSkillID=134007111", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1196,6 +1258,7 @@ "MainSkillCheck": "MainSkillID=134007311", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1215,6 +1278,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [ "SelfHpproless=500" ], @@ -1236,6 +1300,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [ "FriendHpproless=500" ], @@ -1258,6 +1323,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1277,6 +1343,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [ "EffType=0,Result=1" ], @@ -1296,6 +1363,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1315,6 +1383,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "Effect=3,Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1334,6 +1403,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1353,6 +1423,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1372,6 +1443,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "Effect=3,Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1391,6 +1463,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "SkillID=215002313", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1410,6 +1483,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1429,6 +1503,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1448,6 +1523,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1467,6 +1543,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1486,6 +1563,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1505,6 +1583,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1524,6 +1603,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1543,6 +1623,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1562,6 +1643,7 @@ "MainSkillCheck": "MainSkillID=124009211", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1581,6 +1663,7 @@ "MainSkillCheck": "MainSkillID=124009311", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1600,6 +1683,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "SkillID=224001111", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1619,6 +1703,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1638,6 +1723,7 @@ "MainSkillCheck": "MainSkillID=133002211", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1657,6 +1743,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1674,6 +1761,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1693,6 +1781,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1712,6 +1801,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1729,6 +1819,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1748,6 +1839,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1767,6 +1859,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1786,6 +1879,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1805,6 +1899,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1824,6 +1919,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1843,6 +1939,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1864,6 +1961,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1884,6 +1982,7 @@ "MainSkillCheck": "MainSkillID=155007111", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1903,6 +2002,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [ "EffType=0,Result=1" ], @@ -1924,6 +2024,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [ "HasBuff=390001415" ], @@ -1945,6 +2046,7 @@ "MainSkillCheck": "MainSkillID=155007211", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1964,6 +2066,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -1984,6 +2087,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2003,6 +2107,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2022,6 +2127,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001122,OverlayNumUp=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2041,6 +2147,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "SkillID=255006212", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2061,6 +2168,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [ "SelfNoBuff=390001448" ], @@ -2082,6 +2190,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2099,6 +2208,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 150, "PasCorrection": 0, @@ -2118,6 +2228,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 600, "PasCorrection": 0, @@ -2137,6 +2248,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2156,6 +2268,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2175,6 +2288,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [ "EnemyHasBuff=390001008" ], @@ -2196,6 +2310,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2215,6 +2330,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2234,6 +2350,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [ "EffType=1,Result=1" ], @@ -2249,12 +2366,13 @@ }, { "Id": 451010111, - "When": 10, + "When": 16, "FromCheck": "Target=3", "TargetCheck": "3", "MainSkillCheck": "MainSkillID=151010111", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "CriCal=1", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2268,12 +2386,13 @@ }, { "Id": 451010211, - "When": 10, + "When": 16, "FromCheck": "Target=3", "TargetCheck": "3", "MainSkillCheck": "MainSkillID=151010211", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "CriCal=1", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2293,6 +2412,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2312,6 +2432,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2331,6 +2452,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2350,6 +2472,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2369,6 +2492,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2382,12 +2506,13 @@ }, { "Id": 444003311, - "When": 2, - "FromCheck": "Target=1", - "TargetCheck": "", + "When": 15, + "FromCheck": "", + "TargetCheck": "Target=1", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [ "Alive=0" ], @@ -2398,7 +2523,7 @@ "MaxEmitTimes": 0, "MaxEmitTimesInRound": 1, "Callback": [ - 244003212 + 244003314 ] }, { @@ -2409,6 +2534,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2428,6 +2554,7 @@ "MainSkillCheck": "MainSkillID=144001111", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2447,6 +2574,7 @@ "MainSkillCheck": "MainSkillID=144001211", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2466,6 +2594,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2485,6 +2614,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2504,6 +2634,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2523,6 +2654,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2542,6 +2674,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001122", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2561,6 +2694,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2580,6 +2714,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2599,6 +2734,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "Effect=1,Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2618,6 +2754,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2637,6 +2774,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2656,6 +2794,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2675,6 +2814,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2694,6 +2834,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2713,6 +2854,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2732,6 +2874,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 250, "PasCorrection": 0, @@ -2752,6 +2895,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2771,6 +2915,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2790,6 +2935,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2809,6 +2955,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2828,6 +2975,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2847,6 +2995,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2866,6 +3015,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2885,6 +3035,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2904,6 +3055,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2923,6 +3075,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2942,6 +3095,7 @@ "MainSkillCheck": "MainSkillID=144004211", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2962,6 +3116,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -2981,6 +3136,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3000,6 +3156,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3019,6 +3176,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3038,6 +3196,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3057,6 +3216,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3076,6 +3236,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3095,6 +3256,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3114,6 +3276,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3127,12 +3290,13 @@ }, { "Id": 424008111, - "When": 16, + "When": 3, "FromCheck": "Target=3", "TargetCheck": "Target=2", "MainSkillCheck": "MainSkillID=124008111", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [ "RoleALive=34008,HasFriendRole=34008" ], @@ -3148,12 +3312,13 @@ }, { "Id": 424008211, - "When": 16, + "When": 3, "FromCheck": "Target=3", "TargetCheck": "Target=2", "MainSkillCheck": "MainSkillID=124008211", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [ "RoleALive=34008,HasFriendRole=34008" ], @@ -3169,12 +3334,13 @@ }, { "Id": 434008111, - "When": 16, + "When": 3, "FromCheck": "Target=3", "TargetCheck": "Target=2", "MainSkillCheck": "MainSkillID=134008111", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [ "RoleALive=24008,HasFriendRole=24008" ], @@ -3190,12 +3356,13 @@ }, { "Id": 434008211, - "When": 16, + "When": 3, "FromCheck": "Target=3", "TargetCheck": "Target=2", "MainSkillCheck": "MainSkillID=134008211", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [ "RoleALive=24008,HasFriendRole=24008" ], @@ -3217,6 +3384,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3237,6 +3405,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3256,6 +3425,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3275,6 +3445,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3294,6 +3465,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3313,6 +3485,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3332,6 +3505,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3351,6 +3525,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 150, "PasCorrection": 0, @@ -3371,6 +3546,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 150, "PasCorrection": 0, @@ -3391,6 +3567,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3410,6 +3587,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3429,6 +3607,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3448,6 +3627,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3467,6 +3647,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3486,6 +3667,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3505,6 +3687,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3524,6 +3707,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3543,6 +3727,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3562,6 +3747,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3582,6 +3768,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffType=SHIELD,Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3601,6 +3788,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffType=SHIELD,Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3620,6 +3808,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3639,6 +3828,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3658,6 +3848,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3677,6 +3868,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3696,6 +3888,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 300, "PasCorrection": 0, @@ -3716,6 +3909,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 400, "PasCorrection": 0, @@ -3736,6 +3930,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3755,6 +3950,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3774,6 +3970,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "EffType=3", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3793,6 +3990,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "EffType=3", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3813,6 +4011,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "EffType=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3832,6 +4031,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "EffType=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3852,6 +4052,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "EffType=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3871,6 +4072,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "EffType=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3891,6 +4093,7 @@ "MainSkillCheck": "SkillPose=3", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3910,6 +4113,7 @@ "MainSkillCheck": "SkillPose=3", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3929,6 +4133,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3948,6 +4153,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3967,6 +4173,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -3986,6 +4193,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4005,6 +4213,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4024,6 +4233,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4043,6 +4253,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4062,6 +4273,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4081,6 +4293,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4100,6 +4313,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4119,6 +4333,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4138,6 +4353,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4158,6 +4374,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4177,6 +4394,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4197,6 +4415,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4216,6 +4435,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4235,6 +4455,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4255,6 +4476,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4274,6 +4496,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4293,6 +4516,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4312,6 +4536,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001105", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4331,6 +4556,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001105", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4350,6 +4576,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4369,6 +4596,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4388,6 +4616,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001108", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4407,6 +4636,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001108", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4426,6 +4656,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4445,6 +4676,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4464,6 +4696,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4483,6 +4716,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4502,6 +4736,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "EffType=2", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4521,6 +4756,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "EffType=2", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4540,6 +4776,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4559,6 +4796,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4578,6 +4816,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4597,6 +4836,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4616,6 +4856,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4635,6 +4876,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4654,6 +4896,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4673,6 +4916,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4692,6 +4936,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4711,6 +4956,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4730,6 +4976,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "EffType=2", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4749,6 +4996,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "EffType=2", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4769,6 +5017,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "EffType=2", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4788,6 +5037,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "EffType=2", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4807,6 +5057,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4826,6 +5077,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "EffType=2", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4845,6 +5097,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "EffType=2", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4864,6 +5117,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 150, "PasCorrection": 0, @@ -4884,6 +5138,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4903,6 +5158,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4922,6 +5178,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 150, "PasCorrection": 0, @@ -4942,6 +5199,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4961,6 +5219,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4980,6 +5239,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -4999,6 +5259,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5018,6 +5279,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5038,6 +5300,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5057,6 +5320,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5076,6 +5340,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5097,6 +5362,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5116,6 +5382,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5137,6 +5404,7 @@ "MainSkillCheck": "MainSkillID=113001211", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5156,6 +5424,7 @@ "MainSkillCheck": "MainSkillID=113001211", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5175,6 +5444,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5194,6 +5464,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5213,6 +5484,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5232,6 +5504,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5251,6 +5524,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5270,6 +5544,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5289,6 +5564,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5308,6 +5584,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5327,6 +5604,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5346,6 +5624,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5365,6 +5644,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5384,6 +5664,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5403,6 +5684,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5422,6 +5704,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5441,6 +5724,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5460,6 +5744,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5479,6 +5764,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5498,6 +5784,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5517,6 +5804,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5536,6 +5824,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001205,Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5555,6 +5844,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5574,6 +5864,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5593,6 +5884,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5612,6 +5904,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5631,6 +5924,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5650,6 +5944,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5669,6 +5964,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5688,6 +5984,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "SkillID=224001111", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5707,6 +6004,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5726,6 +6024,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5745,6 +6044,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5765,6 +6065,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5784,6 +6085,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5803,6 +6105,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5822,6 +6125,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5841,6 +6145,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5856,10 +6161,11 @@ "Id": 482400523, "When": 2, "FromCheck": "", - "TargetCheck": "Target=3,SKILLSPACE=-1,CD=1", + "TargetCheck": "Target=3,SkillPose=-1,CD=1", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5879,6 +6185,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5898,6 +6205,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "SkillID=224009211", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5917,6 +6225,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5936,6 +6245,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5955,6 +6265,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5974,6 +6285,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -5993,6 +6305,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6012,6 +6325,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6031,6 +6345,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6050,6 +6365,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6069,6 +6385,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6088,6 +6405,7 @@ "MainSkillCheck": "MainSkillID=133002211", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6107,6 +6425,7 @@ "MainSkillCheck": "MainSkillID=133003111", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 300, "PasCorrection": 0, @@ -6127,6 +6446,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6146,6 +6466,7 @@ "MainSkillCheck": "MainSkillID=133002111", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 500, "PasCorrection": 0, @@ -6165,6 +6486,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6184,6 +6506,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6203,6 +6526,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6222,6 +6546,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6241,6 +6566,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6260,6 +6586,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6279,6 +6606,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6298,6 +6626,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6317,6 +6646,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6336,6 +6666,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001434,Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6355,6 +6686,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6374,6 +6706,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6393,6 +6726,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6412,6 +6746,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6431,6 +6766,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6450,6 +6786,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6469,6 +6806,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6488,6 +6826,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6507,6 +6846,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6526,6 +6866,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6545,6 +6886,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6564,6 +6906,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6583,6 +6926,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6602,6 +6946,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6621,6 +6966,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6640,6 +6986,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6659,6 +7006,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6678,6 +7026,7 @@ "MainSkillCheck": "MainSkillID=144001211", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 300, "PasCorrection": 0, @@ -6699,6 +7048,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6718,6 +7068,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6737,6 +7088,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6756,6 +7108,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6775,6 +7128,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6794,6 +7148,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6813,6 +7168,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 200, "PasCorrection": 0, @@ -6832,6 +7188,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6851,6 +7208,7 @@ "MainSkillCheck": "MainSkillID=125001111", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6870,6 +7228,7 @@ "MainSkillCheck": "MainSkillID=125001311", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 500, "PasCorrection": 0, @@ -6889,6 +7248,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6909,6 +7269,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390002003,Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6928,6 +7289,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001202,Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6947,6 +7309,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -6966,6 +7329,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 150, "PasCorrection": 0, @@ -6985,6 +7349,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7004,6 +7369,7 @@ "MainSkillCheck": "MainSkillID=114005311", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7023,6 +7389,7 @@ "MainSkillCheck": "MainSkillID=114005311", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7042,6 +7409,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7061,6 +7429,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7080,6 +7449,7 @@ "MainSkillCheck": "MainSkillID=1150025311", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7099,6 +7469,7 @@ "MainSkillCheck": "MainSkillID=1150025311", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7118,6 +7489,7 @@ "MainSkillCheck": "MainSkillID=1150025311", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7137,6 +7509,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "SkillID=915005313", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7156,6 +7529,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7175,6 +7549,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [ "RoleALive=34008,HasFriendRole=34008" ], @@ -7196,6 +7571,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "SkillID=224009311", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7215,6 +7591,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 600, "PasCorrection": 0, @@ -7235,6 +7612,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7254,6 +7632,7 @@ "MainSkillCheck": "MainSkillID=133002311", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 300, "PasCorrection": 0, @@ -7274,6 +7653,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7293,6 +7673,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7312,6 +7693,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7331,6 +7713,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7350,6 +7733,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7370,6 +7754,7 @@ "MainSkillCheck": "MainSkillID=135004311", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7389,6 +7774,7 @@ "MainSkillCheck": "MainSkillID=143003311", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7408,6 +7794,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7427,6 +7814,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7446,6 +7834,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7465,6 +7854,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7484,6 +7874,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "SkillID=244004314", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7503,6 +7894,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7522,6 +7914,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7541,6 +7934,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7560,6 +7954,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7579,6 +7974,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7598,6 +7994,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "SkillID=234007214", "BuffCheck": "Succ=1", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7617,6 +8014,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7638,6 +8036,7 @@ "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", + "DpsCheck": "", "AddCon": [], "PasPr": 1000, "PasCorrection": 0, @@ -7648,5 +8047,47 @@ "Callback": [ 275005213 ] + }, + { + "Id": 413002211, + "When": 16, + "FromCheck": "Target=3", + "TargetCheck": "", + "MainSkillCheck": "", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 99, + "Callback": [ + 213002212 + ] + }, + { + "Id": 491400231, + "When": 16, + "FromCheck": "", + "TargetCheck": "Target=3", + "MainSkillCheck": "", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 150, + "PasCorrection": 0, + "Type": "BeatBack", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 0, + "Callback": [ + 1, + 1000, + 914008314 + ] } ] \ No newline at end of file diff --git a/bin/json/game_trainlv.json b/bin/json/game_trainlv.json index ec5e51abc..c5db74cec 100644 --- a/bin/json/game_trainlv.json +++ b/bin/json/game_trainlv.json @@ -320,7 +320,7 @@ "type": 3, "lv": 22, "exp": 100, - "etime": 50, + "etime": 51, "reward": [ { "a": "attr", @@ -335,7 +335,7 @@ "type": 3, "lv": 23, "exp": 100, - "etime": 50, + "etime": 52, "reward": [ { "a": "attr", @@ -350,7 +350,7 @@ "type": 3, "lv": 24, "exp": 100, - "etime": 50, + "etime": 53, "reward": [ { "a": "attr", @@ -365,7 +365,7 @@ "type": 3, "lv": 25, "exp": 100, - "etime": 50, + "etime": 54, "reward": [ { "a": "attr", @@ -380,7 +380,7 @@ "type": 3, "lv": 26, "exp": 100, - "etime": 50, + "etime": 55, "reward": [ { "a": "attr", @@ -395,7 +395,7 @@ "type": 3, "lv": 27, "exp": 100, - "etime": 50, + "etime": 56, "reward": [ { "a": "attr", @@ -410,7 +410,7 @@ "type": 3, "lv": 28, "exp": 100, - "etime": 50, + "etime": 57, "reward": [ { "a": "attr", @@ -425,7 +425,7 @@ "type": 3, "lv": 29, "exp": 100, - "etime": 50, + "etime": 58, "reward": [ { "a": "attr", @@ -440,7 +440,907 @@ "type": 3, "lv": 30, "exp": 100, + "etime": 59, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 30 + } + ] + }, + { + "key": 31, + "id": "20030002", + "type": 1, + "lv": 1, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "key": 32, + "id": "20030002", + "type": 1, + "lv": 2, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 2 + } + ] + }, + { + "key": 33, + "id": "20030002", + "type": 1, + "lv": 3, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 3 + } + ] + }, + { + "key": 34, + "id": "20030002", + "type": 1, + "lv": 4, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 4 + } + ] + }, + { + "key": 35, + "id": "20030002", + "type": 1, + "lv": 5, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 5 + } + ] + }, + { + "key": 36, + "id": "20030002", + "type": 2, + "lv": 6, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 6 + } + ] + }, + { + "key": 37, + "id": "20030002", + "type": 2, + "lv": 7, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 7 + } + ] + }, + { + "key": 38, + "id": "20030002", + "type": 2, + "lv": 8, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 8 + } + ] + }, + { + "key": 39, + "id": "20030002", + "type": 2, + "lv": 9, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 9 + } + ] + }, + { + "key": 40, + "id": "20030002", + "type": 2, + "lv": 10, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 10 + } + ] + }, + { + "key": 41, + "id": "20030002", + "type": 2, + "lv": 11, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 11 + } + ] + }, + { + "key": 42, + "id": "20030002", + "type": 2, + "lv": 12, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 12 + } + ] + }, + { + "key": 43, + "id": "20030002", + "type": 2, + "lv": 13, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 13 + } + ] + }, + { + "key": 44, + "id": "20030002", + "type": 2, + "lv": 14, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 14 + } + ] + }, + { + "key": 45, + "id": "20030002", + "type": 2, + "lv": 15, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 15 + } + ] + }, + { + "key": 46, + "id": "20030002", + "type": 2, + "lv": 16, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 16 + } + ] + }, + { + "key": 47, + "id": "20030002", + "type": 2, + "lv": 17, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 17 + } + ] + }, + { + "key": 48, + "id": "20030002", + "type": 2, + "lv": 18, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 18 + } + ] + }, + { + "key": 49, + "id": "20030002", + "type": 2, + "lv": 19, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 19 + } + ] + }, + { + "key": 50, + "id": "20030002", + "type": 2, + "lv": 20, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 20 + } + ] + }, + { + "key": 51, + "id": "20030002", + "type": 3, + "lv": 21, + "exp": 100, "etime": 50, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 21 + } + ] + }, + { + "key": 52, + "id": "20030002", + "type": 3, + "lv": 22, + "exp": 100, + "etime": 51, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 22 + } + ] + }, + { + "key": 53, + "id": "20030002", + "type": 3, + "lv": 23, + "exp": 100, + "etime": 52, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 23 + } + ] + }, + { + "key": 54, + "id": "20030002", + "type": 3, + "lv": 24, + "exp": 100, + "etime": 53, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 24 + } + ] + }, + { + "key": 55, + "id": "20030002", + "type": 3, + "lv": 25, + "exp": 100, + "etime": 54, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 25 + } + ] + }, + { + "key": 56, + "id": "20030002", + "type": 3, + "lv": 26, + "exp": 100, + "etime": 55, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 26 + } + ] + }, + { + "key": 57, + "id": "20030002", + "type": 3, + "lv": 27, + "exp": 100, + "etime": 56, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 27 + } + ] + }, + { + "key": 58, + "id": "20030002", + "type": 3, + "lv": 28, + "exp": 100, + "etime": 57, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 28 + } + ] + }, + { + "key": 59, + "id": "20030002", + "type": 3, + "lv": 29, + "exp": 100, + "etime": 58, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 29 + } + ] + }, + { + "key": 60, + "id": "20030002", + "type": 3, + "lv": 30, + "exp": 100, + "etime": 59, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 30 + } + ] + }, + { + "key": 61, + "id": "20030003", + "type": 1, + "lv": 1, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 1 + } + ] + }, + { + "key": 62, + "id": "20030003", + "type": 1, + "lv": 2, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 2 + } + ] + }, + { + "key": 63, + "id": "20030003", + "type": 1, + "lv": 3, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 3 + } + ] + }, + { + "key": 64, + "id": "20030003", + "type": 1, + "lv": 4, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 4 + } + ] + }, + { + "key": 65, + "id": "20030003", + "type": 1, + "lv": 5, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 5 + } + ] + }, + { + "key": 66, + "id": "20030003", + "type": 2, + "lv": 6, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 6 + } + ] + }, + { + "key": 67, + "id": "20030003", + "type": 2, + "lv": 7, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 7 + } + ] + }, + { + "key": 68, + "id": "20030003", + "type": 2, + "lv": 8, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 8 + } + ] + }, + { + "key": 69, + "id": "20030003", + "type": 2, + "lv": 9, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 9 + } + ] + }, + { + "key": 70, + "id": "20030003", + "type": 2, + "lv": 10, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 10 + } + ] + }, + { + "key": 71, + "id": "20030003", + "type": 2, + "lv": 11, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 11 + } + ] + }, + { + "key": 72, + "id": "20030003", + "type": 2, + "lv": 12, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 12 + } + ] + }, + { + "key": 73, + "id": "20030003", + "type": 2, + "lv": 13, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 13 + } + ] + }, + { + "key": 74, + "id": "20030003", + "type": 2, + "lv": 14, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 14 + } + ] + }, + { + "key": 75, + "id": "20030003", + "type": 2, + "lv": 15, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 15 + } + ] + }, + { + "key": 76, + "id": "20030003", + "type": 2, + "lv": 16, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 16 + } + ] + }, + { + "key": 77, + "id": "20030003", + "type": 2, + "lv": 17, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 17 + } + ] + }, + { + "key": 78, + "id": "20030003", + "type": 2, + "lv": 18, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 18 + } + ] + }, + { + "key": 79, + "id": "20030003", + "type": 2, + "lv": 19, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 19 + } + ] + }, + { + "key": 80, + "id": "20030003", + "type": 2, + "lv": 20, + "exp": 100, + "etime": 0, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 20 + } + ] + }, + { + "key": 81, + "id": "20030003", + "type": 3, + "lv": 21, + "exp": 100, + "etime": 50, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 21 + } + ] + }, + { + "key": 82, + "id": "20030003", + "type": 3, + "lv": 22, + "exp": 100, + "etime": 51, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 22 + } + ] + }, + { + "key": 83, + "id": "20030003", + "type": 3, + "lv": 23, + "exp": 100, + "etime": 52, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 23 + } + ] + }, + { + "key": 84, + "id": "20030003", + "type": 3, + "lv": 24, + "exp": 100, + "etime": 53, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 24 + } + ] + }, + { + "key": 85, + "id": "20030003", + "type": 3, + "lv": 25, + "exp": 100, + "etime": 54, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 25 + } + ] + }, + { + "key": 86, + "id": "20030003", + "type": 3, + "lv": 26, + "exp": 100, + "etime": 55, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 26 + } + ] + }, + { + "key": 87, + "id": "20030003", + "type": 3, + "lv": 27, + "exp": 100, + "etime": 56, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 27 + } + ] + }, + { + "key": 88, + "id": "20030003", + "type": 3, + "lv": 28, + "exp": 100, + "etime": 57, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 28 + } + ] + }, + { + "key": 89, + "id": "20030003", + "type": 3, + "lv": 29, + "exp": 100, + "etime": 58, + "reward": [ + { + "a": "attr", + "t": "gold", + "n": 29 + } + ] + }, + { + "key": 90, + "id": "20030003", + "type": 3, + "lv": 30, + "exp": 100, + "etime": 59, "reward": [ { "a": "attr", diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 26d6ef97c..52dfe7127 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -864,7 +864,7 @@ { "a": "equi", "t": "10131", - "n": 1 + "n": 5 }, { "a": "equi", diff --git a/sys/configure/structs/Game.BattleReadyData.go b/sys/configure/structs/Game.BattleReadyData.go index 17eec5a17..f91c520a0 100644 --- a/sys/configure/structs/Game.BattleReadyData.go +++ b/sys/configure/structs/Game.BattleReadyData.go @@ -17,8 +17,8 @@ type GameBattleReadyData struct { ReadyScene string BattleScenes []string HideAlienSpace int32 - ShowBuff int32 RuleTips string + BattleTips string BattleEvents []int32 ScoreGroupID int32 DisableAiCamera int32 @@ -61,8 +61,8 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HideAlienSpace"].(float64); !_ok_ { err = errors.New("HideAlienSpace error"); return }; _v.HideAlienSpace = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ShowBuff"].(float64); !_ok_ { err = errors.New("ShowBuff error"); return }; _v.ShowBuff = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["RuleTips"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.RuleTips error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.RuleTips, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["BattleTips"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.BattleTips error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.BattleTips, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.BuzkashiGradeData.go b/sys/configure/structs/Game.BuzkashiGradeData.go index 2fcee4121..676659818 100644 --- a/sys/configure/structs/Game.BuzkashiGradeData.go +++ b/sys/configure/structs/Game.BuzkashiGradeData.go @@ -14,6 +14,7 @@ type GameBuzkashiGradeData struct { Num int32 Distance float32 Value int32 + Energy int32 } const TypeId_GameBuzkashiGradeData = -378990226 @@ -26,6 +27,7 @@ func (_v *GameBuzkashiGradeData)Deserialize(_buf map[string]interface{}) (err er { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["distance"].(float64); !_ok_ { err = errors.New("distance error"); return }; _v.Distance = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["energy"].(float64); !_ok_ { err = errors.New("energy error"); return }; _v.Energy = int32(_tempNum_) } return } diff --git a/sys/configure/structs/Game.DragonPlayData.go b/sys/configure/structs/Game.DragonPlayData.go index 011621523..e2625a02d 100644 --- a/sys/configure/structs/Game.DragonPlayData.go +++ b/sys/configure/structs/Game.DragonPlayData.go @@ -17,6 +17,7 @@ type GameDragonPlayData struct { Type int32 Exp int32 Time int32 + Deplete *Gameatn Group int32 } @@ -33,6 +34,7 @@ func (_v *GameDragonPlayData)Deserialize(_buf map[string]interface{}) (err error { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["exp"].(float64); !_ok_ { err = errors.New("exp error"); return }; _v.Exp = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["deplete"].(map[string]interface{}); !_ok_ { err = errors.New("deplete error"); return }; if _v.Deplete, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) } return } diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index cd4fcddff..9880879ae 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -225,25 +225,33 @@ type GameGlobalData struct { FavorabilityLikes int32 FavorabilityDislikes int32 BuzkashiTime int32 - BuzkashiSchedule int32 - BuzkashiStime int32 BuzkashiVreward []*Gameatn BuzkashiFreward []*Gameatn BuzkashiVintegral []*Gameatn BuzkashiFintegral []*Gameatn BuzkashiResurrection int32 - FavorabilityAttenuation []*Gamekv - Mounts string - BuzkashiRecentPlayer int32 - TaskActivation int32 + BuzkashiCaddtracktime int32 + BuzkashiAddtracktime int32 + BuzkashiSubtracktime int32 + BuzkashiBumpspeedtime int32 + BuzkashiDeathsubtime int32 + BuzkashiCatchsubtime int32 + BuzkashiItemendtime int32 + BuzkashiSchedule int32 + BuzkashiStime int32 + BuzkashiSendtime int32 BuzkashiSpeedbumptime int32 BuzkashiSpeedbumphp int32 + BuzkashiBumpdis float32 BuzkashiRecovertime int32 BuzkashiRecoverHp int32 BuzkashiDeathspeed int32 - BuzkashiGoal int32 - BuzkashiGoalspeed int32 - BuzkashiBumpdis float32 + BuzkashiCatch int32 + BuzkashiCatchspeed int32 + BuzkashiRecentPlayer int32 + TaskActivation int32 + FavorabilityAttenuation []*Gamekv + Mounts string StaminaPotion *Gameatn FightPs int32 PlayerBodychange int32 @@ -921,8 +929,6 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_likes"].(float64); !_ok_ { err = errors.New("favorability_likes error"); return }; _v.FavorabilityLikes = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_dislikes"].(float64); !_ok_ { err = errors.New("favorability_dislikes error"); return }; _v.FavorabilityDislikes = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_time"].(float64); !_ok_ { err = errors.New("buzkashi_time error"); return }; _v.BuzkashiTime = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_schedule"].(float64); !_ok_ { err = errors.New("buzkashi_schedule error"); return }; _v.BuzkashiSchedule = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_stime"].(float64); !_ok_ { err = errors.New("buzkashi_stime error"); return }; _v.BuzkashiStime = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool @@ -980,6 +986,26 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_resurrection"].(float64); !_ok_ { err = errors.New("buzkashi_resurrection error"); return }; _v.BuzkashiResurrection = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_caddtracktime"].(float64); !_ok_ { err = errors.New("buzkashi_caddtracktime error"); return }; _v.BuzkashiCaddtracktime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_addtracktime"].(float64); !_ok_ { err = errors.New("buzkashi_addtracktime error"); return }; _v.BuzkashiAddtracktime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_subtracktime"].(float64); !_ok_ { err = errors.New("buzkashi_subtracktime error"); return }; _v.BuzkashiSubtracktime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_bumpspeedtime"].(float64); !_ok_ { err = errors.New("buzkashi_bumpspeedtime error"); return }; _v.BuzkashiBumpspeedtime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_deathsubtime"].(float64); !_ok_ { err = errors.New("buzkashi_deathsubtime error"); return }; _v.BuzkashiDeathsubtime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_catchsubtime"].(float64); !_ok_ { err = errors.New("buzkashi_catchsubtime error"); return }; _v.BuzkashiCatchsubtime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_itemendtime"].(float64); !_ok_ { err = errors.New("buzkashi_itemendtime error"); return }; _v.BuzkashiItemendtime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_schedule"].(float64); !_ok_ { err = errors.New("buzkashi_schedule error"); return }; _v.BuzkashiSchedule = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_stime"].(float64); !_ok_ { err = errors.New("buzkashi_stime error"); return }; _v.BuzkashiStime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_sendtime"].(float64); !_ok_ { err = errors.New("buzkashi_sendtime error"); return }; _v.BuzkashiSendtime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_speedbumptime"].(float64); !_ok_ { err = errors.New("buzkashi_speedbumptime error"); return }; _v.BuzkashiSpeedbumptime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_speedbumphp"].(float64); !_ok_ { err = errors.New("buzkashi_speedbumphp error"); return }; _v.BuzkashiSpeedbumphp = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_bumpdis"].(float64); !_ok_ { err = errors.New("buzkashi_bumpdis error"); return }; _v.BuzkashiBumpdis = float32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recovertime"].(float64); !_ok_ { err = errors.New("buzkashi_recovertime error"); return }; _v.BuzkashiRecovertime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recoverHp"].(float64); !_ok_ { err = errors.New("buzkashi_recoverHp error"); return }; _v.BuzkashiRecoverHp = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_deathspeed"].(float64); !_ok_ { err = errors.New("buzkashi_deathspeed error"); return }; _v.BuzkashiDeathspeed = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_catch"].(float64); !_ok_ { err = errors.New("buzkashi_catch error"); return }; _v.BuzkashiCatch = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_catchspeed"].(float64); !_ok_ { err = errors.New("buzkashi_catchspeed error"); return }; _v.BuzkashiCatchspeed = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recentPlayer"].(float64); !_ok_ { err = errors.New("buzkashi_recentPlayer error"); return }; _v.BuzkashiRecentPlayer = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["task_activation"].(float64); !_ok_ { err = errors.New("task_activation error"); return }; _v.TaskActivation = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool @@ -995,16 +1021,6 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { } { var _ok_ bool; if _v.Mounts, _ok_ = _buf["mounts"].(string); !_ok_ { err = errors.New("mounts error"); return } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recentPlayer"].(float64); !_ok_ { err = errors.New("buzkashi_recentPlayer error"); return }; _v.BuzkashiRecentPlayer = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["task_activation"].(float64); !_ok_ { err = errors.New("task_activation error"); return }; _v.TaskActivation = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_speedbumptime"].(float64); !_ok_ { err = errors.New("buzkashi_speedbumptime error"); return }; _v.BuzkashiSpeedbumptime = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_speedbumphp"].(float64); !_ok_ { err = errors.New("buzkashi_speedbumphp error"); return }; _v.BuzkashiSpeedbumphp = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recovertime"].(float64); !_ok_ { err = errors.New("buzkashi_recovertime error"); return }; _v.BuzkashiRecovertime = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recoverHp"].(float64); !_ok_ { err = errors.New("buzkashi_recoverHp error"); return }; _v.BuzkashiRecoverHp = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_deathspeed"].(float64); !_ok_ { err = errors.New("buzkashi_deathspeed error"); return }; _v.BuzkashiDeathspeed = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goal"].(float64); !_ok_ { err = errors.New("buzkashi_goal error"); return }; _v.BuzkashiGoal = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_goalspeed"].(float64); !_ok_ { err = errors.New("buzkashi_goalspeed error"); return }; _v.BuzkashiGoalspeed = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_bumpdis"].(float64); !_ok_ { err = errors.New("buzkashi_bumpdis error"); return }; _v.BuzkashiBumpdis = float32(_tempNum_) } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["stamina_potion"].(map[string]interface{}); !_ok_ { err = errors.New("stamina_potion error"); return }; if _v.StaminaPotion, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fight_ps"].(float64); !_ok_ { err = errors.New("fight_ps error"); return }; _v.FightPs = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["player_bodychange"].(float64); !_ok_ { err = errors.New("player_bodychange error"); return }; _v.PlayerBodychange = int32(_tempNum_) } diff --git a/sys/configure/structs/game.skillPassiveData.go b/sys/configure/structs/game.skillPassiveData.go index 271f26f26..f1fd85aa2 100644 --- a/sys/configure/structs/game.skillPassiveData.go +++ b/sys/configure/structs/game.skillPassiveData.go @@ -18,6 +18,7 @@ type GameSkillPassiveData struct { MainSkillCheck string AfterSkillCheck string BuffCheck string + DpsCheck string AddCon []string PasPr int32 PasCorrection int32 @@ -42,6 +43,7 @@ func (_v *GameSkillPassiveData)Deserialize(_buf map[string]interface{}) (err err { var _ok_ bool; if _v.MainSkillCheck, _ok_ = _buf["MainSkillCheck"].(string); !_ok_ { err = errors.New("MainSkillCheck error"); return } } { var _ok_ bool; if _v.AfterSkillCheck, _ok_ = _buf["AfterSkillCheck"].(string); !_ok_ { err = errors.New("AfterSkillCheck error"); return } } { var _ok_ bool; if _v.BuffCheck, _ok_ = _buf["BuffCheck"].(string); !_ok_ { err = errors.New("BuffCheck error"); return } } + { var _ok_ bool; if _v.DpsCheck, _ok_ = _buf["DpsCheck"].(string); !_ok_ { err = errors.New("DpsCheck error"); return } } { var _arr_ []interface{} var _ok_ bool